From nobody Mon Feb 9 10:39:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632316022; cv=none; d=zohomail.com; s=zohoarc; b=RQh/thFTZ0q42DZw+VyIjj+os/FmCEZcV4LaurD4IM+kyFJ5AFlTcWlg/Kr6qwRSoIOR+Y1zzmJBnucGUX6bcp2mkedSsiMjSThFzSe4dbzWrjPy4HlCHE3AtYfAh5TcpODD6Y54189OURMk+VHV+xatIfFg1SuPxBqz1U5lTG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632316022; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ySd+MpYBtT+ReweV+EkfbH8pvGYzA9o91iwuZ44Hnc4=; b=W0rUuBWMQGmmIThoGLMY6YE13plG05E2koZICP09NhjT0W39yvo3VjcrePV4hCqV6agREX9qbWr0z+FwYr2Q/K9e4qx4Mo6Ro5+mIR3tbawwjADToOKalUcmRWztOSLJeHYeSe1Poi6M7oZ9oFHtt8pJFYgQ9awHSeAf1FMmDmQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1632316022254458.46508733715643; Wed, 22 Sep 2021 06:07:02 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-554-rpZ2_mpSPYWbn4a5AKLfhQ-1; Wed, 22 Sep 2021 09:06:56 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10F2091294; Wed, 22 Sep 2021 13:06:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4C7810013C1; Wed, 22 Sep 2021 13:06:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B46F81800FE4; Wed, 22 Sep 2021 13:06:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MD6n1s021617 for ; Wed, 22 Sep 2021 09:06:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BB5D29671; Wed, 22 Sep 2021 13:06:49 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id A040F1B46D for ; Wed, 22 Sep 2021 13:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632316021; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ySd+MpYBtT+ReweV+EkfbH8pvGYzA9o91iwuZ44Hnc4=; b=ObycSAQMyjTksyUn3L4A8wcz94hZmBHWuZnwuTvvTNvL07vlNIxoVZe090mkahwIxlqVFB OhPQyb3glWhLY6biqU/K2pCLz7OdwJ1ofzng9MaJ93qAJtAd7kg9TQayZagkw0Ux7gAQJa hTfPSNl330cR5fpX43L4+EuLT2QAo30= X-MC-Unique: rpZ2_mpSPYWbn4a5AKLfhQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/20] qemuxml2argvtest: Pin old-style '-no-reboot' usage to qemu-5.2 Date: Wed, 22 Sep 2021 15:02:28 +0200 Message-Id: <76b834bd51f5837fd53f759f475ad6890d499650.1632315628.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632316024242100003 Content-Type: text/plain; charset="utf-8" After qemu-5.2 we always use -no-shutdown. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/misc-no-reboot.args | 31 ---------------- .../misc-no-reboot.x86_64-5.2.0.args | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 +- 3 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 tests/qemuxml2argvdata/misc-no-reboot.args create mode 100644 tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2arg= vdata/misc-no-reboot.args deleted file mode 100644 index 54ae04a480..0000000000 --- a/tests/qemuxml2argvdata/misc-no-reboot.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-reboot \ --no-acpi \ --boot strict=3Don \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args b/test= s/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args new file mode 100644 index 0000000000..db6fff54db --- /dev/null +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-reboot \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 87c8a27b73..b464d4bb68 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1564,7 +1564,7 @@ mymain(void) DO_TEST("misc-disable-suspends", QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_= PIIX_DISABLE_S4); DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4); DO_TEST_PARSE_ERROR_NOCAPS("misc-enable-s4"); - DO_TEST_NOCAPS("misc-no-reboot"); + DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0"); DO_TEST_CAPS_LATEST("misc-no-reboot"); DO_TEST_NOCAPS("misc-uuid"); DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid"); --=20 2.31.1