From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923900; cv=none; d=zohomail.com; s=zohoarc; b=Ma+DuCiNHUZdU98Ht5vhLDBtIVTmzeCQmIF3oO7G3cSdLEmpljo+E3XwNfEYTBgcr1i89CrRiYNkD3EtfII8FeymP5/r2bX//7M9ljO3zLptqK4w1eqE+b9hkmdA9esKnsqFHKMmfUcF0Q97kFXcTOhjlI94A0UlE7Czelye9cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923900; 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=fcPBxLoh6C1q8uy9pF62YWLhh/ljs2erGjym0CND6JU=; b=YjfkfILSTwp75Qs67YWWoOZfVSNdrEWbEk9CJBcIzcs6dS5PQINhVEUHhLg0+xvJM/IFZAJlJXQqxZWMHiS/8ynreWOwM0FOctGgWASHiHrK66qB9++1VzhrMQJd9NxM19EVj/07LZ0NtVVSQGgMIfsdubehaC6SMC2bcDJUkJc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923900791559.7001420406427; Tue, 5 Sep 2023 07:25:00 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-161-QOYmVMBqPv2mmVJyRv2IJg-1; Tue, 05 Sep 2023 10:24:51 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 43AA2280BC9C; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F685C03291; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 04ABC1946595; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B48031946589 for ; Tue, 5 Sep 2023 14:24:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A14091121314; Tue, 5 Sep 2023 14:24:23 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07F711121319 for ; Tue, 5 Sep 2023 14:24:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923899; 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=fcPBxLoh6C1q8uy9pF62YWLhh/ljs2erGjym0CND6JU=; b=Uh7CSdR8ZHOgMLlxQrRI8mNByCFXSmQZulRS81Y6bM/z8dmQY6vQ4DZrk8Fcx2nPvl9h/C +MvL4ZEvSkc2Y+vuN4m6MUYbPiQAO8HriLSAkGIrx1EZw6q80Rm8rcHbHpQyBIRgsgZOer 4/jZZKHgt42puvd7iMmRPHWZW5/wL8A= X-MC-Unique: QOYmVMBqPv2mmVJyRv2IJg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/51] qemu: Always assume support for QEMU_CAPS_PIIX_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* Date: Tue, 5 Sep 2023 16:23:28 +0200 Message-ID: <6399dee8d98b576a88da3a4933a29b03114fc910.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: 1693923902089100001 Content-Type: text/plain; charset="utf-8" The support for PIIX power management was added in qemu commit v1.0-3094-g459ae5ea5a and the suport for ICH9 power management was added in qemu commit v2.2.0-542-g6ac0d8d44c and both can't be compiled out. This means we can always assume support for these features. Remove the validation and impossible tests. Move relevant bits from 'q35-pm-disable' to 'q35' test case. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 40 +++++++------------ src/qemu/qemu_validate.c | 37 ++--------------- tests/qemuxml2argvdata/misc-enable-s4.err | 1 - .../q35-pm-disable-fallback.args | 37 ----------------- .../q35-pm-disable-fallback.xml | 18 --------- tests/qemuxml2argvdata/q35-pm-disable.args | 37 ----------------- tests/qemuxml2argvdata/q35-pm-disable.xml | 18 --------- tests/qemuxml2argvdata/q35.args | 2 + tests/qemuxml2argvdata/q35.xml | 4 ++ tests/qemuxml2argvtest.c | 18 ++------- .../qemuxml2xmloutdata/q35.x86_64-latest.xml | 4 ++ 11 files changed, 31 insertions(+), 185 deletions(-) delete mode 100644 tests/qemuxml2argvdata/misc-enable-s4.err delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.xml delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a55218d5fd..f7079c6920 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6047,7 +6047,7 @@ qemuBuildClockCommandLine(virCommand *cmd, } -static int +static void qemuBuildPMCommandLine(virCommand *cmd, const virDomainDef *def, qemuDomainObjPrivate *priv) @@ -6075,35 +6075,24 @@ qemuBuildPMCommandLine(virCommand *cmd, virCommandAddArg(cmd, "-no-acpi"); } - /* We fall back to PIIX4_PM even for q35, since it's what we did - pre-q35-pm support. QEMU starts up fine (with a warning) if - mixing PIIX PM and -M q35. Starting to reject things here - could mean we refuse to start existing configs in the wild.*/ - if (def->pm.s3) { + if (def->pm.s3 || def->pm.s4) { const char *pm_object =3D "PIIX4_PM"; - if (qemuDomainIsQ35(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S3)) + if (qemuDomainIsQ35(def)) pm_object =3D "ICH9-LPC"; - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "%s.disable_s3=3D%d", - pm_object, def->pm.s3 =3D=3D VIR_TRISTATE_B= OOL_NO); - } - - if (def->pm.s4) { - const char *pm_object =3D "PIIX4_PM"; - - if (qemuDomainIsQ35(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S4)) - pm_object =3D "ICH9-LPC"; + if (def->pm.s3) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.disable_s3=3D%d", + pm_object, def->pm.s3 =3D=3D VIR_TRISTA= TE_BOOL_NO); + } - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "%s.disable_s4=3D%d", - pm_object, def->pm.s4 =3D=3D VIR_TRISTATE_B= OOL_NO); + if (def->pm.s4) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.disable_s4=3D%d", + pm_object, def->pm.s4 =3D=3D VIR_TRISTA= TE_BOOL_NO); + } } - - return 0; } @@ -10444,8 +10433,7 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0) return NULL; - if (qemuBuildPMCommandLine(cmd, def, priv) < 0) - return NULL; + qemuBuildPMCommandLine(cmd, def, priv); if (qemuBuildBootCommandLine(cmd, def) < 0) return NULL; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8f9e8fd7f0..d5fe1cbd73 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -588,38 +588,6 @@ qemuValidateDomainDefClockTimers(const virDomainDef *d= ef, } -static int -qemuValidateDomainDefPM(const virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - bool q35Dom =3D qemuDomainIsQ35(def); - - if (def->pm.s3) { - bool q35ICH9_S3 =3D q35Dom && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_= S3); - - if (!q35ICH9_S3 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABL= E_S3)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("setting ACPI S3 not supported")); - return -1; - } - } - - if (def->pm.s4) { - bool q35ICH9_S4 =3D q35Dom && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_= S4); - - if (!q35ICH9_S4 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABL= E_S4)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("setting ACPI S4 not supported")); - return -1; - } - } - - return 0; -} - - static int qemuValidateDomainDefNvram(const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -1279,8 +1247,11 @@ qemuValidateDomainDef(const virDomainDef *def, if (qemuValidateDomainDefClockTimers(def, qemuCaps) < 0) return -1; - if (qemuValidateDomainDefPM(def, qemuCaps) < 0) + if ((def->pm.s3 || def->pm.s4) && !ARCH_IS_X86(def->os.arch)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("setting ACPI S3/S4 not supported")); return -1; + } if (qemuValidateDomainDefBoot(def, qemuCaps) < 0) return -1; diff --git a/tests/qemuxml2argvdata/misc-enable-s4.err b/tests/qemuxml2argv= data/misc-enable-s4.err deleted file mode 100644 index a256b75792..0000000000 --- a/tests/qemuxml2argvdata/misc-enable-s4.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: setting ACPI S4 not supported diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qe= muxml2argvdata/q35-pm-disable-fallback.args deleted file mode 100644 index 924e3087fb..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-q35 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dq35,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D1048576k \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ --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-shutdown \ --no-acpi \ --global PIIX4_PM.disable_s3=3D1 \ --global PIIX4_PM.disable_s4=3D1 \ --boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --global ICH9-LPC.noreboot=3Doff \ --watchdog-action reset \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml b/tests/qem= uxml2argvdata/q35-pm-disable-fallback.xml deleted file mode 100644 index 386391b270..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml +++ /dev/null @@ -1,18 +0,0 @@ - - q35 - 56f5055c-1b8d-490c-844a-ad646a1caaaa - 1048576 - 1048576 - 1 - - hvm - - - - - - - - /usr/bin/qemu-system-x86_64 - - diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2arg= vdata/q35-pm-disable.args deleted file mode 100644 index f50ddcc118..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-q35 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dq35,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D1048576k \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ --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-shutdown \ --no-acpi \ --global ICH9-LPC.disable_s3=3D1 \ --global ICH9-LPC.disable_s4=3D1 \ --boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --global ICH9-LPC.noreboot=3Doff \ --watchdog-action reset \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pm-disable.xml b/tests/qemuxml2argv= data/q35-pm-disable.xml deleted file mode 100644 index 386391b270..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable.xml +++ /dev/null @@ -1,18 +0,0 @@ - - q35 - 56f5055c-1b8d-490c-844a-ad646a1caaaa - 1048576 - 1048576 - 1 - - hvm - - - - - - - - /usr/bin/qemu-system-x86_64 - - diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index e4cb36b1d0..638c79d45f 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -24,6 +24,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ +-global ICH9-LPC.disable_s3=3D1 \ +-global ICH9-LPC.disable_s4=3D0 \ -boot strict=3Don \ -device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ -device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ diff --git a/tests/qemuxml2argvdata/q35.xml b/tests/qemuxml2argvdata/q35.xml index 22a7aca47b..30697fb940 100644 --- a/tests/qemuxml2argvdata/q35.xml +++ b/tests/qemuxml2argvdata/q35.xml @@ -8,6 +8,10 @@ hvm + + + + destroy restart diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1e6cbbf028..5d23c552c5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1394,10 +1394,9 @@ mymain(void) DO_TEST_NOCAPS("input-usbmouse"); DO_TEST_NOCAPS("input-usbtablet"); DO_TEST_NOCAPS("misc-acpi"); - DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3); - 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-disable-s3"); + DO_TEST_NOCAPS("misc-disable-suspends"); + DO_TEST_NOCAPS("misc-enable-s4"); DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0"); DO_TEST_CAPS_LATEST("misc-no-reboot"); DO_TEST_NOCAPS("misc-uuid"); @@ -2135,17 +2134,6 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420); - DO_TEST("q35-pm-disable", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, - QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4); - DO_TEST("q35-pm-disable-fallback", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable"); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable"); DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5= .1.0"); diff --git a/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml b/tests/qemuxml= 2xmloutdata/q35.x86_64-latest.xml index 909f94fe2c..3303370e7a 100644 --- a/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml @@ -15,6 +15,10 @@ destroy restart destroy + + + + /usr/bin/qemu-system-x86_64 --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923895; cv=none; d=zohomail.com; s=zohoarc; b=R2ahlcdqXZ7LVY3FJJKMzFYI56PZDT4WNveevLo3SIjicClT1nUfaIiFR62b1P4UqRSk6b9u1x3ua/atMirkbKmz9vWCwECsl4Gw93OtL85hSXD9/0AbMievE3Recf+78OtJjUfx1XdCqm2CzVIVB7bv2EtWMeDvZ2nucSDYejY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923895; 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=HAKq5R4O1HJ0nLs3kOgY1HYeOEOhxup5QGvO93CDyuM=; b=NIPpRbpOvRZbA5xtWfA5fqJ9SKOjC5R6H9ZACTx+9Ua9lwfF+8IsNmpoERSj49Lm7oW7CFGb0mlBu8YCBMoN/VpbsiTntPHO6HzOuOy6a//BGJSf7xVVzzGxG56zvjxXsTu/lQ7jna0k7ULm5Ocxj1C8evAcipv3nuv5rXNDHxE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923895034195.73870210468317; Tue, 5 Sep 2023 07:24:55 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-511-d0hLPoewPMy95Otb8euZdA-1; Tue, 05 Sep 2023 10:24:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B5E18381495B; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6325040F2D29; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 38D3A1946595; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4867E1946589 for ; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 39C3010CD6A8; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 216C61121318 for ; Tue, 5 Sep 2023 14:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923894; 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=HAKq5R4O1HJ0nLs3kOgY1HYeOEOhxup5QGvO93CDyuM=; b=EAgNdTyYTk/r7qadFD8a52siWelBLKjs/azjkRX5p96NMIH+HKu7BKYlumVW7wnh5FpJQw a7XjazNGrm2d63fFSSXuk6R43ByUB++EpztRyx6D/AyP4mF/TI05f32GR9kjo/2kO+wJ8T y9NjZvW5lJrinJxW3Wkwp+TYa7zkStI= X-MC-Unique: d0hLPoewPMy95Otb8euZdA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/51] qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* capabilities Date: Tue, 5 Sep 2023 16:23:29 +0200 Message-ID: <86cd101bda918e4ff8cdc5b99851f78bf2902374.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1693923895972100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 12 ++++-------- src/qemu/qemu_capabilities.h | 8 ++++---- tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 4 ---- 19 files changed, 8 insertions(+), 72 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ea4e248349..b52e25a072 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -208,8 +208,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 100 */ "virtio-scsi-pci", /* QEMU_CAPS_VIRTIO_SCSI */ "blockio", /* X_QEMU_CAPS_BLOCKIO */ - "disable-s3", /* QEMU_CAPS_PIIX_DISABLE_S3 */ - "disable-s4", /* QEMU_CAPS_PIIX_DISABLE_S4 */ + "disable-s3", /* X_QEMU_CAPS_PIIX_DISABLE_S3 */ + "disable-s4", /* X_QEMU_CAPS_PIIX_DISABLE_S4 */ "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ /* 105 */ @@ -354,8 +354,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 205 */ "chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */ - "ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */ - "ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */ + "ich9-disable-s3", /* X_QEMU_CAPS_ICH9_DISABLE_S3 */ + "ich9-disable-s4", /* X_QEMU_CAPS_ICH9_DISABLE_S4 */ "vserport-change-event", /* X_QEMU_CAPS_VSERPORT_CHANGE */ "virtio-balloon-pci.deflate-on-oom", /* QEMU_CAPS_VIRTIO_BAL= LOON_AUTODEFLATE */ @@ -1457,8 +1457,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsIDEDrive[] =3D { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = =3D { - { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL }, { "acpi-root-pci-hotplug", QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG, NULL= }, }; @@ -1493,8 +1491,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioGpu[] =3D { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] =3D= { - { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU= [] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ba289ba6b9..642a4762b3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -186,8 +186,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 100 */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ X_QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ - QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ - QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ /* 105 */ @@ -332,8 +332,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 205 */ X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=3Don|off */ - QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ - QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ X_QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,cc= w}. * deflate-on-oom */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0_x86_64.xml index bf920a74c4..3c197af464 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0_x86_64.xml index 8fa4148232..dc107952ca 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0_x86_64.xml index c0f3444d85..ddd3b560ab 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0_x86_64.xml index 6bd531a825..7162ca6a18 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0_x86_64.xml index 4223eb1a2e..77890694ad 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -71,8 +69,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0_x86_64.xml index cacfd6969f..563c337b23 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml index 914cda2048..b18d0509c2 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -20,8 +20,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index 4792691285..a33911ff3c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml index 748b897f70..6f29b29632 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -24,8 +24,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index 8d026d540d..ce16662d6b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml index 310b8f9d75..67d9b23e79 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -23,8 +23,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 07e8c57f27..56422fbdf8 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml index b8d4d4888c..e5df1832b7 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -24,8 +24,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 928270d287..69e35c7133 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -23,8 +23,6 @@ - - @@ -69,8 +67,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index a889c1b034..b2fd5794cc 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index 6d105e78a9..3613dfd4cc 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index adcf594138..965ba37c7f 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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=1693923895; cv=none; d=zohomail.com; s=zohoarc; b=KcEpv7z4bwO3d79e5CFUD7qAkxx0V/lYvKABm7DIHkpnwF81lIaCbOAO+x+GVcB/QWs6go2/9daUxRbrbwOxaqMfvqQJyrnqphntlJFQWAlcQmI3jUpwKMlINgKPITYPjzvTjtnSmEhxZ/PBt4oTu2GUc3aWDvlwt6vhp0536gU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923895; 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=P03egAFMuqqpOuOvSXYANXRhegvZq3BMscM34hDOQhs=; b=Jb71A/JKYrIErieNyjpB1QMWjYcfwyCmEXrIEJWnwPD0bLJvZaVKUIwct5pxV4zd7lu2QnS5Ee7WnXcIXo/1/nOZGq9BvsK+SKRSnNRMZGtcrdxa9SLoawxBlPwoS2HIQciL571xq34Fe3iQEHcO/3olxEJRuLR/z3oP4gf4JJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923895360679.1043687606717; Tue, 5 Sep 2023 07:24:55 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-207-I26F_0mMPK-58lGgKyuXXA-1; Tue, 05 Sep 2023 10:24:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E31373815F65; Tue, 5 Sep 2023 14:24:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C84E3140E962; Tue, 5 Sep 2023 14:24:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 776BC1946595; Tue, 5 Sep 2023 14:24:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4B60619465BC for ; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3819C1121319; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 933621121314 for ; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) X-MC-Unique: I26F_0mMPK-58lGgKyuXXA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/51] qemu: capabilities: Preserve location of the default machine type when stripping aliases for tests Date: Tue, 5 Sep 2023 16:23:30 +0200 Message-ID: <7172a9e40bae6b0e16baaacd61e98f547f229397.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1693923897011100003 Content-Type: text/plain; charset="utf-8" Internally the preferred machine which is 'pc' for x86_64 must be kept in the first place in the array of machines. This was not the case when stripping the machine aliases for use in tests (so that test output stays stable) where we've created a new entry for the alias. This means that the original name (e.g. pc-i440fx-8.1) stayed in the first place. To fix this we now swap the names around and create a new entry at the end for the specific type. Additionally the default flag is not propagated to the copy. This is also visible now in the output of 'qemuxml2xmltest' as the test cases which use the default machine type return to 'pc' instead of the more specific name. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 21 +++++++++++++++---- .../default-kvm-host-arch.x86_64-latest.xml | 2 +- .../default-qemu-host-arch.x86_64-latest.xml | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b52e25a072..972f3e24ee 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6756,11 +6756,21 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCa= ps *qemuCaps, for (i =3D 0; i < accel->nmachineTypes; i++) { virQEMUCapsMachineType *mach =3D &accel->machineTypes[i]; - g_autofree char *name =3D g_steal_pointer(&mach->alias); - if (name) { - virQEMUCapsAddMachine(qemuCaps, virtType, name, NULL, mach->de= faultCPU, - mach->maxCpus, mach->hotplugCpus, mach->= qemuDefault, + if (mach->alias) { + g_autofree char *origName =3D g_steal_pointer(&mach->name); + + /* The preferred machine type, which is generally the default = by qemu + * in most cases but also generally an alias needs to be kept = at the + * first entry in the list, because virQEMUCapsGetPreferredMac= hine + * picks the first element. Thus we create a new entry for the + * original machine name and replace the existing one by the a= lias. */ + mach->name =3D g_steal_pointer(&mach->alias); + + /* also de-assert the copy's default flag, to ensure we don't = have multiple + * machines with it */ + virQEMUCapsAddMachine(qemuCaps, virtType, origName, NULL, mach= ->defaultCPU, + mach->maxCpus, mach->hotplugCpus, false, mach->numaMemSupported, mach->defaultRAM= id, mach->deprecated, mach->acpi); } @@ -6778,6 +6788,9 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCaps= *qemuCaps, * * Remove all aliases so that the tests depending on the latest capabiliti= es * file can be stable when new files are added. + * + * Additionally if a machine type is default, only the copy created for the + * alias will be kept as default to eliminate churn in output files. */ void virQEMUCapsStripMachineAliases(virQEMUCaps *qemuCaps) diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.x= ml b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml index a9de07d41c..c5f03ff2c1 100644 --- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.= xml b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml index 37673010f6..36ed26c473 100644 --- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923920; cv=none; d=zohomail.com; s=zohoarc; b=Rw01+/VdOd4weJVkTNCODyTgJYoe3OXuEavuts7JDrXe+J39maI4qWjQivh8j/60yln4hX8dWp3BxHCWoWE9W0XqMDRNZguBBb617wIYcIzMBPIo2cZ1dcjnROnQAohyvW/VlofTNFanDyCKd0DSfleSc1f8DhM22+PWON0i1lI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923920; 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=i9fR7Vrz7TAjz6UrcC/JhTg2QRVr4GFOMYiUOeEM/GY=; b=K27YJWtwxJup81omOC58KdRWX5gRXokjg001WsurQqhiR5c0RhpwFpR5BDsZCRMZHGs0QH1PogldzP6eumNLxvhVJn+1tMr94Vj7JPaV7+r+HmhWC+IX7irshSI1Os98ZT7JRj1qietvrdzwSbd8mmuf0dImKBbk+lna6sPYmQE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923920325147.90206586512295; Tue, 5 Sep 2023 07:25:20 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-237-Nsoe514LNealraxoQOmffA-1; Tue, 05 Sep 2023 10:24:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03EE81E441DB; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E174F2026D76; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A81001946595; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2B9DD1946589 for ; Tue, 5 Sep 2023 14:24:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 19FB01121319; Tue, 5 Sep 2023 14:24:27 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87F6A1005B8E for ; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923919; 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=i9fR7Vrz7TAjz6UrcC/JhTg2QRVr4GFOMYiUOeEM/GY=; b=DTXRWTdlmKMz1yACya6abKR7QgdJzHvETDugvKwLLv8nNCTTzdvTpsjdhjtVwMHtv/toL9 B2SWLNs7R10R3ZqMW6MS+bbdPbMpwuJipBsV419flGBE/wlPOCYvxFekkAoa0d4hVanXGP nkEwZYpfOfQtxWiqSUk8DJFGNMqsC7M= X-MC-Unique: Nsoe514LNealraxoQOmffA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/51] qemuxml2argvtest: Clean up host CPU if overriden Date: Tue, 5 Sep 2023 16:23:31 +0200 Message-ID: <8d55d6cc13dbb363c8a2566a9817e4360ba740ab.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1693923921948100003 Content-Type: text/plain; charset="utf-8" If a test uses ARG_CAPS_HOST_CPU_MODEL feature we override the global host cpu model to the selected CPU but don't clear it afterwards. This can trip up fake caps tests following a test which uses this feature. This does not happen with real caps, because unless overriden, the host cpu from capabilities is always populated as the host cpu. Clear the CPU on cleanup. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvtest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5d23c552c5..32affb16c0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -713,6 +713,9 @@ testCompareXMLToArgv(const void *data) ret =3D 0; cleanup: + /* clear overriden host cpu */ + if (info->args.capsHostCPUModel) + qemuTestSetHostCPU(&driver, driver.hostarch, NULL); virDomainChrSourceDefClear(&monitor_chr); virObjectUnref(vm); virIdentitySetCurrent(NULL); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923915; cv=none; d=zohomail.com; s=zohoarc; b=GPgqC4ToSJjq7MX7UZsSjjWJMyT2ZbVIDzgWLLO10bZknRrDFi/C0FOt/nP78GBDUjJESSbvaQBCVXqGheALREg2eSMKu6po0qC3VCx8+GBIQeSnXhYJMpKYcf4YXPUI6sqJ6ldS0qgFQ3V1TekH4NilZPrvluBuaBSptO3bUxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923915; 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=8k6Cn3rD2LY8B10s1aZ/z7ZSBYmSdsu0k/r9ad/Btl4=; b=fR6uMW3s2gokXGvNOgLYQNGVMKvOKDPfp9MOumy9KUv/5YcLGQyrOK61PUOQBO6OeIV8y/LXchVm9AAuJBH/6zFqJMY84jnHU0X4gMCXTU315YLkGIYWAnOMHjkwx1I3UWCoD1bNNn7rzt+wSF6m7puLz30Z3y6dSk34tUk/FGQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923915903510.6725997414168; Tue, 5 Sep 2023 07:25:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-ylzSQfHBOrCYA88xRuCjqg-1; Tue, 05 Sep 2023 10:24:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ADAC23C1938E; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 923F21460FE5; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 77BA51946597; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 796AD19465B3 for ; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5CF591121319; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 697031121314 for ; Tue, 5 Sep 2023 14:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923914; 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=8k6Cn3rD2LY8B10s1aZ/z7ZSBYmSdsu0k/r9ad/Btl4=; b=BC1ILns6wBx0VjCKdks8j2wPHmhbEe+GNLiIiV7NFP2YHeXmwy5F1/8H58Zspv905xU4al eBZ7b2NvMH9FRdXgMY46ukeDb2bFtCPSata0A3GKRP7SI1/Cgt8+mkBrr1SLcVxglgszl9 yvzhdRHU2TxM+PnP1Ml+BgBnGULyGck= X-MC-Unique: ylzSQfHBOrCYA88xRuCjqg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/51] qemuxml2argvtest: testAddCPUModels: Remove non-x86_64 fake cpu models Date: Tue, 5 Sep 2023 16:23:32 +0200 Message-ID: <186ed1e4bf963c1c5107fa7c5d1397dc3b0c3fd3.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1693923917840100001 Content-Type: text/plain; charset="utf-8" At this point only x86_64 is using fake machines, and for real machines we don't populate the fake cpu models. Thus we can remove everything non-x86_64. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvtest.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 32affb16c0..3c2156118a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -270,15 +270,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) "486", "coreduo", "kvm32", "qemu32", "kvm64", "core2duo", "phenom", "qemu64", }; - const char *armModels[] =3D { - "cortex-a9", "cortex-a8", "cortex-a57", "cortex-a53", - }; - const char *ppc64Models[] =3D { - "POWER8", "POWER7", - }; - const char *s390xModels[] =3D { - "z990", "zEC12", "z13", - }; if (ARCH_IS_X86(arch)) { if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, x86Mod= els, @@ -300,27 +291,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) VIR_DOMCAPS_CPU_USABLE_UNKNOW= N) < 0) return -1; } - } else if (ARCH_IS_ARM(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, armMod= els, - G_N_ELEMENTS(armModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, armMo= dels, - G_N_ELEMENTS(armModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0) - return -1; - } else if (ARCH_IS_PPC64(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, ppc64M= odels, - G_N_ELEMENTS(ppc64Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, ppc64= Models, - G_N_ELEMENTS(ppc64Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0) - return -1; - } else if (ARCH_IS_S390(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, s390xM= odels, - G_N_ELEMENTS(s390xModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0) - return -1; } return 0; --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693923909; cv=none; d=zohomail.com; s=zohoarc; b=OOsXEeOxHKANS2jaz2ewNL64iF+SiaHz+uUzmDHB0s1YuAB6/ZOTC012PAjJRxkZpVcZXhohGYD+ka70XUSFeFwYVcegmD3C4xpF+ZqoLsU0kQj8FCw2p1zX4KJ0NICrZUkJqUNTmLw442aTDqJT1MHtrZFwT2oGchxhffIfY3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923909; 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=UGlMWwkRZ9+e9iyWhKqTP4IfEAyOa2bd6IHvaehIqdw=; b=JTg3Wg5WtJlCyNMGmOflVQrApufW54PGFC6LIGSd4zFMaVbOXa8spCmaozqWxRhKFkcYcVcXNio/92uSvofARarGKrmLQM/3ziTHiXGBPuJnOzQYmvlrlXIEO8vkmTIX4QFB6Z6OPifkMAi2uY9NdGNMKq5dYW29zfvT9SArFmg= 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 1693923909071500.4451816989076; Tue, 5 Sep 2023 07:25:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-158-GCoA0-igPxqlph9uq0fPFg-1; Tue, 05 Sep 2023 10:24:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1EB802812942; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A30A412F2D0; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DC2F61946595; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 660471946589 for ; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5795C1208F6E; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B98801121319 for ; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923908; 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=UGlMWwkRZ9+e9iyWhKqTP4IfEAyOa2bd6IHvaehIqdw=; b=EheqV+4tAOfBhGx6DRDdDt+30MorY6avQFI/D6vDSwaITD37fs+9Krb1RcxPcvnyVxGCiw ojkgcl6J75hdFxUn1RNv0yHhos8noq6Q7+s2ADmMPT7UEEQ4MxF7WaS26TLm1asg/vpLly iWhC9ED9p+Jx33x4xpZO31M65ChUfes= X-MC-Unique: GCoA0-igPxqlph9uq0fPFg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/51] qemuxml2argvtest: Drop 'monitor-json' case Date: Tue, 5 Sep 2023 16:23:33 +0200 Message-ID: <34466da4436f5b1a10a086a837c9fa7b816112f7.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: 1693923909662100001 Content-Type: text/plain; charset="utf-8" QMP monitor is the only thing we support at this point, thus all other tests test the same thing. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/monitor-json.args | 34 ------------------------ tests/qemuxml2argvdata/monitor-json.xml | 25 ----------------- tests/qemuxml2argvtest.c | 2 -- 3 files changed, 61 deletions(-) delete mode 100644 tests/qemuxml2argvdata/monitor-json.args delete mode 100644 tests/qemuxml2argvdata/monitor-json.xml diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvd= ata/monitor-json.args deleted file mode 100644 index 817806f5a4..0000000000 --- a/tests/qemuxml2argvdata/monitor-json.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dencryptdisk,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-encryptdisk/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --blockdev '{"driver":"file","filename":"/dev/hda1","node-name":"libvirt-1-= storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/monitor-json.xml b/tests/qemuxml2argvda= ta/monitor-json.xml deleted file mode 100644 index d151884434..0000000000 --- a/tests/qemuxml2argvdata/monitor-json.xml +++ /dev/null @@ -1,25 +0,0 @@ - - encryptdisk - 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c2156118a..8238dceed8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1892,8 +1892,6 @@ mymain(void) DO_TEST("multifunction-pci-device", QEMU_CAPS_SCSI_LSI); - DO_TEST_NOCAPS("monitor-json"); - DO_TEST_NOCAPS("seclabel-dynamic"); DO_TEST_NOCAPS("seclabel-dynamic-baselabel"); DO_TEST_NOCAPS("seclabel-dynamic-override"); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693923920; cv=none; d=zohomail.com; s=zohoarc; b=cafA8FkOy9qdVT+3GO5g+jvfj0ogT99/xR7aRGHCLAkdFOwC3t2be0Ao2hqJij5k9dwxNx1OPYAoOI7kEMLxtvqQIV73UYdjoJyhgOhSkfQFM5UgsZY3EmcscnBcLVoQmUthrBEQYesK29jq8erbtblIfBEavgna+CbeFAGGu1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923920; 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=uAW6s5ro8Cbl6WCmzQnHglBhydFY72tBuk1tGZ8DzrU=; b=Wzq4wqypoEMdpi3EhO0gnrZt3iSV9clrnG2TPxB7YbEKjBEBIaIZb9vwXmpRuORQjNBe9jSnwn9Pr87B1a4BFOcqDArn/w7Trc9wNt82aYJbU+1kNrnIg/dkToxQlDNqQpxvlFThykcjgLRn7aGn37OKHVMZs3O9YMaGzlTFZ5I= 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 1693923920516838.597503608065; Tue, 5 Sep 2023 07:25:20 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-504-lxm3h4vgOsKjo1rCY3u3mQ-1; Tue, 05 Sep 2023 10:24:59 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2B0C4280770A; Tue, 5 Sep 2023 14:24:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E918640C6CCC; Tue, 5 Sep 2023 14:24:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B0D6D1946595; Tue, 5 Sep 2023 14:24:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 618AE1946595 for ; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5435D1121319; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8A7A1012F13 for ; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923919; 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=uAW6s5ro8Cbl6WCmzQnHglBhydFY72tBuk1tGZ8DzrU=; b=ahJIKbXkN6YMwEsoNz6K9Eh48hYP1dUtasFaT9tmk5fjC1MdQ85GzwnMzs4baB5nFqxRJ5 XyPpEsvKE9W3IahFUlBUgn81sMzcjDyNm24Ew8IUWWTbeAe76bDREc6gC51bMZ+/ZOTo92 vnNR5sLmKswR9hGSQkzWqIV4Wgqc+2k= X-MC-Unique: lxm3h4vgOsKjo1rCY3u3mQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/51] qemu: Always assume support for QEMU_CAPS_CPU_CACHE Date: Tue, 5 Sep 2023 16:23:34 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: 1693923921363100001 Content-Type: text/plain; charset="utf-8" All supported qemu versions have this feature and it can't be compiled out. The logic is a bit more complex in this instance as the flag is asserted if: if (ARCH_IS_X86(qemuCaps->arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); } Now QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION is available since qemu-2.8 but only on certain architectures, thus we need to keep the flag itself, but x86_64 is one of them. The flag can be also assumed as qemuValidateDomainDefCpu rejects any cache config on non-x86 arches. Remove any use of the capability and drop the impossible test cases. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 6 ++-- .../qemuxml2argvdata/cpu-cache-disable2.args | 32 ------------------- tests/qemuxml2argvdata/cpu-cache-disable2.xml | 20 ------------ .../cpu-cache-passthrough2.args | 32 ------------------- .../cpu-cache-passthrough2.xml | 20 ------------ tests/qemuxml2argvtest.c | 10 +++--- 6 files changed, 6 insertions(+), 114 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.xml delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f7079c6920..a912ed064f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6560,12 +6560,10 @@ qemuBuildCpuCommandLine(virCommand *cmd, if (hostOff && (def->cpu->mode =3D=3D VIR_CPU_MODE_HOST_PASSTHROUGH || - def->cpu->mode =3D=3D VIR_CPU_MODE_MAXIMUM) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_CACHE)) + def->cpu->mode =3D=3D VIR_CPU_MODE_MAXIMUM)) virBufferAddLit(&buf, ",host-cache-info=3Doff"); - if (l3Off && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_CACHE)) + if (l3Off) virBufferAddLit(&buf, ",l3-cache=3Doff"); } diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml= 2argvdata/cpu-cache-disable2.args deleted file mode 100644 index adfad725aa..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-disable2.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-foo \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dfoo,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ --cpu host \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.xml b/tests/qemuxml2= argvdata/cpu-cache-disable2.xml deleted file mode 100644 index e6f39951ca..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-disable2.xml +++ /dev/null @@ -1,20 +0,0 @@ - - foo - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - - - - destroy - restart - destroy - - - diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qem= uxml2argvdata/cpu-cache-passthrough2.args deleted file mode 100644 index 37b27e450a..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-foo \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dfoo,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ --cpu host,host-cache-info=3Don \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml b/tests/qemu= xml2argvdata/cpu-cache-passthrough2.xml deleted file mode 100644 index 74846fdd31..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml +++ /dev/null @@ -1,20 +0,0 @@ - - foo - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - - - - destroy - restart - destroy - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8238dceed8..8afb2bf2be 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2521,12 +2521,10 @@ mymain(void) DO_TEST("cpu-check-default-partial", QEMU_CAPS_KVM); DO_TEST("cpu-check-default-partial2", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST("cpu-cache-disable2", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST("cpu-cache-passthrough2", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); + DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM); + DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM); + DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM); + DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924007; cv=none; d=zohomail.com; s=zohoarc; b=CWmbc4Lj+FZ1mmqFWsNoltfvMRfQV1yaOgZCnyYOHViQPUCP2igfhPoSE/2twIS4J/0FK74DoNcUqAMTgMMQU1/6KOg94o9Fj4GJjAJck99xzTWkTDEgZBKSncI5C7CBnzn5M82sE5vY5idJ2MUmV61US6pZQlmS7IUF1cif+K0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924007; 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=CMo1lthglxyGEtCwBWdM8zcVpeNBGXolcwMfUykXhzo=; b=DXlLYbIuX1bSVAPpJ67KZbSDgPwK1LX/dy9xdAdjlllSsBkYIRV9ArBBQq+RauuZjUVe3MLE++RPCBAL9dfapoMNHlCPvd3S+9h4GOGlw471cRlJBJhZWR10UcWunEwoYwd64tdwCv3VAb8kCuOClr6FF/cDPANNx+C6Hs2PJsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924007254882.2402304329783; Tue, 5 Sep 2023 07:26:47 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-635-qVpvK__5Ntybi_4ZZXn4gg-1; Tue, 05 Sep 2023 10:25:37 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 64071101F629; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 272D246F523; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id ECE7319465A2; Tue, 5 Sep 2023 14:24:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5C48E1946589 for ; Tue, 5 Sep 2023 14:24:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4E3331005B8E; Tue, 5 Sep 2023 14:24:31 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFBD01121314 for ; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924006; 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=CMo1lthglxyGEtCwBWdM8zcVpeNBGXolcwMfUykXhzo=; b=cSpeC7wSEN6UfarFk7cItGi1ksgkQYG9Hvqwo6CKg/oQ40K8rZ5zUYMfVPSBOCazzGSSAc ApCRHbL7EpcSsDWF++q8Ogp+QlVR0ImbwnEWbMaKVwzgct7HgL8zr8ryQd+87V46UN9UF/ JbQb/q9hexberVe0UrEuzoii+isX95s= X-MC-Unique: qVpvK__5Ntybi_4ZZXn4gg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/51] qemu: capabilities: Retire QEMU_CAPS_CPU_CACHE Date: Tue, 5 Sep 2023 16:23:35 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1693924008415100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 7 +------ src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - 15 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 972f3e24ee..c1aca27d64 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -417,7 +417,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 250 */ "query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_= NODES */ - "cpu-cache", /* QEMU_CAPS_CPU_CACHE */ + "cpu-cache", /* X_QEMU_CAPS_CPU_CACHE */ "qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */ "kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */ "kernel-irqchip.split", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHI= P_SPLIT */ @@ -5457,11 +5457,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qem= uCaps) static void virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) { - if (ARCH_IS_X86(qemuCaps->arch) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); - } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 642a4762b3..612ed03c1f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -396,7 +396,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 250 */ X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */ - QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache pro= perties */ + X_QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache p= roperties */ QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */ X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */ X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip= =3Dsplit */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0_x86_64.xml index 3c197af464..87d4fc6308 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0_x86_64.xml index dc107952ca..bd506fc3b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0_x86_64.xml index ddd3b560ab..96ea862323 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0_x86_64.xml index 7162ca6a18..7761b43708 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0_x86_64.xml index 77890694ad..237268cb69 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0_x86_64.xml index 563c337b23..d7fd5742df 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index a33911ff3c..da548c8beb 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index ce16662d6b..d4b9c16a52 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 56422fbdf8..088c417f4d 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 69e35c7133..d25f0c50b3 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -83,7 +83,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index b2fd5794cc..b29c52a643 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index 3613dfd4cc..20625eee00 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index 965ba37c7f..a107d2c8dd 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -84,7 +84,6 @@ - --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924039; cv=none; d=zohomail.com; s=zohoarc; b=CoXBsTbzpkoUVVwmUrZsZPWH7l5Hp6nJ755Mt2EnRjGP4hF2DrycEcZS/5fZndRnC4icEabNBA2HQvHZtT7iSDkDP1OA21KQSbeCrd8pMtePSLEf/dJmhUSP5GOveS63Tu+WCoc6DKT+oOkfyYxQD28lurL4Xyp99/r01MicSxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924039; 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=+KeuU9ZvxbWD6yj4/G/c8d2VU54eURRyM8bETPbe2so=; b=nI+0h+KgK4O2sXmy3V5vDDV8Bc8WYbzvVWZ3AeP+11udSiH/z4q8g7V8JrP5go1BDbyNrJD8KqpAUt/PnGPR6ws7uq8i+9BrOLbFkUvZN2RNCklCZrfgZgAFOgDkR4oij80RKcST1NTpqSP6EVsTmOhL/Yf6XG2Z06FmPx6Nh1c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924039531580.1184940083227; Tue, 5 Sep 2023 07:27:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-c_ZXPNoMOMOI4nTvBhXmDg-1; Tue, 05 Sep 2023 10:25:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D772938149B3; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A19B81121319; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E5B61946597; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 736A51946595 for ; Tue, 5 Sep 2023 14:24:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5EB01101328D; Tue, 5 Sep 2023 14:24:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADBF0101328A for ; Tue, 5 Sep 2023 14:24:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924038; 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=+KeuU9ZvxbWD6yj4/G/c8d2VU54eURRyM8bETPbe2so=; b=PmaVdHXS1SodlYF1zAqr+CmEEoEMv5UV7CPM2hwiqHnsLXHkZTsDc49L3o/ImtIEzmuOOY 8/VxrRnCTNG+wwVy0atQTizWqRMDzRH+ZlYZi0+Av9SHaYlYdPGFnFThqyiTpBzMw+Rvfb lFqfeBcQU3fUR6E14j+NBILLApo2HfI= X-MC-Unique: c_ZXPNoMOMOI4nTvBhXmDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/51] qemu: Always assume support for QEMU_CAPS_DEVICE_VFIO_PCI Date: Tue, 5 Sep 2023 16:23:36 +0200 Message-ID: <6678b6e77a7ae152396c83ce151ecb090ef81bfb.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1693924040161100001 Content-Type: text/plain; charset="utf-8" The 'display' option for the 'vfio-pci' device was added in qemu-2.12 and can't be compiled out. Assume support for the flag. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 11 ++++------- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- tests/qemuxml2argvtest.c | 3 +-- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9781df1355..c7d64e1b5c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6034,13 +6034,11 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAl= ias(virDomainHostdevDef *host static int -qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevs= rc, - virQEMUCaps *qemuCaps) +qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevs= rc) { /* QEMU 2.12 added support for vfio-pci display type, we default to * 'display=3Doff' to stay safe from future changes */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) && - mdevsrc->model =3D=3D VIR_MDEV_MODEL_TYPE_VFIO_PCI && + if (mdevsrc->model =3D=3D VIR_MDEV_MODEL_TYPE_VFIO_PCI && mdevsrc->display =3D=3D VIR_TRISTATE_SWITCH_ABSENT) mdevsrc->display =3D VIR_TRISTATE_SWITCH_OFF; @@ -6050,7 +6048,6 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSub= sysMediatedDev *mdevsrc, static int qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev, - virQEMUCaps *qemuCaps, unsigned int parseFlags) { virDomainHostdevSubsys *subsys =3D &hostdev->source.subsys; @@ -6063,7 +6060,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *ho= stdev, if (hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= MDEV && - qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev, qemuCaps) < 0) + qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev) < 0) return -1; return 0; @@ -6213,7 +6210,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev, break; case VIR_DOMAIN_DEVICE_HOSTDEV: - ret =3D qemuDomainHostdevDefPostParse(dev->data.hostdev, qemuCaps,= parseFlags); + ret =3D qemuDomainHostdevDefPostParse(dev->data.hostdev, parseFlag= s); break; case VIR_DOMAIN_DEVICE_TPM: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index d5fe1cbd73..1346bbfb44 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2341,12 +2341,6 @@ qemuValidateDomainMdevDefVFIOPCI(const virDomainHost= devDef *hostdev, if (dev->display =3D=3D VIR_TRISTATE_SWITCH_ABSENT) return 0; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("display property of device vfio-pci is not suppo= rted by this version of QEMU")); - return -1; - } - if (dev->model !=3D VIR_MDEV_MODEL_TYPE_VFIO_PCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _(" attribute 'display' is only supported = with model=3D'vfio-pci'")); diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qe= muxml2argvdata/hostdev-mdev-precreated.args index 2e49cff0e2..7c76cd5d15 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,bus=3Dpci.0,addr=3D0x2 \ +-device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Doff,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8afb2bf2be..1fe2fafeab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1714,8 +1714,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless"); DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_VFIO_PCI_DISPLAY); + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple"); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch", --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924145; cv=none; d=zohomail.com; s=zohoarc; b=DK1GfTMGno7NOsQ648zHylCu3EFOiCF6XeJfRXjEtqP7zDIFRxodh97p+oYa+FEtMT9opnULDfu02zmq912EFXnGpQqEpHDdBIWqPv6usWja1/rJX/glbumP9up7NVcaNixG5+MAX3J6f8LvtuBhVhnJHNcoh5MKdcEmiQ+Sc/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924145; 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=Zi5CvXTJJLNNTgS+UVf1xMfh+QbJEk3w37M6QpKALTs=; b=NxHqkb7mQsP3+p2d/q35OlFf9Dx1tjyvNQh5G3aIJsBQiDVOdPEDEPManQozn253kSMCVeRExK4XkYjjrvoJrSIjT7pZyP/aiwl4tFltBgtgzCVvIH0qPOcqbgtyy4FPmcPnXB3V4+gYu5LvpRadHKhgc2dSfQSXowkDIE4rkYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 16939241454121013.5870031743538; Tue, 5 Sep 2023 07:29:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-653-9lSsvgjVOwe1drwZAIegEg-1; Tue, 05 Sep 2023 10:27:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 51BCB927A3A; Tue, 5 Sep 2023 14:24:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 390B7C77D9; Tue, 5 Sep 2023 14:24:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1C5FD19465A2; Tue, 5 Sep 2023 14:24:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D386C1946589 for ; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B51811208F6F; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC6921121314 for ; Tue, 5 Sep 2023 14:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924144; 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=Zi5CvXTJJLNNTgS+UVf1xMfh+QbJEk3w37M6QpKALTs=; b=WKdDCatSOqKQ70wMGCcws4l+LAcSjtc8uGzGgJRT3LJHvBeKaHdxoxDR8FtP5yvRasuVpX gLBDuJWHLjn5HoB921vmBsAUx+hsuaHKHp3uh3IB4MOeTIXXVa7sqCWhjoyE2zIYk0sRY2 LvftP3gEzE8WoX5h6iyQ9fKxDPns768= X-MC-Unique: 9lSsvgjVOwe1drwZAIegEg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/51] qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI Date: Tue, 5 Sep 2023 16:23:37 +0200 Message-ID: <183f08ff112dbc6faae7fc92d8d7c651fdc91826.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1693924146988100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - 36 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c1aca27d64..630be618bf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -503,7 +503,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.pseries.cap-htm", /* X_QEMU_CAPS_MACHINE_PSERIES_CA= P_HTM */ "usb-storage.werror", /* X_QEMU_CAPS_USB_STORAGE_WERROR */ "egl-headless", /* QEMU_CAPS_EGL_HEADLESS */ - "vfio-pci.display", /* QEMU_CAPS_VFIO_PCI_DISPLAY */ + "vfio-pci.display", /* X_QEMU_CAPS_VFIO_PCI_DISPLAY */ "blockdev", /* X_QEMU_CAPS_BLOCKDEV */ /* 315 */ @@ -1445,7 +1445,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioSCSI[] =3D { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = =3D { - { "display", QEMU_CAPS_VFIO_PCI_DISPLAY, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[]= =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 612ed03c1f..afc28620dd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -482,7 +482,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */ X_QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=3D..,rer= ror=3D.. */ QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */ - QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */ + X_QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */ X_QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */ /* 315 */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0_aarch64.xml index f4f52fc1af..72e6b614cf 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0_ppc64.xml index baa05be2fb..9eff51672f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -78,7 +78,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0_s390x.xml index 4f7c98377d..20d458e55d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml @@ -46,7 +46,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0_x86_64.xml index 87d4fc6308..28ccaa1271 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -107,7 +107,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_aarch64.xml index 0b9eabd3da..9d90e25343 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0_ppc64.xml index 481519c762..3e244da67e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_riscv64.xml index 60384517a1..a1393e843d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0_x86_64.xml index bd506fc3b3..d40f771e77 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -107,7 +107,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0_x86_64.xml index 96ea862323..e26f946a63 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_aarch64.xml index d0c75c2bb9..46666a783f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0_ppc64.xml index d86dab4482..0496d3f0d6 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_riscv64.xml index f57dc02b13..edd562898e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0_s390x.xml index d44ca2a121..0a18f55960 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0_x86_64.xml index 7761b43708..387fa3c8c2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0_aarch64.xml index 5f2e6c2e5b..6b7c40fb54 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0_s390x.xml index 19f23f22f1..483962c83b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0_x86_64.xml index 237268cb69..daf47aa4b5 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0_x86_64.xml index d7fd5742df..28f3a94617 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0_aarch64.xml index 5cfce5eaa9..3a16a54ca7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml index b18d0509c2..fe1bffd491 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index da548c8beb..3f021441ed 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/= qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index 9a340e2566..45131f0b7f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0_aarch64.xml index f662cefb42..bbdd01b55a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml index 6f29b29632..047a867766 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -83,7 +83,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index d4b9c16a52..25d9725391 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml index 67d9b23e79..4315241d1d 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 088c417f4d..bd84750dc5 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml index e5df1832b7..a1fc441412 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index d25f0c50b3..06a01a2c4c 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index b29c52a643..8ac1529c30 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_8.0.0_riscv64.xml index 4aeb210ca7..31300d3d31 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index 20625eee00..c2fa8eb028 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.1.0_s390x.xml index a7519021e2..427ee9d5c7 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -41,7 +41,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index a107d2c8dd..6f8c5a57b7 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -104,7 +104,6 @@ - --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693923947; cv=none; d=zohomail.com; s=zohoarc; b=Oahc7lyZ9ivJej0cuNmwBhAzlt28exK8b6p1G6g104QyPxlCZpgY3dU7Pp8LlyvHYW0yqEQthe8XrnNMFJ6w2yDg9m5FCoZP6PzTK8/gSDPu6+NGgiKKqeW1fkn6Pb61zUsxIGiJ0XYdCKwpA8BE2jNOzvOYkqPQPR8nJ4QKetc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923947; 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=bXeDYMbEx22jR1G1UT4NYQbfILCf1xcnGSEWmZkRCT8=; b=d+ZdvK65FT3J8o3+t3ixbC2PvWnt8JDiCo6pUKsPSKuBHPfhMpVI3ncWHWfGsFK7KlSQgsss6NRUQGboiKbJZPXRvr6mD/hsBOnL5EkRTDndF43tQvWxoMqFENwjsP9/BubC1nxqLHLySRj44Et60amzfcDFF+9NxD3esV2+aEc= 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 1693923947866603.9823374486571; Tue, 5 Sep 2023 07:25:47 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-0ya0HUWSOfmuygxUw8iLyA-1; Tue, 05 Sep 2023 10:25:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9FF5B3C0FCA4; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A171140E962; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7E4501946595; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF5001946595 for ; Tue, 5 Sep 2023 14:24:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 89B5D1121314; Tue, 5 Sep 2023 14:24:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E7DE1013288 for ; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923946; 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=bXeDYMbEx22jR1G1UT4NYQbfILCf1xcnGSEWmZkRCT8=; b=O/vpmEgTH/jJbNW7j0NVSWyKPatnUrlzg1CmUbvcsiH9iJ8eM8IoZO/rHrSGU36IRrLNBB Ei8SAlH2qz86XD8a2IY4NBIILjgg7vhYoCAERXFlfYZtwBPUg1DlEtuG4NSGIu1mmOs/5w vFUYi+JdI7y2s2XXjKLky5XPU9UWhUk= X-MC-Unique: 0ya0HUWSOfmuygxUw8iLyA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/51] qemuxml2argvtest: Add missing versioned test cases for 'cpu-host-model' Date: Tue, 5 Sep 2023 16:23:38 +0200 Message-ID: <3b399596c3844bb8ec15c2b06df957e6e19aff35.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1693923950196100001 Content-Type: text/plain; charset="utf-8" We've forgot to add test invocations with real caps for qemu versions starting with 6.2. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../cpu-host-model.x86_64-6.2.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-7.0.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-7.1.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-7.2.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-8.0.0.args | 38 ++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 6 files changed, 199 insertions(+) create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args new file mode 100644 index 0000000000..f65444948e --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,svme-addr-chk=3Don,rdctl-no=3Don,skip-l1dfl-vm= entry=3Don,mds-no=3Don,pschange-mc-no=3Don \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args new file mode 100644 index 0000000000..8f8b1645d5 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-7.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,tsc-scale=3Don,svme-addr-chk=3Don,rdctl-no=3Do= n,skip-l1dfl-vmentry=3Don,mds-no=3Don,pschange-mc-no=3Don \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args new file mode 100644 index 0000000000..df03bafab3 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-7.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,tsc-scale=3Don,vmcb-clean=3Don,svme-addr-chk= =3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no=3Don,pschange-mc-no=3Don= \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args new file mode 100644 index 0000000000..7a796812fa --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,lbrv=3Don,tsc-scale=3Don,vmcb-clean=3Don,pause= -filter=3Don,pfthreshold=3Don,v-vmsave-vmload=3Don,vgif=3Don,svme-addr-chk= =3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no=3Don,pschange-mc-no=3Don= \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args new file mode 100644 index 0000000000..d63438e81c --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-8.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Doff \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,lbrv=3Don,tsc-scale=3Don,vmcb-clean=3Don,pause= -filter=3Don,pfthreshold=3Don,v-vmsave-vmload=3Don,vgif=3Don,svme-addr-chk= =3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no=3Don,pschange-mc-no=3Don= \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-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 1fe2fafeab..49041e7925 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1813,6 +1813,11 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model", "5.2.0"); DO_TEST_CAPS_VER("cpu-host-model", "6.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "6.1.0"); + DO_TEST_CAPS_VER("cpu-host-model", "6.2.0"); + DO_TEST_CAPS_VER("cpu-host-model", "7.0.0"); + DO_TEST_CAPS_VER("cpu-host-model", "7.1.0"); + DO_TEST_CAPS_VER("cpu-host-model", "7.2.0"); + DO_TEST_CAPS_VER("cpu-host-model", "8.0.0"); /* For this specific test we accept the increased likelihood of changes * if qemu updates the CPU model */ --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924000; cv=none; d=zohomail.com; s=zohoarc; b=lcolITGwWrXovLYnEjIo7N+m61Tr5SDaZRHFypFFBUdAry+cGNL0RTFu5HO/C8GoQP2sppkKAvhbli1xKXvHqdrNAAonhlHn8C0FmrM5gpeZFqyhin/NoCUlAOsFt1dlpUblU96yRvmp13nZhDK+MsI4cG1CYc+VePcRfP6vYFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924000; 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=S7DGa/fCXS0UFlySrdUw0HxcuR0YV4iVgZj/daaAmv8=; b=VyVjM4oJRLxAopKBE3wyE1ClEEuxhTCccXNFN3Pk+JDdbAXQujUw8y9xNhCF0hxILAfVvUmJ8P2/x3rrnxzpF3cn5N7MRQE+Y6WUnLtU6lp8ZUX8msBrur2AigI159p1jv+M8fnqBfRyZRGRd8QmzuUXeyBRnulQMsBEikOtziI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924000871253.65063088029854; Tue, 5 Sep 2023 07:26:40 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-472-y49b_DYnO4iGJ8cNCyS5HQ-1; Tue, 05 Sep 2023 10:25:13 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E43F08A436D; Tue, 5 Sep 2023 14:24:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C95CE40275C; Tue, 5 Sep 2023 14:24:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AEF511946589; Tue, 5 Sep 2023 14:24:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 92DFA1946595 for ; Tue, 5 Sep 2023 14:24:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 825821121319; Tue, 5 Sep 2023 14:24:35 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFC0D1121314 for ; Tue, 5 Sep 2023 14:24:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923999; 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=S7DGa/fCXS0UFlySrdUw0HxcuR0YV4iVgZj/daaAmv8=; b=Jeabi0JPkIbMU4ewgsMKAFw3OcekYXIFVnSGCItoyGExqb887hCjBz9wBZkTb0q7j5fock +LiI1eWEjz7J6p5xl/4goiVMdni/BgrLkPz5ffXMgxMYcYlDXcA58xLowwQCOUR2wRuxFj YErs+Njwbjk2Trt7yYaIdlgbpQwwK6k= X-MC-Unique: y49b_DYnO4iGJ8cNCyS5HQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/51] qemuxml2argvtest: Remove old chardev tests Date: Tue, 5 Sep 2023 16:23:39 +0200 Message-ID: <7b185ef3b2815867b58d82dad4b02b2a23de23da.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1693924002342100001 Content-Type: text/plain; charset="utf-8" All tests have already a real capability variant. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../qemuxml2argvdata/console-compat-auto.args | 36 --------------- .../console-compat-chardev.args | 36 --------------- tests/qemuxml2argvdata/console-compat.args | 35 -------------- .../parallel-parport-chardev.args | 36 --------------- .../parallel-tcp-chardev.args | 36 --------------- .../pci-serial-dev-chardev.args | 36 --------------- .../serial-dev-chardev-iobase.args | 36 --------------- .../qemuxml2argvdata/serial-dev-chardev.args | 36 --------------- .../qemuxml2argvdata/serial-file-chardev.args | 37 --------------- tests/qemuxml2argvdata/serial-file-log.args | 37 --------------- .../qemuxml2argvdata/serial-many-chardev.args | 39 ---------------- .../qemuxml2argvdata/serial-pty-chardev.args | 36 --------------- tests/qemuxml2argvdata/serial-spiceport.args | 38 --------------- .../qemuxml2argvdata/serial-tcp-chardev.args | 36 --------------- .../serial-tcp-telnet-chardev.args | 36 --------------- .../serial-tcp-tlsx509-chardev-verify.args | 39 ---------------- .../serial-tcp-tlsx509-chardev.args | 39 ---------------- .../serial-tcp-tlsx509-secret-chardev.args | 40 ---------------- .../qemuxml2argvdata/serial-udp-chardev.args | 38 --------------- .../qemuxml2argvdata/serial-unix-chardev.args | 35 -------------- tests/qemuxml2argvdata/serial-vc-chardev.args | 36 --------------- tests/qemuxml2argvtest.c | 46 ------------------- 22 files changed, 819 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-compat-auto.args delete mode 100644 tests/qemuxml2argvdata/console-compat-chardev.args delete mode 100644 tests/qemuxml2argvdata/console-compat.args delete mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.args delete mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-log.args delete mode 100644 tests/qemuxml2argvdata/serial-many-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verif= y.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-charde= v.args delete mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-unix-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.args diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxm= l2argvdata/console-compat-auto.args deleted file mode 100644 index 12159aca7d..0000000000 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qem= uxml2argvdata/console-compat-chardev.args deleted file mode 100644 index 12159aca7d..0000000000 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2arg= vdata/console-compat.args deleted file mode 100644 index 69439cba46..0000000000 --- a/tests/qemuxml2argvdata/console-compat.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/q= emuxml2argvdata/parallel-parport-chardev.args deleted file mode 100644 index 0ced8a58ac..0000000000 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev parallel,id=3Dcharparallel0,path=3D/dev/parport0 \ --device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemux= ml2argvdata/parallel-tcp-chardev.args deleted file mode 100644 index 6ffc4cbf10..0000000000 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev socket,id=3Dcharparallel0,host=3D127.0.0.1,port=3D9999,server=3Do= n,wait=3Doff \ --device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qem= uxml2argvdata/pci-serial-dev-chardev.args deleted file mode 100644 index 7dbba6985d..0000000000 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev serial,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device pci-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dpci.0,addr=3D0= x4 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/= qemuxml2argvdata/serial-dev-chardev-iobase.args deleted file mode 100644 index d118e5a204..0000000000 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev serial,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0,iobase=3D1= 016,irq=3D4 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml= 2argvdata/serial-dev-chardev.args deleted file mode 100644 index 67e965d648..0000000000 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev serial,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxm= l2argvdata/serial-file-chardev.args deleted file mode 100644 index 5e0f9baab8..0000000000 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ --chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2ar= gvdata/serial-file-log.args deleted file mode 100644 index 0068cf98ce..0000000000 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ --add-fd set=3D1,fd=3D1751,opaque=3Dserial0-log \ --chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don,logfile=3D/= dev/fdset/1,logappend=3Don \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxm= l2argvdata/serial-many-chardev.args deleted file mode 100644 index 540a97ad65..0000000000 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial1-source \ --chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml= 2argvdata/serial-pty-chardev.args deleted file mode 100644 index 12159aca7d..0000000000 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2a= rgvdata/serial-spiceport.args deleted file mode 100644 index ce8356ae48..0000000000 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev spiceport,id=3Dcharserial0,name=3Dorg.qemu.console.serial.0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ --audiodev '{"id":"audio1","driver":"spice"}' \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml= 2argvdata/serial-tcp-chardev.args deleted file mode 100644 index b204fcc650..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/= qemuxml2argvdata/serial-tcp-telnet-chardev.args deleted file mode 100644 index e8df25bd92..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999,telnet=3Don,= server=3Don,wait=3Doff \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args deleted file mode 100644 index bbc4b83808..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don \ --chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests= /qemuxml2argvdata/serial-tcp-tlsx509-chardev.args deleted file mode 100644 index bbc4b83808..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don \ --chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args deleted file mode 100644 index 292953e184..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ /dev/null @@ -1,40 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --object secret,id=3Dcharserial1-secret0,data=3D9eao5F8qtkGt+seB1HYivWIxbtw= Uu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBgcIC= QoLDA0ODw=3D=3D,format=3Dbase64 \ --object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dcharserial1-secret0 \ --chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml= 2argvdata/serial-udp-chardev.args deleted file mode 100644 index 0bf4f1c7af..0000000000 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D9998,localaddr=3D127= .0.0.1,localport=3D9999 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --chardev udp,id=3Dcharserial1,host=3D,port=3D9999,localaddr=3D,localport= =3D0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxm= l2argvdata/serial-unix-chardev.args deleted file mode 100644 index f518b03568..0000000000 --- a/tests/qemuxml2argvdata/serial-unix-chardev.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --chardev socket,id=3Dcharserial0,path=3D/tmp/serial.sock \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --chardev socket,id=3Dcharserial1,fd=3D1729,server=3Don,wait=3Doff \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2= argvdata/serial-vc-chardev.args deleted file mode 100644 index 3d87049879..0000000000 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --chardev vc,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 49041e7925..fd8339a819 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1423,32 +1423,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("serial-file-log", - QEMU_CAPS_DEVICE_ISA_SERIAL); - driver.config->spiceTLS =3D 1; - DO_TEST("serial-spiceport", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_ISA_SERIAL); - driver.config->spiceTLS =3D 0; - - DO_TEST("console-compat", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-compat-auto", - QEMU_CAPS_DEVICE_ISA_SERIAL); - - DO_TEST("serial-vc-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-pty-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-dev-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-dev-chardev-iobase", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-file-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-unix-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-file-log"); driver.config->spiceTLS =3D 1; DO_TEST_CAPS_LATEST("serial-spiceport"); @@ -1464,45 +1438,25 @@ mymain(void) DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase"); DO_TEST_CAPS_LATEST("serial-file-chardev"); DO_TEST_CAPS_LATEST("serial-unix-chardev"); - DO_TEST("serial-tcp-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-udp-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-tcp-telnet-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-unix-chardev"); DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-unix-missing-source"); DO_TEST_CAPS_LATEST("serial-tcp-chardev"); DO_TEST_CAPS_LATEST("serial-udp-chardev"); DO_TEST_CAPS_LATEST("serial-tcp-telnet-chardev"); driver.config->chardevTLS =3D 1; - DO_TEST("serial-tcp-tlsx509-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev"); driver.config->chardevTLSx509verify =3D 1; - DO_TEST("serial-tcp-tlsx509-chardev-verify", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-verify"); driver.config->chardevTLSx509verify =3D 0; DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls"); driver.config->chardevTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a= 4e-a869-7acd6376d8ea"); - DO_TEST("serial-tcp-tlsx509-secret-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-secret-chardev"); VIR_FREE(driver.config->chardevTLSx509secretUUID); driver.config->chardevTLS =3D 0; - DO_TEST("serial-many-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_NOCAPS("parallel-tcp-chardev"); - DO_TEST_NOCAPS("parallel-parport-chardev"); DO_TEST_CAPS_LATEST("serial-many-chardev"); DO_TEST_CAPS_LATEST("parallel-tcp-chardev"); DO_TEST_CAPS_LATEST("parallel-parport-chardev"); DO_TEST_CAPS_LATEST("parallel-unix-chardev"); - DO_TEST("console-compat-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("pci-serial-dev-chardev", - QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST_CAPS_LATEST("console-compat-chardev"); DO_TEST_CAPS_LATEST("pci-serial-dev-chardev"); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923953; cv=none; d=zohomail.com; s=zohoarc; b=Wu4gUxXCo9XlddTxKSTQn9rtVT+vp15RP8NgdjLHJWzOWqTSvjFSVAUFnfB3NsjHYYZi5Vvd/WJJmtG4bmMA04jxtDILVjg7sw3hHr1/2Ar8GsUSjS3+yQjkwz/2SG0PDjn3o9bNS3T/76qe7RxXJTdj/WQoiFjEi5pzjcHoTHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923953; 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=9a+xY6/a/xBOet9Du5VmFdrTCcJQYgsN783mwFj1XGM=; b=RTv4rXqCXzRQz14XCuu6ILV65ldjgnrTgUZLtWiaau8WtRi7HES9PoGNIf5tJs3tPeiFKnl9BX60geutxGm9ME5bxs9y4BO1KTji7tWhwnTmCcboutp1yo+KReI2i8M3Q93NchHicdyH63y7/zT6OTZBHkFMuCmEPvMs4RnYk9c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923953354330.75732867784257; Tue, 5 Sep 2023 07:25:53 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-411-T7REgFV7Oe28yZKfzz6Ptg-1; Tue, 05 Sep 2023 10:25:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9ABFF946305; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85EAD2026D68; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6B02E1946595; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8523B19465B7 for ; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 67BBF1121314; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE1891121319 for ; Tue, 5 Sep 2023 14:24:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923949; 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=9a+xY6/a/xBOet9Du5VmFdrTCcJQYgsN783mwFj1XGM=; b=Ku25jiSqIfiGUUHublT5TjUwR5+Z17X6T3O5vYqVtp6KySwY4Kaggyy+wJC4iP/r1/Bjgw QOZujxEhLd5IjlHLKYpID3zZPfFlcRiuZ2p0OPGBzCtLOjy40PTpHyj4GZnNDqnunK/5Zd 7MpLhiA5/z+lwxK162sjczOtADDFrzk= X-MC-Unique: T7REgFV7Oe28yZKfzz6Ptg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/51] qemuxml2argvtest: Simplify invocation of GIC tests Date: Tue, 5 Sep 2023 16:23:40 +0200 Message-ID: <0701a6e1f3e40ed84b62076f972142b785edec37.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1693923956933100005 Content-Type: text/plain; charset="utf-8" Change DO_TEST_GIC so that it accepts the version and switch it to use DO_TEST_CAPS_ARCH_VER_FULL internally which will ensure that the output filenames conform to the format we use for real capabilities. This also allows us to convert a few of versioned tests to use this improved macro. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...ch64-gic-default-both.aarch64-latest.args} | 0 ...arch64-gic-default-v2.aarch64-latest.args} | 0 ...arch64-gic-default-v3.aarch64-latest.args} | 0 ...s =3D> aarch64-gic-host.aarch64-latest.args} | 0 ...aarch64-gic-none-both.aarch64-latest.args} | 0 ... aarch64-gic-none-tcg.aarch64-latest.args} | 0 ...> aarch64-gic-none-v2.aarch64-latest.args} | 0 ...> aarch64-gic-none-v3.aarch64-latest.args} | 0 ...rgs =3D> aarch64-gic-v2.aarch64-latest.args} | 0 ...rgs =3D> aarch64-gic-v3.aarch64-latest.args} | 0 tests/qemuxml2argvtest.c | 79 +++++++------------ 11 files changed, 28 insertions(+), 51 deletions(-) rename tests/qemuxml2argvdata/{aarch64-gic-default-both.args =3D> aarch64-= gic-default-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args =3D> aarch64-gi= c-default-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args =3D> aarch64-gi= c-default-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-host.args =3D> aarch64-gic-host= .aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args =3D> aarch64-gic= -none-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args =3D> aarch64-gic-= none-tcg.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args =3D> aarch64-gic-n= one-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args =3D> aarch64-gic-n= one-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v2.args =3D> aarch64-gic-v2.aar= ch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v3.args =3D> aarch64-gic-v3.aar= ch64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-both.args rename to tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.ar= gs diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2a= rgvdata/aarch64-gic-host.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-host.args rename to tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-both.args rename to tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemux= ml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-tcg.args rename to tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2arg= vdata/aarch64-gic-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2arg= vdata/aarch64-gic-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd8339a819..92ff7e4b1c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -877,13 +877,8 @@ mymain(void) # define DO_TEST_NOCAPS(name) \ DO_TEST_FULL(name, "", ARG_END) -/* GIC tests use 'latest' capabilities */ -# define DO_TEST_GIC(name, gic) \ - DO_TEST_FULL(name, "", \ - ARG_GIC, gic, \ - ARG_CAPS_ARCH, "aarch64", \ - ARG_CAPS_VER, "latest", \ - ARG_END) +# define DO_TEST_GIC(name, ver, gic) \ + DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END) # define DO_TEST_FAILURE(name, ...) \ DO_TEST_FULL(name, "", \ @@ -2249,50 +2244,32 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64"); - DO_TEST_FULL("aarch64-gic-none", ".aarch64-4.2.0", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "4.2.0", - ARG_END); - DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_END); - DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH); - DO_TEST_FULL("aarch64-gic-none-tcg", "", - ARG_GIC, GIC_BOTH, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST, - ARG_END); - DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "4.2.0", - ARG_END); - DO_TEST_FULL("aarch64-gic-default", ".aarch64-latest", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_END); - DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-v2", GIC_NONE); - DO_TEST_GIC("aarch64-gic-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-v2", GIC_V3); - DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-v3", GIC_NONE); - DO_TEST_GIC("aarch64-gic-v3", GIC_V2); - DO_TEST_GIC("aarch64-gic-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-host", GIC_NONE); - DO_TEST_GIC("aarch64-gic-host", GIC_V2); - DO_TEST_GIC("aarch64-gic-host", GIC_V3); - DO_TEST_GIC("aarch64-gic-host", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE); + DO_TEST_GIC("aarch64-gic-none", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-none-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-none-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-none-both", "latest", GIC_BOTH); + DO_TEST_CAPS_ARCH_VER_FULL("aarch64-gic-none-tcg", "aarch64", "latest", + ARG_GIC, GIC_BOTH, + ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS= _LAST, + ARG_END); + DO_TEST_GIC("aarch64-gic-default", "4.2.0", GIC_NONE); + DO_TEST_GIC("aarch64-gic-default", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-default-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-default-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-default-both", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_BOTH); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-invalid", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt", "aarch64"= ); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64"); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923969; cv=none; d=zohomail.com; s=zohoarc; b=gP6bzQWb3g5ND1mwkWHQ8rPdDIIRGe3UipOD2Ak9dRj42ARKXj1uYNmn6S3CqoqqQe4A0sveIqSWLhrSo3LoYQEyZrikd3bwE0BrHZxWItiBgG9ElEh80+9hUjOuuc3HtbQ9nCQVs0iBEC2Vztv1+2bLbFr7UpVXmgqTWtDdmRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923969; 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=djI3JPP9tsmSkk40clK4jelKHTnc4RscYjBqSJPgeNI=; b=X8K1Lyt0aKRUMe14aZ73y70nGfklLmatudnWQlfmsFzTIGtnKdILum0FlpDNwGnpOAMVmhWyGkneVaRKziRnH1eTN1UYiiS54ejjzA0W6c3iktpbqK3Sw9k71UwKcCKL5kI3GkaxVtryQ1L+pZi+pLIID6mHKfNZq9q8Iz4oOUw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 16939239695451011.5955752539433; Tue, 5 Sep 2023 07:26:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-694-UHJqyDnkOI6Iqd455T0iPQ-1; Tue, 05 Sep 2023 10:25:20 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D1B01C07550; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1810B49310E; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EFA8C1946A46; Tue, 5 Sep 2023 14:24:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4E26F1946589 for ; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3E5271121314; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAB6D101325D for ; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923968; 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=djI3JPP9tsmSkk40clK4jelKHTnc4RscYjBqSJPgeNI=; b=ZnQQLmXFuVSmIRfL7fPmFSOITPFZyNlkPUB9AT3l6XojxOitQfqRy0gfYsOCjYb854XqvC vh8W7gI8ns3TwFAw1D+NZ5oJhMMTmVvfw/9Zytiw4ELEQvyl5hRlT/Vc6Vxy95xLzCOako pGgPZvS9iW/FBZxjimBjx0UDYX8+ucI= X-MC-Unique: UHJqyDnkOI6Iqd455T0iPQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/51] qemuxml2argvtest: Remove duplicated test invocations Date: Tue, 5 Sep 2023 16:23:41 +0200 Message-ID: <0f45ca335184b54722915932446943e221ef15cd.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1693923971563100003 Content-Type: text/plain; charset="utf-8" Few tests were invoked multiple times either with identical or equivalent config. Remove those invocations. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvtest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 92ff7e4b1c..870902868b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1371,7 +1371,6 @@ mymain(void) DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid"); - DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST_CAPS_LATEST("net-vhostuser-multiq"); DO_TEST_CAPS_LATEST_FAILURE("net-vhostuser-fail"); @@ -1433,7 +1432,6 @@ mymain(void) DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase"); DO_TEST_CAPS_LATEST("serial-file-chardev"); DO_TEST_CAPS_LATEST("serial-unix-chardev"); - DO_TEST_CAPS_LATEST("serial-unix-chardev"); DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-unix-missing-source"); DO_TEST_CAPS_LATEST("serial-tcp-chardev"); DO_TEST_CAPS_LATEST("serial-udp-chardev"); @@ -2313,7 +2311,6 @@ mymain(void) DO_TEST_FAILURE_NOCAPS("memory-align-fail"); DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode"); - DO_TEST_NOCAPS("memory-hotplug"); DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923934; cv=none; d=zohomail.com; s=zohoarc; b=hEOwUthVREab63xZZtxyfRXJyFBp9MIgjenqC6BggjUwafTEuMgHkeb6H4ublkSjerH2szcY1k20eSG4Ko8NWcJvR2EJKAiDUZB2acCxWtnfwi5i/YUaI+9QPxhcWlYnUHQd3FErCEbYYLdPiRy2juuWmQVX5qHVuVwgoTTWtkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923934; 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=7m9EdxeD9Dy345Rx2Ipmp29O/q8hQQfc88Ux7CoH0vM=; b=V49VzFQ3LB5+MvwQUfLd7Gthufy1gXb/gr5ggXIR+2fvx4sgN1SsShxwYitQZz6+Tzfb+lnx8epLcnjnVWedGAW+dHqWd0EZPRNhgw14Q5GECjdULJkE0hoQ7rxsGNqY3Bvh7iR6AS6QVD7eYMPLZQ35xm6Gk4mkKVNyFeZn9Nw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923934053581.492780744143; Tue, 5 Sep 2023 07:25:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-583-EPwD0AMpMgOsX-TIHxj3GQ-1; Tue, 05 Sep 2023 10:25:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DFA43C108C5; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18603140E963; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D80221946595; Tue, 5 Sep 2023 14:24:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 974531946589 for ; Tue, 5 Sep 2023 14:24:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 713991121318; Tue, 5 Sep 2023 14:24:38 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 909491121314 for ; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923933; 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=7m9EdxeD9Dy345Rx2Ipmp29O/q8hQQfc88Ux7CoH0vM=; b=LEiZgp+c9nE6inl01P1D/zNE9wAe0PRwJNb54AKvOUe2U4AeYI6gy+fy9jqSFXAK/4zkdd jICOFv2uqB3B830jdfNXx2oYDyZss0kfyBGN36QQD0HioLrj21WGmtKFWSA75icDGn+cEB ZImdFU6LOtNMV23vTP19/dC3atluG5w= X-MC-Unique: EPwD0AMpMgOsX-TIHxj3GQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/51] qemuxml2argvtest: Remove fake-caps invocations of tests which also real caps version Date: Tue, 5 Sep 2023 16:23:42 +0200 Message-ID: <2e236039f36bfe0a5876f12636f497765dbc45b3.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1693923935881100001 Content-Type: text/plain; charset="utf-8" Drop tests which already are tested with real caps, thus the fake caps version doesn't bring much value. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/cpu-host-model.args | 40 ------------------- .../graphics-egl-headless.args | 33 --------------- tests/qemuxml2argvtest.c | 9 ----- 3 files changed, 82 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.args delete mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2arg= vdata/cpu-host-model.args deleted file mode 100644 index a35822ada3..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model.args +++ /dev/null @@ -1,40 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ --cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ --m size=3D219136k \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ --audiodev '{"id":"audio1","driver":"none"}' \ --global ICH9-LPC.noreboot=3Doff \ --watchdog-action reset \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemu= xml2argvdata/graphics-egl-headless.args deleted file mode 100644 index e5ea7bcf2b..0000000000 --- a/tests/qemuxml2argvdata/graphics-egl-headless.args +++ /dev/null @@ -1,33 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 \ --display egl-headless \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 870902868b..07cc2f9bef 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1292,9 +1292,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); - DO_TEST("graphics-egl-headless", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_EGL_HEADLESS); DO_TEST_CAPS_LATEST("graphics-egl-headless"); DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode"); @@ -1745,12 +1742,6 @@ mymain(void) DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa3"); DO_TEST_NOCAPS("cpu-numa-disjoint"); DO_TEST_NOCAPS("cpu-numa-memshared"); - DO_TEST("cpu-host-model", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1); /* host-model cpu expansion depends on the cpu reported by qemu and th= us * we invoke it for all real capability dumps we have */ --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924183; cv=none; d=zohomail.com; s=zohoarc; b=O/PMwLb3Mrq4DwrZivC292XEY8DRZOLlzUBkH2eDGjcuPIMa+X6KQugZGNw22c7MWE9+5v0dOwhQqrLtasAtuAOM/umS+f0jtMZmWlGqdiKgsnBHLPdQwicQ7BVu/VKkPq7UlAH1D75pi+dDlOMW6A7TP7H6YJ6Sc+siSYLJUhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924183; 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=0XPOKqrjHGieRpDqsOKq+bqwfMMtpjNsu0NN6WiiR+Y=; b=bijnb/OfzO3EEl2pRHkK5AVKBVAHpgD5b0LwVE8umQ6tX8VK9G3TnbPiBxu7A/0uNF/Vrbb4w0HxI5ji3cnW6IFEmXvno4oiEa1EnjCC1sORjBJo8vAb8yfE1BnpdmQLVaT9qvoVnRrQ/cv23nCe/pwePq8qaL5J9r8ODdPAxrA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924183799774.9297900388534; Tue, 5 Sep 2023 07:29:43 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-625-EogfR7NjO-muZf24zgTHsA-1; Tue, 05 Sep 2023 10:27:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48B288A4383; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32A712026D4B; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1EC901946597; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6D4FC1946589 for ; Tue, 5 Sep 2023 14:24:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4F40F1121318; Tue, 5 Sep 2023 14:24:39 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6BEE1121314 for ; Tue, 5 Sep 2023 14:24:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924136; 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=0XPOKqrjHGieRpDqsOKq+bqwfMMtpjNsu0NN6WiiR+Y=; b=DqwaucqoGwhbx/59ZyqLlwONPMHvz09FVuGNI5fBn/zN6Pbvv2HPPsxscRufghj1O8B9ak TCd+WG2ZjxlxzElOfdqtJE2WC3tays4c///scQ3Q9OfUpCDf3aV8mFePx5tTocVIne66Ll l7py4KRdC99IxsuycsZolJsBjW6rHik= X-MC-Unique: EogfR7NjO-muZf24zgTHsA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/51] qemuxml2argvtest: Use proper version in negative 'virtio-options-memballoon-freepage-reporting' case Date: Tue, 5 Sep 2023 16:23:43 +0200 Message-ID: <9e69551404a547ef8664faf9a6a6424590a9b463.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1693924184142100001 Content-Type: text/plain; charset="utf-8" The feature is supported since qemu-5.1. Use real qemu-5.0 caps for the test. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...rtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} | 0 tests/qemuxml2argvtest.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/qemuxml2argvdata/{virtio-options-memballoon-freepage-reportin= g.err =3D> virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} (= 100%) diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-repo= rting.err b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-repor= ting.x86_64-5.0.0.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-freepage-repor= ting.err rename to tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporti= ng.x86_64-5.0.0.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 07cc2f9bef..840daab25a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2421,10 +2421,10 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options-input-packed"); DO_TEST_CAPS_LATEST("virtio-options-memballoon-packed"); DO_TEST_CAPS_LATEST("virtio-options-memballoon-freepage-reporting"); + DO_TEST_CAPS_VER_PARSE_ERROR("virtio-options-memballoon-freepage-repor= ting", "5.0.0"); DO_TEST_CAPS_LATEST("virtio-options-net-packed"); DO_TEST_CAPS_LATEST("virtio-options-rng-packed"); DO_TEST_CAPS_LATEST("virtio-options-video-packed"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-freepage-reporti= ng"); DO_TEST_CAPS_LATEST("fd-memory-numa-topology"); DO_TEST_CAPS_LATEST("fd-memory-numa-topology2"); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924040; cv=none; d=zohomail.com; s=zohoarc; b=NlumPCxxzF9esOK7hiKT7sKJkoM3ENsMIb6Yauxh1xUjbQF+INNHdoV88muDCfLWIXVnJcQLxDnQCvoMBKVh4BzBQw3l1CU/O8VwR3wgm0MxWMN1Se9nXOFl5Ib2FTuwqE6g9h6aaU/HS8aupgrrJESBmOPZc2mm9xHz8m/i5nA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924040; 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=nbjej+ReCraNE0NvVssje21ifOSVMYeV2pv3JzXpCnY=; b=WgdZfhUUlhFoXDE78x57PuLP/l/Jaic9aSFHcrqM4SwOS5s3u4HfRqRFPCtghyNAFypIdJi6As2flQ/8XZiMfv393ca9nLhEwPti/Vs7aIgTGBKrXygtnXQ5Jto3wULavMiprdXynO/nBUeaPo/FwNs3FTiFQFE9sWePYXGjrGE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924040318291.998169183084; Tue, 5 Sep 2023 07:27:20 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-38-JrNTHyNRMi-PmIyP7k0DtQ-1; Tue, 05 Sep 2023 10:25:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CFEE7927A39; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B08E82014E19; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 592E31946A6B; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 404121946A6D for ; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2FC38101325D; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA251121314 for ; Tue, 5 Sep 2023 14:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924039; 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=nbjej+ReCraNE0NvVssje21ifOSVMYeV2pv3JzXpCnY=; b=grC1q/YByLK8KPH7YaWoSJsQ1NmQhv/AbX86jV7/SKWNWaulu3ALhZIrjbIRFV3PFBBice zFrqk5X7uG/bLJw9sFIF93oCUp1qJv6oc+1mQkPJ3LaVwl+5w1cqX6jxQNzWcv2+ayPVB1 0zlQQT76YEPRwrvd/umwkdWQMCAasFM= X-MC-Unique: JrNTHyNRMi-PmIyP7k0DtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/51] qemuxml2argvtest: Use real caps for 'cpu-host-model-fallback' test case Date: Tue, 5 Sep 2023 16:23:44 +0200 Message-ID: <6d0cd548dcf9b776776b202edd61704071f9b7d6.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1693924041438100003 Content-Type: text/plain; charset="utf-8" Similarly to 'cpu-host-model' add a real capability invocation for each version we support and remove the old fake caps invocation. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...cpu-host-model-fallback.x86_64-4.2.0.args} | 7 ++-- .../cpu-host-model-fallback.x86_64-5.0.0.args | 33 ++++++++++++++++++ .../cpu-host-model-fallback.x86_64-5.1.0.args | 33 ++++++++++++++++++ .../cpu-host-model-fallback.x86_64-5.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.0.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.1.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.0.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.1.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-8.0.0.args | 33 ++++++++++++++++++ ...cpu-host-model-fallback.x86_64-latest.args | 33 ++++++++++++++++++ tests/qemuxml2argvtest.c | 15 ++++++-- 13 files changed, 387 insertions(+), 5 deletions(-) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args =3D> cpu-host-= model-fallback.x86_64-4.2.0.args} (63%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5= .1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5= .2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6= .1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6= .2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7= .1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7= .2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-l= atest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qe= muxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args similarity index 63% rename from tests/qemuxml2argvdata/cpu-host-model-fallback.args rename to tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args index 3d09b039f3..cf7ad7b5f4 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args @@ -10,9 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --cpu Conroe,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,mo= nitor=3Don,ds-cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-= lm=3Don \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args new file mode 100644 index 0000000000..257b271386 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args new file mode 100644 index 0000000000..71551b51a3 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args new file mode 100644 index 0000000000..834d92c35a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args new file mode 100644 index 0000000000..611bf05482 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args new file mode 100644 index 0000000000..79ae00e993 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args new file mode 100644 index 0000000000..9c8331629a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis= alignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args new file mode 100644 index 0000000000..5929c9a87b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p= ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb= =3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-= chk=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args new file mode 100644 index 0000000000..141c2e36eb --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p= ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb= =3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-= chk=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args new file mode 100644 index 0000000000..1e7f444d73 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d= nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse= ed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,3dnowpr= efetch=3Doff,osvw=3Doff,topoext=3Doff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args new file mode 100644 index 0000000000..943b0d477b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-8.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs= rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi= f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,= fxsr-opt=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Do= ff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args new file mode 100644 index 0000000000..135aed7287 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,= pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x= saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof= f,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,top= oext=3Doff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-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 840daab25a..6222b2edc5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1757,13 +1757,24 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model", "7.2.0"); DO_TEST_CAPS_VER("cpu-host-model", "8.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "4.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "8.0.0"); + /* For this specific test we accept the increased likelihood of changes * if qemu updates the CPU model */ DO_TEST_CAPS_LATEST("cpu-host-model"); + DO_TEST_CAPS_LATEST("cpu-host-model-fallback"); DO_TEST_NOCAPS("cpu-host-model-vendor"); - DO_TEST_FULL("cpu-host-model-fallback", "", - ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS, ARG_END); DO_TEST_FULL("cpu-host-model-nofallback", "", ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, ARG_END); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693923967; cv=none; d=zohomail.com; s=zohoarc; b=O69rTrCBfrGUXG01Rqg7drZlSyaHst06lulCYazmBsMslzDX9NDS+0MpVumFoqi2GvlK9kP1ICqFlcl9+i+fZ6hbpE+Cuzf++eoKhtH+X9ZgxGiXH+8qIn4vd+ALvjo0UsJ7zACJcdiEj8OJfyzD5DZGLqrjT0XiSucWnQRaTHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923967; 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=evNwdGvX1FvkmRgMAvxq00KJZVrVCKWWjB0V5rVctIA=; b=iYhBvqah+TPifsGOp6gb8uqFfw0vxZhB6djPjlU6NKa24I1epNGba4B1l/ARIHpnFQrT9Qr5ZDFakNWQajrYNBRYjpM5J+2e4MRLfzdnaCSxn/WPOcEifUN+thRs1ckV8bFy98j51AhuNlGpqDS+eUD+NU/Q5AJsO4S5hbX0sdE= 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 1693923967200600.7053747026694; Tue, 5 Sep 2023 07:26:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-455-WGVkLzI1PPWHVyXxzRv2kQ-1; Tue, 05 Sep 2023 10:25:33 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8A84B3822556; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D9B340F2D2D; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3BEC11946A42; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 370D71946595 for ; Tue, 5 Sep 2023 14:24:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0A1C11121314; Tue, 5 Sep 2023 14:24:41 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E8251121319 for ; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923966; 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=evNwdGvX1FvkmRgMAvxq00KJZVrVCKWWjB0V5rVctIA=; b=DmiRLbBYOQnS+L+dbvS3wAaj0GQI1f8DIXXxd8fiCLs4B+D/bsGeAmdb6/ohopGPZuIrwY tY/k8bvo3RUj5FOeJfrgQbF23tE5LnNzcdNu2RgrNNiN9WWkBVWlsI3Dtrjs9otQ6FwZwc qlM8dsB7mj52ye/9K3UQxa6vqLu7vuw= X-MC-Unique: WGVkLzI1PPWHVyXxzRv2kQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/51] qemuxml2argvtest: Use real caps for 'cpu-host-model-nofallback' test case Date: Tue, 5 Sep 2023 16:23:45 +0200 Message-ID: <0dfdbfb63f0b41d8c41135aa44bb7c56da3275e1.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1693923969372100001 Content-Type: text/plain; charset="utf-8" Similarly to 'cpu-host-model' add a real capability invocation for each version we support and remove the old fake caps invocation. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../cpu-host-model-nofallback.err | 1 - ...pu-host-model-nofallback.x86_64-4.2.0.args | 33 ++++++++++++++++++ ...pu-host-model-nofallback.x86_64-5.0.0.args | 33 ++++++++++++++++++ ...pu-host-model-nofallback.x86_64-5.1.0.args | 33 ++++++++++++++++++ ...pu-host-model-nofallback.x86_64-5.2.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-6.0.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-6.1.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-6.2.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-7.0.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-7.1.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-7.2.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-8.0.0.args | 33 ++++++++++++++++++ ...u-host-model-nofallback.x86_64-latest.args | 33 ++++++++++++++++++ tests/qemuxml2argvtest.c | 16 +++++++-- 14 files changed, 416 insertions(+), 4 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64= -latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.err b/tests/q= emuxml2argvdata/cpu-host-model-nofallback.err deleted file mode 100644 index 35fa03a5a4..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model-nofallback.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: CPU model core2duo is not supported by hypervis= or diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args new file mode 100644 index 0000000000..cf7ad7b5f4 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args new file mode 100644 index 0000000000..257b271386 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args new file mode 100644 index 0000000000..71551b51a3 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args new file mode 100644 index 0000000000..834d92c35a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args new file mode 100644 index 0000000000..611bf05482 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args new file mode 100644 index 0000000000..79ae00e993 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args new file mode 100644 index 0000000000..9c8331629a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis= alignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args new file mode 100644 index 0000000000..5929c9a87b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p= ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb= =3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-= chk=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args new file mode 100644 index 0000000000..141c2e36eb --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p= ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb= =3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-= chk=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args new file mode 100644 index 0000000000..1e7f444d73 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d= nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse= ed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,3dnowpr= efetch=3Doff,osvw=3Doff,topoext=3Doff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.= args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args new file mode 100644 index 0000000000..943b0d477b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-8.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs= rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi= f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,= fxsr-opt=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Do= ff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest= .args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args new file mode 100644 index 0000000000..135aed7287 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,= pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x= saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof= f,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,top= oext=3Doff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,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-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-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 6222b2edc5..a8f476b551 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1769,15 +1769,25 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.2.0"); DO_TEST_CAPS_VER("cpu-host-model-fallback", "8.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "4.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "8.0.0"); + /* For this specific test we accept the increased likelihood of changes * if qemu updates the CPU model */ DO_TEST_CAPS_LATEST("cpu-host-model"); DO_TEST_CAPS_LATEST("cpu-host-model-fallback"); + DO_TEST_CAPS_LATEST("cpu-host-model-nofallback"); DO_TEST_NOCAPS("cpu-host-model-vendor"); - DO_TEST_FULL("cpu-host-model-nofallback", "", - ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, - ARG_END); DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693923956; cv=none; d=zohomail.com; s=zohoarc; b=LDB6RRcAzMn0Dq7N0SPFNSRdAatDK101Ypv6grKd1nNbgF6riuFiyTuAwfeZn5VW7OhFl1xpYlTDjWeiIWZid49POG86TWLwq3AewrRvRmvOWjG1onRNJCg8Wi/mCcJswoyDPXmwQX5sgrzfLXe73asu4DzNcg38m2hThPcXbGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923956; 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=Dno2u0cOLKooMLBDUyxZAodcw3/3AwnKDd3XMBG5NPw=; b=PSULvLR5+V7u9NAwraUMJ89EBzgo9lBYj9r9sIHRcDGw3g/7elgMci5r/5W4/QdXYbT+G5qE1VXAteb9wDafc3wyywmdKDZfllfXWlnsYZrQVxm+WtmM/L2yU0b2dLfaW7MSBh6EvQP9oe/z4b2k9Ur1LAKsMWYkbfGWtm5dh6Y= 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 1693923956156200.3507472774221; Tue, 5 Sep 2023 07:25:56 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-446-IetNDCOBMyypPv0J8OQDzQ-1; Tue, 05 Sep 2023 10:25:42 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 430E118DA750; Tue, 5 Sep 2023 14:24:43 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CF1146F524; Tue, 5 Sep 2023 14:24:43 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B063119472A4; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E2C1B19465B1 for ; Tue, 5 Sep 2023 14:24:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D4A051121318; Tue, 5 Sep 2023 14:24:41 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59F691121314 for ; Tue, 5 Sep 2023 14:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923955; 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=Dno2u0cOLKooMLBDUyxZAodcw3/3AwnKDd3XMBG5NPw=; b=ghckELDbvUbOH9pnxXuEw4KQWQ3V638MCSdPo+kczsxqQpDtF1FNCJDHbv0z/M5wtQdUh9 j9MfQe9xLBOfbuCtWc8AfvD0+/urUL5GLp/WAjbh/B+IeI7Vad3ANwz173doIRgJwGGg9R mWjtdlBBx14zWH0w1Mk4olYiZqH/7bE= X-MC-Unique: IetNDCOBMyypPv0J8OQDzQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/51] qemuxml2argvtest: Remove FLAG_SKIP_LEGACY_CPUS Date: Tue, 5 Sep 2023 16:23:46 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1693923958094100011 Content-Type: text/plain; charset="utf-8" Remove the notion of legacy cpus as there are no test cases using it any more. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvtest.c | 27 +++++---------------------- tests/testutilsqemu.h | 5 ++--- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a8f476b551..a6a1646efb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -257,18 +257,16 @@ static virNWFilterDriver fakeNWFilterDriver =3D { static int -testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) +testAddCPUModels(virQEMUCaps *caps) { virArch arch =3D virQEMUCapsGetArch(caps); const char *x86Models[] =3D { - "Opteron_G3", "Opteron_G2", "Opteron_G1", - "Nehalem", "Penryn", "Conroe", - "Haswell-noTSX", "Haswell", - }; - const char *x86LegacyModels[] =3D { "n270", "athlon", "pentium3", "pentium2", "pentium", "486", "coreduo", "kvm32", "qemu32", "kvm64", "core2duo", "phenom", "qemu64", + "Opteron_G3", "Opteron_G2", "Opteron_G1", + "Nehalem", "Penryn", "Conroe", + "Haswell-noTSX", "Haswell", }; if (ARCH_IS_X86(arch)) { @@ -279,18 +277,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) G_N_ELEMENTS(x86Models), VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0) return -1; - - if (!skipLegacy) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, - x86LegacyModels, - G_N_ELEMENTS(x86LegacyModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOW= N) < 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, - x86LegacyModels, - G_N_ELEMENTS(x86LegacyModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOW= N) < 0) - return -1; - } } return 0; @@ -313,8 +299,7 @@ testUpdateQEMUCaps(const struct testQemuInfo *info, virQEMUCapsSetArch(info->qemuCaps, arch); - if (testAddCPUModels(info->qemuCaps, - !!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0) + if (testAddCPUModels(info->qemuCaps) < 0) return -1; testUpdateQEMUCapsHostCPUModel(info->qemuCaps, caps->host.arch); @@ -330,11 +315,9 @@ testCheckExclusiveFlags(int flags) FLAG_EXPECT_PARSE_ERROR | FLAG_FIPS_HOST | FLAG_REAL_CAPS | - FLAG_SKIP_LEGACY_CPUS | FLAG_SLIRP_HELPER | 0, -1); - VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1); return 0; } diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 7845ac7cb6..89d40ce9bc 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -57,9 +57,8 @@ typedef enum { FLAG_EXPECT_PARSE_ERROR =3D 1 << 1, FLAG_FIPS_HOST =3D 1 << 2, /* simulate host with FIPS mode en= abled */ FLAG_REAL_CAPS =3D 1 << 3, - FLAG_SKIP_LEGACY_CPUS =3D 1 << 4, - FLAG_SLIRP_HELPER =3D 1 << 5, - FLAG_SKIP_CONFIG_ACTIVE =3D 1 << 6, /* Skip 'active' config test in qe= muxml2xmltest */ + FLAG_SLIRP_HELPER =3D 1 << 4, + FLAG_SKIP_CONFIG_ACTIVE =3D 1 << 5, /* Skip 'active' config test in qe= muxml2xmltest */ } testQemuInfoFlags; struct testQemuConf { --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924052; cv=none; d=zohomail.com; s=zohoarc; b=K9Lh3sdJb9YzQ2v6q2gKuwwYRsgEYM+gacfLNzoM3ttCljB3XhkTf46rKGWpU0DZqRyKusGYPoea32DKMqdMFB4fRkOt62QIE5Yiepnm9sbgTqd9/zhrEdjHsvKd1WxSkm3O3+kQF6Q6D786S3yFr3wp6ZfEeBtQ9RRqo9zZUqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924052; 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=cdB0yFKb4UUvmpHjmgtDzm8zN3sjq202PuoPJRVCoYU=; b=i14XVsqivwEvdWNP3YsDpFx3ppk8YZ2IfrSebBrg11i5iHudV4b1N1q+SkOTsvJFtPoPn3FaVg+OqFZhU0FA4vfh+sd95XkTWnw8S6ewymJGdNtHsljGgwMMl2+7QEEbfiS4MXp2ZuPCQnoTaFVrsRfXIs5sNoRILiyn5gk1Skk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924052229838.7573142232711; Tue, 5 Sep 2023 07:27:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-470-USRFAebDOlC-tBNC2QRCQw-1; Tue, 05 Sep 2023 10:25:23 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5BD703C1ACE1; Tue, 5 Sep 2023 14:24:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19D5346F525; Tue, 5 Sep 2023 14:24:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 089A31946597; Tue, 5 Sep 2023 14:24:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A60061946589 for ; Tue, 5 Sep 2023 14:24:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 96EC51121314; Tue, 5 Sep 2023 14:24:45 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 502B81121318 for ; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924050; 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=cdB0yFKb4UUvmpHjmgtDzm8zN3sjq202PuoPJRVCoYU=; b=LsY5ksF+tvobg7BzCuJuGNfE2mw0NgS2W2wfufk+EmCwBZwkiF4o/sjelWpAFsYriR9dCX Gi7zpiZPkCL7/qPo3RmNsJ91ozDXI8qIi4/PCOGfg7Wfjrg4jQM79asd/iKZbtL+Po6qLX pgG1IcQB5RXztSScap7R+0nntyYNwEs= X-MC-Unique: USRFAebDOlC-tBNC2QRCQw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/51] qemuxml2argvtest: Enable JSON syntax for -device, -object, and -netdev for all fake-caps tests Date: Tue, 5 Sep 2023 16:23:47 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1693924055056100001 Content-Type: text/plain; charset="utf-8" To minimize upcoming churn in test data when they will be converted to latest capabilities enable JSON syntax for -device, -object, and -netdev for all fake caps test files. Doing this should also help git track renames of the files better as there will be more of consistent context present. We can do this safely as internally we generate JSON first and then back-convert it into the old-style commandline if given qemu doesn't support it. This means that all generated content will be the same. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/acpi-table.args | 2 +- tests/qemuxml2argvdata/autoindex.args | 62 ++--- .../qemuxml2argvdata/balloon-device-auto.args | 6 +- .../balloon-device-deflate-off.args | 6 +- .../balloon-device-deflate.args | 6 +- .../balloon-device-period.args | 6 +- tests/qemuxml2argvdata/balloon-device.args | 6 +- tests/qemuxml2argvdata/blkiotune-device.args | 6 +- tests/qemuxml2argvdata/blkiotune.args | 6 +- tests/qemuxml2argvdata/channel-guestfwd.args | 8 +- tests/qemuxml2argvdata/channel-spicevmc.args | 12 +- .../qemuxml2argvdata/channel-virtio-auto.args | 24 +- .../channel-virtio-autoadd.args | 22 +- .../channel-virtio-autoassign.args | 22 +- .../channel-virtio-default.args | 16 +- .../channel-virtio-state.args | 14 +- .../qemuxml2argvdata/channel-virtio-unix.args | 16 +- tests/qemuxml2argvdata/channel-virtio.args | 10 +- tests/qemuxml2argvdata/chardev-reconnect.args | 20 +- tests/qemuxml2argvdata/clock-catchup.args | 6 +- tests/qemuxml2argvdata/clock-france.args | 6 +- tests/qemuxml2argvdata/clock-hpet-off.args | 6 +- .../clock-localtime-basis-localtime.args | 6 +- tests/qemuxml2argvdata/clock-localtime.args | 4 +- .../clock-timer-hyperv-rtc.args | 4 +- tests/qemuxml2argvdata/clock-utc.args | 4 +- tests/qemuxml2argvdata/clock-variable.args | 6 +- .../qemuxml2argvdata/console-virtio-many.args | 16 +- tests/qemuxml2argvdata/console-virtio.args | 10 +- tests/qemuxml2argvdata/controller-order.args | 36 +-- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 4 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 4 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 4 +- .../cpu-cache-emulate-l3.args | 4 +- .../cpu-cache-passthrough.args | 4 +- .../cpu-check-default-none.args | 4 +- .../cpu-check-default-none2.args | 4 +- .../cpu-check-default-partial.args | 4 +- .../cpu-check-default-partial2.args | 4 +- tests/qemuxml2argvdata/cpu-check-none.args | 4 +- tests/qemuxml2argvdata/cpu-exact1.args | 4 +- .../cpu-exact2-nofallback.args | 4 +- tests/qemuxml2argvdata/cpu-exact2.args | 4 +- tests/qemuxml2argvdata/cpu-fallback.args | 4 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 4 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 4 +- .../cpu-host-model-vendor.args | 4 +- .../cpu-host-passthrough-features.args | 6 +- .../cpu-host-passthrough.args | 4 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 4 +- tests/qemuxml2argvdata/cpu-minimum1.args | 4 +- tests/qemuxml2argvdata/cpu-minimum2.args | 4 +- .../cpu-no-removed-features.args | 4 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 4 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 8 +- .../cpu-numa-no-memory-element.args | 4 +- tests/qemuxml2argvdata/cpu-numa1.args | 4 +- tests/qemuxml2argvdata/cpu-numa2.args | 4 +- .../cpu-phys-bits-emulate.args | 4 +- .../cpu-phys-bits-emulate2.args | 4 +- .../cpu-phys-bits-passthrough.args | 4 +- tests/qemuxml2argvdata/cpu-strict1.args | 4 +- tests/qemuxml2argvdata/cpu-topology1.args | 4 +- tests/qemuxml2argvdata/cpu-topology2.args | 4 +- tests/qemuxml2argvdata/cpu-topology3.args | 4 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 4 +- .../default-kvm-host-arch.args | 4 +- .../default-qemu-host-arch.args | 4 +- .../graphics-sdl-fullscreen.args | 6 +- tests/qemuxml2argvdata/graphics-sdl.args | 6 +- .../hostdev-mdev-precreated.args | 4 +- .../hostdev-pci-address-unassigned.args | 10 +- .../hostdev-pci-multifunction.args | 18 +- .../hostdev-scsi-vhost-scsi-pci.args | 10 +- .../hostdev-vfio-multidomain.args | 8 +- tests/qemuxml2argvdata/hostdev-vfio.args | 8 +- tests/qemuxml2argvdata/hotplug-base.args | 6 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 8 +- tests/qemuxml2argvdata/input-usbmouse.args | 6 +- tests/qemuxml2argvdata/input-usbtablet.args | 6 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 6 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 6 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 6 +- tests/qemuxml2argvdata/machine-aliases2.args | 6 +- tests/qemuxml2argvdata/machine-core-off.args | 4 +- tests/qemuxml2argvdata/machine-core-on.args | 4 +- .../qemuxml2argvdata/machine-vmport-opt.args | 6 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 14 +- tests/qemuxml2argvdata/memory-hotplug.args | 6 +- tests/qemuxml2argvdata/memtune-unlimited.args | 6 +- tests/qemuxml2argvdata/memtune.args | 6 +- tests/qemuxml2argvdata/minimal.args | 6 +- tests/qemuxml2argvdata/misc-acpi.args | 4 +- tests/qemuxml2argvdata/misc-disable-s3.args | 4 +- .../misc-disable-suspends.args | 4 +- tests/qemuxml2argvdata/misc-enable-s4.args | 4 +- tests/qemuxml2argvdata/misc-uuid.args | 4 +- .../multifunction-pci-device.args | 24 +- tests/qemuxml2argvdata/nosharepages.args | 4 +- .../numad-auto-memory-vcpu-cpuset.args | 6 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 6 +- .../numad-auto-vcpu-static-numatune.args | 6 +- .../numad-static-memory-auto-vcpu.args | 6 +- tests/qemuxml2argvdata/numad.args | 6 +- .../numatune-auto-nodeset-invalid.args | 6 +- .../numatune-auto-prefer.args | 4 +- .../qemuxml2argvdata/numatune-distances.args | 4 +- .../numatune-memnode-no-memory.args | 8 +- tests/qemuxml2argvdata/numatune-memnode.args | 10 +- tests/qemuxml2argvdata/numatune-memory.args | 6 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 22 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 24 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 8 +- .../pci-bridge-many-disks.args | 218 +++++++++--------- tests/qemuxml2argvdata/pci-bridge.args | 140 +++++------ tests/qemuxml2argvdata/pci-expander-bus.args | 136 +++++------ tests/qemuxml2argvdata/pci-many.args | 64 ++--- tests/qemuxml2argvdata/pci-rom-disabled.args | 6 +- tests/qemuxml2argvdata/pci-rom.args | 18 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 202 ++++++++-------- .../pcie-root-port-model-generic.args | 8 +- .../pcie-root-port-model-ioh3420.args | 6 +- tests/qemuxml2argvdata/pcie-root-port.args | 10 +- tests/qemuxml2argvdata/pcie-root.args | 2 +- .../pcie-switch-downstream-port.args | 26 +-- .../pcie-switch-upstream-port.args | 14 +- tests/qemuxml2argvdata/pcihole64-q35.args | 6 +- tests/qemuxml2argvdata/pcihole64.args | 4 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- .../q35-pci-force-address.args | 16 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 34 +-- tests/qemuxml2argvdata/q35-usb2-reorder.args | 34 +-- tests/qemuxml2argvdata/q35-usb2.args | 18 +- tests/qemuxml2argvdata/q35.args | 14 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 6 +- .../qemu-ns-commandline-ns0.args | 6 +- .../qemu-ns-commandline-ns1.args | 6 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 6 +- .../qemu-ns-domain-commandline-ns0.args | 6 +- .../qemu-ns-domain-commandline.args | 6 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 6 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 4 +- .../reboot-timeout-disabled.args | 2 +- .../reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 6 +- .../seclabel-dynamic-baselabel.args | 6 +- .../seclabel-dynamic-labelskip.args | 6 +- .../seclabel-dynamic-override.args | 8 +- .../seclabel-dynamic-relabel.args | 6 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 6 +- tests/qemuxml2argvdata/seclabel-none.args | 6 +- .../seclabel-static-labelskip.args | 6 +- .../seclabel-static-relabel.args | 6 +- tests/qemuxml2argvdata/seclabel-static.args | 6 +- .../smartcard-controller.args | 8 +- .../smartcard-host-certificates-database.args | 8 +- .../smartcard-host-certificates.args | 8 +- tests/qemuxml2argvdata/smartcard-host.args | 8 +- .../smartcard-passthrough-spicevmc.args | 10 +- .../smartcard-passthrough-tcp.args | 8 +- tests/qemuxml2argvdata/smbios.args | 6 +- tests/qemuxml2argvdata/smp-dies.args | 4 +- tests/qemuxml2argvdata/smp.args | 4 +- .../usb-controller-default-q35.args | 4 +- .../usb-controller-explicit-q35.args | 4 +- .../usb-controller-qemu-xhci.args | 4 +- .../qemuxml2argvdata/usb-controller-xhci.args | 4 +- tests/qemuxml2argvdata/usb-controller.args | 4 +- .../usb-hub-autoadd-deluxe.args | 42 ++-- tests/qemuxml2argvdata/usb-hub-autoadd.args | 14 +- tests/qemuxml2argvdata/usb-hub.args | 6 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 22 +- .../qemuxml2argvdata/usb-ich9-companion.args | 12 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 28 +-- .../qemuxml2argvdata/usb-long-port-path.args | 12 +- tests/qemuxml2argvdata/usb-none.args | 4 +- .../usb-piix3-controller.args | 6 +- .../qemuxml2argvdata/usb-port-autoassign.args | 14 +- tests/qemuxml2argvdata/usb-port-missing.args | 10 +- tests/qemuxml2argvdata/usb-ports.args | 14 +- tests/qemuxml2argvdata/usb-redir-boot.args | 18 +- .../usb-redir-filter-version.args | 10 +- tests/qemuxml2argvdata/usb-redir-filter.args | 18 +- tests/qemuxml2argvdata/usb-redir.args | 18 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 14 +- tests/qemuxml2argvdata/usb1-usb2.args | 30 +-- .../virtio-input-passthrough.args | 6 +- tests/qemuxml2argvdata/virtio-input.args | 10 +- .../qemuxml2argvdata/virtio-rng-default.args | 8 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 8 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 12 +- tests/qemuxml2argvdata/virtio-rng-random.args | 8 +- tests/qemuxml2argvdata/vmcoreinfo.args | 8 +- tests/qemuxml2argvtest.c | 17 +- 199 files changed, 1223 insertions(+), 1210 deletions(-) diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdat= a/acpi-table.args index 6819a8573b..88a9c97e79 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata= /autoindex.args index 87d98012e4..3d7bffff7f 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,38 +25,38 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --device x3130-upstream,id=3Dpci.4,bus=3Dpci.3,addr=3D0x0 \ --device xio3130-downstream,port=3D0,chassis=3D5,id=3Dpci.5,bus=3Dpci.4,add= r=3D0x0 \ --device xio3130-downstream,port=3D1,chassis=3D6,id=3Dpci.6,bus=3Dpci.4,add= r=3D0x1 \ --device xio3130-downstream,port=3D2,chassis=3D7,id=3Dpci.7,bus=3Dpci.4,add= r=3D0x2 \ --device xio3130-downstream,port=3D3,chassis=3D8,id=3Dpci.8,bus=3Dpci.4,add= r=3D0x3 \ --device xio3130-downstream,port=3D4,chassis=3D9,id=3Dpci.9,bus=3Dpci.4,add= r=3D0x4 \ --device xio3130-downstream,port=3D5,chassis=3D10,id=3Dpci.10,bus=3Dpci.4,a= ddr=3D0x5 \ --device xio3130-downstream,port=3D6,chassis=3D11,id=3Dpci.11,bus=3Dpci.4,a= ddr=3D0x6 \ --device xio3130-downstream,port=3D7,chassis=3D12,id=3Dpci.12,bus=3Dpci.4,a= ddr=3D0x7 \ --device xio3130-downstream,port=3D8,chassis=3D13,id=3Dpci.13,bus=3Dpci.4,a= ddr=3D0x8 \ --device xio3130-downstream,port=3D9,chassis=3D14,id=3Dpci.14,bus=3Dpci.4,a= ddr=3D0x9 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ --device ich9-usb-ehci1,id=3Dusb1,bus=3Dpcie.0,addr=3D0x1a.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb1.0,firstport=3D0,bus=3Dpcie.0,multi= function=3Don,addr=3D0x1a \ --device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x1 \ --device ich9-usb-uhci2,masterbus=3Dusb2.0,firstport=3D2,bus=3Dpci.2,addr= =3D0x1.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x1.0x2 \ --device ich9-usb-ehci1,id=3Dusb2,bus=3Dpci.2,addr=3D0x1.0x7 \ --device nec-usb-xhci,id=3Dusb3,bus=3Dpci.5,addr=3D0x0 \ --device ich9-usb-uhci1,masterbus=3Dusb4.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x2 \ --device ich9-usb-uhci2,masterbus=3Dusb4.0,firstport=3D2,bus=3Dpci.2,addr= =3D0x2.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb4.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x2.0x2 \ --device ich9-usb-ehci1,id=3Dusb4,bus=3Dpci.2,addr=3D0x2.0x7 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ +-device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.3","addr":"0x0= "}' \ +-device '{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5",= "bus":"pci.4","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6",= "bus":"pci.4","addr":"0x1"}' \ +-device '{"driver":"xio3130-downstream","port":2,"chassis":7,"id":"pci.7",= "bus":"pci.4","addr":"0x2"}' \ +-device '{"driver":"xio3130-downstream","port":3,"chassis":8,"id":"pci.8",= "bus":"pci.4","addr":"0x3"}' \ +-device '{"driver":"xio3130-downstream","port":4,"chassis":9,"id":"pci.9",= "bus":"pci.4","addr":"0x4"}' \ +-device '{"driver":"xio3130-downstream","port":5,"chassis":10,"id":"pci.10= ","bus":"pci.4","addr":"0x5"}' \ +-device '{"driver":"xio3130-downstream","port":6,"chassis":11,"id":"pci.11= ","bus":"pci.4","addr":"0x6"}' \ +-device '{"driver":"xio3130-downstream","port":7,"chassis":12,"id":"pci.12= ","bus":"pci.4","addr":"0x7"}' \ +-device '{"driver":"xio3130-downstream","port":8,"chassis":13,"id":"pci.13= ","bus":"pci.4","addr":"0x8"}' \ +-device '{"driver":"xio3130-downstream","port":9,"chassis":14,"id":"pci.14= ","bus":"pci.4","addr":"0x9"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1= a.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bu= s":"pcie.0","multifunction":true,"addr":"0x1a"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bu= s":"pci.2","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.2","addr":"0x1.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bu= s":"pci.2","addr":"0x1.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.= 0x7"}' \ +-device '{"driver":"nec-usb-xhci","id":"usb3","bus":"pci.5","addr":"0x0"}'= \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb4.0","firstport":0,"bu= s":"pci.2","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb4.0","firstport":2,"bu= s":"pci.2","addr":"0x2.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb4.0","firstport":4,"bu= s":"pci.2","addr":"0x2.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb4","bus":"pci.2","addr":"0x2.= 0x7"}' \ -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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxm= l2argvdata/balloon-device-auto.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests= /qemuxml2argvdata/balloon-device-deflate-off.args index c1acd2f6b6..dbee8dab7b 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,deflate-on-oom=3Doff,bus=3Dpci.0,= addr=3D0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":f= alse,"bus":"pci.0","addr":"0x12"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qem= uxml2argvdata/balloon-device-deflate.args index a5017e6657..c7ed5f1698 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,deflate-on-oom=3Don,bus=3Dpci.0,a= ddr=3D0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":t= rue,"bus":"pci.0","addr":"0x12"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemu= xml2argvdata/balloon-device-period.args index 517d83feab..5de1090233 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x12"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2arg= vdata/balloon-device.args index 517d83feab..5de1090233 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x12"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2a= rgvdata/blkiotune-device.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata= /blkiotune.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2a= rgvdata/channel-guestfwd.args index bdd413d4bf..147c54348f 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd \ --netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ +-netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2a= rgvdata/channel-spicevmc.args index da36b815b0..009abf0b09 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -24,15 +24,15 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dcom.redhat.spice.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxm= l2argvdata/channel-virtio-auto.args index 5bd8e2193c..d86ff6d6a0 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,25 +25,25 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial0,max_ports=3D16,vectors=3D4,b= us=3Dpci.0,addr=3D0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ --device virtio-serial-pci,id=3Dvirtio-serial2,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":1= 6,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial2","bus":"pci.0"= ,"addr":"0x3"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=3Dcharchannel1 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D1,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dorg.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chard= ev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=3Dcharchannel2 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 2,id=3Dchannel2,name=3Dorg.linux-kvm.port.bar \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}' \ -chardev pty,id=3Dcharchannel3 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 3,id=3Dchannel3,name=3Dorg.linux-kvm.port.wizz \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}' \ -chardev pty,id=3Dcharchannel4 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D2,chardev=3Dcharchannel= 4,id=3Dchannel4,name=3Dorg.linux-kvm.port.ooh \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":2,"chard= ev":"charchannel4","id":"channel4","name":"org.linux-kvm.port.ooh"}' \ -chardev pty,id=3Dcharchannel5 \ --device virtserialport,bus=3Dvirtio-serial2.0,nr=3D1,chardev=3Dcharchannel= 5,id=3Dchannel5,name=3Dorg.linux-kvm.port.lla \ +-device '{"driver":"virtserialport","bus":"virtio-serial2.0","nr":1,"chard= ev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qem= uxml2argvdata/channel-virtio-autoadd.args index df6657f587..d7a32b5b1d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,24 +25,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial0,max_ports=3D4,vectors=3D4,bu= s=3Dpci.0,addr=3D0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4= ,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0x3"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=3Dcharchannel1 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dorg.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=3Dcharchannel2 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D3,chardev=3Dcharchannel= 2,id=3Dchannel2,name=3Dorg.linux-kvm.port.bar \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}' \ -chardev pty,id=3Dcharchannel3 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D1,chardev=3Dcharchannel= 3,id=3Dchannel3,name=3Dorg.linux-kvm.port.wizz \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chard= ev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}' \ -chardev pty,id=3Dcharchannel4 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D2,chardev=3Dcharchannel= 4,id=3Dchannel4,name=3Dorg.linux-kvm.port.ooh \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":2,"chard= ev":"charchannel4","id":"channel4","name":"org.linux-kvm.port.ooh"}' \ -chardev pty,id=3Dcharchannel5 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 5,id=3Dchannel5,name=3Dorg.linux-kvm.port.lla \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/= qemuxml2argvdata/channel-virtio-autoassign.args index b952025101..8ee30c8c2a 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,24 +25,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial0,max_ports=3D4,vectors=3D4,bu= s=3Dpci.0,addr=3D0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4= ,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=3Dcharchannel1 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D3,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dorg.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=3Dcharchannel2 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 2,id=3Dchannel2,name=3Dorg.linux-kvm.port.bar \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}' \ -chardev pty,id=3Dcharchannel3 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D1,chardev=3Dcharchannel= 3,id=3Dchannel3,name=3Dorg.linux-kvm.port.wizz \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chard= ev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}' \ -chardev pty,id=3Dcharchannel4 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D2,chardev=3Dcharchannel= 4,id=3Dchannel4,name=3Dorg.linux-kvm.port.ooh \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":2,"chard= ev":"charchannel4","id":"channel4","name":"org.linux-kvm.port.ooh"}' \ -chardev pty,id=3Dcharchannel5 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 5,id=3Dchannel5,name=3Dorg.linux-kvm.port.lla \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qem= uxml2argvdata/channel-virtio-default.args index 5ff502848d..032938afca 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -24,18 +24,18 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0"}' \ -chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dcom.redhat.spice.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"com.redhat.spice.0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemux= ml2argvdata/channel-virtio-state.args index 6d20f431cb..27113716ad 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,17 +25,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=3Dcharchannel1 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D4,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dorg.linux-kvm.port.foo1 \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":4,"chard= ev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo1"}' \ -chardev pty,id=3Dcharchannel2 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D5,chardev=3Dcharchannel= 2,id=3Dchannel2,name=3Dorg.linux-kvm.port.foo2 \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":5,"chard= ev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.foo2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxm= l2argvdata/channel-virtio-unix.args index 6e42dc9f41..12ef286573 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev socket,id=3Dcharchannel1,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,id=3Dchannel1 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1"}' \ -chardev socket,id=3Dcharchannel2,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D3,chardev=3Dcharchannel= 2,id=3Dchannel2,name=3Dble \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"ble"}' \ -chardev socket,id=3Dcharchannel3,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D4,chardev=3Dcharchannel= 3,id=3Dchannel3,name=3Dfdsa \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2arg= vdata/channel-virtio.args index 423c27eb42..11c899376a 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,13 +25,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2= argvdata/chardev-reconnect.args index aae62b8f75..ee84969f73 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,20 +25,20 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ -usb \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev socket,id=3Dcharsmartcard0,path=3D/var/lib/libvirt/qemu/channel/t= arget/asdf,reconnect=3D20 \ --device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ +-device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -chardev socket,id=3Dcharchannel0,host=3Dlocalhost,port=3D1234,reconnect= =3D10 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dasdf \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"asdf"}' \ -chardev socket,id=3Dcharchannel1,path=3D/var/lib/libvirt/qemu/channel/tar= get/fdsa,reconnect=3D0 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dfdsa \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D3456,reconnect=3D1= 5 \ --device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D2 \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"2"}' \ -chardev socket,id=3Dcharrng0,host=3Dlocalhost,port=3D2345,reconnect=3D5 \ --object rng-egd,id=3Dobjrng0,chardev=3Dcharrng0 \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ +-object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argv= data/clock-catchup.args index d7ec73ace2..717e39de4b 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvd= ata/clock-france.args index a5664b547d..ebaf3983f2 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -10,7 +10,7 @@ TZ=3DEurope/Paris \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,7 +29,7 @@ TZ=3DEurope/Paris \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2arg= vdata/clock-hpet-off.args index b5cb297e92..349685854d 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/= tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 8fd8f42083..cfb65c94b3 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2ar= gvdata/clock-localtime.args index daf503d3fd..2f27165702 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qem= uxml2argvdata/clock-timer-hyperv-rtc.args index 5a952a2cf6..629091aba2 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu64,hv-time=3Don \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata= /clock-utc.args index 2ebb6cb762..7b0d7e31af 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2arg= vdata/clock-variable.args index ed42be8dd0..7faefe3464 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxm= l2argvdata/console-virtio-many.args index bb67eec187..d45a1b4eb0 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev pty,id=3Dcharconsole1 \ --device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ +-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ -chardev pty,id=3Dcharconsole2 \ --device virtconsole,chardev=3Dcharconsole2,id=3Dconsole2 \ +-device '{"driver":"virtconsole","chardev":"charconsole2","id":"console2"}= ' \ -chardev pty,id=3Dcharconsole3 \ --device virtconsole,chardev=3Dcharconsole3,id=3Dconsole3 \ +-device '{"driver":"virtconsole","chardev":"charconsole3","id":"console3"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2arg= vdata/console-virtio.args index 2baa069c04..20a6eb9c45 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,13 +25,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharconsole0 \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 27a0e01153..58222e601f 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfdr,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m size=3D4194304k \ @@ -23,30 +23,30 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr/.= config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Doff,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x7 \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1.1 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x7"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1.1"}' \ -blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node= -name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-r= ead-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,share-rw=3Don,drive=3Dlibvir= t-2-format,id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","share-rw":= true,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1,"write-ca= che":"on"}' \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop= .iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:4d:4b:19= ,bootindex=3D2,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:4d:4b:19","bootindex":2,"bus":"pci.0","addr":"0x3"}' \ -chardev spicevmc,id=3Dcharsmartcard0,name=3Dsmartcard \ --device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ +-device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dcom.redhat.spice.0 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1.2 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1.2"}'= \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5901,addr=3D0.0.0.0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device intel-hda,id=3Dsound0,bus=3Dpci.0,addr=3D0x4 \ --device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0,audiodev=3Dau= dio1 \ --device usb-host,hostbus=3D14,hostaddr=3D6,id=3Dhostdev0,bus=3Dusb.0,port= =3D2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"intel-hda","id":"sound0","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad= ":0,"audiodev":"audio1"}' \ +-device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","b= us":"usb.0","port":"2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2= argvdata/cpu-Haswell-noTSX.args index dc35ed4a7e..6b4e0aa6cb 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell-noTSX \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvda= ta/cpu-Haswell.args index 97eeed5804..c36c67a8b8 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvd= ata/cpu-Haswell2.args index c816510613..280d48f76f 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell,hle=3Doff,rtm=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvd= ata/cpu-Haswell3.args index 9d692e3c6c..f66a637bbe 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell,rtm=3Don,hle=3Don \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2= argvdata/cpu-cache-disable.args index 7b5d95270d..6bab5d64a5 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,host-cache-info=3Doff,l3-cache=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml= 2argvdata/cpu-cache-disable3.args index e4ccdad41c..dd9227de22 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,l3-cache=3Do= ff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemux= ml2argvdata/cpu-cache-emulate-l3.args index bcb354433b..38f1d93973 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,l3-cache=3Don,host-cache-info=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemu= xml2argvdata/cpu-cache-passthrough.args index cf90428952..4bf1305f16 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,host-cache-info=3Don,l3-cache=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qem= uxml2argvdata/cpu-check-default-none.args index 4ca878576d..65fc3e1bad 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qe= muxml2argvdata/cpu-check-default-none2.args index bd056383f6..cd55fad737 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/= qemuxml2argvdata/cpu-check-default-partial.args index fff3d02cfc..959a421741 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests= /qemuxml2argvdata/cpu-check-default-partial2.args index de46ed5ae7..48ad817176 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2arg= vdata/cpu-check-none.args index de46ed5ae7..48ad817176 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdat= a/cpu-exact1.args index b6dc380ddb..bd452e017e 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu64,mca=3Doff,pse36=3Doff,clflush=3Doff,syscall=3Doff,nx=3Doff,lm= =3Doff,svm=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemu= xml2argvdata/cpu-exact2-nofallback.args index 844da9ef3d..2916d10b23 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdat= a/cpu-exact2.args index 844da9ef3d..2916d10b23 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvd= ata/cpu-fallback.args index 341e649ce6..ef6c3b29f3 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Conroe,cx16=3Don,sse4.1=3Doff,sse4.2=3Doff,popcnt=3Doff,aes=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2= argvdata/cpu-host-kvmclock.args index 1e5a3af103..836fe208a0 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,kvmclock=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml= 2argvdata/cpu-host-model-cmt.args index d891dcd73b..97b7b9fda6 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds-cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf-lm=3Don \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemu= xml2argvdata/cpu-host-model-vendor.args index c043bba085..8bece6f8da 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu 'core2duo,vendor=3DLibvirt QEMU,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm= =3Don,pbe=3Don,ds-cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,l= ahf-lm=3Don' \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/te= sts/qemuxml2argvdata/cpu-host-passthrough-features.args index fba3d076d2..b8e0734d7d 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,abm=3Don,ds=3Don,invtsc=3Doff \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemux= ml2argvdata/cpu-host-passthrough.args index 4ca878576d..65fc3e1bad 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvd= ata/cpu-kvmclock.args index 60bc63a2bf..ef469a1e5a 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,kvmclock=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvd= ata/cpu-minimum1.args index fff3d02cfc..959a421741 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvd= ata/cpu-minimum2.args index 632f76f7dd..de2c6f4fe5 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,syscall=3Dof= f,nx=3Doff,lm=3Doff,svm=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qe= muxml2argvdata/cpu-no-removed-features.args index de46ed5ae7..48ad817176 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2= argvdata/cpu-numa-disjoint.args index 7ef84e0b2c..5fc82723eb 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml= 2argvdata/cpu-numa-memshared.args index 47341169d5..fc4c03f1a6 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -9,15 +9,15 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ --object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-QEMUGuest1/ram-node0,share=3Don,size=3D112197632 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197= 632}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dram-node1,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-QEMUGuest1/ram-node1,share=3Doff,size=3D112197632 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":11219= 7632}' \ -numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests= /qemuxml2argvdata/cpu-numa-no-memory-element.args index 741edc4c1c..3cf5b44742 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata= /cpu-numa1.args index 741edc4c1c..3cf5b44742 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata= /cpu-numa2.args index 741edc4c1c..3cf5b44742 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemu= xml2argvdata/cpu-phys-bits-emulate.args index e1823727ae..6710c3edc5 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,phys-bits=3D42 \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qem= uxml2argvdata/cpu-phys-bits-emulate2.args index d8add83283..f4fdaab483 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,phys-bits=3D= 42 \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/= qemuxml2argvdata/cpu-phys-bits-passthrough.args index 7af943c451..0ae7743b5a 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,host-phys-bits=3Don \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvda= ta/cpu-strict1.args index 69a1405f92..f865d7557a 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,vmx=3Don,est= =3Don,xtpr=3Don,3dnowext=3Don,lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pb= e=3Doff,ss=3Doff,sse4a=3Doff,wdt=3Doff \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argv= data/cpu-topology1.args index 6482bacaf1..52e36d0de5 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argv= data/cpu-topology2.args index ff4c85c800..6f8f674859 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argv= data/cpu-topology3.args index 6482bacaf1..52e36d0de5 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2= argvdata/cpu-tsc-frequency.args index f4b7a70ba2..f3a8a62c00 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds-cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf-lm=3Don,i= nvtsc=3Don,tsc-frequency=3D4567890000 \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemu= xml2argvdata/default-kvm-host-arch.args index 7ae1c7eef1..07ee740065 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dkvm,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-kvm/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-kvm/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m size=3D4194304k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.co= nfig \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qem= uxml2argvdata/default-qemu-host-arch.args index cc37778373..a54dc14136 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu-host= /.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dqemu-host,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-qemu-host/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-qemu-host/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D4194304k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu-ho= st/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qe= muxml2argvdata/graphics-sdl-fullscreen.args index 96ab12917e..33ad2bd5da 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -11,7 +11,7 @@ DISPLAY=3D:0.1 \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,8 +29,8 @@ DISPLAY=3D:0.1 \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -full-screen \ -display sdl \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvd= ata/graphics-sdl.args index c7d20d3e1f..bd6f994856 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -11,7 +11,7 @@ DISPLAY=3D:0.1 \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,7 +29,7 @@ DISPLAY=3D:0.1 \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -display sdl \ --device VGA,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"VGA","id":"video0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qe= muxml2argvdata/hostdev-mdev-precreated.args index 7c76cd5d15..8f51127035 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Doff,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"off","bus":"pci.0","= addr":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/t= ests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index 61fe727996..b59083cb3c 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Ddelete,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-delete/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m size=3D262144k \ @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0005:90:01.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ --device vfio-pci,host=3D0005:90:01.2,id=3Dhostdev2,bus=3Dpci.0,addr=3D0x3 \ --device vfio-pci,host=3D0005:90:01.3,id=3Dhostdev3,bus=3Dpci.0,addr=3D0x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ +-device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev2","bus":= "pci.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev3","bus":= "pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/= qemuxml2argvdata/hostdev-pci-multifunction.args index 50d6010429..b0110be8b1 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Ddelete,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-delete/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m size=3D262144k \ @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delet= e/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0005:90:01.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ --device vfio-pci,host=3D0001:01:00.1,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x3 \ --device vfio-pci,host=3D0001:01:00.0,id=3Dhostdev2,bus=3Dpci.0,addr=3D0x4 \ --device vfio-pci,host=3D0005:90:01.2,id=3Dhostdev3,bus=3Dpci.0,addr=3D0x5 \ --device vfio-pci,host=3D0005:90:01.3,id=3Dhostdev4,bus=3Dpci.0,addr=3D0x6 \ --device vfio-pci,host=3D0000:06:12.1,id=3Dhostdev5,bus=3Dpci.0,addr=3D0x7 \ --device vfio-pci,host=3D0000:06:12.2,id=3Dhostdev6,bus=3Dpci.0,addr=3D0x8 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x9 \ +-device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.1","id":"hostdev1","bus":= "pci.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.0","id":"hostdev2","bus":= "pci.0","addr":"0x4"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev3","bus":= "pci.0","addr":"0x5"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev4","bus":= "pci.0","addr":"0x6"}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev5","bus":= "pci.0","addr":"0x7"}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev6","bus":= "pci.0","addr":"0x8"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x9"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index 5f8197e7ed..972a023d5b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest2/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd= ":"3","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/q= emuxml2argvdata/hostdev-vfio-multidomain.args index ac9db13ab5..909f65ecae 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0021:de:1f.1,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"vfio-pci","host":"0021:de:1f.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvd= ata/hostdev-vfio.args index 9872d77f17..a52b705099 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0000:06:12.1,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvd= ata/hotplug-base.args index fd1ff8f36d..030552411e 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-hotplug/.= config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dhotplug,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-hotplug/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-hotplug/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m size=3D4194304k \ @@ -24,8 +24,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-hotplug= /.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x4"}' \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxm= l2argvdata/input-usbmouse-addr.args index 06d31b4605..1d7e8f29aa 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D2 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2arg= vdata/input-usbmouse.args index 3b85615ce2..fdf0cd14c5 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2ar= gvdata/input-usbtablet.args index 95ceafb413..18f484fc0a 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argv= data/kvm-pit-delay.args index f8234ba1cb..fd7a2b306a 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2ar= gvdata/kvm-pit-discard.args index b75f0945cc..c3cdc71020 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/= kvmclock.args index bd71be3ec0..df9ab68537 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu64,kvmclock=3Doff \ diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2a= rgvdata/machine-aliases1.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2a= rgvdata/machine-aliases2.args index 290a762e91..6501e5e417 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2a= rgvdata/machine-core-off.args index 2ebb6cb762..7b0d7e31af 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2ar= gvdata/machine-core-on.args index 78dea552bf..a1b9905d5c 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Don \ -accel tcg \ -m size=3D219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml= 2argvdata/machine-vmport-opt.args index 88eb59d12e..c7cdb0c85f 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxm= l2argvdata/memory-hotplug-dimm.args index 4e45bb059a..b84efa4556 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --object memory-backend-ram,id=3Dmemdimm0,size=3D536870912 \ --device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ --object memory-backend-file,id=3Dmemdimm1,mem-path=3D/dev/hugepages2M/libv= irt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D536870912,host-nodes=3D1-3,poli= cy=3Dbind \ --device pc-dimm,node=3D0,memdev=3Dmemdimm1,id=3Ddimm1,slot=3D1 \ +-object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912= }' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","sl= ot":0}' \ +-object '{"qom-type":"memory-backend-file","id":"memdimm1","mem-path":"/de= v/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":536870912,= "host-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","sl= ot":1}' \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2arg= vdata/memory-hotplug.args index 3bd7aaf9e5..62600fefe2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2= argvdata/memtune-unlimited.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/m= emtune.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/m= inimal.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata= /misc-acpi.args index 12f2d4e6ae..15343c68b0 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2ar= gvdata/misc-disable-s3.args index d64b9f56ae..3dc66e443e 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,6 +29,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemu= xml2argvdata/misc-disable-suspends.args index 554620fe24..314612c229 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2arg= vdata/misc-enable-s4.args index 0734635405..f2e9fcc0a6 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -29,6 +29,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata= /misc-uuid.args index 12f2d4e6ae..15343c68b0 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/q= emuxml2argvdata/multifunction-pci-device.args index 40a25fbe7b..40c38dea48 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device lsi,id=3Dscsi0,bus=3Dpci.0,multifunction=3Doff,addr=3D0x3 \ --device lsi,id=3Dscsi1,bus=3Dpci.0,multifunction=3Don,addr=3D0x4 \ --device lsi,id=3Dscsi2,bus=3Dpci.0,multifunction=3Don,addr=3D0x4.0x1 \ --device lsi,id=3Dscsi3,bus=3Dpci.0,addr=3D0x4.0x2 \ --device lsi,id=3Dscsi4,bus=3Dpci.0,addr=3D0x4.0x3 \ --device lsi,id=3Dscsi5,bus=3Dpci.0,addr=3D0x4.0x4 \ --device lsi,id=3Dscsi6,bus=3Dpci.0,addr=3D0x4.0x5 \ --device lsi,id=3Dscsi7,bus=3Dpci.0,addr=3D0x4.0x6 \ --device lsi,id=3Dscsi8,bus=3Dpci.0,addr=3D0x4.0x7 \ +-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","multifunction":false,= "addr":"0x3"}' \ +-device '{"driver":"lsi","id":"scsi1","bus":"pci.0","multifunction":true,"= addr":"0x4"}' \ +-device '{"driver":"lsi","id":"scsi2","bus":"pci.0","multifunction":true,"= addr":"0x4.0x1"}' \ +-device '{"driver":"lsi","id":"scsi3","bus":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"lsi","id":"scsi4","bus":"pci.0","addr":"0x4.0x3"}' \ +-device '{"driver":"lsi","id":"scsi5","bus":"pci.0","addr":"0x4.0x4"}' \ +-device '{"driver":"lsi","id":"scsi6","bus":"pci.0","addr":"0x4.0x5"}' \ +-device '{"driver":"lsi","id":"scsi7","bus":"pci.0","addr":"0x4.0x6"}' \ +-device '{"driver":"lsi","id":"scsi8","bus":"pci.0","addr":"0x4.0x7"}' \ -usb \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-1-format,id=3Dscsi0-0-0,bootindex=3D1 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvd= ata/nosharepages.args index a059b61da4..7bcd073c98 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff,mem-merge=3Doff \ -accel tcg \ -m size=3D220160k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/te= sts/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-= placement.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/= tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/te= sts/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/num= ad.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/te= sts/qemuxml2argvdata/numatune-auto-nodeset-invalid.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemux= ml2argvdata/numatune-auto-prefer.args index fd9b839404..5f8db1b479 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= /.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D65536k \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml= 2argvdata/numatune-distances.args index d2f240dd96..f349b5639c 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= /.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D12582912k \ @@ -68,5 +68,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests= /qemuxml2argvdata/numatune-memnode-no-memory.args index b8098cd5a5..efc9bb9476 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args @@ -9,15 +9,15 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D65536k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D33554432,host-nodes=3D3,p= olicy=3Dpreferred \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":33554432= ,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-ram,id=3Dram-node1,size=3D33554432 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":33554432= }' \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2a= rgvdata/numatune-memnode.args index f5f6e727a1..163aa530da 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ b/tests/qemuxml2argvdata/numatune-memnode.args @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D24683520k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D20971520,host-nodes=3D3,p= olicy=3Dpreferred \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520= ,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-ram,id=3Dram-node1,size=3D676331520,host-nodes=3D0-= 3,policy=3Dbind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":67633152= 0,"host-nodes":[0,1,2,3],"policy":"bind"}' \ -numa node,nodeid=3D1,cpus=3D1-27,cpus=3D29,memdev=3Dram-node1 \ --object memory-backend-ram,id=3Dram-node2,size=3D24578621440,host-nodes=3D= 0,host-nodes=3D2,policy=3Dbind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621= 440,"host-nodes":[0,2],"policy":"bind"}' \ -numa node,nodeid=3D2,cpus=3D28,cpus=3D30-31,memdev=3Dram-node2 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ @@ -33,5 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2ar= gvdata/numatune-memory.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2a= rgvdata/pci-autoadd-addr.args index f1a49702ef..ec75429384 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -24,18 +24,18 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x3 \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x4 \ --device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.0,addr=3D0x5 \ --device pci-bridge,chassis_nr=3D4,id=3Dpci.4,bus=3Dpci.0,addr=3D0x6 \ --device pci-bridge,chassis_nr=3D5,id=3Dpci.5,bus=3Dpci.0,addr=3D0x7 \ --device pci-bridge,chassis_nr=3D6,id=3Dpci.6,bus=3Dpci.0,addr=3D0x8 \ --device pci-bridge,chassis_nr=3D7,id=3Dpci.7,bus=3Dpci.0,addr=3D0x9 \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x4"}' \ +-device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0",= "addr":"0x5"}' \ +-device '{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0",= "addr":"0x6"}' \ +-device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0",= "addr":"0x7"}' \ +-device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0",= "addr":"0x8"}' \ +-device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0",= "addr":"0x9"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.7,addr=3D0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2ar= gvdata/pci-autoadd-idx.args index aed802a501..5c6377d619 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -24,19 +24,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pci-bridge,chassis_nr=3D8,id=3Dpci.8,bus=3Dpci.0,addr=3D0x3 \ --device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x4 \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x5 \ --device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.0,addr=3D0x6 \ --device pci-bridge,chassis_nr=3D4,id=3Dpci.4,bus=3Dpci.0,addr=3D0x7 \ --device pci-bridge,chassis_nr=3D5,id=3Dpci.5,bus=3Dpci.0,addr=3D0x8 \ --device pci-bridge,chassis_nr=3D6,id=3Dpci.6,bus=3Dpci.0,addr=3D0x9 \ --device pci-bridge,chassis_nr=3D7,id=3Dpci.7,bus=3Dpci.0,addr=3D0xa \ +-device '{"driver":"pci-bridge","chassis_nr":8,"id":"pci.8","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x4"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x5"}' \ +-device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0",= "addr":"0x6"}' \ +-device '{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0",= "addr":"0x7"}' \ +-device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0",= "addr":"0x8"}' \ +-device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0",= "addr":"0x9"}' \ +-device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0",= "addr":"0xa"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2= argvdata/pci-autofill-addr.args index 0b9866d00e..f43a1da7ab 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemu= xml2argvdata/pci-bridge-many-disks.args index 6868de7344..7d990296c7 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-lots-of-d= isks/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dlots-of-disks,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-lots-of-disks/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-lots-of-disks/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64,kvmclock=3Doff \ @@ -25,324 +25,324 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-lot= s-of-disks/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x2 \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x3 \ --device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x2"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0",= "addr":"0x4"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-105-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-105-format","read-only":false,"driver":"r= aw","file":"libvirt-105-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-105-format,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-105-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-104-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-104-format","read-only":false,"driver":"r= aw","file":"libvirt-104-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-104-format,i= d=3Dvirtio-disk26 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-104-format","id":"virtio-disk26"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-103-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-103-format","read-only":false,"driver":"r= aw","file":"libvirt-103-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-103-format,i= d=3Dvirtio-disk27 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-103-format","id":"virtio-disk27"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-102-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-102-format","read-only":false,"driver":"r= aw","file":"libvirt-102-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-102-format,i= d=3Dvirtio-disk28 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-102-format","id":"virtio-disk28"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-101-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-101-format","read-only":false,"driver":"r= aw","file":"libvirt-101-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-101-format,i= d=3Dvirtio-disk29 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-101-format","id":"virtio-disk29"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-100-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-100-format","read-only":false,"driver":"r= aw","file":"libvirt-100-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xa,drive=3Dlibvirt-100-format,i= d=3Dvirtio-disk52 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"li= bvirt-100-format","id":"virtio-disk52"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-99-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-99-format","read-only":false,"driver":"ra= w","file":"libvirt-99-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xb,drive=3Dlibvirt-99-format,id= =3Dvirtio-disk53 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"li= bvirt-99-format","id":"virtio-disk53"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-98-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-98-format","read-only":false,"driver":"ra= w","file":"libvirt-98-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xc,drive=3Dlibvirt-98-format,id= =3Dvirtio-disk54 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"li= bvirt-98-format","id":"virtio-disk54"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-97-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-97-format","read-only":false,"driver":"ra= w","file":"libvirt-97-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xd,drive=3Dlibvirt-97-format,id= =3Dvirtio-disk55 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"li= bvirt-97-format","id":"virtio-disk55"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-96-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-96-format","read-only":false,"driver":"ra= w","file":"libvirt-96-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xe,drive=3Dlibvirt-96-format,id= =3Dvirtio-disk78 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"li= bvirt-96-format","id":"virtio-disk78"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-95-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-95-format","read-only":false,"driver":"ra= w","file":"libvirt-95-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xf,drive=3Dlibvirt-95-format,id= =3Dvirtio-disk79 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"li= bvirt-95-format","id":"virtio-disk79"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-94-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-94-format","read-only":false,"driver":"ra= w","file":"libvirt-94-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x10,drive=3Dlibvirt-94-format,i= d=3Dvirtio-disk80 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"l= ibvirt-94-format","id":"virtio-disk80"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-93-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-93-format","read-only":false,"driver":"ra= w","file":"libvirt-93-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x11,drive=3Dlibvirt-93-format,i= d=3Dvirtio-disk81 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"l= ibvirt-93-format","id":"virtio-disk81"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-92-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-92-format","read-only":false,"driver":"ra= w","file":"libvirt-92-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x12,drive=3Dlibvirt-92-format,i= d=3Dvirtio-disk104 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"l= ibvirt-92-format","id":"virtio-disk104"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-91-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-91-format","read-only":false,"driver":"ra= w","file":"libvirt-91-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x13,drive=3Dlibvirt-91-format,i= d=3Dvirtio-disk105 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"l= ibvirt-91-format","id":"virtio-disk105"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-90-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-90-format","read-only":false,"driver":"ra= w","file":"libvirt-90-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x14,drive=3Dlibvirt-90-format,i= d=3Dvirtio-disk106 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"l= ibvirt-90-format","id":"virtio-disk106"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-89-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-89-format","read-only":false,"driver":"ra= w","file":"libvirt-89-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x15,drive=3Dlibvirt-89-format,i= d=3Dvirtio-disk107 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"l= ibvirt-89-format","id":"virtio-disk107"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-88-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-88-format","read-only":false,"driver":"ra= w","file":"libvirt-88-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x16,drive=3Dlibvirt-88-format,i= d=3Dvirtio-disk130 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"l= ibvirt-88-format","id":"virtio-disk130"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-87-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-87-format","read-only":false,"driver":"ra= w","file":"libvirt-87-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x17,drive=3Dlibvirt-87-format,i= d=3Dvirtio-disk131 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"l= ibvirt-87-format","id":"virtio-disk131"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-86-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-86-format","read-only":false,"driver":"ra= w","file":"libvirt-86-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x18,drive=3Dlibvirt-86-format,i= d=3Dvirtio-disk132 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"l= ibvirt-86-format","id":"virtio-disk132"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-85-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-85-format","read-only":false,"driver":"ra= w","file":"libvirt-85-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x19,drive=3Dlibvirt-85-format,i= d=3Dvirtio-disk133 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"l= ibvirt-85-format","id":"virtio-disk133"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-84-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-84-format","read-only":false,"driver":"ra= w","file":"libvirt-84-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1a,drive=3Dlibvirt-84-format,i= d=3Dvirtio-disk156 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"l= ibvirt-84-format","id":"virtio-disk156"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-83-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-83-format","read-only":false,"driver":"ra= w","file":"libvirt-83-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1b,drive=3Dlibvirt-83-format,i= d=3Dvirtio-disk157 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"l= ibvirt-83-format","id":"virtio-disk157"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-82-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-82-format","read-only":false,"driver":"ra= w","file":"libvirt-82-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1c,drive=3Dlibvirt-82-format,i= d=3Dvirtio-disk158 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"l= ibvirt-82-format","id":"virtio-disk158"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-81-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-81-format","read-only":false,"driver":"ra= w","file":"libvirt-81-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1d,drive=3Dlibvirt-81-format,i= d=3Dvirtio-disk159 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"l= ibvirt-81-format","id":"virtio-disk159"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-80-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-80-format","read-only":false,"driver":"ra= w","file":"libvirt-80-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1e,drive=3Dlibvirt-80-format,i= d=3Dvirtio-disk182 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"l= ibvirt-80-format","id":"virtio-disk182"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-name":"libvirt-79-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-79-format","read-only":false,"driver":"ra= w","file":"libvirt-79-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1f,drive=3Dlibvirt-79-format,i= d=3Dvirtio-disk183 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"l= ibvirt-79-format","id":"virtio-disk183"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-c.i= mg","node-name":"libvirt-78-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-78-format","read-only":false,"driver":"ra= w","file":"libvirt-78-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1,drive=3Dlibvirt-78-format,id= =3Dvirtio-disk184 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1","drive":"li= bvirt-78-format","id":"virtio-disk184"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-d.i= mg","node-name":"libvirt-77-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-77-format","read-only":false,"driver":"ra= w","file":"libvirt-77-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x2,drive=3Dlibvirt-77-format,id= =3Dvirtio-disk185 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x2","drive":"li= bvirt-77-format","id":"virtio-disk185"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-a.i= mg","node-name":"libvirt-76-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-76-format","read-only":false,"driver":"ra= w","file":"libvirt-76-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x3,drive=3Dlibvirt-76-format,id= =3Dvirtio-disk208 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x3","drive":"li= bvirt-76-format","id":"virtio-disk208"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-b.i= mg","node-name":"libvirt-75-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-75-format","read-only":false,"driver":"ra= w","file":"libvirt-75-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x4,drive=3Dlibvirt-75-format,id= =3Dvirtio-disk209 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x4","drive":"li= bvirt-75-format","id":"virtio-disk209"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-c.i= mg","node-name":"libvirt-74-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-74-format","read-only":false,"driver":"ra= w","file":"libvirt-74-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x5,drive=3Dlibvirt-74-format,id= =3Dvirtio-disk210 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x5","drive":"li= bvirt-74-format","id":"virtio-disk210"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-d.i= mg","node-name":"libvirt-73-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-73-format","read-only":false,"driver":"ra= w","file":"libvirt-73-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x6,drive=3Dlibvirt-73-format,id= =3Dvirtio-disk211 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x6","drive":"li= bvirt-73-format","id":"virtio-disk211"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-a.i= mg","node-name":"libvirt-72-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-72-format","read-only":false,"driver":"ra= w","file":"libvirt-72-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x7,drive=3Dlibvirt-72-format,id= =3Dvirtio-disk234 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x7","drive":"li= bvirt-72-format","id":"virtio-disk234"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-b.i= mg","node-name":"libvirt-71-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-71-format","read-only":false,"driver":"ra= w","file":"libvirt-71-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x8,drive=3Dlibvirt-71-format,id= =3Dvirtio-disk235 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x8","drive":"li= bvirt-71-format","id":"virtio-disk235"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-c.i= mg","node-name":"libvirt-70-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-70-format","read-only":false,"driver":"ra= w","file":"libvirt-70-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x9,drive=3Dlibvirt-70-format,id= =3Dvirtio-disk236 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x9","drive":"li= bvirt-70-format","id":"virtio-disk236"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-d.i= mg","node-name":"libvirt-69-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-69-format","read-only":false,"driver":"ra= w","file":"libvirt-69-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xa,drive=3Dlibvirt-69-format,id= =3Dvirtio-disk237 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xa","drive":"li= bvirt-69-format","id":"virtio-disk237"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-a.i= mg","node-name":"libvirt-68-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-68-format","read-only":false,"driver":"ra= w","file":"libvirt-68-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xb,drive=3Dlibvirt-68-format,id= =3Dvirtio-disk260 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xb","drive":"li= bvirt-68-format","id":"virtio-disk260"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-b.i= mg","node-name":"libvirt-67-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-67-format","read-only":false,"driver":"ra= w","file":"libvirt-67-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xc,drive=3Dlibvirt-67-format,id= =3Dvirtio-disk261 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xc","drive":"li= bvirt-67-format","id":"virtio-disk261"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-c.i= mg","node-name":"libvirt-66-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-66-format","read-only":false,"driver":"ra= w","file":"libvirt-66-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xd,drive=3Dlibvirt-66-format,id= =3Dvirtio-disk262 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xd","drive":"li= bvirt-66-format","id":"virtio-disk262"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-d.i= mg","node-name":"libvirt-65-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-65-format","read-only":false,"driver":"ra= w","file":"libvirt-65-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xe,drive=3Dlibvirt-65-format,id= =3Dvirtio-disk263 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xe","drive":"li= bvirt-65-format","id":"virtio-disk263"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-a.i= mg","node-name":"libvirt-64-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-64-format","read-only":false,"driver":"ra= w","file":"libvirt-64-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xf,drive=3Dlibvirt-64-format,id= =3Dvirtio-disk286 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xf","drive":"li= bvirt-64-format","id":"virtio-disk286"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-b.i= mg","node-name":"libvirt-63-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-63-format","read-only":false,"driver":"ra= w","file":"libvirt-63-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x10,drive=3Dlibvirt-63-format,i= d=3Dvirtio-disk287 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x10","drive":"l= ibvirt-63-format","id":"virtio-disk287"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-c.i= mg","node-name":"libvirt-62-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-62-format","read-only":false,"driver":"ra= w","file":"libvirt-62-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x11,drive=3Dlibvirt-62-format,i= d=3Dvirtio-disk288 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x11","drive":"l= ibvirt-62-format","id":"virtio-disk288"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-d.i= mg","node-name":"libvirt-61-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-61-format","read-only":false,"driver":"ra= w","file":"libvirt-61-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x12,drive=3Dlibvirt-61-format,i= d=3Dvirtio-disk289 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x12","drive":"l= ibvirt-61-format","id":"virtio-disk289"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-a.i= mg","node-name":"libvirt-60-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-60-format","read-only":false,"driver":"ra= w","file":"libvirt-60-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x13,drive=3Dlibvirt-60-format,i= d=3Dvirtio-disk312 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x13","drive":"l= ibvirt-60-format","id":"virtio-disk312"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-b.i= mg","node-name":"libvirt-59-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-59-format","read-only":false,"driver":"ra= w","file":"libvirt-59-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x14,drive=3Dlibvirt-59-format,i= d=3Dvirtio-disk313 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x14","drive":"l= ibvirt-59-format","id":"virtio-disk313"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-c.i= mg","node-name":"libvirt-58-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-58-format","read-only":false,"driver":"ra= w","file":"libvirt-58-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x15,drive=3Dlibvirt-58-format,i= d=3Dvirtio-disk314 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x15","drive":"l= ibvirt-58-format","id":"virtio-disk314"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-d.i= mg","node-name":"libvirt-57-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-57-format","read-only":false,"driver":"ra= w","file":"libvirt-57-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x16,drive=3Dlibvirt-57-format,i= d=3Dvirtio-disk315 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x16","drive":"l= ibvirt-57-format","id":"virtio-disk315"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-a.i= mg","node-name":"libvirt-56-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-56-format","read-only":false,"driver":"ra= w","file":"libvirt-56-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x17,drive=3Dlibvirt-56-format,i= d=3Dvirtio-disk338 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x17","drive":"l= ibvirt-56-format","id":"virtio-disk338"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-b.i= mg","node-name":"libvirt-55-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-55-format","read-only":false,"driver":"ra= w","file":"libvirt-55-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x18,drive=3Dlibvirt-55-format,i= d=3Dvirtio-disk339 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x18","drive":"l= ibvirt-55-format","id":"virtio-disk339"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-c.i= mg","node-name":"libvirt-54-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-54-format","read-only":false,"driver":"ra= w","file":"libvirt-54-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x19,drive=3Dlibvirt-54-format,i= d=3Dvirtio-disk340 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x19","drive":"l= ibvirt-54-format","id":"virtio-disk340"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-d.i= mg","node-name":"libvirt-53-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-53-format","read-only":false,"driver":"ra= w","file":"libvirt-53-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1a,drive=3Dlibvirt-53-format,i= d=3Dvirtio-disk341 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1a","drive":"l= ibvirt-53-format","id":"virtio-disk341"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-a.i= mg","node-name":"libvirt-52-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-52-format","read-only":false,"driver":"ra= w","file":"libvirt-52-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1b,drive=3Dlibvirt-52-format,i= d=3Dvirtio-disk364 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1b","drive":"l= ibvirt-52-format","id":"virtio-disk364"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-b.i= mg","node-name":"libvirt-51-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-51-format","read-only":false,"driver":"ra= w","file":"libvirt-51-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1c,drive=3Dlibvirt-51-format,i= d=3Dvirtio-disk365 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1c","drive":"l= ibvirt-51-format","id":"virtio-disk365"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-c.i= mg","node-name":"libvirt-50-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-50-format","read-only":false,"driver":"ra= w","file":"libvirt-50-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1d,drive=3Dlibvirt-50-format,i= d=3Dvirtio-disk366 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1d","drive":"l= ibvirt-50-format","id":"virtio-disk366"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-d.i= mg","node-name":"libvirt-49-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-49-format","read-only":false,"driver":"ra= w","file":"libvirt-49-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1e,drive=3Dlibvirt-49-format,i= d=3Dvirtio-disk367 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1e","drive":"l= ibvirt-49-format","id":"virtio-disk367"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-a.i= mg","node-name":"libvirt-48-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-48-format","read-only":false,"driver":"ra= w","file":"libvirt-48-storage"}' \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1f,drive=3Dlibvirt-48-format,i= d=3Dvirtio-disk390 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1f","drive":"l= ibvirt-48-format","id":"virtio-disk390"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-b.i= mg","node-name":"libvirt-47-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-47-format","read-only":false,"driver":"ra= w","file":"libvirt-47-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1,drive=3Dlibvirt-47-format,id= =3Dvirtio-disk391 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1","drive":"li= bvirt-47-format","id":"virtio-disk391"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-c.i= mg","node-name":"libvirt-46-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-46-format","read-only":false,"driver":"ra= w","file":"libvirt-46-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x2,drive=3Dlibvirt-46-format,id= =3Dvirtio-disk392 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x2","drive":"li= bvirt-46-format","id":"virtio-disk392"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-d.i= mg","node-name":"libvirt-45-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-45-format","read-only":false,"driver":"ra= w","file":"libvirt-45-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x3,drive=3Dlibvirt-45-format,id= =3Dvirtio-disk393 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x3","drive":"li= bvirt-45-format","id":"virtio-disk393"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-a.i= mg","node-name":"libvirt-44-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-44-format","read-only":false,"driver":"ra= w","file":"libvirt-44-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x4,drive=3Dlibvirt-44-format,id= =3Dvirtio-disk416 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x4","drive":"li= bvirt-44-format","id":"virtio-disk416"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-b.i= mg","node-name":"libvirt-43-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-43-format","read-only":false,"driver":"ra= w","file":"libvirt-43-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x5,drive=3Dlibvirt-43-format,id= =3Dvirtio-disk417 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x5","drive":"li= bvirt-43-format","id":"virtio-disk417"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-c.i= mg","node-name":"libvirt-42-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-42-format","read-only":false,"driver":"ra= w","file":"libvirt-42-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x6,drive=3Dlibvirt-42-format,id= =3Dvirtio-disk418 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x6","drive":"li= bvirt-42-format","id":"virtio-disk418"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-d.i= mg","node-name":"libvirt-41-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-41-format","read-only":false,"driver":"ra= w","file":"libvirt-41-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x7,drive=3Dlibvirt-41-format,id= =3Dvirtio-disk419 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x7","drive":"li= bvirt-41-format","id":"virtio-disk419"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-a.i= mg","node-name":"libvirt-40-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-40-format","read-only":false,"driver":"ra= w","file":"libvirt-40-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x8,drive=3Dlibvirt-40-format,id= =3Dvirtio-disk442 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x8","drive":"li= bvirt-40-format","id":"virtio-disk442"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-b.i= mg","node-name":"libvirt-39-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-39-format","read-only":false,"driver":"ra= w","file":"libvirt-39-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x9,drive=3Dlibvirt-39-format,id= =3Dvirtio-disk443 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x9","drive":"li= bvirt-39-format","id":"virtio-disk443"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-c.i= mg","node-name":"libvirt-38-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-38-format","read-only":false,"driver":"ra= w","file":"libvirt-38-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xa,drive=3Dlibvirt-38-format,id= =3Dvirtio-disk444 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xa","drive":"li= bvirt-38-format","id":"virtio-disk444"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-d.i= mg","node-name":"libvirt-37-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-37-format","read-only":false,"driver":"ra= w","file":"libvirt-37-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xb,drive=3Dlibvirt-37-format,id= =3Dvirtio-disk445 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xb","drive":"li= bvirt-37-format","id":"virtio-disk445"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-a.i= mg","node-name":"libvirt-36-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-36-format","read-only":false,"driver":"ra= w","file":"libvirt-36-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xc,drive=3Dlibvirt-36-format,id= =3Dvirtio-disk468 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xc","drive":"li= bvirt-36-format","id":"virtio-disk468"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-b.i= mg","node-name":"libvirt-35-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-35-format","read-only":false,"driver":"ra= w","file":"libvirt-35-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xd,drive=3Dlibvirt-35-format,id= =3Dvirtio-disk469 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xd","drive":"li= bvirt-35-format","id":"virtio-disk469"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-c.i= mg","node-name":"libvirt-34-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-34-format","read-only":false,"driver":"ra= w","file":"libvirt-34-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xe,drive=3Dlibvirt-34-format,id= =3Dvirtio-disk470 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xe","drive":"li= bvirt-34-format","id":"virtio-disk470"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-d.i= mg","node-name":"libvirt-33-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-33-format","read-only":false,"driver":"ra= w","file":"libvirt-33-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xf,drive=3Dlibvirt-33-format,id= =3Dvirtio-disk471 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xf","drive":"li= bvirt-33-format","id":"virtio-disk471"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-a.i= mg","node-name":"libvirt-32-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-32-format","read-only":false,"driver":"ra= w","file":"libvirt-32-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x10,drive=3Dlibvirt-32-format,i= d=3Dvirtio-disk494 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x10","drive":"l= ibvirt-32-format","id":"virtio-disk494"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-b.i= mg","node-name":"libvirt-31-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-31-format","read-only":false,"driver":"ra= w","file":"libvirt-31-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x11,drive=3Dlibvirt-31-format,i= d=3Dvirtio-disk495 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x11","drive":"l= ibvirt-31-format","id":"virtio-disk495"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-c.i= mg","node-name":"libvirt-30-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-30-format","read-only":false,"driver":"ra= w","file":"libvirt-30-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x12,drive=3Dlibvirt-30-format,i= d=3Dvirtio-disk496 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x12","drive":"l= ibvirt-30-format","id":"virtio-disk496"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-d.i= mg","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-29-format","read-only":false,"driver":"ra= w","file":"libvirt-29-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x13,drive=3Dlibvirt-29-format,i= d=3Dvirtio-disk497 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x13","drive":"l= ibvirt-29-format","id":"virtio-disk497"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-a.i= mg","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"ra= w","file":"libvirt-28-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x14,drive=3Dlibvirt-28-format,i= d=3Dvirtio-disk520 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x14","drive":"l= ibvirt-28-format","id":"virtio-disk520"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-b.i= mg","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"ra= w","file":"libvirt-27-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x15,drive=3Dlibvirt-27-format,i= d=3Dvirtio-disk521 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x15","drive":"l= ibvirt-27-format","id":"virtio-disk521"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-c.i= mg","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"ra= w","file":"libvirt-26-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x16,drive=3Dlibvirt-26-format,i= d=3Dvirtio-disk522 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x16","drive":"l= ibvirt-26-format","id":"virtio-disk522"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-d.i= mg","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"ra= w","file":"libvirt-25-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x17,drive=3Dlibvirt-25-format,i= d=3Dvirtio-disk523 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x17","drive":"l= ibvirt-25-format","id":"virtio-disk523"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-a.i= mg","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"ra= w","file":"libvirt-24-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x18,drive=3Dlibvirt-24-format,i= d=3Dvirtio-disk546 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x18","drive":"l= ibvirt-24-format","id":"virtio-disk546"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-b.i= mg","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"ra= w","file":"libvirt-23-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x19,drive=3Dlibvirt-23-format,i= d=3Dvirtio-disk547 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x19","drive":"l= ibvirt-23-format","id":"virtio-disk547"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-c.i= mg","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"ra= w","file":"libvirt-22-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1a,drive=3Dlibvirt-22-format,i= d=3Dvirtio-disk548 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1a","drive":"l= ibvirt-22-format","id":"virtio-disk548"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-d.i= mg","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"ra= w","file":"libvirt-21-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1b,drive=3Dlibvirt-21-format,i= d=3Dvirtio-disk549 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1b","drive":"l= ibvirt-21-format","id":"virtio-disk549"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-a.i= mg","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"ra= w","file":"libvirt-20-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1c,drive=3Dlibvirt-20-format,i= d=3Dvirtio-disk572 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1c","drive":"l= ibvirt-20-format","id":"virtio-disk572"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-b.i= mg","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"ra= w","file":"libvirt-19-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1d,drive=3Dlibvirt-19-format,i= d=3Dvirtio-disk573 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1d","drive":"l= ibvirt-19-format","id":"virtio-disk573"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-c.i= mg","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"ra= w","file":"libvirt-18-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1e,drive=3Dlibvirt-18-format,i= d=3Dvirtio-disk574 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1e","drive":"l= ibvirt-18-format","id":"virtio-disk574"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-d.i= mg","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"ra= w","file":"libvirt-17-storage"}' \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1f,drive=3Dlibvirt-17-format,i= d=3Dvirtio-disk575 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1f","drive":"l= ibvirt-17-format","id":"virtio-disk575"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-a.i= mg","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x1,drive=3Dlibvirt-16-format,id= =3Dvirtio-disk598 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x1","drive":"li= bvirt-16-format","id":"virtio-disk598"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-b.i= mg","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"ra= w","file":"libvirt-15-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x2,drive=3Dlibvirt-15-format,id= =3Dvirtio-disk599 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x2","drive":"li= bvirt-15-format","id":"virtio-disk599"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-c.i= mg","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"ra= w","file":"libvirt-14-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x3,drive=3Dlibvirt-14-format,id= =3Dvirtio-disk600 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x3","drive":"li= bvirt-14-format","id":"virtio-disk600"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-d.i= mg","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"ra= w","file":"libvirt-13-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x4,drive=3Dlibvirt-13-format,id= =3Dvirtio-disk601 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x4","drive":"li= bvirt-13-format","id":"virtio-disk601"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-a.i= mg","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"ra= w","file":"libvirt-12-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x5,drive=3Dlibvirt-12-format,id= =3Dvirtio-disk624 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x5","drive":"li= bvirt-12-format","id":"virtio-disk624"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-b.i= mg","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"ra= w","file":"libvirt-11-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x6,drive=3Dlibvirt-11-format,id= =3Dvirtio-disk625 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x6","drive":"li= bvirt-11-format","id":"virtio-disk625"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-c.i= mg","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"ra= w","file":"libvirt-10-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x7,drive=3Dlibvirt-10-format,id= =3Dvirtio-disk626 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x7","drive":"li= bvirt-10-format","id":"virtio-disk626"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-d.i= mg","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw= ","file":"libvirt-9-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x8,drive=3Dlibvirt-9-format,id= =3Dvirtio-disk627 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x8","drive":"li= bvirt-9-format","id":"virtio-disk627"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-a.i= mg","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw= ","file":"libvirt-8-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x9,drive=3Dlibvirt-8-format,id= =3Dvirtio-disk650 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x9","drive":"li= bvirt-8-format","id":"virtio-disk650"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-b.i= mg","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xa,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk651 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xa","drive":"li= bvirt-7-format","id":"virtio-disk651"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-c.i= mg","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xb,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk652 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xb","drive":"li= bvirt-6-format","id":"virtio-disk652"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-d.i= mg","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xc,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk653 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xc","drive":"li= bvirt-5-format","id":"virtio-disk653"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-a.i= mg","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xd,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk676 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xd","drive":"li= bvirt-4-format","id":"virtio-disk676"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-b.i= mg","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xe,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk677 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xe","drive":"li= bvirt-3-format","id":"virtio-disk677"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-c.i= mg","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xf,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk678 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xf","drive":"li= bvirt-2-format","id":"virtio-disk678"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-d.i= mg","node-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 virtio-blk-pci,bus=3Dpci.3,addr=3D0x10,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk679 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x10","drive":"l= ibvirt-1-format","id":"virtio-disk679"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index 0740a887ba..1e1d4c30e2 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -23,79 +23,79 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x3 \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x4"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ --netdev user,id=3Dhostnet0 \ --device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.0,addr=3D0x5 \ --netdev user,id=3Dhostnet1 \ --device e1000,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpc= i.0,addr=3D0x7 \ --netdev user,id=3Dhostnet2 \ --device e1000,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpc= i.0,addr=3D0x8 \ --netdev user,id=3Dhostnet3 \ --device e1000,netdev=3Dhostnet3,id=3Dnet3,mac=3D52:54:00:45:28:cb,bus=3Dpc= i.0,addr=3D0x9 \ --netdev user,id=3Dhostnet4 \ --device e1000,netdev=3Dhostnet4,id=3Dnet4,mac=3D52:54:00:ee:b9:a8,bus=3Dpc= i.0,addr=3D0xa \ --netdev user,id=3Dhostnet5 \ --device e1000,netdev=3Dhostnet5,id=3Dnet5,mac=3D52:54:00:a9:f7:17,bus=3Dpc= i.0,addr=3D0xb \ --netdev user,id=3Dhostnet6 \ --device e1000,netdev=3Dhostnet6,id=3Dnet6,mac=3D52:54:00:df:2b:f3,bus=3Dpc= i.0,addr=3D0xc \ --netdev user,id=3Dhostnet7 \ --device e1000,netdev=3Dhostnet7,id=3Dnet7,mac=3D52:54:00:78:94:b4,bus=3Dpc= i.0,addr=3D0xd \ --netdev user,id=3Dhostnet8 \ --device e1000,netdev=3Dhostnet8,id=3Dnet8,mac=3D52:54:00:6b:9b:06,bus=3Dpc= i.0,addr=3D0xe \ --netdev user,id=3Dhostnet9 \ --device e1000,netdev=3Dhostnet9,id=3Dnet9,mac=3D52:54:00:17:df:bc,bus=3Dpc= i.0,addr=3D0xf \ --netdev user,id=3Dhostnet10 \ --device rtl8139,netdev=3Dhostnet10,id=3Dnet10,mac=3D52:54:00:3b:d0:51,bus= =3Dpci.0,addr=3D0x10 \ --netdev user,id=3Dhostnet11 \ --device e1000,netdev=3Dhostnet11,id=3Dnet11,mac=3D52:54:00:8d:2d:17,bus=3D= pci.0,addr=3D0x11 \ --netdev user,id=3Dhostnet12 \ --device e1000,netdev=3Dhostnet12,id=3Dnet12,mac=3D52:54:00:a7:66:af,bus=3D= pci.0,addr=3D0x12 \ --netdev user,id=3Dhostnet13 \ --device e1000,netdev=3Dhostnet13,id=3Dnet13,mac=3D52:54:00:54:ab:d7,bus=3D= pci.0,addr=3D0x13 \ --netdev user,id=3Dhostnet14 \ --device e1000,netdev=3Dhostnet14,id=3Dnet14,mac=3D52:54:00:1f:99:90,bus=3D= pci.0,addr=3D0x14 \ --netdev user,id=3Dhostnet15 \ --device e1000,netdev=3Dhostnet15,id=3Dnet15,mac=3D52:54:00:c8:43:87,bus=3D= pci.0,addr=3D0x15 \ --netdev user,id=3Dhostnet16 \ --device e1000,netdev=3Dhostnet16,id=3Dnet16,mac=3D52:54:00:df:22:b2,bus=3D= pci.0,addr=3D0x16 \ --netdev user,id=3Dhostnet17 \ --device e1000,netdev=3Dhostnet17,id=3Dnet17,mac=3D52:54:00:d2:9a:47,bus=3D= pci.0,addr=3D0x17 \ --netdev user,id=3Dhostnet18 \ --device e1000,netdev=3Dhostnet18,id=3Dnet18,mac=3D52:54:00:86:05:e2,bus=3D= pci.0,addr=3D0x18 \ --netdev user,id=3Dhostnet19 \ --device e1000,netdev=3Dhostnet19,id=3Dnet19,mac=3D52:54:00:8c:1c:c2,bus=3D= pci.0,addr=3D0x19 \ --netdev user,id=3Dhostnet20 \ --device e1000,netdev=3Dhostnet20,id=3Dnet20,mac=3D52:54:00:48:58:92,bus=3D= pci.0,addr=3D0x1a \ --netdev user,id=3Dhostnet21 \ --device e1000,netdev=3Dhostnet21,id=3Dnet21,mac=3D52:54:00:99:e5:bf,bus=3D= pci.0,addr=3D0x1b \ --netdev user,id=3Dhostnet22 \ --device e1000,netdev=3Dhostnet22,id=3Dnet22,mac=3D52:54:00:b1:8c:25,bus=3D= pci.0,addr=3D0x1c \ --netdev user,id=3Dhostnet23 \ --device e1000,netdev=3Dhostnet23,id=3Dnet23,mac=3D52:54:00:60:e0:d0,bus=3D= pci.0,addr=3D0x1d \ --netdev user,id=3Dhostnet24 \ --device e1000,netdev=3Dhostnet24,id=3Dnet24,mac=3D52:54:00:37:00:6a,bus=3D= pci.0,addr=3D0x1e \ --netdev user,id=3Dhostnet25 \ --device e1000,netdev=3Dhostnet25,id=3Dnet25,mac=3D52:54:00:c7:c8:ad,bus=3D= pci.0,addr=3D0x1f \ --netdev user,id=3Dhostnet26 \ --device e1000,netdev=3Dhostnet26,id=3Dnet26,mac=3D52:54:00:4e:a7:cf,bus=3D= pci.1,addr=3D0x1 \ --netdev user,id=3Dhostnet27 \ --device e1000,netdev=3Dhostnet27,id=3Dnet27,mac=3D52:54:00:00:79:69,bus=3D= pci.1,addr=3D0x2 \ --netdev user,id=3Dhostnet28 \ --device e1000,netdev=3Dhostnet28,id=3Dnet28,mac=3D52:54:00:47:00:6f,bus=3D= pci.1,addr=3D0x3 \ --netdev user,id=3Dhostnet29 \ --device e1000,netdev=3Dhostnet29,id=3Dnet29,mac=3D52:54:00:2a:8c:8b,bus=3D= pci.1,addr=3D0x4 \ --netdev user,id=3Dhostnet30 \ --device e1000,netdev=3Dhostnet30,id=3Dnet30,mac=3D52:54:00:ec:d5:e3,bus=3D= pci.1,addr=3D0x5 \ --netdev user,id=3Dhostnet31 \ --device e1000,netdev=3Dhostnet31,id=3Dnet31,mac=3D52:54:00:7e:6e:c8,bus=3D= pci.1,addr=3D0x6 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:f1:95:51","bus":"pci.0","addr":"0x5"}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00= :5c:c6:1a","bus":"pci.0","addr":"0x7"}' \ +-netdev '{"type":"user","id":"hostnet2"}' \ +-device '{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00= :39:97:ac","bus":"pci.0","addr":"0x8"}' \ +-netdev '{"type":"user","id":"hostnet3"}' \ +-device '{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00= :45:28:cb","bus":"pci.0","addr":"0x9"}' \ +-netdev '{"type":"user","id":"hostnet4"}' \ +-device '{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00= :ee:b9:a8","bus":"pci.0","addr":"0xa"}' \ +-netdev '{"type":"user","id":"hostnet5"}' \ +-device '{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00= :a9:f7:17","bus":"pci.0","addr":"0xb"}' \ +-netdev '{"type":"user","id":"hostnet6"}' \ +-device '{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00= :df:2b:f3","bus":"pci.0","addr":"0xc"}' \ +-netdev '{"type":"user","id":"hostnet7"}' \ +-device '{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00= :78:94:b4","bus":"pci.0","addr":"0xd"}' \ +-netdev '{"type":"user","id":"hostnet8"}' \ +-device '{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00= :6b:9b:06","bus":"pci.0","addr":"0xe"}' \ +-netdev '{"type":"user","id":"hostnet9"}' \ +-device '{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00= :17:df:bc","bus":"pci.0","addr":"0xf"}' \ +-netdev '{"type":"user","id":"hostnet10"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet10","id":"net10","mac":"52:5= 4:00:3b:d0:51","bus":"pci.0","addr":"0x10"}' \ +-netdev '{"type":"user","id":"hostnet11"}' \ +-device '{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:= 00:8d:2d:17","bus":"pci.0","addr":"0x11"}' \ +-netdev '{"type":"user","id":"hostnet12"}' \ +-device '{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:= 00:a7:66:af","bus":"pci.0","addr":"0x12"}' \ +-netdev '{"type":"user","id":"hostnet13"}' \ +-device '{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:= 00:54:ab:d7","bus":"pci.0","addr":"0x13"}' \ +-netdev '{"type":"user","id":"hostnet14"}' \ +-device '{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:= 00:1f:99:90","bus":"pci.0","addr":"0x14"}' \ +-netdev '{"type":"user","id":"hostnet15"}' \ +-device '{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:= 00:c8:43:87","bus":"pci.0","addr":"0x15"}' \ +-netdev '{"type":"user","id":"hostnet16"}' \ +-device '{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:= 00:df:22:b2","bus":"pci.0","addr":"0x16"}' \ +-netdev '{"type":"user","id":"hostnet17"}' \ +-device '{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:= 00:d2:9a:47","bus":"pci.0","addr":"0x17"}' \ +-netdev '{"type":"user","id":"hostnet18"}' \ +-device '{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:= 00:86:05:e2","bus":"pci.0","addr":"0x18"}' \ +-netdev '{"type":"user","id":"hostnet19"}' \ +-device '{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:= 00:8c:1c:c2","bus":"pci.0","addr":"0x19"}' \ +-netdev '{"type":"user","id":"hostnet20"}' \ +-device '{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:= 00:48:58:92","bus":"pci.0","addr":"0x1a"}' \ +-netdev '{"type":"user","id":"hostnet21"}' \ +-device '{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:= 00:99:e5:bf","bus":"pci.0","addr":"0x1b"}' \ +-netdev '{"type":"user","id":"hostnet22"}' \ +-device '{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:= 00:b1:8c:25","bus":"pci.0","addr":"0x1c"}' \ +-netdev '{"type":"user","id":"hostnet23"}' \ +-device '{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:= 00:60:e0:d0","bus":"pci.0","addr":"0x1d"}' \ +-netdev '{"type":"user","id":"hostnet24"}' \ +-device '{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:= 00:37:00:6a","bus":"pci.0","addr":"0x1e"}' \ +-netdev '{"type":"user","id":"hostnet25"}' \ +-device '{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:= 00:c7:c8:ad","bus":"pci.0","addr":"0x1f"}' \ +-netdev '{"type":"user","id":"hostnet26"}' \ +-device '{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:= 00:4e:a7:cf","bus":"pci.1","addr":"0x1"}' \ +-netdev '{"type":"user","id":"hostnet27"}' \ +-device '{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:= 00:00:79:69","bus":"pci.1","addr":"0x2"}' \ +-netdev '{"type":"user","id":"hostnet28"}' \ +-device '{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:= 00:47:00:6f","bus":"pci.1","addr":"0x3"}' \ +-netdev '{"type":"user","id":"hostnet29"}' \ +-device '{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:= 00:2a:8c:8b","bus":"pci.1","addr":"0x4"}' \ +-netdev '{"type":"user","id":"hostnet30"}' \ +-device '{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:= 00:ec:d5:e3","bus":"pci.1","addr":"0x5"}' \ +-netdev '{"type":"user","id":"hostnet31"}' \ +-device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:= 00:7e:6e:c8","bus":"pci.1","addr":"0x6"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -k en-us \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2a= rgvdata/pci-expander-bus.args index 16622b8b83..e4c9bfead0 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expander-= test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dexpander-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-expander-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-expander-test/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,72 +27,72 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expan= der-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pxb,bus_nr=3D254,id=3Dpci.1,numa_node=3D1,bus=3Dpci.0,addr=3D0x2 \ --device pxb,bus_nr=3D252,id=3Dpci.2,bus=3Dpci.0,addr=3D0x3 \ --netdev user,id=3Dhostnet0 \ --device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.0,addr=3D0x4 \ --netdev user,id=3Dhostnet1 \ --device e1000,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpc= i.0,addr=3D0x5 \ --netdev user,id=3Dhostnet2 \ --device e1000,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpc= i.0,addr=3D0x7 \ --netdev user,id=3Dhostnet3 \ --device e1000,netdev=3Dhostnet3,id=3Dnet3,mac=3D52:54:00:45:28:cb,bus=3Dpc= i.0,addr=3D0x8 \ --netdev user,id=3Dhostnet4 \ --device e1000,netdev=3Dhostnet4,id=3Dnet4,mac=3D52:54:00:ee:b9:a8,bus=3Dpc= i.0,addr=3D0x9 \ --netdev user,id=3Dhostnet5 \ --device e1000,netdev=3Dhostnet5,id=3Dnet5,mac=3D52:54:00:a9:f7:17,bus=3Dpc= i.0,addr=3D0xa \ --netdev user,id=3Dhostnet6 \ --device e1000,netdev=3Dhostnet6,id=3Dnet6,mac=3D52:54:00:df:2b:f3,bus=3Dpc= i.0,addr=3D0xb \ --netdev user,id=3Dhostnet7 \ --device e1000,netdev=3Dhostnet7,id=3Dnet7,mac=3D52:54:00:78:94:b4,bus=3Dpc= i.0,addr=3D0xc \ --netdev user,id=3Dhostnet8 \ --device e1000,netdev=3Dhostnet8,id=3Dnet8,mac=3D52:54:00:6b:9b:06,bus=3Dpc= i.0,addr=3D0xd \ --netdev user,id=3Dhostnet9 \ --device e1000,netdev=3Dhostnet9,id=3Dnet9,mac=3D52:54:00:17:df:bc,bus=3Dpc= i.0,addr=3D0xe \ --netdev user,id=3Dhostnet10 \ --device e1000,netdev=3Dhostnet10,id=3Dnet10,mac=3D52:54:00:3b:d0:51,bus=3D= pci.0,addr=3D0xf \ --netdev user,id=3Dhostnet11 \ --device e1000,netdev=3Dhostnet11,id=3Dnet11,mac=3D52:54:00:8d:2d:17,bus=3D= pci.0,addr=3D0x10 \ --netdev user,id=3Dhostnet12 \ --device e1000,netdev=3Dhostnet12,id=3Dnet12,mac=3D52:54:00:a7:66:af,bus=3D= pci.0,addr=3D0x11 \ --netdev user,id=3Dhostnet13 \ --device e1000,netdev=3Dhostnet13,id=3Dnet13,mac=3D52:54:00:54:ab:d7,bus=3D= pci.0,addr=3D0x12 \ --netdev user,id=3Dhostnet14 \ --device e1000,netdev=3Dhostnet14,id=3Dnet14,mac=3D52:54:00:1f:99:90,bus=3D= pci.0,addr=3D0x13 \ --netdev user,id=3Dhostnet15 \ --device e1000,netdev=3Dhostnet15,id=3Dnet15,mac=3D52:54:00:c8:43:87,bus=3D= pci.0,addr=3D0x14 \ --netdev user,id=3Dhostnet16 \ --device e1000,netdev=3Dhostnet16,id=3Dnet16,mac=3D52:54:00:df:22:b2,bus=3D= pci.0,addr=3D0x15 \ --netdev user,id=3Dhostnet17 \ --device e1000,netdev=3Dhostnet17,id=3Dnet17,mac=3D52:54:00:d2:9a:47,bus=3D= pci.0,addr=3D0x16 \ --netdev user,id=3Dhostnet18 \ --device e1000,netdev=3Dhostnet18,id=3Dnet18,mac=3D52:54:00:86:05:e2,bus=3D= pci.0,addr=3D0x17 \ --netdev user,id=3Dhostnet19 \ --device e1000,netdev=3Dhostnet19,id=3Dnet19,mac=3D52:54:00:8c:1c:c2,bus=3D= pci.0,addr=3D0x18 \ --netdev user,id=3Dhostnet20 \ --device e1000,netdev=3Dhostnet20,id=3Dnet20,mac=3D52:54:00:48:58:92,bus=3D= pci.0,addr=3D0x19 \ --netdev user,id=3Dhostnet21 \ --device e1000,netdev=3Dhostnet21,id=3Dnet21,mac=3D52:54:00:99:e5:bf,bus=3D= pci.0,addr=3D0x1a \ --netdev user,id=3Dhostnet22 \ --device e1000,netdev=3Dhostnet22,id=3Dnet22,mac=3D52:54:00:b1:8c:25,bus=3D= pci.0,addr=3D0x1b \ --netdev user,id=3Dhostnet23 \ --device e1000,netdev=3Dhostnet23,id=3Dnet23,mac=3D52:54:00:60:e0:d0,bus=3D= pci.0,addr=3D0x1c \ --netdev user,id=3Dhostnet24 \ --device e1000,netdev=3Dhostnet24,id=3Dnet24,mac=3D52:54:00:37:00:6a,bus=3D= pci.0,addr=3D0x1d \ --netdev user,id=3Dhostnet25 \ --device e1000,netdev=3Dhostnet25,id=3Dnet25,mac=3D52:54:00:c7:c8:ad,bus=3D= pci.0,addr=3D0x1e \ --netdev user,id=3Dhostnet26 \ --device e1000,netdev=3Dhostnet26,id=3Dnet26,mac=3D52:54:00:4e:a7:cf,bus=3D= pci.0,addr=3D0x1f \ --netdev user,id=3Dhostnet27 \ --device e1000,netdev=3Dhostnet27,id=3Dnet27,mac=3D52:54:00:00:79:69,bus=3D= pci.1,addr=3D0x0 \ --netdev user,id=3Dhostnet28 \ --device e1000,netdev=3Dhostnet28,id=3Dnet28,mac=3D52:54:00:47:00:6f,bus=3D= pci.1,addr=3D0x1 \ --netdev user,id=3Dhostnet29 \ --device e1000,netdev=3Dhostnet29,id=3Dnet29,mac=3D52:54:00:2a:8c:8b,bus=3D= pci.1,addr=3D0x2 \ --netdev user,id=3Dhostnet30 \ --device e1000,netdev=3Dhostnet30,id=3Dnet30,mac=3D52:54:00:ec:d5:e3,bus=3D= pci.1,addr=3D0x3 \ --netdev user,id=3Dhostnet31 \ --device e1000,netdev=3Dhostnet31,id=3Dnet31,mac=3D52:54:00:7e:6e:c8,bus=3D= pci.1,addr=3D0x4 \ +-device '{"driver":"pxb","bus_nr":254,"id":"pci.1","numa_node":1,"bus":"pc= i.0","addr":"0x2"}' \ +-device '{"driver":"pxb","bus_nr":252,"id":"pci.2","bus":"pci.0","addr":"0= x3"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:f1:95:51","bus":"pci.0","addr":"0x4"}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00= :5c:c6:1a","bus":"pci.0","addr":"0x5"}' \ +-netdev '{"type":"user","id":"hostnet2"}' \ +-device '{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00= :39:97:ac","bus":"pci.0","addr":"0x7"}' \ +-netdev '{"type":"user","id":"hostnet3"}' \ +-device '{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00= :45:28:cb","bus":"pci.0","addr":"0x8"}' \ +-netdev '{"type":"user","id":"hostnet4"}' \ +-device '{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00= :ee:b9:a8","bus":"pci.0","addr":"0x9"}' \ +-netdev '{"type":"user","id":"hostnet5"}' \ +-device '{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00= :a9:f7:17","bus":"pci.0","addr":"0xa"}' \ +-netdev '{"type":"user","id":"hostnet6"}' \ +-device '{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00= :df:2b:f3","bus":"pci.0","addr":"0xb"}' \ +-netdev '{"type":"user","id":"hostnet7"}' \ +-device '{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00= :78:94:b4","bus":"pci.0","addr":"0xc"}' \ +-netdev '{"type":"user","id":"hostnet8"}' \ +-device '{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00= :6b:9b:06","bus":"pci.0","addr":"0xd"}' \ +-netdev '{"type":"user","id":"hostnet9"}' \ +-device '{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00= :17:df:bc","bus":"pci.0","addr":"0xe"}' \ +-netdev '{"type":"user","id":"hostnet10"}' \ +-device '{"driver":"e1000","netdev":"hostnet10","id":"net10","mac":"52:54:= 00:3b:d0:51","bus":"pci.0","addr":"0xf"}' \ +-netdev '{"type":"user","id":"hostnet11"}' \ +-device '{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:= 00:8d:2d:17","bus":"pci.0","addr":"0x10"}' \ +-netdev '{"type":"user","id":"hostnet12"}' \ +-device '{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:= 00:a7:66:af","bus":"pci.0","addr":"0x11"}' \ +-netdev '{"type":"user","id":"hostnet13"}' \ +-device '{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:= 00:54:ab:d7","bus":"pci.0","addr":"0x12"}' \ +-netdev '{"type":"user","id":"hostnet14"}' \ +-device '{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:= 00:1f:99:90","bus":"pci.0","addr":"0x13"}' \ +-netdev '{"type":"user","id":"hostnet15"}' \ +-device '{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:= 00:c8:43:87","bus":"pci.0","addr":"0x14"}' \ +-netdev '{"type":"user","id":"hostnet16"}' \ +-device '{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:= 00:df:22:b2","bus":"pci.0","addr":"0x15"}' \ +-netdev '{"type":"user","id":"hostnet17"}' \ +-device '{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:= 00:d2:9a:47","bus":"pci.0","addr":"0x16"}' \ +-netdev '{"type":"user","id":"hostnet18"}' \ +-device '{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:= 00:86:05:e2","bus":"pci.0","addr":"0x17"}' \ +-netdev '{"type":"user","id":"hostnet19"}' \ +-device '{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:= 00:8c:1c:c2","bus":"pci.0","addr":"0x18"}' \ +-netdev '{"type":"user","id":"hostnet20"}' \ +-device '{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:= 00:48:58:92","bus":"pci.0","addr":"0x19"}' \ +-netdev '{"type":"user","id":"hostnet21"}' \ +-device '{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:= 00:99:e5:bf","bus":"pci.0","addr":"0x1a"}' \ +-netdev '{"type":"user","id":"hostnet22"}' \ +-device '{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:= 00:b1:8c:25","bus":"pci.0","addr":"0x1b"}' \ +-netdev '{"type":"user","id":"hostnet23"}' \ +-device '{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:= 00:60:e0:d0","bus":"pci.0","addr":"0x1c"}' \ +-netdev '{"type":"user","id":"hostnet24"}' \ +-device '{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:= 00:37:00:6a","bus":"pci.0","addr":"0x1d"}' \ +-netdev '{"type":"user","id":"hostnet25"}' \ +-device '{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:= 00:c7:c8:ad","bus":"pci.0","addr":"0x1e"}' \ +-netdev '{"type":"user","id":"hostnet26"}' \ +-device '{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:= 00:4e:a7:cf","bus":"pci.0","addr":"0x1f"}' \ +-netdev '{"type":"user","id":"hostnet27"}' \ +-device '{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:= 00:00:79:69","bus":"pci.1","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet28"}' \ +-device '{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:= 00:47:00:6f","bus":"pci.1","addr":"0x1"}' \ +-netdev '{"type":"user","id":"hostnet29"}' \ +-device '{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:= 00:2a:8c:8b","bus":"pci.1","addr":"0x2"}' \ +-netdev '{"type":"user","id":"hostnet30"}' \ +-device '{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:= 00:ec:d5:e3","bus":"pci.1","addr":"0x3"}' \ +-netdev '{"type":"user","id":"hostnet31"}' \ +-device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:= 00:7e:6e:c8","bus":"pci.1","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/= pci-many.args index 494451423d..028f4bf278 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -27,92 +27,92 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-29-format","read-only":true,"driver":"raw= ","file":"libvirt-29-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-29-format,id=3Dide0-1-= 0 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-29-for= mat","id":"ide0-1-0"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"ra= w","file":"libvirt-28-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-28-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-28-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"ra= w","file":"libvirt-27-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-27-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-27-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"ra= w","file":"libvirt-26-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-26-format,id= =3Dvirtio-disk26 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-26-format","id":"virtio-disk26"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"ra= w","file":"libvirt-25-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-25-format,id= =3Dvirtio-disk27 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-25-format","id":"virtio-disk27"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"ra= w","file":"libvirt-24-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-24-format,id= =3Dvirtio-disk28 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-24-format","id":"virtio-disk28"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"ra= w","file":"libvirt-23-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-23-format,id= =3Dvirtio-disk29 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-23-format","id":"virtio-disk29"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"ra= w","file":"libvirt-22-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xa,drive=3Dlibvirt-22-format,id= =3Dvirtio-disk52 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"li= bvirt-22-format","id":"virtio-disk52"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"ra= w","file":"libvirt-21-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xb,drive=3Dlibvirt-21-format,id= =3Dvirtio-disk53 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"li= bvirt-21-format","id":"virtio-disk53"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"ra= w","file":"libvirt-20-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xc,drive=3Dlibvirt-20-format,id= =3Dvirtio-disk54 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"li= bvirt-20-format","id":"virtio-disk54"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"ra= w","file":"libvirt-19-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xd,drive=3Dlibvirt-19-format,id= =3Dvirtio-disk55 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"li= bvirt-19-format","id":"virtio-disk55"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"ra= w","file":"libvirt-18-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xe,drive=3Dlibvirt-18-format,id= =3Dvirtio-disk78 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"li= bvirt-18-format","id":"virtio-disk78"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"ra= w","file":"libvirt-17-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xf,drive=3Dlibvirt-17-format,id= =3Dvirtio-disk79 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"li= bvirt-17-format","id":"virtio-disk79"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x10,drive=3Dlibvirt-16-format,i= d=3Dvirtio-disk80 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"l= ibvirt-16-format","id":"virtio-disk80"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"ra= w","file":"libvirt-15-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x11,drive=3Dlibvirt-15-format,i= d=3Dvirtio-disk81 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"l= ibvirt-15-format","id":"virtio-disk81"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"ra= w","file":"libvirt-14-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x12,drive=3Dlibvirt-14-format,i= d=3Dvirtio-disk104 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"l= ibvirt-14-format","id":"virtio-disk104"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"ra= w","file":"libvirt-13-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x13,drive=3Dlibvirt-13-format,i= d=3Dvirtio-disk105 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"l= ibvirt-13-format","id":"virtio-disk105"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"ra= w","file":"libvirt-12-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x14,drive=3Dlibvirt-12-format,i= d=3Dvirtio-disk106 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"l= ibvirt-12-format","id":"virtio-disk106"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"ra= w","file":"libvirt-11-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x15,drive=3Dlibvirt-11-format,i= d=3Dvirtio-disk107 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"l= ibvirt-11-format","id":"virtio-disk107"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"ra= w","file":"libvirt-10-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x16,drive=3Dlibvirt-10-format,i= d=3Dvirtio-disk130 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"l= ibvirt-10-format","id":"virtio-disk130"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw= ","file":"libvirt-9-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x17,drive=3Dlibvirt-9-format,id= =3Dvirtio-disk131 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"l= ibvirt-9-format","id":"virtio-disk131"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw= ","file":"libvirt-8-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x18,drive=3Dlibvirt-8-format,id= =3Dvirtio-disk132 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"l= ibvirt-8-format","id":"virtio-disk132"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x19,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk133 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"l= ibvirt-7-format","id":"virtio-disk133"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1a,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk156 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"l= ibvirt-6-format","id":"virtio-disk156"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1b,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk157 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"l= ibvirt-5-format","id":"virtio-disk157"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1c,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk158 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"l= ibvirt-4-format","id":"virtio-disk158"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1d,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk159 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"l= ibvirt-3-format","id":"virtio-disk159"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1e,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk182 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"l= ibvirt-2-format","id":"virtio-disk182"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x1f,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk183 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"l= ibvirt-1-format","id":"virtio-disk183"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2a= rgvdata/pci-rom-disabled.args index ecf638e182..2ddb190c66 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.co= nfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:24:a5:9f= ,bus=3Dpci.0,addr=3D0x2,romfile=3D \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","romfile":""}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/p= ci-rom.args index 886862eb98..cbc3fc950c 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,13 +28,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest2/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:24:a5:9f= ,bus=3Dpci.0,addr=3D0x2,rombar=3D1 \ --netdev user,id=3Dhostnet1 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:24:a5:9e= ,bus=3Dpci.0,addr=3D0x3,romfile=3D/etc/fake/bootrom.bin \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","rombar":1}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:24:a5:9e","bus":"pci.0","addr":"0x3","romfile":"/etc/fake/bootrom= .bin"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0000:06:12.5,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x4,= rombar=3D0 \ --device vfio-pci,host=3D0000:06:12.6,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x5,= rombar=3D1,romfile=3D/etc/fake/bootrom.bin \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":= "pci.0","addr":"0x4","rombar":0}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.6","id":"hostdev1","bus":= "pci.0","addr":"0x5","rombar":1,"romfile":"/etc/fake/bootrom.bin"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index e8f4dc1292..4cb85a0999 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-expa= nder-bus-te/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dpcie-expander-bus-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-pcie-expander-bus-te/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,108 +27,108 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pci= e-expander-bus-te/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pxb-pcie,bus_nr=3D254,id=3Dpci.1,numa_node=3D0,bus=3Dpcie.0,addr= =3D0x4 \ --device ioh3420,port=3D0,chassis=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device x3130-upstream,id=3Dpci.3,bus=3Dpci.2,addr=3D0x0 \ --device xio3130-downstream,port=3D0,chassis=3D4,id=3Dpci.4,bus=3Dpci.3,add= r=3D0x0 \ --device xio3130-downstream,port=3D1,chassis=3D5,id=3Dpci.5,bus=3Dpci.3,add= r=3D0x1 \ --device xio3130-downstream,port=3D2,chassis=3D6,id=3Dpci.6,bus=3Dpci.3,add= r=3D0x2 \ --device xio3130-downstream,port=3D3,chassis=3D7,id=3Dpci.7,bus=3Dpci.3,add= r=3D0x3 \ --device xio3130-downstream,port=3D4,chassis=3D8,id=3Dpci.8,bus=3Dpci.3,add= r=3D0x4 \ --device xio3130-downstream,port=3D5,chassis=3D9,id=3Dpci.9,bus=3Dpci.3,add= r=3D0x5 \ --device xio3130-downstream,port=3D6,chassis=3D10,id=3Dpci.10,bus=3Dpci.3,a= ddr=3D0x6 \ --device xio3130-downstream,port=3D7,chassis=3D11,id=3Dpci.11,bus=3Dpci.3,a= ddr=3D0x7 \ --device xio3130-downstream,port=3D8,chassis=3D12,id=3Dpci.12,bus=3Dpci.3,a= ddr=3D0x8 \ --device xio3130-downstream,port=3D9,chassis=3D13,id=3Dpci.13,bus=3Dpci.3,a= ddr=3D0x9 \ --device xio3130-downstream,port=3D10,chassis=3D14,id=3Dpci.14,bus=3Dpci.3,= addr=3D0xa \ --device xio3130-downstream,port=3D11,chassis=3D15,id=3Dpci.15,bus=3Dpci.3,= addr=3D0xb \ --device xio3130-downstream,port=3D12,chassis=3D16,id=3Dpci.16,bus=3Dpci.3,= addr=3D0xc \ --device xio3130-downstream,port=3D13,chassis=3D17,id=3Dpci.17,bus=3Dpci.3,= addr=3D0xd \ --device xio3130-downstream,port=3D14,chassis=3D18,id=3Dpci.18,bus=3Dpci.3,= addr=3D0xe \ --device xio3130-downstream,port=3D15,chassis=3D19,id=3Dpci.19,bus=3Dpci.3,= addr=3D0xf \ --device xio3130-downstream,port=3D16,chassis=3D20,id=3Dpci.20,bus=3Dpci.3,= addr=3D0x10 \ --device xio3130-downstream,port=3D17,chassis=3D21,id=3Dpci.21,bus=3Dpci.3,= addr=3D0x11 \ --device xio3130-downstream,port=3D18,chassis=3D22,id=3Dpci.22,bus=3Dpci.3,= addr=3D0x12 \ --device xio3130-downstream,port=3D19,chassis=3D23,id=3Dpci.23,bus=3Dpci.3,= addr=3D0x13 \ --device xio3130-downstream,port=3D20,chassis=3D24,id=3Dpci.24,bus=3Dpci.3,= addr=3D0x14 \ --device xio3130-downstream,port=3D21,chassis=3D25,id=3Dpci.25,bus=3Dpci.3,= addr=3D0x15 \ --device xio3130-downstream,port=3D22,chassis=3D26,id=3Dpci.26,bus=3Dpci.3,= addr=3D0x16 \ --device xio3130-downstream,port=3D23,chassis=3D27,id=3Dpci.27,bus=3Dpci.3,= addr=3D0x17 \ --device xio3130-downstream,port=3D24,chassis=3D28,id=3Dpci.28,bus=3Dpci.3,= addr=3D0x18 \ --device xio3130-downstream,port=3D25,chassis=3D29,id=3Dpci.29,bus=3Dpci.3,= addr=3D0x19 \ --device xio3130-downstream,port=3D26,chassis=3D30,id=3Dpci.30,bus=3Dpci.3,= addr=3D0x1a \ --device xio3130-downstream,port=3D27,chassis=3D31,id=3Dpci.31,bus=3Dpci.3,= addr=3D0x1b \ --device xio3130-downstream,port=3D28,chassis=3D32,id=3Dpci.32,bus=3Dpci.3,= addr=3D0x1c \ --device xio3130-downstream,port=3D29,chassis=3D33,id=3Dpci.33,bus=3Dpci.3,= addr=3D0x1d \ --device xio3130-downstream,port=3D30,chassis=3D34,id=3Dpci.34,bus=3Dpci.3,= addr=3D0x1e \ --device xio3130-downstream,port=3D31,chassis=3D35,id=3Dpci.35,bus=3Dpci.3,= addr=3D0x1f \ +-device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus= ":"pcie.0","addr":"0x4"}' \ +-device '{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.= 1","addr":"0x0"}' \ +-device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.2","addr":"0x0= "}' \ +-device '{"driver":"xio3130-downstream","port":0,"chassis":4,"id":"pci.4",= "bus":"pci.3","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":1,"chassis":5,"id":"pci.5",= "bus":"pci.3","addr":"0x1"}' \ +-device '{"driver":"xio3130-downstream","port":2,"chassis":6,"id":"pci.6",= "bus":"pci.3","addr":"0x2"}' \ +-device '{"driver":"xio3130-downstream","port":3,"chassis":7,"id":"pci.7",= "bus":"pci.3","addr":"0x3"}' \ +-device '{"driver":"xio3130-downstream","port":4,"chassis":8,"id":"pci.8",= "bus":"pci.3","addr":"0x4"}' \ +-device '{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9",= "bus":"pci.3","addr":"0x5"}' \ +-device '{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10= ","bus":"pci.3","addr":"0x6"}' \ +-device '{"driver":"xio3130-downstream","port":7,"chassis":11,"id":"pci.11= ","bus":"pci.3","addr":"0x7"}' \ +-device '{"driver":"xio3130-downstream","port":8,"chassis":12,"id":"pci.12= ","bus":"pci.3","addr":"0x8"}' \ +-device '{"driver":"xio3130-downstream","port":9,"chassis":13,"id":"pci.13= ","bus":"pci.3","addr":"0x9"}' \ +-device '{"driver":"xio3130-downstream","port":10,"chassis":14,"id":"pci.1= 4","bus":"pci.3","addr":"0xa"}' \ +-device '{"driver":"xio3130-downstream","port":11,"chassis":15,"id":"pci.1= 5","bus":"pci.3","addr":"0xb"}' \ +-device '{"driver":"xio3130-downstream","port":12,"chassis":16,"id":"pci.1= 6","bus":"pci.3","addr":"0xc"}' \ +-device '{"driver":"xio3130-downstream","port":13,"chassis":17,"id":"pci.1= 7","bus":"pci.3","addr":"0xd"}' \ +-device '{"driver":"xio3130-downstream","port":14,"chassis":18,"id":"pci.1= 8","bus":"pci.3","addr":"0xe"}' \ +-device '{"driver":"xio3130-downstream","port":15,"chassis":19,"id":"pci.1= 9","bus":"pci.3","addr":"0xf"}' \ +-device '{"driver":"xio3130-downstream","port":16,"chassis":20,"id":"pci.2= 0","bus":"pci.3","addr":"0x10"}' \ +-device '{"driver":"xio3130-downstream","port":17,"chassis":21,"id":"pci.2= 1","bus":"pci.3","addr":"0x11"}' \ +-device '{"driver":"xio3130-downstream","port":18,"chassis":22,"id":"pci.2= 2","bus":"pci.3","addr":"0x12"}' \ +-device '{"driver":"xio3130-downstream","port":19,"chassis":23,"id":"pci.2= 3","bus":"pci.3","addr":"0x13"}' \ +-device '{"driver":"xio3130-downstream","port":20,"chassis":24,"id":"pci.2= 4","bus":"pci.3","addr":"0x14"}' \ +-device '{"driver":"xio3130-downstream","port":21,"chassis":25,"id":"pci.2= 5","bus":"pci.3","addr":"0x15"}' \ +-device '{"driver":"xio3130-downstream","port":22,"chassis":26,"id":"pci.2= 6","bus":"pci.3","addr":"0x16"}' \ +-device '{"driver":"xio3130-downstream","port":23,"chassis":27,"id":"pci.2= 7","bus":"pci.3","addr":"0x17"}' \ +-device '{"driver":"xio3130-downstream","port":24,"chassis":28,"id":"pci.2= 8","bus":"pci.3","addr":"0x18"}' \ +-device '{"driver":"xio3130-downstream","port":25,"chassis":29,"id":"pci.2= 9","bus":"pci.3","addr":"0x19"}' \ +-device '{"driver":"xio3130-downstream","port":26,"chassis":30,"id":"pci.3= 0","bus":"pci.3","addr":"0x1a"}' \ +-device '{"driver":"xio3130-downstream","port":27,"chassis":31,"id":"pci.3= 1","bus":"pci.3","addr":"0x1b"}' \ +-device '{"driver":"xio3130-downstream","port":28,"chassis":32,"id":"pci.3= 2","bus":"pci.3","addr":"0x1c"}' \ +-device '{"driver":"xio3130-downstream","port":29,"chassis":33,"id":"pci.3= 3","bus":"pci.3","addr":"0x1d"}' \ +-device '{"driver":"xio3130-downstream","port":30,"chassis":34,"id":"pci.3= 4","bus":"pci.3","addr":"0x1e"}' \ +-device '{"driver":"xio3130-downstream","port":31,"chassis":35,"id":"pci.3= 5","bus":"pci.3","addr":"0x1f"}' \ -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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ --netdev user,id=3Dhostnet0 \ --device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.4,addr=3D0x0 \ --netdev user,id=3Dhostnet1 \ --device e1000,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpc= i.5,addr=3D0x0 \ --netdev user,id=3Dhostnet2 \ --device e1000,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpc= i.6,addr=3D0x0 \ --netdev user,id=3Dhostnet3 \ --device e1000,netdev=3Dhostnet3,id=3Dnet3,mac=3D52:54:00:ee:b9:a8,bus=3Dpc= i.7,addr=3D0x0 \ --netdev user,id=3Dhostnet4 \ --device e1000,netdev=3Dhostnet4,id=3Dnet4,mac=3D52:54:00:a9:f7:17,bus=3Dpc= i.8,addr=3D0x0 \ --netdev user,id=3Dhostnet5 \ --device e1000,netdev=3Dhostnet5,id=3Dnet5,mac=3D52:54:00:df:2b:f3,bus=3Dpc= i.9,addr=3D0x0 \ --netdev user,id=3Dhostnet6 \ --device e1000,netdev=3Dhostnet6,id=3Dnet6,mac=3D52:54:00:78:94:b4,bus=3Dpc= i.10,addr=3D0x0 \ --netdev user,id=3Dhostnet7 \ --device e1000,netdev=3Dhostnet7,id=3Dnet7,mac=3D52:54:00:6b:9b:06,bus=3Dpc= i.11,addr=3D0x0 \ --netdev user,id=3Dhostnet8 \ --device e1000,netdev=3Dhostnet8,id=3Dnet8,mac=3D52:54:00:17:df:bc,bus=3Dpc= i.12,addr=3D0x0 \ --netdev user,id=3Dhostnet9 \ --device e1000,netdev=3Dhostnet9,id=3Dnet9,mac=3D52:54:00:3b:d0:51,bus=3Dpc= i.13,addr=3D0x0 \ --netdev user,id=3Dhostnet10 \ --device e1000,netdev=3Dhostnet10,id=3Dnet10,mac=3D52:54:00:8d:2d:17,bus=3D= pci.14,addr=3D0x0 \ --netdev user,id=3Dhostnet11 \ --device e1000,netdev=3Dhostnet11,id=3Dnet11,mac=3D52:54:00:a7:66:af,bus=3D= pci.15,addr=3D0x0 \ --netdev user,id=3Dhostnet12 \ --device e1000,netdev=3Dhostnet12,id=3Dnet12,mac=3D52:54:00:54:ab:d7,bus=3D= pci.16,addr=3D0x0 \ --netdev user,id=3Dhostnet13 \ --device e1000,netdev=3Dhostnet13,id=3Dnet13,mac=3D52:54:00:1f:99:90,bus=3D= pci.17,addr=3D0x0 \ --netdev user,id=3Dhostnet14 \ --device e1000,netdev=3Dhostnet14,id=3Dnet14,mac=3D52:54:00:c8:43:87,bus=3D= pci.18,addr=3D0x0 \ --netdev user,id=3Dhostnet15 \ --device e1000,netdev=3Dhostnet15,id=3Dnet15,mac=3D52:54:00:df:22:b2,bus=3D= pci.19,addr=3D0x0 \ --netdev user,id=3Dhostnet16 \ --device e1000,netdev=3Dhostnet16,id=3Dnet16,mac=3D52:54:00:d2:9a:47,bus=3D= pci.20,addr=3D0x0 \ --netdev user,id=3Dhostnet17 \ --device e1000,netdev=3Dhostnet17,id=3Dnet17,mac=3D52:54:00:86:05:e2,bus=3D= pci.21,addr=3D0x0 \ --netdev user,id=3Dhostnet18 \ --device e1000,netdev=3Dhostnet18,id=3Dnet18,mac=3D52:54:00:8c:1c:c2,bus=3D= pci.22,addr=3D0x0 \ --netdev user,id=3Dhostnet19 \ --device e1000,netdev=3Dhostnet19,id=3Dnet19,mac=3D52:54:00:48:58:92,bus=3D= pci.23,addr=3D0x0 \ --netdev user,id=3Dhostnet20 \ --device e1000,netdev=3Dhostnet20,id=3Dnet20,mac=3D52:54:00:99:e5:bf,bus=3D= pci.24,addr=3D0x0 \ --netdev user,id=3Dhostnet21 \ --device e1000,netdev=3Dhostnet21,id=3Dnet21,mac=3D52:54:00:b1:8c:25,bus=3D= pci.25,addr=3D0x0 \ --netdev user,id=3Dhostnet22 \ --device e1000,netdev=3Dhostnet22,id=3Dnet22,mac=3D52:54:00:60:e0:d0,bus=3D= pci.26,addr=3D0x0 \ --netdev user,id=3Dhostnet23 \ --device e1000,netdev=3Dhostnet23,id=3Dnet23,mac=3D52:54:00:37:00:6a,bus=3D= pci.27,addr=3D0x0 \ --netdev user,id=3Dhostnet24 \ --device e1000,netdev=3Dhostnet24,id=3Dnet24,mac=3D52:54:00:c7:c8:ad,bus=3D= pci.28,addr=3D0x0 \ --netdev user,id=3Dhostnet25 \ --device e1000,netdev=3Dhostnet25,id=3Dnet25,mac=3D52:54:00:4e:a7:cf,bus=3D= pci.29,addr=3D0x0 \ --netdev user,id=3Dhostnet26 \ --device e1000,netdev=3Dhostnet26,id=3Dnet26,mac=3D52:54:00:00:79:69,bus=3D= pci.30,addr=3D0x0 \ --netdev user,id=3Dhostnet27 \ --device e1000,netdev=3Dhostnet27,id=3Dnet27,mac=3D52:54:00:47:00:6f,bus=3D= pci.31,addr=3D0x0 \ --netdev user,id=3Dhostnet28 \ --device e1000,netdev=3Dhostnet28,id=3Dnet28,mac=3D52:54:00:2a:8c:8b,bus=3D= pci.32,addr=3D0x0 \ --netdev user,id=3Dhostnet29 \ --device e1000,netdev=3Dhostnet29,id=3Dnet29,mac=3D52:54:00:ec:d5:e3,bus=3D= pci.33,addr=3D0x0 \ --netdev user,id=3Dhostnet30 \ --device e1000,netdev=3Dhostnet30,id=3Dnet30,mac=3D52:54:00:7e:6e:c8,bus=3D= pci.34,addr=3D0x0 \ --netdev user,id=3Dhostnet31 \ --device e1000,netdev=3Dhostnet31,id=3Dnet31,mac=3D52:54:00:7e:6d:c9,bus=3D= pci.35,addr=3D0x0 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:f1:95:51","bus":"pci.4","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00= :5c:c6:1a","bus":"pci.5","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet2"}' \ +-device '{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00= :39:97:ac","bus":"pci.6","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet3"}' \ +-device '{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00= :ee:b9:a8","bus":"pci.7","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet4"}' \ +-device '{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00= :a9:f7:17","bus":"pci.8","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet5"}' \ +-device '{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00= :df:2b:f3","bus":"pci.9","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet6"}' \ +-device '{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00= :78:94:b4","bus":"pci.10","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet7"}' \ +-device '{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00= :6b:9b:06","bus":"pci.11","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet8"}' \ +-device '{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00= :17:df:bc","bus":"pci.12","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet9"}' \ +-device '{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00= :3b:d0:51","bus":"pci.13","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet10"}' \ +-device '{"driver":"e1000","netdev":"hostnet10","id":"net10","mac":"52:54:= 00:8d:2d:17","bus":"pci.14","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet11"}' \ +-device '{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:= 00:a7:66:af","bus":"pci.15","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet12"}' \ +-device '{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:= 00:54:ab:d7","bus":"pci.16","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet13"}' \ +-device '{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:= 00:1f:99:90","bus":"pci.17","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet14"}' \ +-device '{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:= 00:c8:43:87","bus":"pci.18","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet15"}' \ +-device '{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:= 00:df:22:b2","bus":"pci.19","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet16"}' \ +-device '{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:= 00:d2:9a:47","bus":"pci.20","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet17"}' \ +-device '{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:= 00:86:05:e2","bus":"pci.21","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet18"}' \ +-device '{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:= 00:8c:1c:c2","bus":"pci.22","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet19"}' \ +-device '{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:= 00:48:58:92","bus":"pci.23","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet20"}' \ +-device '{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:= 00:99:e5:bf","bus":"pci.24","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet21"}' \ +-device '{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:= 00:b1:8c:25","bus":"pci.25","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet22"}' \ +-device '{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:= 00:60:e0:d0","bus":"pci.26","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet23"}' \ +-device '{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:= 00:37:00:6a","bus":"pci.27","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet24"}' \ +-device '{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:= 00:c7:c8:ad","bus":"pci.28","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet25"}' \ +-device '{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:= 00:4e:a7:cf","bus":"pci.29","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet26"}' \ +-device '{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:= 00:00:79:69","bus":"pci.30","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet27"}' \ +-device '{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:= 00:47:00:6f","bus":"pci.31","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet28"}' \ +-device '{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:= 00:2a:8c:8b","bus":"pci.32","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet29"}' \ +-device '{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:= 00:ec:d5:e3","bus":"pci.33","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet30"}' \ +-device '{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:= 00:7e:6e:c8","bus":"pci.34","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet31"}' \ +-device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:= 00:7e:6d:c9","bus":"pci.35","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-generic.args index bd90434aaa..aa8c171594 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.co= nfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device ioh3420,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1.0= x2 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"ioh3420","port":10,"chassis":3,"id":"pci.3","bus":"pci= e.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 3a353dc59a..fc5e591733 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.co= nfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ioh3420,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunction= =3Don,addr=3D0x1 \ --device ioh3420,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x1.0x= 1 \ +-device '{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie= .0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie= .0","addr":"0x1.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index b8f1de42a1..a5342e8b70 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,13 +25,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ioh3420,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x2 \ --device ioh3420,port=3D26,chassis=3D40,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.= 0x1 \ +-device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pc= ie.0","addr":"0x2.0x1"}' \ -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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata= /pcie-root.args index 5a27ae86b0..169e73608b 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index f2f22c155b..0c3da6bd1a 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,21 +25,21 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ioh3420,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x2 \ --device x3130-upstream,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device xio3130-downstream,port=3D0,chassis=3D3,id=3Dpci.3,bus=3Dpci.2,add= r=3D0x0 \ --device xio3130-downstream,port=3D1,chassis=3D4,id=3Dpci.4,bus=3Dpci.2,add= r=3D0x1 \ --device xio3130-downstream,port=3D2,chassis=3D5,id=3Dpci.5,bus=3Dpci.2,add= r=3D0x2 \ --device xio3130-downstream,port=3D39,chassis=3D30,id=3Dpci.6,bus=3Dpci.2,a= ddr=3D0x3 \ --device x3130-upstream,id=3Dpci.7,bus=3Dpci.3,addr=3D0x0 \ --device xio3130-downstream,port=3D4,chassis=3D8,id=3Dpci.8,bus=3Dpci.2,add= r=3D0x4 \ --device xio3130-downstream,port=3D5,chassis=3D9,id=3Dpci.9,bus=3Dpci.2,add= r=3D0x5 \ --device xio3130-downstream,port=3D6,chassis=3D10,id=3Dpci.10,bus=3Dpci.2,a= ddr=3D0x6 \ +-device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","addr":"0x2"}' \ +-device '{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0= "}' \ +-device '{"driver":"xio3130-downstream","port":0,"chassis":3,"id":"pci.3",= "bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":1,"chassis":4,"id":"pci.4",= "bus":"pci.2","addr":"0x1"}' \ +-device '{"driver":"xio3130-downstream","port":2,"chassis":5,"id":"pci.5",= "bus":"pci.2","addr":"0x2"}' \ +-device '{"driver":"xio3130-downstream","port":39,"chassis":30,"id":"pci.6= ","bus":"pci.2","addr":"0x3"}' \ +-device '{"driver":"x3130-upstream","id":"pci.7","bus":"pci.3","addr":"0x0= "}' \ +-device '{"driver":"xio3130-downstream","port":4,"chassis":8,"id":"pci.8",= "bus":"pci.2","addr":"0x4"}' \ +-device '{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9",= "bus":"pci.2","addr":"0x5"}' \ +-device '{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10= ","bus":"pci.2","addr":"0x6"}' \ -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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index 6bdfba9fb5..aaae74d377 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,15 +25,15 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ioh3420,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x2 \ --device ioh3420,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.0= x1 \ --device x3130-upstream,id=3Dpci.3,bus=3Dpci.1,addr=3D0x0 \ --device x3130-upstream,id=3Dpci.4,bus=3Dpci.2,addr=3D0x0 \ +-device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pci= e.0","addr":"0x2.0x1"}' \ +-device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.1","addr":"0x0= "}' \ +-device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0= "}' \ -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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv= data/pcihole64-q35.args index e9d84d935e..86e5778b35 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -global q35-pcihost.pci-hole64-size=3D1048576K \ -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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata= /pcihole64.args index 224363f81d..43f5a6dbf0 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.conf= ig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfoo,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -global i440FX-pcihost.pci-hole64-size=3D1048576K \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2ar= gvdata/pmu-feature-off.args index 4af05c4d9a..80d0ebb925 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64,pmu=3Doff \ diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvda= ta/pmu-feature.args index 26296caedb..3531746845 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64,pmu=3Don \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemu= xml2argvdata/q35-pci-force-address.args index d3d04b1467..2c7b88f0d0 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,14 +25,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --netdev user,id=3Dhostnet0 \ --device e1000e,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:aa:bf:ef,bus=3Dp= ci.2,addr=3D0x1 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"e1000e","netdev":"hostnet0","id":"net0","mac":"52:54:0= 0:aa:bf:ef","bus":"pci.2","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device intel-hda,id=3Dsound0,bus=3Dpci.3,addr=3D0x0 \ --device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0,audiodev=3Dau= dio1 \ +-device '{"driver":"intel-hda","id":"sound0","bus":"pci.3","addr":"0x0"}' \ +-device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad= ":0,"audiodev":"audio1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg= vdata/q35-usb2-multi.args index bcaf3236f0..be6f4bbc5d 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,25 +25,25 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D56,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ --device ich9-usb-ehci1,id=3Dusb1,bus=3Dpcie.0,addr=3D0x1a.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb1.0,firstport=3D0,bus=3Dpcie.0,multi= function=3Don,addr=3D0x1a \ --device ich9-usb-uhci2,masterbus=3Dusb1.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1a.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb1.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1a.0x2 \ --device ich9-usb-ehci1,id=3Dusb2,bus=3Dpci.2,addr=3D0x1.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x1 \ --device ich9-usb-uhci2,masterbus=3Dusb2.0,firstport=3D2,bus=3Dpci.2,addr= =3D0x1.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x1.0x2 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1"= ,"addr":"0x0"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1= a.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bu= s":"pcie.0","multifunction":true,"addr":"0x1a"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bu= s":"pcie.0","addr":"0x1a.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bu= s":"pcie.0","addr":"0x1a.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.= 0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bu= s":"pci.2","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.2","addr":"0x1.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bu= s":"pci.2","addr":"0x1.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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a= rgvdata/q35-usb2-reorder.args index 6236cb8a98..f0f32c80ed 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,25 +25,25 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D56,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ --device ich9-usb-ehci1,id=3Dusb1,bus=3Dpcie.0,addr=3D0x1a.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb1.0,firstport=3D0,bus=3Dpcie.0,multi= function=3Don,addr=3D0x1a \ --device ich9-usb-uhci3,masterbus=3Dusb1.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1a.0x2 \ --device ich9-usb-uhci2,masterbus=3Dusb1.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1a.0x1 \ --device ich9-usb-ehci1,id=3Dusb2,bus=3Dpci.2,addr=3D0x1.0x7 \ --device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x1.0x2 \ --device ich9-usb-uhci2,masterbus=3Dusb2.0,firstport=3D2,bus=3Dpci.2,addr= =3D0x1.0x1 \ --device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x1 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1"= ,"addr":"0x0"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1= a.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bu= s":"pcie.0","multifunction":true,"addr":"0x1a"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bu= s":"pcie.0","addr":"0x1a.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bu= s":"pcie.0","addr":"0x1a.0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.= 0x7"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bu= s":"pci.2","addr":"0x1.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.2","addr":"0x1.0x1"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bu= s":"pci.2","multifunction":true,"addr":"0x1"}' \ -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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/= q35-usb2.args index 3e24c0760d..4b7d83ba51 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,17 +25,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D56,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1"= ,"addr":"0x0"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index 638c79d45f..3d4c93038c 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-t= est/.config \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D0 \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.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,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvda= ta/qemu-ns-alt.args index 0af708dfe0..9eec4d266e 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -11,7 +11,7 @@ BAR=3D'' \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -30,8 +30,8 @@ BAR=3D'' \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -unknown parameter \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns0.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns1.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxm= l2argvdata/qemu-ns-commandline.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/t= ests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests= /qemuxml2argvdata/qemu-ns-domain-commandline.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml= 2argvdata/qemu-ns-domain-ns0.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2arg= vdata/qemu-ns-no-env.args index 11a2a9b480..9f06ef5a80 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -unknown parameter \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qe= muxml2argvdata/reboot-timeout-disabled.args index 9dfd4cad5c..43150e9e15 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qem= uxml2argvdata/reboot-timeout-enabled.args index ce3712cdbc..c123cd9dce 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2= argvdata/seclabel-dac-none.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests= /qemuxml2argvdata/seclabel-dynamic-baselabel.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests= /qemuxml2argvdata/seclabel-dynamic-labelskip.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/= qemuxml2argvdata/seclabel-dynamic-override.args index 1f41c61f72..b417f976af 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,10 +28,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/q= emuxml2argvdata/seclabel-dynamic-relabel.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2a= rgvdata/seclabel-dynamic.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argv= data/seclabel-none.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/= qemuxml2argvdata/seclabel-static-labelskip.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qe= muxml2argvdata/seclabel-static-relabel.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2ar= gvdata/seclabel-static.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemux= ml2argvdata/smartcard-controller.args index 5127fd07d5..6ff6005c39 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ --device ccid-card-emulated,backend=3Dnss-emulated,id=3Dsmartcard0,bus=3Dcc= id0.0 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"sma= rtcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.ar= gs b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index 4e7be2c3dc..f7261da7fe 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ --device ccid-card-emulated,backend=3Dcertificates,cert1=3Dcert1,cert2=3Dce= rt2,cert3=3Dcert3,db=3D/tmp/foo,id=3Dsmartcard0,bus=3Dccid0.0 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1","cert2":"cert2","cert3":"cert3","db":"/tmp/foo","id":"smartcard0","b= us":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/test= s/qemuxml2argvdata/smartcard-host-certificates.args index 3e1c0d4267..fcbeebb8fe 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ --device ccid-card-emulated,backend=3Dcertificates,cert1=3Dcert1,cert2=3Dce= rt2,cert3=3Dcert3,db=3D/etc/pki/nssdb,id=3Dsmartcard0,bus=3Dccid0.0 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb","id":"smartcar= d0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2arg= vdata/smartcard-host.args index 5127fd07d5..6ff6005c39 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ --device ccid-card-emulated,backend=3Dnss-emulated,id=3Dsmartcard0,bus=3Dcc= id0.0 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"sma= rtcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/t= ests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 8f4da0c94b..6d74ded58c 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev spicevmc,id=3Dcharsmartcard0,name=3Dsmartcard \ --device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ +-device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/= qemuxml2argvdata/smartcard-passthrough-tcp.args index 53074a41e8..f9991c0a6b 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev socket,id=3Dcharsmartcard0,host=3D127.0.0.1,port=3D2001,server=3D= on,wait=3Doff \ --device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ +-device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/sm= bios.args index 54c7c361be..d510624693 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/= smp-dies.args index 1b73feb8a2..95f018af2e 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.a= rgs index 1b090e9dbe..91c4a1eacc 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests= /qemuxml2argvdata/usb-controller-default-q35.args index 22a6d4d20a..41110fc0d0 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pcie.0","addr":"0x1"= }' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/test= s/qemuxml2argvdata/usb-controller-explicit-q35.args index 9fd3065308..ad421f5eb3 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/= .config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D2097152k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device nec-usb-xhci,id=3Dusb,bus=3Dpcie.0,addr=3D0x1 \ +-device '{"driver":"nec-usb-xhci","id":"usb","bus":"pcie.0","addr":"0x1"}'= \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/q= emuxml2argvdata/usb-controller-qemu-xhci.args index 2f4bd5df0d..001af94982 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,6 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device qemu-xhci,p2=3D8,p3=3D8,id=3Dusb,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"qemu-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","add= r":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxm= l2argvdata/usb-controller-xhci.args index ca0b40ff28..2a39d7cdd3 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,6 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device nec-usb-xhci,p2=3D8,p3=3D8,id=3Dusb,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","= addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2arg= vdata/usb-controller.args index 4a49b33727..738e28c155 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qem= uxml2argvdata/usb-hub-autoadd-deluxe.args index c1ce4d5327..da0a967d1e 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,25 +26,25 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-hub,id=3Dhub1,bus=3Dusb.0,port=3D2 \ --device usb-hub,id=3Dhub2,bus=3Dusb.0,port=3D1.1 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D1.2 \ --device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D1.3 \ --device usb-mouse,id=3Dinput2,bus=3Dusb.0,port=3D1.4 \ --device usb-tablet,id=3Dinput3,bus=3Dusb.0,port=3D1.5 \ --device usb-tablet,id=3Dinput4,bus=3Dusb.0,port=3D1.6 \ --device usb-tablet,id=3Dinput5,bus=3Dusb.0,port=3D1.7 \ --device usb-tablet,id=3Dinput6,bus=3Dusb.0,port=3D1.8 \ --device usb-tablet,id=3Dinput7,bus=3Dusb.0,port=3D1.1.1 \ --device usb-tablet,id=3Dinput8,bus=3Dusb.0,port=3D1.1.2 \ --device usb-tablet,id=3Dinput9,bus=3Dusb.0,port=3D1.1.3 \ --device usb-tablet,id=3Dinput10,bus=3Dusb.0,port=3D1.1.4 \ --device usb-tablet,id=3Dinput11,bus=3Dusb.0,port=3D1.1.5 \ --device usb-tablet,id=3Dinput12,bus=3Dusb.0,port=3D1.1.6 \ --device usb-tablet,id=3Dinput13,bus=3Dusb.0,port=3D1.1.7 \ --device usb-tablet,id=3Dinput14,bus=3Dusb.0,port=3D1.1.8 \ --device usb-tablet,id=3Dinput15,bus=3Dusb.0,port=3D2.1 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.3"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.4"}' \ +-device '{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.5"}'= \ +-device '{"driver":"usb-tablet","id":"input4","bus":"usb.0","port":"1.6"}'= \ +-device '{"driver":"usb-tablet","id":"input5","bus":"usb.0","port":"1.7"}'= \ +-device '{"driver":"usb-tablet","id":"input6","bus":"usb.0","port":"1.8"}'= \ +-device '{"driver":"usb-tablet","id":"input7","bus":"usb.0","port":"1.1.1"= }' \ +-device '{"driver":"usb-tablet","id":"input8","bus":"usb.0","port":"1.1.2"= }' \ +-device '{"driver":"usb-tablet","id":"input9","bus":"usb.0","port":"1.1.3"= }' \ +-device '{"driver":"usb-tablet","id":"input10","bus":"usb.0","port":"1.1.4= "}' \ +-device '{"driver":"usb-tablet","id":"input11","bus":"usb.0","port":"1.1.5= "}' \ +-device '{"driver":"usb-tablet","id":"input12","bus":"usb.0","port":"1.1.6= "}' \ +-device '{"driver":"usb-tablet","id":"input13","bus":"usb.0","port":"1.1.7= "}' \ +-device '{"driver":"usb-tablet","id":"input14","bus":"usb.0","port":"1.1.8= "}' \ +-device '{"driver":"usb-tablet","id":"input15","bus":"usb.0","port":"2.1"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2ar= gvdata/usb-hub-autoadd.args index 72a969ffff..ebbc82df50 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D2 \ --device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D1.1 \ --device usb-mouse,id=3Dinput2,bus=3Dusb.0,port=3D1.2 \ --device usb-tablet,id=3Dinput3,bus=3Dusb.0,port=3D1.3 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.3"}'= \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/u= sb-hub.args index df6912ecf8..c8614ed8de 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxm= l2argvdata/usb-ich9-autoassign.args index b30ef04710..263f645f67 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,15 +25,15 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-hub,id=3Dhub1,bus=3Dusb.0,port=3D2 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D3 \ --device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D4 \ --device usb-mouse,id=3Dinput2,bus=3Dusb.0,port=3D5 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"3"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml= 2argvdata/usb-ich9-companion.args index 03c5a04492..75c1c82600 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml= 2argvdata/usb-ich9-ehci-addr.args index 70b8cc7a3b..661e086c37 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,18 +25,18 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x2.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x2 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x2.0x2 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x2.0x1 \ --device ich9-usb-ehci1,id=3Dusb1,bus=3Dpci.0,addr=3D0x3.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb1.0,firstport=3D0,bus=3Dpci.0,multif= unction=3Don,addr=3D0x3 \ --device ich9-usb-uhci3,masterbus=3Dusb1.0,firstport=3D4,bus=3Dpci.0,addr= =3D0x3.0x2 \ --device ich9-usb-uhci2,masterbus=3Dusb1.0,firstport=3D2,bus=3Dpci.0,addr= =3D0x3.0x1 \ --device ich9-usb-ehci1,id=3Dusb2,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.0,multif= unction=3Don,addr=3D0x4 \ --device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.0,addr= =3D0x4.0x2 \ --device ich9-usb-uhci2,masterbus=3Dusb2.0,firstport=3D2,bus=3Dpci.0,addr= =3D0x4.0x1 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x2.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x2.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x2.0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x3.= 0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bu= s":"pci.0","multifunction":true,"addr":"0x3"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bu= s":"pci.0","addr":"0x3.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bu= s":"pci.0","addr":"0x3.0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.0","addr":"0x4.= 0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bu= s":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bu= s":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.0","addr":"0x4.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml= 2argvdata/usb-long-port-path.args index 210a82bc9b..8f29017c8e 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-hub,id=3Dhub1,bus=3Dusb.0,port=3D1.1 \ --device usb-hub,id=3Dhub2,bus=3Dusb.0,port=3D1.1.1 \ --device usb-hub,id=3Dhub3,bus=3Dusb.0,port=3D1.1.1.1 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1.1"}' \ +-device '{"driver":"usb-hub","id":"hub3","bus":"usb.0","port":"1.1.1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/= usb-none.args index 755b7fcace..00470d4396 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,5 +26,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemux= ml2argvdata/usb-piix3-controller.args index fa2643e2fa..857577af38 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxm= l2argvdata/usb-port-autoassign.args index 2fbef8d060..4703a94715 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-hub,id=3Dhub1,bus=3Dusb.0,port=3D2 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D1.1 \ --device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D1.2 \ --device usb-mouse,id=3Dinput2,bus=3Dusb.0,port=3D1.3 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2a= rgvdata/usb-port-missing.args index 80713b27e4..4280ecef26 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-hub,id=3Dhub1,bus=3Dusb.0,port=3D2 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D1.1 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata= /usb-ports.args index e3e5cb73ca..905d2fe4da 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-hub,id=3Dhub1,bus=3Dusb.0,port=3D1.2 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D1.1 \ --device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D1.2.1 \ --device usb-mouse,id=3Dinput2,bus=3Dusb.0,port=3D1.2.2 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.2.1"}= ' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2.2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2arg= vdata/usb-redir-boot.args index 150e3c5008..9cc1f16529 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -24,16 +24,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D4000 \ --device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bootindex=3D1,bus=3Dusb= .0,port=3D1 \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","booti= ndex":1,"bus":"usb.0","port":"1"}' \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ --device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bootindex=3D2,bus=3Dusb= .0,port=3D4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","booti= ndex":2,"bus":"usb.0","port":"4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/q= emuxml2argvdata/usb-redir-filter-version.args index 904c6f7842..3d9f9f7951 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \ --device 'usb-redir,chardev=3Dcharredir0,id=3Dredir0,filter=3D0x08:0x15E1:0= x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=3Dusb.0,port= =3D1' \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","filte= r":"0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0",= "bus":"usb.0","port":"1"}' \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ --device 'usb-redir,chardev=3Dcharredir1,id=3Dredir1,filter=3D0x08:0x15E1:0= x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=3Dusb.0,port= =3D2' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filte= r":"0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0",= "bus":"usb.0","port":"2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2a= rgvdata/usb-redir-filter.args index aba04c7485..92616b6e2d 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -24,16 +24,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \ --device 'usb-redir,chardev=3Dcharredir0,id=3Dredir0,filter=3D0x08:0x15E1:0= x2007:0x0110:1|-1:-1:-1:-1:0,bus=3Dusb.0,port=3D4' \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","filte= r":"0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0","bus":"usb.0","port":"4"}' \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ --device 'usb-redir,chardev=3Dcharredir1,id=3Dredir1,filter=3D0x08:0x15E1:0= x2007:0x0110:1|-1:-1:-1:-1:0,bus=3Dusb.0,port=3D5' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filte= r":"0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0","bus":"usb.0","port":"5"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata= /usb-redir.args index 2729c7d8d1..20055947b0 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -24,16 +24,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D4000 \ --device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"1"}' \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ --device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxm= l2argvdata/usb-xhci-autoassign.args index 3f7720237a..43116f06f7 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device nec-usb-xhci,p2=3D8,p3=3D8,id=3Dusb,bus=3Dpci.0,addr=3D0x2 \ --device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ --device usb-hub,id=3Dhub1,bus=3Dusb.0,port=3D2 \ --device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D3 \ --device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D4 \ --device usb-mouse,id=3Dinput2,bus=3Dusb.0,port=3D5 \ +-device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"3"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata= /usb1-usb2.args index 56d0c52e06..caecedde68 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device ich9-usb-ehci1,id=3Dusb1,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb1.0,firstport=3D0,bus=3Dpci.0,multif= unction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb1.0,firstport=3D2,bus=3Dpci.0,addr= =3D0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb1.0,firstport=3D4,bus=3Dpci.0,addr= =3D0x4.0x2 \ --device ich9-usb-ehci1,id=3Dusb2,bus=3Dpci.0,addr=3D0x5.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.0,multif= unction=3Don,addr=3D0x5 \ --device ich9-usb-uhci2,masterbus=3Dusb2.0,firstport=3D2,bus=3Dpci.0,addr= =3D0x5.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.0,addr= =3D0x5.0x2 \ --device usb-hub,id=3Dhub0,bus=3Dusb1.0,port=3D1 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x4.= 0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bu= s":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bu= s":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bu= s":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.0","addr":"0x5.= 0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bu= s":"pci.0","multifunction":true,"addr":"0x5"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.0","addr":"0x5.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bu= s":"pci.0","addr":"0x5.0x2"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb1.0","port":"1"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device usb-host,hostbus=3D14,hostaddr=3D6,id=3Dhostdev0,bus=3Dusb2.0,port= =3D1 \ --device usb-host,hostbus=3D14,hostaddr=3D7,id=3Dhostdev1,bus=3Dusb2.0,port= =3D2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","b= us":"usb2.0","port":"1"}' \ +-device '{"driver":"usb-host","hostbus":14,"hostaddr":7,"id":"hostdev1","b= us":"usb2.0","port":"2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/q= emuxml2argvdata/virtio-input-passthrough.args index ba4ba35f50..a00ee57660 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus= =3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvd= ata/virtio-input.args index 4aa488a101..dc6aa53d9c 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --device virtio-mouse-pci,id=3Dinput0,bus=3Dpci.0,addr=3D0x3 \ --device virtio-keyboard-pci,id=3Dinput1,bus=3Dpci.0,addr=3D0xa \ --device virtio-tablet-pci,id=3Dinput2,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-mouse-pci","id":"input0","bus":"pci.0","addr":"= 0x3"}' \ +-device '{"driver":"virtio-keyboard-pci","id":"input1","bus":"pci.0","addr= ":"0xa"}' \ +-device '{"driver":"virtio-tablet-pci","id":"input2","bus":"pci.0","addr":= "0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml= 2argvdata/virtio-rng-default.args index a3a33be54f..5e035afeb9 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x7 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x7"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2arg= vdata/virtio-rng-egd.args index befc02c6e4..02c5bb0e66 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -chardev socket,id=3Dcharrng0,host=3D1.2.3.4,port=3D1234 \ --object rng-egd,id=3Dobjrng0,chardev=3Dcharrng0 \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ +-object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxm= l2argvdata/virtio-rng-multiple.args index 3dc689d25c..beb8a32c31 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x7 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x7"}' \ -chardev socket,id=3Dcharrng1,host=3D1.2.3.4,port=3D1234 \ --object rng-egd,id=3Dobjrng1,chardev=3Dcharrng1 \ --device virtio-rng-pci,rng=3Dobjrng1,id=3Drng1,bus=3Dpci.0,addr=3D0x3 \ +-object '{"qom-type":"rng-egd","id":"objrng1","chardev":"charrng1"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci= .0","addr":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2= argvdata/virtio-rng-random.args index e4c87f9b86..f3473129e0 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes= ":123,"period":1234,"bus":"pci.0","addr":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdat= a/vmcoreinfo.args index e9f0ec94e1..1e96abf12d 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --device vmcoreinfo \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device '{"driver":"vmcoreinfo"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a6a1646efb..0a217949b8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -856,9 +856,22 @@ mymain(void) * at the end of the argument list, or the NONE placeholder. * */ # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, "", ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG= _END) + DO_TEST_FULL(name, "", \ + ARG_QEMU_CAPS, \ + QEMU_CAPS_DEVICE_JSON, \ + QEMU_CAPS_OBJECT_JSON, \ + QEMU_CAPS_NETDEV_JSON, \ + __VA_ARGS__, \ + QEMU_CAPS_LAST, \ + ARG_END) # define DO_TEST_NOCAPS(name) \ - DO_TEST_FULL(name, "", ARG_END) + DO_TEST_FULL(name, "", \ + ARG_QEMU_CAPS, \ + QEMU_CAPS_DEVICE_JSON, \ + QEMU_CAPS_OBJECT_JSON, \ + QEMU_CAPS_NETDEV_JSON, \ + QEMU_CAPS_LAST, \ + ARG_END) # define DO_TEST_GIC(name, ver, gic) \ DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END) --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693924028; cv=none; d=zohomail.com; s=zohoarc; b=nMEYtoYSzlLK6+VMrLhdkR+MYGF92c4A71hE45iuVLumo9GiW62urlkYOP8a7h2/mIF+2En5nOXrRBQj3SwbE1svFn4+Lrx1PF+04+JpQhdJfcXVXUZX4E5dPCDp2GnnnUcKDKhKEUk+FDi3RRf+thTYZ+666Xng7BwmKsh44Rc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924028; 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=whc1n3tJxyaBDD4dBQeNfYkLopG8PvVYob2Anm8uqgw=; b=n7oSuaxCfGlQliZDNRDuQNYBsjdTGqtLp/Q3A3cMUW23PzAitfXBy9orHm84ruRvSEch0QT4Edq06Jtdwj6v0q+lPNIt61heIkT5F4x6zmjhojSU6WA5jZN/5M1Xr3H9enD6miM5EtKyo0MjCqo73oXezO78swptUuocr+R7p2A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924028798684.8657312740269; Tue, 5 Sep 2023 07:27:08 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-307-JTn0WisqPXC7jYY1-3n-NA-1; Tue, 05 Sep 2023 10:25:39 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E68672800492; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF60A493110; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C08601946595; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9AFAA1946A4F for ; Tue, 5 Sep 2023 14:24:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 783731121319; Tue, 5 Sep 2023 14:24:46 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 025E31121314 for ; Tue, 5 Sep 2023 14:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924027; 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=whc1n3tJxyaBDD4dBQeNfYkLopG8PvVYob2Anm8uqgw=; b=BLQshx0HEESKI0OpRqhkV36fY/dBa1bk5M73EZ+Uqy+m58TygGpk0sdBVJzoXc1HUgg+4U zRPDUS5V0WV1HG8cfrkPIDXM/xQ8TvAetwa5eHg/GyjTG+lLGPX2rtyT57BAMkaYei8guU MNTkkCq64GxWq0E1ydYtIGw0QbP++h8= X-MC-Unique: JTn0WisqPXC7jYY1-3n-NA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 21/51] virQEMUCapsAddCPUDefinitions: Fill in cpu type in data and node it's used only in tests Date: Tue, 5 Sep 2023 16:23:48 +0200 Message-ID: <5816246ea7e757489888eacc001ed6916ad9e9ef.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1693924031030100003 Content-Type: text/plain; charset="utf-8" 'virQEMUCapsAddCPUDefinitions' is used solely to populate fake cpu models for the fake-caps tests. Note that and also populate the 'type' field so that default cpu type can be propagated properly. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 630be618bf..bd6a32b815 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2119,6 +2119,8 @@ bool virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps= *qemuCaps) } +/* Note that this function is invoked only by test code for faking support= ed cpu + * models */ int virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, virDomainVirtType type, @@ -2149,6 +2151,8 @@ virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, cpu->usable =3D usable; cpu->name =3D g_strdup(name[i]); + /* while the type name doesn't correspond with reality, this is ju= st for fake cpu models */ + cpu->type =3D g_strdup(name[i]); } return 0; --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923957; cv=none; d=zohomail.com; s=zohoarc; b=cm6/fqY1jRa7FpPQJC+Z8wv5QGSbWRP80TmDh6XyP6fOzsRtpvuIHZlYEwtqRaqIoRzaCbla915bo4YG5+KShveJ1h7ns1ONj6CdvrkqHLIvPUySS3NYV9+USiNspo1MKRlPyc7/sqnfozEAhnoL/FgKqQz6bh3PbVEZaGcOLOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923957; 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=5HOrWy23IIzRH+nGR1+t6gN1BMGmsJPvVhTRNq/IMyY=; b=eIXP42c+7rDSAHO9M1g8D1Ek5TF+utezigYFd8fCh/IzHcdYFRMt9kp1EYbcNxoPrENPUpa5xMAWn1ASkZe+Akb9ZFlPWxO9vfrHKJBkRUzmEEAfXuT/10aiYHMULGWVOQ0X8PLopjp8PLfBOYVneTlyMnzGH25jKGNZvzPIvmg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923957666132.74648588687148; Tue, 5 Sep 2023 07:25:57 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-509-RzDi37cHP6OvZyCPfZVgNA-1; Tue, 05 Sep 2023 10:25:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ACD573844E0C; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 966022026D4B; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 87E8C1946597; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5E04019465A2 for ; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 517781121318; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFE191121314 for ; Tue, 5 Sep 2023 14:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923956; 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=5HOrWy23IIzRH+nGR1+t6gN1BMGmsJPvVhTRNq/IMyY=; b=aVFUbEXCzFhWtaR2xkBLjmoauS32gWzY3YzsBU83uJHj6Auuz2Sy/JSkyDbabFF5akPQmT dVMSY0iGPZ+LxfO9FwYn/PZUspjEPPqrDO3Jg5tOf4C9xb9y9NY596b4SlrEweQnc91ijj 46bjTl054fyIDEtkxoB70mREACeXhBk= X-MC-Unique: RzDi37cHP6OvZyCPfZVgNA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 22/51] qemuxml2argvtest: Modernize negative testing for hugepages Date: Tue, 5 Sep 2023 16:23:49 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1693923958378100013 Content-Type: text/plain; charset="utf-8" Use proper version for negative case of 'hugepages-memaccess3' QEMU allowed to configure a memory backend for default ram since qemu-5.2. Fix the test to use real capability data. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...rr =3D> hugepages-default-1G-nodeset-2M.x86_64-latest.err} | 0 ...id.err =3D> hugepages-memaccess-invalid.x86_64-latest.err} | 0 ...memaccess3.err =3D> hugepages-memaccess3.x86_64-5.1.0.err} | 0 tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err =3D> hu= gepages-default-1G-nodeset-2M.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err =3D> hugepa= ges-memaccess-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess3.err =3D> hugepages-mem= access3.x86_64-5.1.0.err} (100%) diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err b/t= ests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err rename to tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-lat= est.err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.err b/tests= /qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess-invalid.err rename to tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.= err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.err b/tests/qemuxm= l2argvdata/hugepages-memaccess3.x86_64-5.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess3.err rename to tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0a217949b8..a6d569e0c6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1137,7 +1137,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-default-2M"); DO_TEST_CAPS_LATEST("hugepages-default-system-size"); DO_TEST_CAPS_LATEST_FAILURE("hugepages-default-5M"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-default-1G-nodeset-2M"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M"); DO_TEST_CAPS_LATEST("hugepages-nodeset"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-nodeset-nonexist"); DO_TEST_CAPS_LATEST("hugepages-numa-default"); @@ -1147,10 +1147,10 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-numa-nodeset-part"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist"); DO_TEST_CAPS_LATEST("hugepages-shared"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-memaccess-invalid"); DO_TEST_CAPS_LATEST("hugepages-memaccess"); DO_TEST_CAPS_LATEST("hugepages-memaccess2"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess3"); + DO_TEST_CAPS_VER_PARSE_ERROR("hugepages-memaccess3", "5.1.0"); DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST_NOCAPS("nosharepages"); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693923962; cv=none; d=zohomail.com; s=zohoarc; b=K/AZRX3/1WmOemoXslbKJU3yCMBDsV8G7qE15H52tZxZs0rknHKNbO75GXHihy7mVWHGqU2/fvwLBnltPtMIHBxXnttBK2JPypVgR46g6We4jr01ClJpplXCRtwoMhW8y4IUc4T+mbqNjwf4s6L2V9dKCqYev35DVU/WWcYar84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923962; 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=VZIVurORHlHkmeqP6akfvTzSyk9nHJvR5hFV/rqkWrk=; b=LHi6tFqLxIIVNdDQ6Vf/o6pjoCwb0IlgMLmA3oF9+7gcX+FO0cqm+9MyBEipBWX7Z3UBy/9dTF1CGQ6jMxxSL4XbNczO2Gesu/4PT84xrhLddPijg1/c3MJq2Dq46t7L5RNzgp2g+ItfRtj0AoWErAmRac5H5XQhFH2YHQj70p0= 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 1693923962785856.435361262604; Tue, 5 Sep 2023 07:26:02 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-522-rPNf-m4BNmGJl_DmlUwJLw-1; Tue, 05 Sep 2023 10:25:35 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0761610518B1; Tue, 5 Sep 2023 14:24:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E423C493110; Tue, 5 Sep 2023 14:24:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C1E4E1946595; Tue, 5 Sep 2023 14:24:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E4AF1946597 for ; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2D1701005B8E; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F6A41121314 for ; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923961; 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=VZIVurORHlHkmeqP6akfvTzSyk9nHJvR5hFV/rqkWrk=; b=gW+i0T1sxWzvJ19zLsmIHNtZvEi5wghJSIVgulSrioRac3XAzujdwZ8O9RY2XedkRiP0Kp Tgzc/j599EPObhDduSsqzIjWqrknqqBykT9aYBKCHd8nS79mU+mAJgPGxK228RNhxPomGw AulBX+3xXDDiapzhWelR/wp2FIjrBRY= X-MC-Unique: rPNf-m4BNmGJl_DmlUwJLw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 23/51] qemuxml2argvtest: Modernize 'numatune' tests Date: Tue, 5 Sep 2023 16:23:50 +0200 Message-ID: <617deb651fcd8e058ca484ad57f3f1b78b723786.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1693923964526100005 Content-Type: text/plain; charset="utf-8" The 'numatune-memory' case is completely dropped as it's sufficiently covered by 'numatune-memnode'. The positive fake-caps version of 'numatune-memnode' is dropped as it's covered by the two existing real caps invocations. 'numatune-memory-invalid-nodeset', 'numatune-memnode-invalid-mode', 'numatune-memnode-nocpu', 'numatune-memnodes-problematic' parsing error negative cases are converted to use latest capabilities. 'numatune-static-nodeset-exceed-hostnode' commandline generation failure negative case is converted to use latest capabilities. 'numatune-memnode-no-memory', 'numatune-distances', 'numatune-auto-nodeset-invalid', 'numatune-auto-prefer' positive cases are converted to use latest capabilities. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...e-auto-nodeset-invalid.x86_64-latest.args} | 10 +++-- ...> numatune-auto-prefer.x86_64-latest.args} | 10 +++-- ... =3D> numatune-distances.x86_64-latest.args} | 24 ++++++++---- ...ne-memnode-invalid-mode.x86_64-latest.err} | 0 ...tune-memnode-no-memory.x86_64-latest.args} | 7 ++-- ... numatune-memnode-nocpu.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memnode.args | 37 ------------------- ...ne-memnodes-problematic.x86_64-latest.err} | 0 ...-memory-invalid-nodeset.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memory.args | 34 ----------------- tests/qemuxml2argvdata/numatune-memory.xml | 31 ---------------- ...nodeset-exceed-hostnode.x86_64-latest.err} | 0 tests/qemuxml2argvtest.c | 21 +++++------ 13 files changed, 42 insertions(+), 132 deletions(-) rename tests/qemuxml2argvdata/{numatune-auto-nodeset-invalid.args =3D> num= atune-auto-nodeset-invalid.x86_64-latest.args} (76%) rename tests/qemuxml2argvdata/{numatune-auto-prefer.args =3D> numatune-aut= o-prefer.x86_64-latest.args} (71%) rename tests/qemuxml2argvdata/{numatune-distances.args =3D> numatune-dista= nces.x86_64-latest.args} (67%) rename tests/qemuxml2argvdata/{numatune-memnode-invalid-mode.err =3D> numa= tune-memnode-invalid-mode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memnode-no-memory.args =3D> numatu= ne-memnode-no-memory.x86_64-latest.args} (84%) rename tests/qemuxml2argvdata/{numatune-memnode-nocpu.err =3D> numatune-me= mnode-nocpu.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.args rename tests/qemuxml2argvdata/{numatune-memnodes-problematic.err =3D> numa= tune-memnodes-problematic.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memory-invalid-nodeset.err =3D> nu= matune-memory-invalid-nodeset.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memory.args delete mode 100644 tests/qemuxml2argvdata/numatune-memory.xml rename tests/qemuxml2argvdata/{numatune-static-nodeset-exceed-hostnode.err= =3D> numatune-static-nodeset-exceed-hostnode.x86_64-latest.err} (100%) diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/te= sts/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args similarity index 76% rename from tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args rename to tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-lates= t.args index d0703d283a..57a2b893f1 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.ar= gs @@ -10,11 +10,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"preferred"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -23,12 +25,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemux= ml2argvdata/numatune-auto-prefer.x86_64-latest.args similarity index 71% rename from tests/qemuxml2argvdata/numatune-auto-prefer.args rename to tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args index 5f8db1b479..d67d0dbe15 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest/.config \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D65536k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0,mem=3D64 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":67108864= ,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ -no-user-config \ @@ -24,9 +26,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml= 2argvdata/numatune-distances.x86_64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/numatune-distances.args rename to tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args index f349b5639c..8eb4883ed1 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args @@ -10,17 +10,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest/.config \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D12582912k \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0,cpus=3D11,mem=3D2048 \ --numa node,nodeid=3D1,cpus=3D1,cpus=3D10,mem=3D2048 \ --numa node,nodeid=3D2,cpus=3D2,cpus=3D9,mem=3D2048 \ --numa node,nodeid=3D3,cpus=3D3,cpus=3D8,mem=3D2048 \ --numa node,nodeid=3D4,cpus=3D4,cpus=3D7,mem=3D2048 \ --numa node,nodeid=3D5,cpus=3D5-6,mem=3D2048 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21474836= 48}' \ +-numa node,nodeid=3D0,cpus=3D0,cpus=3D11,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":21474836= 48}' \ +-numa node,nodeid=3D1,cpus=3D1,cpus=3D10,memdev=3Dram-node1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":21474836= 48}' \ +-numa node,nodeid=3D2,cpus=3D2,cpus=3D9,memdev=3Dram-node2 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node3","size":21474836= 48}' \ +-numa node,nodeid=3D3,cpus=3D3,cpus=3D8,memdev=3Dram-node3 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node4","size":21474836= 48}' \ +-numa node,nodeid=3D4,cpus=3D4,cpus=3D7,memdev=3Dram-node4 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node5","size":21474836= 48}' \ +-numa node,nodeid=3D5,cpus=3D5-6,memdev=3Dram-node5 \ -numa dist,src=3D0,dst=3D0,val=3D10 \ -numa dist,src=3D0,dst=3D1,val=3D21 \ -numa dist,src=3D0,dst=3D2,val=3D31 \ @@ -66,7 +73,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err b/tes= ts/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err rename to tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests= /qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args similarity index 84% rename from tests/qemuxml2argvdata/numatune-memnode-no-memory.args rename to tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.a= rgs index efc9bb9476..a500dda611 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D65536k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode-nocpu.err b/tests/qemu= xml2argvdata/numatune-memnode-nocpu.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-nocpu.err rename to tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2a= rgvdata/numatune-memnode.args deleted file mode 100644 index 163aa530da..0000000000 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D24683520k \ --overcommit mem-lock=3Doff \ --smp 32,sockets=3D32,cores=3D1,threads=3D1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520= ,"host-nodes":[3],"policy":"preferred"}' \ --numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":67633152= 0,"host-nodes":[0,1,2,3],"policy":"bind"}' \ --numa node,nodeid=3D1,cpus=3D1-27,cpus=3D29,memdev=3Dram-node1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621= 440,"host-nodes":[0,2],"policy":"bind"}' \ --numa node,nodeid=3D2,cpus=3D28,cpus=3D30-31,memdev=3Dram-node2 \ --uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ --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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnodes-problematic.err b/tes= ts/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnodes-problematic.err rename to tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err b/t= ests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err rename to tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-lat= est.err diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2ar= gvdata/numatune-memory.args deleted file mode 100644 index d0703d283a..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,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-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2arg= vdata/numatune-memory.xml deleted file mode 100644 index ed86d5cf56..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.xml +++ /dev/null @@ -1,31 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 2 - - - - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - -
- - - - - diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode= .err b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_6= 4-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.= err rename to tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x8= 6_64-latest.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a6d569e0c6..04c7814dce 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1813,30 +1813,29 @@ mymain(void) DO_TEST_CAPS_LATEST("vcpu-placement-static"); DO_TEST_CAPS_LATEST("cputune-cpuset-big-id"); - DO_TEST_NOCAPS("numatune-memory"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memory-invalid-nodeset"); - DO_TEST_NOCAPS("numatune-memnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memory-invalid-nodeset"); DO_TEST_CAPS_VER("numatune-memnode", "5.2.0"); DO_TEST_CAPS_LATEST("numatune-memnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-invalid-mode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-invalid-mode"); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-restrictive-mode-err= -mixed"); DO_TEST_CAPS_LATEST("numatune-system-memory"); - DO_TEST_NOCAPS("numatune-memnode-no-memory"); + DO_TEST_CAPS_LATEST("numatune-memnode-no-memory"); - DO_TEST_NOCAPS("numatune-distances"); + DO_TEST_CAPS_LATEST("numatune-distances"); DO_TEST_CAPS_LATEST("numatune-no-vcpu"); DO_TEST_CAPS_LATEST("numatune-hmat"); DO_TEST_CAPS_LATEST("numatune-hmat-none"); - DO_TEST_NOCAPS("numatune-auto-nodeset-invalid"); - DO_TEST_NOCAPS("numatune-auto-prefer"); - DO_TEST_FAILURE_NOCAPS("numatune-static-nodeset-exceed-hostnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-nocpu"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnodes-problematic"); + DO_TEST_CAPS_LATEST("numatune-auto-nodeset-invalid"); + DO_TEST_CAPS_LATEST("numatune-auto-prefer"); + DO_TEST_CAPS_LATEST_FAILURE("numatune-static-nodeset-exceed-hostnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-nocpu"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnodes-problematic"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-strict"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-restrictive"= ); + DO_TEST_NOCAPS("numad"); DO_TEST_NOCAPS("numad-auto-vcpu-static-numatune"); DO_TEST_PARSE_ERROR_NOCAPS("numad-auto-vcpu-static-numatune-no-nodeset= "); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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=1693923954; cv=none; d=zohomail.com; s=zohoarc; b=dn4Puw54OtNhVGFgwS8ws6OeLoyMaJHzBsmU5IYny0rTshVkA4gf/dHtBZmUjgjz9Uu+Evk350aiR0cs7RQf/i7d+XCX2+XSrPEmG6PWn0bx2PbujJQY3XT73tLFuoEf3K4CxorfMdJRBWEsmaLCuG/gcg3IAgl4JpAgxuylI4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923954; 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=LUSoiqCxvcQZa1slTM8ZlMni8vUtp6flCqQfX/thzVM=; b=LGJ2Rsx3Vh+QNq/nkzJRMLvpQEc8hZmLkSaLIpq1b7cs6RM69uLOT/WQl2vMdFuszZBonPuwifiqMRTP4GL77thBAEc3NouyNLOD844Mq5zTQuskHAwLTyCpEiTqWCFrhJ5lqIqRE23z73xRRs1+VdpB4y18dpD5RGHngWU3hDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923954587849.4588346323019; Tue, 5 Sep 2023 07:25:54 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-307-kXCkBrEBOr-WjCrVty4TsQ-1; Tue, 05 Sep 2023 10:25:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4CC44280FEC9; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B38F200A4B6; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 107A01946589; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2C6961946595 for ; Tue, 5 Sep 2023 14:24:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1B8CC1005B8E; Tue, 5 Sep 2023 14:24:50 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0AF31121314 for ; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) X-MC-Unique: kXCkBrEBOr-WjCrVty4TsQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 24/51] testutilsqemu: Always populate default ram id, default cpu, ACPI support for fake machines Date: Tue, 5 Sep 2023 16:23:51 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1693923957144100007 Content-Type: text/plain; charset="utf-8" Enable a few defaults that will decrease churn when converting tests to real capabilities. Since the fake machines are added only for x86_64 at this point we can assume that ACPI is present via -machine. In case of the default ram id assume the same. Additionally the logic was broken as fake capabilities don't have a version so the default RAM was never actually populated into fake caps tests. For CPU we add 'qemu64' as that is the default picked by qemu. We also assume that qemu requires an explicit backend for -numa, which is the case for modern machines. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/acpi-table.args | 4 +++- tests/qemuxml2argvdata/autoindex.args | 5 ++-- .../qemuxml2argvdata/balloon-device-auto.args | 5 ++-- .../balloon-device-deflate-off.args | 5 ++-- .../balloon-device-deflate.args | 5 ++-- .../balloon-device-period.args | 5 ++-- tests/qemuxml2argvdata/balloon-device.args | 5 ++-- tests/qemuxml2argvdata/blkiotune-device.args | 5 ++-- tests/qemuxml2argvdata/blkiotune.args | 5 ++-- tests/qemuxml2argvdata/channel-guestfwd.args | 5 ++-- tests/qemuxml2argvdata/channel-spicevmc.args | 5 ++-- .../qemuxml2argvdata/channel-virtio-auto.args | 5 ++-- .../channel-virtio-autoadd.args | 5 ++-- .../channel-virtio-autoassign.args | 5 ++-- .../channel-virtio-default.args | 5 ++-- .../channel-virtio-state.args | 5 ++-- .../qemuxml2argvdata/channel-virtio-unix.args | 5 ++-- tests/qemuxml2argvdata/channel-virtio.args | 5 ++-- tests/qemuxml2argvdata/chardev-reconnect.args | 5 ++-- tests/qemuxml2argvdata/clock-catchup.args | 5 ++-- tests/qemuxml2argvdata/clock-france.args | 5 ++-- tests/qemuxml2argvdata/clock-hpet-off.args | 5 ++-- .../clock-localtime-basis-localtime.args | 5 ++-- tests/qemuxml2argvdata/clock-localtime.args | 5 ++-- .../clock-timer-hyperv-rtc.args | 4 ++-- tests/qemuxml2argvdata/clock-utc.args | 5 ++-- tests/qemuxml2argvdata/clock-variable.args | 5 ++-- .../qemuxml2argvdata/console-virtio-many.args | 5 ++-- tests/qemuxml2argvdata/console-virtio.args | 5 ++-- tests/qemuxml2argvdata/controller-order.args | 4 +++- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 4 ++-- tests/qemuxml2argvdata/cpu-Haswell.args | 4 ++-- tests/qemuxml2argvdata/cpu-Haswell2.args | 4 ++-- tests/qemuxml2argvdata/cpu-Haswell3.args | 4 ++-- tests/qemuxml2argvdata/cpu-cache-disable.args | 4 ++-- .../qemuxml2argvdata/cpu-cache-disable3.args | 4 ++-- .../cpu-cache-emulate-l3.args | 4 ++-- .../cpu-cache-passthrough.args | 4 ++-- .../cpu-check-default-none.args | 4 ++-- .../cpu-check-default-none2.args | 4 ++-- .../cpu-check-default-partial.args | 4 ++-- .../cpu-check-default-partial2.args | 4 ++-- tests/qemuxml2argvdata/cpu-check-none.args | 4 ++-- tests/qemuxml2argvdata/cpu-exact1.args | 4 ++-- .../cpu-exact2-nofallback.args | 4 ++-- tests/qemuxml2argvdata/cpu-exact2.args | 4 ++-- tests/qemuxml2argvdata/cpu-fallback.args | 4 ++-- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 4 ++-- .../qemuxml2argvdata/cpu-host-model-cmt.args | 4 ++-- .../cpu-host-model-vendor.args | 4 ++-- .../cpu-host-passthrough-features.args | 4 ++-- .../cpu-host-passthrough.args | 4 ++-- tests/qemuxml2argvdata/cpu-kvmclock.args | 4 ++-- tests/qemuxml2argvdata/cpu-minimum1.args | 4 ++-- tests/qemuxml2argvdata/cpu-minimum2.args | 4 ++-- .../cpu-no-removed-features.args | 4 ++-- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 10 ++++---- .../qemuxml2argvdata/cpu-numa-memshared.args | 4 ++-- .../cpu-numa-no-memory-element.args | 10 ++++---- tests/qemuxml2argvdata/cpu-numa1.args | 10 ++++---- tests/qemuxml2argvdata/cpu-numa2.args | 10 ++++---- .../cpu-phys-bits-emulate.args | 4 ++-- .../cpu-phys-bits-emulate2.args | 4 ++-- .../cpu-phys-bits-passthrough.args | 4 ++-- tests/qemuxml2argvdata/cpu-strict1.args | 4 ++-- tests/qemuxml2argvdata/cpu-topology1.args | 5 ++-- tests/qemuxml2argvdata/cpu-topology2.args | 4 ++-- tests/qemuxml2argvdata/cpu-topology3.args | 5 ++-- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 4 ++-- .../default-kvm-host-arch.args | 5 ++-- .../default-qemu-host-arch.args | 5 ++-- .../graphics-sdl-fullscreen.args | 5 ++-- tests/qemuxml2argvdata/graphics-sdl.args | 5 ++-- .../hostdev-mdev-precreated.args | 5 ++-- .../hostdev-pci-address-unassigned.args | 5 ++-- .../hostdev-pci-multifunction.args | 5 ++-- .../hostdev-scsi-vhost-scsi-pci.args | 5 ++-- .../hostdev-vfio-multidomain.args | 5 ++-- tests/qemuxml2argvdata/hostdev-vfio.args | 5 ++-- tests/qemuxml2argvdata/hotplug-base.args | 4 +++- .../qemuxml2argvdata/input-usbmouse-addr.args | 5 ++-- tests/qemuxml2argvdata/input-usbmouse.args | 5 ++-- tests/qemuxml2argvdata/input-usbtablet.args | 5 ++-- tests/qemuxml2argvdata/kvm-pit-delay.args | 5 ++-- tests/qemuxml2argvdata/kvm-pit-discard.args | 5 ++-- tests/qemuxml2argvdata/kvmclock.args | 4 ++-- tests/qemuxml2argvdata/machine-aliases1.args | 5 ++-- tests/qemuxml2argvdata/machine-aliases2.args | 5 ++-- tests/qemuxml2argvdata/machine-core-off.args | 5 ++-- tests/qemuxml2argvdata/machine-core-on.args | 5 ++-- .../qemuxml2argvdata/machine-vmport-opt.args | 5 ++-- .../qemuxml2argvdata/memory-hotplug-dimm.args | 7 +++--- tests/qemuxml2argvdata/memory-hotplug.args | 7 +++--- tests/qemuxml2argvdata/memtune-unlimited.args | 5 ++-- tests/qemuxml2argvdata/memtune.args | 5 ++-- .../migrate-numa-unaligned.args | 4 ++-- tests/qemuxml2argvdata/migrate.args | 5 ++-- tests/qemuxml2argvdata/minimal.args | 5 ++-- tests/qemuxml2argvdata/misc-acpi.args | 4 +++- tests/qemuxml2argvdata/misc-disable-s3.args | 5 ++-- .../misc-disable-suspends.args | 5 ++-- tests/qemuxml2argvdata/misc-enable-s4.args | 5 ++-- tests/qemuxml2argvdata/misc-uuid.args | 4 +++- .../multifunction-pci-device.args | 5 ++-- tests/qemuxml2argvdata/nosharepages.args | 5 ++-- .../numad-auto-memory-vcpu-cpuset.args | 5 ++-- ...o-memory-vcpu-no-cpuset-and-placement.args | 5 ++-- .../numad-auto-vcpu-static-numatune.args | 5 ++-- .../numad-static-memory-auto-vcpu.args | 5 ++-- tests/qemuxml2argvdata/numad.args | 5 ++-- tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +++- tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +++- tests/qemuxml2argvdata/pci-autofill-addr.args | 5 ++-- .../pci-bridge-many-disks.args | 3 ++- tests/qemuxml2argvdata/pci-bridge.args | 4 +++- tests/qemuxml2argvdata/pci-expander-bus.args | 10 ++++---- tests/qemuxml2argvdata/pci-many.args | 4 +++- tests/qemuxml2argvdata/pci-rom-disabled.args | 5 ++-- tests/qemuxml2argvdata/pci-rom.args | 5 ++-- tests/qemuxml2argvdata/pcie-expander-bus.args | 10 ++++---- .../pcie-root-port-model-generic.args | 5 ++-- .../pcie-root-port-model-ioh3420.args | 5 ++-- tests/qemuxml2argvdata/pcie-root-port.args | 5 ++-- tests/qemuxml2argvdata/pcie-root.args | 5 ++-- .../pcie-switch-downstream-port.args | 5 ++-- .../pcie-switch-upstream-port.args | 5 ++-- tests/qemuxml2argvdata/pcihole64-q35.args | 5 ++-- tests/qemuxml2argvdata/pcihole64.args | 5 ++-- tests/qemuxml2argvdata/pmu-feature-off.args | 3 ++- tests/qemuxml2argvdata/pmu-feature.args | 3 ++- .../q35-pci-force-address.args | 5 ++-- tests/qemuxml2argvdata/q35-usb2-multi.args | 5 ++-- tests/qemuxml2argvdata/q35-usb2-reorder.args | 5 ++-- tests/qemuxml2argvdata/q35-usb2.args | 5 ++-- tests/qemuxml2argvdata/q35.args | 5 ++-- tests/qemuxml2argvdata/qemu-ns-alt.args | 5 ++-- .../qemu-ns-commandline-ns0.args | 5 ++-- .../qemu-ns-commandline-ns1.args | 5 ++-- .../qemuxml2argvdata/qemu-ns-commandline.args | 5 ++-- .../qemu-ns-domain-commandline-ns0.args | 5 ++-- .../qemu-ns-domain-commandline.args | 5 ++-- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 5 ++-- tests/qemuxml2argvdata/qemu-ns-no-env.args | 5 ++-- .../reboot-timeout-disabled.args | 5 ++-- .../reboot-timeout-enabled.args | 5 ++-- tests/qemuxml2argvdata/restore-v2-fd.args | 5 ++-- tests/qemuxml2argvdata/restore-v2.args | 5 ++-- tests/qemuxml2argvdata/seclabel-dac-none.args | 5 ++-- .../seclabel-dynamic-baselabel.args | 5 ++-- .../seclabel-dynamic-labelskip.args | 5 ++-- .../seclabel-dynamic-override.args | 5 ++-- .../seclabel-dynamic-relabel.args | 5 ++-- tests/qemuxml2argvdata/seclabel-dynamic.args | 5 ++-- tests/qemuxml2argvdata/seclabel-none.args | 5 ++-- .../seclabel-static-labelskip.args | 5 ++-- .../seclabel-static-relabel.args | 5 ++-- tests/qemuxml2argvdata/seclabel-static.args | 5 ++-- .../smartcard-controller.args | 5 ++-- .../smartcard-host-certificates-database.args | 5 ++-- .../smartcard-host-certificates.args | 5 ++-- tests/qemuxml2argvdata/smartcard-host.args | 5 ++-- .../smartcard-passthrough-spicevmc.args | 5 ++-- .../smartcard-passthrough-tcp.args | 5 ++-- tests/qemuxml2argvdata/smbios.args | 5 ++-- tests/qemuxml2argvdata/smp-dies.args | 5 ++-- tests/qemuxml2argvdata/smp.args | 5 ++-- .../usb-controller-default-q35.args | 5 ++-- .../usb-controller-explicit-q35.args | 5 ++-- .../usb-controller-qemu-xhci.args | 5 ++-- .../qemuxml2argvdata/usb-controller-xhci.args | 5 ++-- tests/qemuxml2argvdata/usb-controller.args | 5 ++-- .../usb-hub-autoadd-deluxe.args | 5 ++-- tests/qemuxml2argvdata/usb-hub-autoadd.args | 5 ++-- tests/qemuxml2argvdata/usb-hub.args | 5 ++-- .../qemuxml2argvdata/usb-ich9-autoassign.args | 5 ++-- .../qemuxml2argvdata/usb-ich9-companion.args | 5 ++-- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 5 ++-- .../qemuxml2argvdata/usb-long-port-path.args | 5 ++-- tests/qemuxml2argvdata/usb-none.args | 5 ++-- .../usb-piix3-controller.args | 5 ++-- .../qemuxml2argvdata/usb-port-autoassign.args | 5 ++-- tests/qemuxml2argvdata/usb-port-missing.args | 5 ++-- tests/qemuxml2argvdata/usb-ports.args | 5 ++-- tests/qemuxml2argvdata/usb-redir-boot.args | 5 ++-- .../usb-redir-filter-version.args | 5 ++-- tests/qemuxml2argvdata/usb-redir-filter.args | 5 ++-- tests/qemuxml2argvdata/usb-redir.args | 5 ++-- .../qemuxml2argvdata/usb-xhci-autoassign.args | 5 ++-- tests/qemuxml2argvdata/usb1-usb2.args | 5 ++-- .../virtio-input-passthrough.args | 5 ++-- tests/qemuxml2argvdata/virtio-input.args | 5 ++-- .../qemuxml2argvdata/virtio-rng-default.args | 5 ++-- tests/qemuxml2argvdata/virtio-rng-egd.args | 5 ++-- .../qemuxml2argvdata/virtio-rng-multiple.args | 5 ++-- tests/qemuxml2argvdata/virtio-rng-random.args | 5 ++-- tests/qemuxml2argvdata/vmcoreinfo.args | 5 ++-- tests/testutilsqemu.c | 23 +++++++------------ 197 files changed, 577 insertions(+), 409 deletions(-) diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdat= a/acpi-table.args index 88a9c97e79..339220c962 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata= /autoindex.args index 3d7bffff7f..110a203de3 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxm= l2argvdata/balloon-device-auto.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests= /qemuxml2argvdata/balloon-device-deflate-off.args index dbee8dab7b..6936fa8958 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qem= uxml2argvdata/balloon-device-deflate.args index c7ed5f1698..d51bd5438c 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemu= xml2argvdata/balloon-device-period.args index 5de1090233..57e56fc2bf 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2arg= vdata/balloon-device.args index 5de1090233..57e56fc2bf 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2a= rgvdata/blkiotune-device.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata= /blkiotune.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2a= rgvdata/channel-guestfwd.args index 147c54348f..043167931c 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2a= rgvdata/channel-spicevmc.args index 009abf0b09..0f211c5723 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxm= l2argvdata/channel-virtio-auto.args index d86ff6d6a0..424c191b5e 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":1= 6,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qem= uxml2argvdata/channel-virtio-autoadd.args index d7a32b5b1d..07b7e2f202 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4= ,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/= qemuxml2argvdata/channel-virtio-autoassign.args index 8ee30c8c2a..c8d5a91a59 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4= ,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qem= uxml2argvdata/channel-virtio-default.args index 032938afca..db44038462 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemux= ml2argvdata/channel-virtio-state.args index 27113716ad..1b7a8af721 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxm= l2argvdata/channel-virtio-unix.args index 12ef286573..bb2f3e1898 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2arg= vdata/channel-virtio.args index 11c899376a..766c08e28c 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2= argvdata/chardev-reconnect.args index ee84969f73..27c2d37514 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argv= data/clock-catchup.args index 717e39de4b..0ee37cae47 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvd= ata/clock-france.args index ebaf3983f2..1aac60b73e 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -11,9 +11,11 @@ TZ=3DEurope/Paris \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ TZ=3DEurope/Paris \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dlocaltime \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2arg= vdata/clock-hpet-off.args index 349685854d..1ade114f84 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc,driftfix=3Dslew \ -no-hpet \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/= tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index cfb65c94b3..2d100be581 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3D2009-02-14T00:01:30 \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2ar= gvdata/clock-localtime.args index 2f27165702..2b127d8eb3 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dlocaltime \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qem= uxml2argvdata/clock-timer-hyperv-rtc.args index 629091aba2..5a7b6df7eb 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64,hv-time=3Don \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata= /clock-utc.args index 7b0d7e31af..4ed1fe72a5 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2arg= vdata/clock-variable.args index 7faefe3464..061697f057 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3D2009-02-15T09:49:06 \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxm= l2argvdata/console-virtio-many.args index d45a1b4eb0..8196f3039b 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2arg= vdata/console-virtio.args index 20a6eb9c45..12d846bc3d 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 58222e601f..8ea076ce51 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr/.c= onfig \ -name guest=3Dfdr,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel kvm \ +-cpu qemu64 \ -m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2= argvdata/cpu-Haswell-noTSX.args index 6b4e0aa6cb..ee856da83c 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu Haswell-noTSX \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvda= ta/cpu-Haswell.args index c36c67a8b8..3a19cd7e7d 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu Haswell \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvd= ata/cpu-Haswell2.args index 280d48f76f..7989bb54f1 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu Haswell,hle=3Doff,rtm=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvd= ata/cpu-Haswell3.args index f66a637bbe..9a198712ee 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu Haswell,rtm=3Don,hle=3Don \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2= argvdata/cpu-cache-disable.args index 6bab5d64a5..341e2c9aff 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.= config \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,host-cache-info=3Doff,l3-cache=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml= 2argvdata/cpu-cache-disable3.args index dd9227de22..1ea6896a8e 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.= config \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,l3-cache=3Do= ff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemux= ml2argvdata/cpu-cache-emulate-l3.args index 38f1d93973..603f0ea0a2 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.= config \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,l3-cache=3Don,host-cache-info=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemu= xml2argvdata/cpu-cache-passthrough.args index 4bf1305f16..1c7325e32a 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.= config \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,host-cache-info=3Don,l3-cache=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qem= uxml2argvdata/cpu-check-default-none.args index 65fc3e1bad..5b75657eea 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qe= muxml2argvdata/cpu-check-default-none2.args index cd55fad737..6348b15672 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu core2duo \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/= qemuxml2argvdata/cpu-check-default-partial.args index 959a421741..0416205d82 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests= /qemuxml2argvdata/cpu-check-default-partial2.args index 48ad817176..d43bc435e1 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2arg= vdata/cpu-check-none.args index 48ad817176..d43bc435e1 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdat= a/cpu-exact1.args index bd452e017e..45e15c91ce 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64,mca=3Doff,pse36=3Doff,clflush=3Doff,syscall=3Doff,nx=3Doff,lm= =3Doff,svm=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemu= xml2argvdata/cpu-exact2-nofallback.args index 2916d10b23..acae725f2e 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdat= a/cpu-exact2.args index 2916d10b23..acae725f2e 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvd= ata/cpu-fallback.args index ef6c3b29f3..d6e2611cde 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu Conroe,cx16=3Don,sse4.1=3Doff,sse4.2=3Doff,popcnt=3Doff,aes=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2= argvdata/cpu-host-kvmclock.args index 836fe208a0..e8f4f4d5c5 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,kvmclock=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml= 2argvdata/cpu-host-model-cmt.args index 97b7b9fda6..634a06e34a 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds-cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf-lm=3Don \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemu= xml2argvdata/cpu-host-model-vendor.args index 8bece6f8da..d39564cb89 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu 'core2duo,vendor=3DLibvirt QEMU,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm= =3Don,pbe=3Don,ds-cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,l= ahf-lm=3Don' \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/te= sts/qemuxml2argvdata/cpu-host-passthrough-features.args index b8e0734d7d..6cce7f9aee 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,abm=3Don,ds=3Don,invtsc=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemux= ml2argvdata/cpu-host-passthrough.args index 65fc3e1bad..5b75657eea 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvd= ata/cpu-kvmclock.args index ef469a1e5a..b2c18d17ba 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,kvmclock=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvd= ata/cpu-minimum1.args index 959a421741..0416205d82 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvd= ata/cpu-minimum2.args index de2c6f4fe5..99ffab88d7 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,syscall=3Dof= f,nx=3Doff,lm=3Doff,svm=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qe= muxml2argvdata/cpu-no-removed-features.args index 48ad817176..d43bc435e1 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2= argvdata/cpu-numa-disjoint.args index 5fc82723eb..cb8581257a 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ --numa node,nodeid=3D0,cpus=3D0-3,cpus=3D8-11,mem=3D107 \ --numa node,nodeid=3D1,cpus=3D4-7,cpus=3D12-15,mem=3D107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ +-numa node,nodeid=3D0,cpus=3D0-3,cpus=3D8-11,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ +-numa node,nodeid=3D1,cpus=3D4-7,cpus=3D12-15,memdev=3Dram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml= 2argvdata/cpu-numa-memshared.args index fc4c03f1a6..1e07b930fe 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ @@ -27,7 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests= /qemuxml2argvdata/cpu-numa-no-memory-element.args index 3cf5b44742..ca93709c64 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ --numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ --numa node,nodeid=3D1,cpus=3D8-15,mem=3D107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ +-numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ +-numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata= /cpu-numa1.args index 3cf5b44742..ca93709c64 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ --numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ --numa node,nodeid=3D1,cpus=3D8-15,mem=3D107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ +-numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ +-numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata= /cpu-numa2.args index 3cf5b44742..ca93709c64 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ --numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ --numa node,nodeid=3D1,cpus=3D8-15,mem=3D107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ +-numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ +-numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemu= xml2argvdata/cpu-phys-bits-emulate.args index 6710c3edc5..b85ccebfc0 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.= config \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,phys-bits=3D42 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qem= uxml2argvdata/cpu-phys-bits-emulate2.args index f4fdaab483..0b08d7e145 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.= config \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,phys-bits=3D= 42 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/= qemuxml2argvdata/cpu-phys-bits-passthrough.args index 0ae7743b5a..b85ce46a20 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.= config \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,host-phys-bits=3Don \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvda= ta/cpu-strict1.args index f865d7557a..65749b9611 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,vmx=3Don,est= =3Don,xtpr=3Don,3dnowext=3Don,lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pb= e=3Doff,ss=3Doff,sse4a=3Doff,wdt=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argv= data/cpu-topology1.args index 52e36d0de5..ee3ea3cb75 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D3,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argv= data/cpu-topology2.args index 6f8f674859..64372f05d7 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu core2duo \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D1,cores=3D2,threads=3D3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argv= data/cpu-topology3.args index 52e36d0de5..ee3ea3cb75 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D3,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2= argvdata/cpu-tsc-frequency.args index f3a8a62c00..33ec51af4b 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds-cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf-lm=3Don,i= nvtsc=3Don,tsc-frequency=3D4567890000 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemu= xml2argvdata/default-kvm-host-arch.args index 07ee740065..1554f13ba0 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.c= onfig \ -name guest=3Dkvm,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-kvm/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ +-cpu qemu64 \ -m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qem= uxml2argvdata/default-qemu-host-arch.args index a54dc14136..a88774dc86 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu-h= ost/.config \ -name guest=3Dqemu-host,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-qemu-host/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu-ho= st/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qe= muxml2argvdata/graphics-sdl-fullscreen.args index 33ad2bd5da..cdec35daf7 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -12,9 +12,11 @@ DISPLAY=3D:0.1 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ DISPLAY=3D:0.1 \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvd= ata/graphics-sdl.args index bd6f994856..1ac0995a24 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -12,9 +12,11 @@ DISPLAY=3D:0.1 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ DISPLAY=3D:0.1 \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qe= muxml2argvdata/hostdev-mdev-precreated.args index 8f51127035..97424f3c56 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est2/.config \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/t= ests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index b59083cb3c..879deef04b 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete= /.config \ -name guest=3Ddelete,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ +-cpu qemu64 \ -m size=3D262144k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":268435456}'= \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/= qemuxml2argvdata/hostdev-pci-multifunction.args index b0110be8b1..823112a276 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete= /.config \ -name guest=3Ddelete,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ +-cpu qemu64 \ -m size=3D262144k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":268435456}'= \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index 972a023d5b..62e24de6e0 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est2/.config \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/q= emuxml2argvdata/hostdev-vfio-multidomain.args index 909f65ecae..09b213afda 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est2/.config \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvd= ata/hostdev-vfio.args index a52b705099..3d436c046d 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est2/.config \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvd= ata/hotplug-base.args index 030552411e..3c2703d735 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-hotplu= g/.config \ -name guest=3Dhotplug,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-hotplug/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel kvm \ +-cpu qemu64 \ -m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxm= l2argvdata/input-usbmouse-addr.args index 1d7e8f29aa..6b1c787d4b 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2arg= vdata/input-usbmouse.args index fdf0cd14c5..77af8a128f 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2ar= gvdata/input-usbtablet.args index 18f484fc0a..9182426b07 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argv= data/kvm-pit-delay.args index fd7a2b306a..871a066e37 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -global kvm-pit.lost_tick_policy=3Ddelay \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2ar= gvdata/kvm-pit-discard.args index c3cdc71020..ffaed42bd9 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -global kvm-pit.lost_tick_policy=3Ddiscard \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/= kvmclock.args index df9ab68537..84232c96b3 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64,kvmclock=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2a= rgvdata/machine-aliases1.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2a= rgvdata/machine-aliases2.args index 6501e5e417..2fdb43c621 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2a= rgvdata/machine-core-off.args index 7b0d7e31af..4ed1fe72a5 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2ar= gvdata/machine-core-on.args index a1b9905d5c..30a6ebf0b5 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Don \ +-machine pc,usb=3Doff,dump-guest-core=3Don,memory-backend=3Dpc.ram,acpi=3D= off \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml= 2argvdata/machine-vmport-opt.args index c7cdb0c85f..7e309f5d09 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxm= l2argvdata/memory-hotplug-dimm.args index b84efa4556..18c0316775 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0-1,mem=3D214 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912= }' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2arg= vdata/memory-hotplug.args index 62600fefe2..1e38bb58c2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0-1,mem=3D214 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2= argvdata/memtune-unlimited.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/m= emtune.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qem= uxml2argvdata/migrate-numa-unaligned.args index 35d665f20b..76e1dfedde 100644 --- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D14682112k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ @@ -29,7 +30,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/m= igrate.args index e46b190249..55f528a7d9 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-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 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/m= inimal.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata= /misc-acpi.args index 15343c68b0..01bd000e48 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2ar= gvdata/misc-disable-s3.args index 3dc66e443e..6323b763ed 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -global PIIX4_PM.disable_s3=3D1 \ -boot strict=3Don \ -usb \ diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemu= xml2argvdata/misc-disable-suspends.args index 314612c229..c91c97b023 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -global PIIX4_PM.disable_s3=3D1 \ -global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2arg= vdata/misc-enable-s4.args index f2e9fcc0a6..af5ece2df0 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -global PIIX4_PM.disable_s4=3D0 \ -boot strict=3Don \ -usb \ diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata= /misc-uuid.args index 15343c68b0..01bd000e48 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/q= emuxml2argvdata/multifunction-pci-device.args index 40c38dea48..e12a9a7441 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"lsi","id":"scsi0","bus":"pci.0","multifunction":false,= "addr":"0x3"}' \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","multifunction":true,"= addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvd= ata/nosharepages.args index 7bcd073c98..cde8d709d3 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,mem-merge=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,mem-merge=3Doff,memory-backend= =3Dpc.ram,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D220160k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":225443840}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/te= sts/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index d0703d283a..955b0233f4 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-= placement.args index d0703d283a..955b0233f4 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/= tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index d0703d283a..755c6d7ba1 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/te= sts/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index d0703d283a..955b0233f4 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/num= ad.args index d0703d283a..955b0233f4 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2a= rgvdata/pci-autoadd-addr.args index ec75429384..7772f468f2 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br= /.config \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2ar= gvdata/pci-autoadd-idx.args index 5c6377d619..e8ea698e9c 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br= /.config \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2= argvdata/pci-autofill-addr.args index f43a1da7ab..6f226370ec 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br= /.config \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemu= xml2argvdata/pci-bridge-many-disks.args index 7d990296c7..c84f98e9e8 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-lots-= of-disks/.config \ -name guest=3Dlots-of-disks,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-lots-of-disks/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,kvmclock=3Doff \ -m size=3D4000768k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4096786432}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \ diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index 1e1d4c30e2..db93c647aa 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br= /.config \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2a= rgvdata/pci-expander-bus.args index e4c9bfead0..85634f4377 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expan= der-test/.config \ -name guest=3Dexpander-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-expander-test/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ --numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ --numa node,nodeid=3D1,cpus=3D8-15,mem=3D107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ +-numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ +-numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expande= r-test/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"pxb","bus_nr":254,"id":"pci.1","numa_node":1,"bus":"pc= i.0","addr":"0x2"}' \ -device '{"driver":"pxb","bus_nr":252,"id":"pci.2","bus":"pci.0","addr":"0= x3"}' \ diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/= pci-many.args index 028f4bf278..0f69ce9f5a 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br= /.config \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2a= rgvdata/pci-rom-disabled.args index 2ddb190c66..ea34132861 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/= .config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","romfile":""}' \ diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/p= ci-rom.args index cbc3fc950c..e3bf06a1ae 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est2/.config \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index 4cb85a0999..acddaea4f5 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-= expander-bus-te/.config \ -name guest=3Dpcie-expander-bus-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ --numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ --numa node,nodeid=3D1,cpus=3D8-15,mem=3D107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ +-numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ +-numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus= ":"pcie.0","addr":"0x4"}' \ -device '{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.= 1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-generic.args index aa8c171594..750b132e7a 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/= .config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index fc5e591733..5e838ba2f4 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/= .config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie= .0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie= .0","addr":"0x1.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index a5342e8b70..c15270294a 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pc= ie.0","addr":"0x2.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata= /pcie-root.args index 169e73608b..afc072da93 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index 0c3da6bd1a..77057d94d5 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","addr":"0x2"}' \ -device '{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0= "}' \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index aaae74d377..f9a4dcc051 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pci= e.0","addr":"0x2.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv= data/pcihole64-q35.args index 86e5778b35..18d584e895 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -global q35-pcihost.pci-hole64-size=3D1048576K \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata= /pcihole64.args index 43f5a6dbf0..c3821eed8f 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.c= onfig \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -global i440FX-pcihost.pci-hole64-size=3D1048576K \ -usb \ diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2ar= gvdata/pmu-feature-off.args index 80d0ebb925..869560c07f 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,pmu=3Doff \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvda= ta/pmu-feature.args index 3531746845..01b75e94fd 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,pmu=3Don \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemu= xml2argvdata/q35-pci-force-address.args index 2c7b88f0d0..d8f0d2e282 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg= vdata/q35-usb2-multi.args index be6f4bbc5d..23cc5aa775 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1"= ,"addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a= rgvdata/q35-usb2-reorder.args index f0f32c80ed..e6c0c1e20e 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1"= ,"addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/= q35-usb2.args index 4b7d83ba51..51d50f7673 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1"= ,"addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index 3d4c93038c..b778f874d6 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D0 \ -boot strict=3Don \ diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvda= ta/qemu-ns-alt.args index 9eec4d266e..b62ad8f47f 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -12,9 +12,11 @@ BAR=3D'' \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,7 +27,6 @@ BAR=3D'' \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns0.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns1.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxm= l2argvdata/qemu-ns-commandline.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/t= ests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests= /qemuxml2argvdata/qemu-ns-domain-commandline.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml= 2argvdata/qemu-ns-domain-ns0.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2arg= vdata/qemu-ns-no-env.args index 9f06ef5a80..2dc4c55ca3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qe= muxml2argvdata/reboot-timeout-disabled.args index 43150e9e15..00eb1321eb 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot reboot-timeout=3D-1,strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qem= uxml2argvdata/reboot-timeout-enabled.args index c123cd9dce..a7c63c3bd0 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot reboot-timeout=3D128,strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argv= data/restore-v2-fd.args index 61c3521103..060a6cfafb 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-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 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdat= a/restore-v2.args index d6247264df..2acb08e1e3 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-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 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2= argvdata/seclabel-dac-none.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests= /qemuxml2argvdata/seclabel-dynamic-baselabel.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests= /qemuxml2argvdata/seclabel-dynamic-labelskip.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/= qemuxml2argvdata/seclabel-dynamic-override.args index b417f976af..20820924bc 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/q= emuxml2argvdata/seclabel-dynamic-relabel.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2a= rgvdata/seclabel-dynamic.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argv= data/seclabel-none.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/= qemuxml2argvdata/seclabel-static-labelskip.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qe= muxml2argvdata/seclabel-static-relabel.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2ar= gvdata/seclabel-static.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemux= ml2argvdata/smartcard-controller.args index 6ff6005c39..a03929ba37 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.ar= gs b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index f7261da7fe..740c59caaf 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/test= s/qemuxml2argvdata/smartcard-host-certificates.args index fcbeebb8fe..7d04cff1a6 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2arg= vdata/smartcard-host.args index 6ff6005c39..a03929ba37 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/t= ests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 6d74ded58c..9ce691d6d7 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/= qemuxml2argvdata/smartcard-passthrough-tcp.args index f9991c0a6b..6bda6a08c7 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/sm= bios.args index d510624693..100725e572 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -28,7 +30,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/= smp-dies.args index 95f018af2e..7cc3538ddf 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,maxcpus=3D4,sockets=3D2,dies=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.a= rgs index 91c4a1eacc..8933b62a9f 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,maxcpus=3D2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests= /qemuxml2argvdata/usb-controller-default-q35.args index 41110fc0d0..f4be0cbc26 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pcie.0","addr":"0x1"= }' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/test= s/qemuxml2argvdata/usb-controller-explicit-q35.args index ad421f5eb3..39e88ccaa5 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-te= st/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"nec-usb-xhci","id":"usb","bus":"pcie.0","addr":"0x1"}'= \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/q= emuxml2argvdata/usb-controller-qemu-xhci.args index 001af94982..fe331a489c 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"qemu-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","add= r":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxm= l2argvdata/usb-controller-xhci.args index 2a39d7cdd3..fd6fc0a10e 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","= addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2arg= vdata/usb-controller.args index 738e28c155..9c60eb502f 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qem= uxml2argvdata/usb-hub-autoadd-deluxe.args index da0a967d1e..d29e39bb77 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2ar= gvdata/usb-hub-autoadd.args index ebbc82df50..f0ffc1595d 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/u= sb-hub.args index c8614ed8de..4a0b2513a8 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxm= l2argvdata/usb-ich9-autoassign.args index 263f645f67..c444e4c940 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml= 2argvdata/usb-ich9-companion.args index 75c1c82600..828d938af8 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml= 2argvdata/usb-ich9-ehci-addr.args index 661e086c37..7f605a1d9c 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x2.0= x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml= 2argvdata/usb-long-port-path.args index 8f29017c8e..40184c3919 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/= usb-none.args index 00470d4396..721417ae35 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemux= ml2argvdata/usb-piix3-controller.args index 857577af38..55c20b4d59 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxm= l2argvdata/usb-port-autoassign.args index 4703a94715..b92a30aea1 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2a= rgvdata/usb-port-missing.args index 4280ecef26..3022160377 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata= /usb-ports.args index 905d2fe4da..e2d3eb7be9 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2arg= vdata/usb-redir-boot.args index 9cc1f16529..04f18dffd5 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/q= emuxml2argvdata/usb-redir-filter-version.args index 3d9f9f7951..b79daf5023 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2a= rgvdata/usb-redir-filter.args index 92616b6e2d..d231b28901 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata= /usb-redir.args index 20055947b0..c304c11194 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxm= l2argvdata/usb-xhci-autoassign.args index 43116f06f7..abc1b9c0d8 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata= /usb1-usb2.args index caecedde68..9f6a5d67f5 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x4.= 0x7"}' \ diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/q= emuxml2argvdata/virtio-input-passthrough.args index a00ee57660..42c1447fc6 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvd= ata/virtio-input.args index dc6aa53d9c..d41b6ebb15 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -device '{"driver":"virtio-mouse-pci","id":"input0","bus":"pci.0","addr":"= 0x3"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml= 2argvdata/virtio-rng-default.args index 5e035afeb9..c9ef5e5c82 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2arg= vdata/virtio-rng-egd.args index 02c5bb0e66..e35a93caa5 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxm= l2argvdata/virtio-rng-multiple.args index beb8a32c31..89e39c777e 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2= argvdata/virtio-rng-random.args index f3473129e0..95b34b6810 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdat= a/vmcoreinfo.args index 1e96abf12d..4a27a21a15 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index fdbad16abe..8996f846bc 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -302,13 +302,6 @@ qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps, virArch arch) { size_t i; - const char *defaultRAMid =3D NULL; - - /* default-ram-id appeared in QEMU 5.2.0. Reflect - * this in our capabilities, i.e. set it for new - * enough versions only. */ - if (virQEMUCapsGetVersion(caps) >=3D 5002000) - defaultRAMid =3D qemu_default_ram_id[arch]; virQEMUCapsSetArch(caps, arch); @@ -317,28 +310,28 @@ qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps, VIR_DOMAIN_VIRT_QEMU, qemu_machines[arch][i], NULL, - NULL, + "qemu64", 0, false, false, - true, - defaultRAMid, false, - VIR_TRISTATE_BOOL_ABSENT); + qemu_default_ram_id[arch], + false, + VIR_TRISTATE_BOOL_YES); virQEMUCapsSet(caps, QEMU_CAPS_TCG); virQEMUCapsAddMachine(caps, VIR_DOMAIN_VIRT_KVM, qemu_machines[arch][i], NULL, - NULL, + "qemu64", 0, false, false, - true, - defaultRAMid, false, - VIR_TRISTATE_BOOL_ABSENT); + qemu_default_ram_id[arch], + false, + VIR_TRISTATE_BOOL_YES); virQEMUCapsSet(caps, QEMU_CAPS_KVM); } } --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693924027; cv=none; d=zohomail.com; s=zohoarc; b=fxfsNeiyBYKDH6+xq780lMEo473UnxFUUVNbxI2P9YFcN/U64wJwGQH9aP8XpWCcEl8xHpnSLoeToZdGoC8CjJC/1O/adaR3lz+XzFH6fh/caE6giNhp7Eg39RIPEWkGhd4GGlHnDMFTeBVCboerE5XQlJrj3LdE1/zXWQdvglw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924027; 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=pOnqn6YJYIEnHChvTl6BcsrWahzzB0PuZ7/PVEz3Gq4=; b=mbDfTebyZp0m5cCmeDKxl7zXA6KXY3j4ux53rHc6/S/FxwI8Qvdj08sPnvrUnyTeln3BFED+U5mFWSjfJ1ERJLw4J/oa+47XDvFNPg9NzNW3JcuElf6JTJDlxnC8iFiA7Cj0rxLveqPQwMQPzdgJDmHbv35IZQf1AkIhexnvFEM= 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 1693924027686767.0291974781142; Tue, 5 Sep 2023 07:27:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-91-9hR0e8VeMiihbc6sKGc-xg-1; Tue, 05 Sep 2023 10:25:56 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5B40F3802BBE; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E1E247FC73; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2D3AE1946589; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 790C31946589 for ; Tue, 5 Sep 2023 14:24:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 66D6E1121318; Tue, 5 Sep 2023 14:24:51 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6929C1121314 for ; Tue, 5 Sep 2023 14:24:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924026; 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=pOnqn6YJYIEnHChvTl6BcsrWahzzB0PuZ7/PVEz3Gq4=; b=ShqIvzzBUjDBg0bXMMCQ6+gNfop1K8Nh0dQt0QwR9Xn3BBgvZ96qXn9T08JoOyusOtCISe N9cP8xbUeZMr0WBQGp0oFzHnkBX7HpMsPb13bgMn64nzsvQQwyhNdaFytSmclBBfourBAU PdTn+mXCMJ64e9FZUNWOq1JQoGK846I= X-MC-Unique: 9hR0e8VeMiihbc6sKGc-xg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 25/51] qemuxml2argvtest: Enable 'seccomp' sandbox in all fake caps tests Date: Tue, 5 Sep 2023 16:23:52 +0200 Message-ID: <80360b2cb0b2e13bc83fc2747ea5b2a94ff62e01.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1693924029235100001 Content-Type: text/plain; charset="utf-8" In order to minimize further churn, make all fake-caps test assume that the seccomp sandbox is supported. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/acpi-table.args | 1 + tests/qemuxml2argvdata/autoindex.args | 1 + tests/qemuxml2argvdata/balloon-device-auto.args | 1 + tests/qemuxml2argvdata/balloon-device-deflate-off.args | 1 + tests/qemuxml2argvdata/balloon-device-deflate.args | 1 + tests/qemuxml2argvdata/balloon-device-period.args | 1 + tests/qemuxml2argvdata/balloon-device.args | 1 + tests/qemuxml2argvdata/blkiotune-device.args | 1 + tests/qemuxml2argvdata/blkiotune.args | 1 + tests/qemuxml2argvdata/channel-guestfwd.args | 1 + tests/qemuxml2argvdata/channel-spicevmc.args | 1 + tests/qemuxml2argvdata/channel-virtio-auto.args | 1 + tests/qemuxml2argvdata/channel-virtio-autoadd.args | 1 + tests/qemuxml2argvdata/channel-virtio-autoassign.args | 1 + tests/qemuxml2argvdata/channel-virtio-default.args | 1 + tests/qemuxml2argvdata/channel-virtio-state.args | 1 + tests/qemuxml2argvdata/channel-virtio-unix.args | 1 + tests/qemuxml2argvdata/channel-virtio.args | 1 + tests/qemuxml2argvdata/chardev-reconnect.args | 1 + tests/qemuxml2argvdata/clock-catchup.args | 1 + tests/qemuxml2argvdata/clock-france.args | 1 + tests/qemuxml2argvdata/clock-hpet-off.args | 1 + tests/qemuxml2argvdata/clock-localtime-basis-localtime.args | 1 + tests/qemuxml2argvdata/clock-localtime.args | 1 + tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 1 + tests/qemuxml2argvdata/clock-utc.args | 1 + tests/qemuxml2argvdata/clock-variable.args | 1 + tests/qemuxml2argvdata/console-virtio-many.args | 1 + tests/qemuxml2argvdata/console-virtio.args | 1 + tests/qemuxml2argvdata/controller-order.args | 1 + tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 + tests/qemuxml2argvdata/cpu-Haswell.args | 1 + tests/qemuxml2argvdata/cpu-Haswell2.args | 1 + tests/qemuxml2argvdata/cpu-Haswell3.args | 1 + tests/qemuxml2argvdata/cpu-cache-disable.args | 1 + tests/qemuxml2argvdata/cpu-cache-disable3.args | 1 + tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 1 + tests/qemuxml2argvdata/cpu-cache-passthrough.args | 1 + tests/qemuxml2argvdata/cpu-check-default-none.args | 1 + tests/qemuxml2argvdata/cpu-check-default-none2.args | 1 + tests/qemuxml2argvdata/cpu-check-default-partial.args | 1 + tests/qemuxml2argvdata/cpu-check-default-partial2.args | 1 + tests/qemuxml2argvdata/cpu-check-none.args | 1 + tests/qemuxml2argvdata/cpu-exact1.args | 1 + tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 1 + tests/qemuxml2argvdata/cpu-exact2.args | 1 + tests/qemuxml2argvdata/cpu-fallback.args | 1 + tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 + tests/qemuxml2argvdata/cpu-host-model-cmt.args | 1 + tests/qemuxml2argvdata/cpu-host-model-vendor.args | 1 + tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 1 + tests/qemuxml2argvdata/cpu-host-passthrough.args | 1 + tests/qemuxml2argvdata/cpu-kvmclock.args | 1 + tests/qemuxml2argvdata/cpu-minimum1.args | 1 + tests/qemuxml2argvdata/cpu-minimum2.args | 1 + tests/qemuxml2argvdata/cpu-no-removed-features.args | 1 + tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 + tests/qemuxml2argvdata/cpu-numa-memshared.args | 1 + tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 1 + tests/qemuxml2argvdata/cpu-numa1.args | 1 + tests/qemuxml2argvdata/cpu-numa2.args | 1 + tests/qemuxml2argvdata/cpu-phys-bits-emulate.args | 1 + tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args | 1 + tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args | 1 + tests/qemuxml2argvdata/cpu-strict1.args | 1 + tests/qemuxml2argvdata/cpu-topology1.args | 1 + tests/qemuxml2argvdata/cpu-topology2.args | 1 + tests/qemuxml2argvdata/cpu-topology3.args | 1 + tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 + tests/qemuxml2argvdata/default-kvm-host-arch.args | 1 + tests/qemuxml2argvdata/default-qemu-host-arch.args | 1 + tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 1 + tests/qemuxml2argvdata/graphics-sdl.args | 1 + tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 1 + tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args | 1 + tests/qemuxml2argvdata/hostdev-pci-multifunction.args | 1 + tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 1 + tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 1 + tests/qemuxml2argvdata/hostdev-vfio.args | 1 + tests/qemuxml2argvdata/hotplug-base.args | 1 + tests/qemuxml2argvdata/input-usbmouse-addr.args | 1 + tests/qemuxml2argvdata/input-usbmouse.args | 1 + tests/qemuxml2argvdata/input-usbtablet.args | 1 + tests/qemuxml2argvdata/kvm-pit-delay.args | 1 + tests/qemuxml2argvdata/kvm-pit-discard.args | 1 + tests/qemuxml2argvdata/kvmclock.args | 1 + tests/qemuxml2argvdata/machine-aliases1.args | 1 + tests/qemuxml2argvdata/machine-aliases2.args | 1 + tests/qemuxml2argvdata/machine-core-off.args | 1 + tests/qemuxml2argvdata/machine-core-on.args | 1 + tests/qemuxml2argvdata/machine-vmport-opt.args | 1 + tests/qemuxml2argvdata/memory-hotplug-dimm.args | 1 + tests/qemuxml2argvdata/memory-hotplug.args | 1 + tests/qemuxml2argvdata/memtune-unlimited.args | 1 + tests/qemuxml2argvdata/memtune.args | 1 + tests/qemuxml2argvdata/minimal.args | 1 + tests/qemuxml2argvdata/misc-acpi.args | 1 + tests/qemuxml2argvdata/misc-disable-s3.args | 1 + tests/qemuxml2argvdata/misc-disable-suspends.args | 1 + tests/qemuxml2argvdata/misc-enable-s4.args | 1 + tests/qemuxml2argvdata/misc-uuid.args | 1 + tests/qemuxml2argvdata/multifunction-pci-device.args | 1 + tests/qemuxml2argvdata/nosharepages.args | 1 + tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 1 + .../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 1 + tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 1 + tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 1 + tests/qemuxml2argvdata/numad.args | 1 + tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 + tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 + tests/qemuxml2argvdata/pci-autofill-addr.args | 1 + tests/qemuxml2argvdata/pci-bridge-many-disks.args | 1 + tests/qemuxml2argvdata/pci-bridge.args | 1 + tests/qemuxml2argvdata/pci-expander-bus.args | 1 + tests/qemuxml2argvdata/pci-many.args | 1 + tests/qemuxml2argvdata/pci-rom-disabled.args | 1 + tests/qemuxml2argvdata/pci-rom.args | 1 + tests/qemuxml2argvdata/pcie-expander-bus.args | 1 + tests/qemuxml2argvdata/pcie-root-port-model-generic.args | 1 + tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 1 + tests/qemuxml2argvdata/pcie-root-port.args | 1 + tests/qemuxml2argvdata/pcie-root.args | 1 + tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 1 + tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 1 + tests/qemuxml2argvdata/pcihole64-q35.args | 1 + tests/qemuxml2argvdata/pcihole64.args | 1 + tests/qemuxml2argvdata/pmu-feature-off.args | 1 + tests/qemuxml2argvdata/pmu-feature.args | 1 + tests/qemuxml2argvdata/q35-pci-force-address.args | 1 + tests/qemuxml2argvdata/q35-usb2-multi.args | 1 + tests/qemuxml2argvdata/q35-usb2-reorder.args | 1 + tests/qemuxml2argvdata/q35-usb2.args | 1 + tests/qemuxml2argvdata/q35.args | 1 + tests/qemuxml2argvdata/qemu-ns-alt.args | 1 + tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 1 + tests/qemuxml2argvdata/qemu-ns-commandline.args | 1 + tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 1 + tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-no-env.args | 1 + tests/qemuxml2argvdata/reboot-timeout-disabled.args | 1 + tests/qemuxml2argvdata/reboot-timeout-enabled.args | 1 + tests/qemuxml2argvdata/seclabel-dac-none.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-override.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic.args | 1 + tests/qemuxml2argvdata/seclabel-none.args | 1 + tests/qemuxml2argvdata/seclabel-static-labelskip.args | 1 + tests/qemuxml2argvdata/seclabel-static-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-static.args | 1 + tests/qemuxml2argvdata/smartcard-controller.args | 1 + .../qemuxml2argvdata/smartcard-host-certificates-database.args | 1 + tests/qemuxml2argvdata/smartcard-host-certificates.args | 1 + tests/qemuxml2argvdata/smartcard-host.args | 1 + tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args | 1 + tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 1 + tests/qemuxml2argvdata/smbios.args | 1 + tests/qemuxml2argvdata/smp-dies.args | 1 + tests/qemuxml2argvdata/smp.args | 1 + tests/qemuxml2argvdata/usb-controller-default-q35.args | 1 + tests/qemuxml2argvdata/usb-controller-explicit-q35.args | 1 + tests/qemuxml2argvdata/usb-controller-qemu-xhci.args | 1 + tests/qemuxml2argvdata/usb-controller-xhci.args | 1 + tests/qemuxml2argvdata/usb-controller.args | 1 + tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 1 + tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 + tests/qemuxml2argvdata/usb-hub.args | 1 + tests/qemuxml2argvdata/usb-ich9-autoassign.args | 1 + tests/qemuxml2argvdata/usb-ich9-companion.args | 1 + tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 + tests/qemuxml2argvdata/usb-long-port-path.args | 1 + tests/qemuxml2argvdata/usb-none.args | 1 + tests/qemuxml2argvdata/usb-piix3-controller.args | 1 + tests/qemuxml2argvdata/usb-port-autoassign.args | 1 + tests/qemuxml2argvdata/usb-port-missing.args | 1 + tests/qemuxml2argvdata/usb-ports.args | 1 + tests/qemuxml2argvdata/usb-redir-boot.args | 1 + tests/qemuxml2argvdata/usb-redir-filter-version.args | 1 + tests/qemuxml2argvdata/usb-redir-filter.args | 1 + tests/qemuxml2argvdata/usb-redir.args | 1 + tests/qemuxml2argvdata/usb-xhci-autoassign.args | 1 + tests/qemuxml2argvdata/usb1-usb2.args | 1 + tests/qemuxml2argvdata/virtio-input-passthrough.args | 1 + tests/qemuxml2argvdata/virtio-input.args | 1 + tests/qemuxml2argvdata/virtio-rng-default.args | 1 + tests/qemuxml2argvdata/virtio-rng-egd.args | 1 + tests/qemuxml2argvdata/virtio-rng-multiple.args | 1 + tests/qemuxml2argvdata/virtio-rng-random.args | 1 + tests/qemuxml2argvdata/vmcoreinfo.args | 1 + tests/qemuxml2argvtest.c | 2 ++ 193 files changed, 194 insertions(+) diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdat= a/acpi-table.args index 339220c962..216a207860 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -acpitable sig=3DSLIC,file=3D/var/lib/libvirt/acpi/slic.dat \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata= /autoindex.args index 110a203de3..e0c7471f3a 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -61,4 +61,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxm= l2argvdata/balloon-device-auto.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests= /qemuxml2argvdata/balloon-device-deflate-off.args index 6936fa8958..2e2dfe69af 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":f= alse,"bus":"pci.0","addr":"0x12"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qem= uxml2argvdata/balloon-device-deflate.args index d51bd5438c..1aac88ba43 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":t= rue,"bus":"pci.0","addr":"0x12"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemu= xml2argvdata/balloon-device-period.args index 57e56fc2bf..a3587435cf 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x12"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2arg= vdata/balloon-device.args index 57e56fc2bf..a3587435cf 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x12"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2a= rgvdata/blkiotune-device.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata= /blkiotune.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2a= rgvdata/channel-guestfwd.args index 043167931c..d1370ade86 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2a= rgvdata/channel-spicevmc.args index 0f211c5723..fa6a95985e 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -36,4 +36,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxm= l2argvdata/channel-virtio-auto.args index 424c191b5e..17eb241e0b 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -47,4 +47,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial2.0","nr":1,"chard= ev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qem= uxml2argvdata/channel-virtio-autoadd.args index 07b7e2f202..0f48ad41bc 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -46,4 +46,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/= qemuxml2argvdata/channel-virtio-autoassign.args index c8d5a91a59..20460f718b 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -46,4 +46,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qem= uxml2argvdata/channel-virtio-default.args index db44038462..fe0a9a9635 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemux= ml2argvdata/channel-virtio-state.args index 1b7a8af721..7cb3ee8e2d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":5,"chard= ev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.foo2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxm= l2argvdata/channel-virtio-unix.args index bb2f3e1898..9e5631a42d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev socket,id=3Dcharchannel3,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2arg= vdata/channel-virtio.args index 766c08e28c..fe467db7d5 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2= argvdata/chardev-reconnect.args index 27c2d37514..186fe49746 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -42,4 +42,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev socket,id=3Dcharrng0,host=3Dlocalhost,port=3D2345,reconnect=3D5 \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argv= data/clock-catchup.args index 0ee37cae47..2c5e597b63 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvd= ata/clock-france.args index 1aac60b73e..d14a923aa2 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -33,4 +33,5 @@ TZ=3DEurope/Paris \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2arg= vdata/clock-hpet-off.args index 1ade114f84..9b98d4d9ae 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/= tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 2d100be581..6798dfb4d6 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2ar= gvdata/clock-localtime.args index 2b127d8eb3..5878a79725 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qem= uxml2argvdata/clock-timer-hyperv-rtc.args index 5a7b6df7eb..f40f1d5588 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata= /clock-utc.args index 4ed1fe72a5..b3adaac533 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2arg= vdata/clock-variable.args index 061697f057..fc9255beb8 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxm= l2argvdata/console-virtio-many.args index 8196f3039b..df4adeaa50 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtconsole","chardev":"charconsole3","id":"console3"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2arg= vdata/console-virtio.args index 12d846bc3d..a81368bd48 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 8ea076ce51..8f676e58fe 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -51,4 +51,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr/.co= nfig \ -device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad= ":0,"audiodev":"audio1"}' \ -device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","b= us":"usb.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2= argvdata/cpu-Haswell-noTSX.args index ee856da83c..32d8054f4e 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvda= ta/cpu-Haswell.args index 3a19cd7e7d..9c732ad4bb 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvd= ata/cpu-Haswell2.args index 7989bb54f1..51e6cf99bf 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvd= ata/cpu-Haswell3.args index 9a198712ee..ede85300c3 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2= argvdata/cpu-cache-disable.args index 341e2c9aff..b920ad022f 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml= 2argvdata/cpu-cache-disable3.args index 1ea6896a8e..557d9c5ac4 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemux= ml2argvdata/cpu-cache-emulate-l3.args index 603f0ea0a2..f7f9403885 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemu= xml2argvdata/cpu-cache-passthrough.args index 1c7325e32a..e3911bea27 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qem= uxml2argvdata/cpu-check-default-none.args index 5b75657eea..67f11be4bf 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qe= muxml2argvdata/cpu-check-default-none2.args index 6348b15672..e01ac72a16 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/= qemuxml2argvdata/cpu-check-default-partial.args index 0416205d82..90712d2eb7 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests= /qemuxml2argvdata/cpu-check-default-partial2.args index d43bc435e1..45c130849d 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2arg= vdata/cpu-check-none.args index d43bc435e1..45c130849d 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdat= a/cpu-exact1.args index 45e15c91ce..17e0ea1a1f 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemu= xml2argvdata/cpu-exact2-nofallback.args index acae725f2e..3c2a166ecd 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdat= a/cpu-exact2.args index acae725f2e..3c2a166ecd 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvd= ata/cpu-fallback.args index d6e2611cde..76961da609 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2= argvdata/cpu-host-kvmclock.args index e8f4f4d5c5..9f3f3dc7a4 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml= 2argvdata/cpu-host-model-cmt.args index 634a06e34a..499d485600 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemu= xml2argvdata/cpu-host-model-vendor.args index d39564cb89..b3cf8c4aa9 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/te= sts/qemuxml2argvdata/cpu-host-passthrough-features.args index 6cce7f9aee..4cd3c83700 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemux= ml2argvdata/cpu-host-passthrough.args index 5b75657eea..67f11be4bf 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvd= ata/cpu-kvmclock.args index b2c18d17ba..b25e51d580 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvd= ata/cpu-minimum1.args index 0416205d82..90712d2eb7 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvd= ata/cpu-minimum2.args index 99ffab88d7..41b0e1fd91 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qe= muxml2argvdata/cpu-no-removed-features.args index d43bc435e1..45c130849d 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2= argvdata/cpu-numa-disjoint.args index cb8581257a..6f13b9de0f 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml= 2argvdata/cpu-numa-memshared.args index 1e07b930fe..4132bee971 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests= /qemuxml2argvdata/cpu-numa-no-memory-element.args index ca93709c64..b28ad67612 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata= /cpu-numa1.args index ca93709c64..b28ad67612 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata= /cpu-numa2.args index ca93709c64..b28ad67612 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemu= xml2argvdata/cpu-phys-bits-emulate.args index b85ccebfc0..96efce2507 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qem= uxml2argvdata/cpu-phys-bits-emulate2.args index 0b08d7e145..e8a3bf58f0 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/= qemuxml2argvdata/cpu-phys-bits-passthrough.args index b85ce46a20..a3b9ddea01 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvda= ta/cpu-strict1.args index 65749b9611..ef44967621 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argv= data/cpu-topology1.args index ee3ea3cb75..83f1a45c9b 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argv= data/cpu-topology2.args index 64372f05d7..3ebc709634 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argv= data/cpu-topology3.args index ee3ea3cb75..83f1a45c9b 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2= argvdata/cpu-tsc-frequency.args index 33ec51af4b..08252d7a74 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemu= xml2argvdata/default-kvm-host-arch.args index 1554f13ba0..fab4e53bb3 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qem= uxml2argvdata/default-qemu-host-arch.args index a88774dc86..900da74fa5 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu-ho= st/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qe= muxml2argvdata/graphics-sdl-fullscreen.args index cdec35daf7..7f73f2e364 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -34,4 +34,5 @@ DISPLAY=3D:0.1 \ -full-screen \ -display sdl \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvd= ata/graphics-sdl.args index 1ac0995a24..f771948f4a 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -33,4 +33,5 @@ DISPLAY=3D:0.1 \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -display sdl \ -device '{"driver":"VGA","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qe= muxml2argvdata/hostdev-mdev-precreated.args index 97424f3c56..b4a0092493 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"off","bus":"pci.0","= addr":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/t= ests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index 879deef04b..30c52bf3a5 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -device '{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev2","bus":= "pci.0","addr":"0x3"}' \ -device '{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev3","bus":= "pci.0","addr":"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/= qemuxml2argvdata/hostdev-pci-multifunction.args index 823112a276..073db68293 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -36,4 +36,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev5","bus":= "pci.0","addr":"0x7"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev6","bus":= "pci.0","addr":"0x8"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x9"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index 62e24de6e0..f8d4c6db21 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd= ":"3","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/q= emuxml2argvdata/hostdev-vfio-multidomain.args index 09b213afda..643d54f7cf 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0021:de:1f.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvd= ata/hostdev-vfio.args index 3d436c046d..e722f6e0ff 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvd= ata/hotplug-base.args index 3c2703d735..24f2e79228 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-hotplug= /.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x4"}' \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxm= l2argvdata/input-usbmouse-addr.args index 6b1c787d4b..1c4e751547 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2arg= vdata/input-usbmouse.args index 77af8a128f..b6eab126b7 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2ar= gvdata/input-usbtablet.args index 9182426b07..34b982c024 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argv= data/kvm-pit-delay.args index 871a066e37..bc517cbb79 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2ar= gvdata/kvm-pit-discard.args index ffaed42bd9..c926618742 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/= kvmclock.args index 84232c96b3..217527c731 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2a= rgvdata/machine-aliases1.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2a= rgvdata/machine-aliases2.args index 2fdb43c621..f785eb07a3 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2a= rgvdata/machine-core-off.args index 4ed1fe72a5..b3adaac533 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2ar= gvdata/machine-core-on.args index 30a6ebf0b5..19caffadfb 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml= 2argvdata/machine-vmport-opt.args index 7e309f5d09..d77df81b08 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxm= l2argvdata/memory-hotplug-dimm.args index 18c0316775..c163442363 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2arg= vdata/memory-hotplug.args index 1e38bb58c2..78d5307ee6 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2= argvdata/memtune-unlimited.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/m= emtune.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/m= inimal.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata= /misc-acpi.args index 01bd000e48..ac30ed91a4 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2ar= gvdata/misc-disable-s3.args index 6323b763ed..e229371a48 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemu= xml2argvdata/misc-disable-suspends.args index c91c97b023..515beb8dec 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2arg= vdata/misc-enable-s4.args index af5ece2df0..f8b2873c2d 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata= /misc-uuid.args index 01bd000e48..ac30ed91a4 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/q= emuxml2argvdata/multifunction-pci-device.args index e12a9a7441..49dad593a3 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvd= ata/nosharepages.args index cde8d709d3..7bcc71d565 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/te= sts/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 955b0233f4..2e0c83d169 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-= placement.args index 955b0233f4..2e0c83d169 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/= tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 755c6d7ba1..9f71a0150c 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/te= sts/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 955b0233f4..2e0c83d169 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/num= ad.args index 955b0233f4..2e0c83d169 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2a= rgvdata/pci-autoadd-addr.args index 7772f468f2..5f7f1b458e 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -40,4 +40,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","add= r":"0x6"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2ar= gvdata/pci-autoadd-idx.args index e8ea698e9c..eacf56c25b 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x6"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2= argvdata/pci-autofill-addr.args index 6f226370ec..bf07b1174a 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemu= xml2argvdata/pci-bridge-many-disks.args index c84f98e9e8..d3e90b5309 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -346,4 +346,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-lots-= of-disks/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x10","drive":"l= ibvirt-1-format","id":"virtio-disk679"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index db93c647aa..aafb60b7c0 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -100,4 +100,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -k en-us \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2a= rgvdata/pci-expander-bus.args index 85634f4377..8bf472d386 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -97,4 +97,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expande= r-test/.config \ -device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:= 00:7e:6e:c8","bus":"pci.1","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/= pci-many.args index 0f69ce9f5a..d64aa49985 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -117,4 +117,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2a= rgvdata/pci-rom-disabled.args index ea34132861..dbc18d1f38 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","romfile":""}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/p= ci-rom.args index e3bf06a1ae..18e3290740 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -38,4 +38,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":= "pci.0","addr":"0x4","rombar":0}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.6","id":"hostdev1","bus":= "pci.0","addr":"0x5","rombar":1,"romfile":"/etc/fake/bootrom.bin"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index acddaea4f5..64b7d5d7df 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -134,4 +134,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-= expander-bus-te/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-generic.args index 750b132e7a..86307c9bd8 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 5e838ba2f4..271bfab93c 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index c15270294a..cee54df33c 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata= /pcie-root.args index afc072da93..656cd80665 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index 77057d94d5..3a346a1697 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -43,4 +43,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index f9a4dcc051..c4670c674e 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv= data/pcihole64-q35.args index 18d584e895..624cfc9264 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata= /pcihole64.args index c3821eed8f..127e76b680 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2ar= gvdata/pmu-feature-off.args index 869560c07f..b711a3b79f 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvda= ta/pmu-feature.args index 01b75e94fd..e0fa5a290e 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemu= xml2argvdata/q35-pci-force-address.args index d8f0d2e282..33171a4d87 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -36,4 +36,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad= ":0,"audiodev":"audio1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg= vdata/q35-usb2-multi.args index 23cc5aa775..f5d39447dc 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -47,4 +47,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a= rgvdata/q35-usb2-reorder.args index e6c0c1e20e..6641391bae 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -47,4 +47,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/= q35-usb2.args index 51d50f7673..a5a6aa300b 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index b778f874d6..bd37012eb0 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvda= ta/qemu-ns-alt.args index b62ad8f47f..1eb331073c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -35,4 +35,5 @@ BAR=3D'' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -unknown parameter \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns0.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns1.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxm= l2argvdata/qemu-ns-commandline.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/t= ests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests= /qemuxml2argvdata/qemu-ns-domain-commandline.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml= 2argvdata/qemu-ns-domain-ns0.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2arg= vdata/qemu-ns-no-env.args index 2dc4c55ca3..f8733cb900 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -unknown parameter \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qe= muxml2argvdata/reboot-timeout-disabled.args index 00eb1321eb..da669f6ee1 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot reboot-timeout=3D-1,strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qem= uxml2argvdata/reboot-timeout-enabled.args index a7c63c3bd0..d26bde8fa3 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot reboot-timeout=3D128,strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2= argvdata/seclabel-dac-none.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests= /qemuxml2argvdata/seclabel-dynamic-baselabel.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests= /qemuxml2argvdata/seclabel-dynamic-labelskip.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/= qemuxml2argvdata/seclabel-dynamic-override.args index 20820924bc..682aa14b67 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/q= emuxml2argvdata/seclabel-dynamic-relabel.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2a= rgvdata/seclabel-dynamic.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argv= data/seclabel-none.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/= qemuxml2argvdata/seclabel-static-labelskip.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qe= muxml2argvdata/seclabel-static-relabel.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2ar= gvdata/seclabel-static.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemux= ml2argvdata/smartcard-controller.args index a03929ba37..779d5a424c 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"sma= rtcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.ar= gs b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index 740c59caaf..eb7a13cdfe 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1","cert2":"cert2","cert3":"cert3","db":"/tmp/foo","id":"smartcard0","b= us":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/test= s/qemuxml2argvdata/smartcard-host-certificates.args index 7d04cff1a6..f3b6c50f76 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb","id":"smartcar= d0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2arg= vdata/smartcard-host.args index a03929ba37..779d5a424c 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"sma= rtcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/t= ests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 9ce691d6d7..016be5321e 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/= qemuxml2argvdata/smartcard-passthrough-tcp.args index 6bda6a08c7..4acd0204f1 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/sm= bios.args index 100725e572..8450149b25 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/= smp-dies.args index 7cc3538ddf..4601db602e 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.a= rgs index 8933b62a9f..fa91ee5721 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests= /qemuxml2argvdata/usb-controller-default-q35.args index f4be0cbc26..23bdedef6c 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/test= s/qemuxml2argvdata/usb-controller-explicit-q35.args index 39e88ccaa5..5c6eed22d1 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/q= emuxml2argvdata/usb-controller-qemu-xhci.args index fe331a489c..852574e17f 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"qemu-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","add= r":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxm= l2argvdata/usb-controller-xhci.args index fd6fc0a10e..f3eac45c57 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","= addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2arg= vdata/usb-controller.args index 9c60eb502f..c8de26e4ee 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qem= uxml2argvdata/usb-hub-autoadd-deluxe.args index d29e39bb77..b3d9be2409 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -48,4 +48,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-tablet","id":"input15","bus":"usb.0","port":"2.1"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2ar= gvdata/usb-hub-autoadd.args index f0ffc1595d..d419faa726 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.3"}'= \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/u= sb-hub.args index 4a0b2513a8..02ec29b63e 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxm= l2argvdata/usb-ich9-autoassign.args index c444e4c940..59d8430a40 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml= 2argvdata/usb-ich9-companion.args index 828d938af8..b935a43647 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml= 2argvdata/usb-ich9-ehci-addr.args index 7f605a1d9c..68b512e94b 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -40,4 +40,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.0","addr":"0x4.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml= 2argvdata/usb-long-port-path.args index 40184c3919..242a39f6cd 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-hub","id":"hub3","bus":"usb.0","port":"1.1.1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/= usb-none.args index 721417ae35..ba1e6d550f 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemux= ml2argvdata/usb-piix3-controller.args index 55c20b4d59..b2d71ccb60 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxm= l2argvdata/usb-port-autoassign.args index b92a30aea1..35bddfc442 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2a= rgvdata/usb-port-missing.args index 3022160377..f849fa2062 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata= /usb-ports.args index e2d3eb7be9..70b15ef466 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2.2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2arg= vdata/usb-redir-boot.args index 04f18dffd5..edbd32dd09 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","booti= ndex":2,"bus":"usb.0","port":"4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/q= emuxml2argvdata/usb-redir-filter-version.args index b79daf5023..b1ac8d3980 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filte= r":"0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0",= "bus":"usb.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2a= rgvdata/usb-redir-filter.args index d231b28901..714a983c62 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filte= r":"0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0","bus":"usb.0","port":"5"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata= /usb-redir.args index c304c11194..3fa6875a39 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxm= l2argvdata/usb-xhci-autoassign.args index abc1b9c0d8..14e62871ca 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}' \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata= /usb1-usb2.args index 9f6a5d67f5..cf84b7279e 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","b= us":"usb2.0","port":"1"}' \ -device '{"driver":"usb-host","hostbus":14,"hostaddr":7,"id":"hostdev1","b= us":"usb2.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/q= emuxml2argvdata/virtio-input-passthrough.args index 42c1447fc6..495d14b4b7 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvd= ata/virtio-input.args index d41b6ebb15..273c475905 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-tablet-pci","id":"input2","bus":"pci.0","addr":= "0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml= 2argvdata/virtio-rng-default.args index c9ef5e5c82..243716bcc1 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x7"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2arg= vdata/virtio-rng-egd.args index e35a93caa5..fc6ecb1118 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev socket,id=3Dcharrng0,host=3D1.2.3.4,port=3D1234 \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxm= l2argvdata/virtio-rng-multiple.args index 89e39c777e..30a0ecd92c 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev socket,id=3Dcharrng1,host=3D1.2.3.4,port=3D1234 \ -object '{"qom-type":"rng-egd","id":"objrng1","chardev":"charrng1"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci= .0","addr":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2= argvdata/virtio-rng-random.args index 95b34b6810..7cacfedce5 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes= ":123,"period":1234,"bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdat= a/vmcoreinfo.args index 4a27a21a15..040feca15f 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -device '{"driver":"vmcoreinfo"}' \ +-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 04c7814dce..00cde55b5a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -861,6 +861,7 @@ mymain(void) QEMU_CAPS_DEVICE_JSON, \ QEMU_CAPS_OBJECT_JSON, \ QEMU_CAPS_NETDEV_JSON, \ + QEMU_CAPS_SECCOMP_SANDBOX, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -870,6 +871,7 @@ mymain(void) QEMU_CAPS_DEVICE_JSON, \ QEMU_CAPS_OBJECT_JSON, \ QEMU_CAPS_NETDEV_JSON, \ + QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_LAST, \ ARG_END) --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 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=1693923972; cv=none; d=zohomail.com; s=zohoarc; b=DpvXseUDq63TCD5wSyn45fFfp+DilSLJTPjpBHhzyvPurVjq8mJF7UK/y2BXdv6S0RVlUubaUmbhi+NY/YIlgawdTgDfpOsn116jCayd5bIztvyWpXtOs2djHQgkdVLCrQ0jZ34T7z4iY805i4NXu/n879XWf3PXxSGor3TPRzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923972; 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=LUi87mC7fi+4k5+vHNQhJnOs+KH1nVupz8RhHugZlmM=; b=c6HGnaorY4gfny8knzv8yckFvkDcYDHPr0GDBQwy7OIsm7NjKrdv2Z+Sd9kyu1POz33qvDSdIkDv+f5j/p7Xz4p9L+2CfkL8FW9QxWwWXqfZHwT7qPYBiH+2DhOe6cxbAUCdWNLlwUSxwLDwJXGBrLJ/Qb1nEJU5qI4mRGyQzgY= 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 1693923972330311.5861328075906; Tue, 5 Sep 2023 07:26:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-32-taoUm8TmNAegQx5IKlOPqA-1; Tue, 05 Sep 2023 10:26:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB990946314; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1AC52026D4B; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 87F3C1946597; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4568819465A2 for ; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 345821121318; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B233D1121314 for ; Tue, 5 Sep 2023 14:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923971; 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=LUi87mC7fi+4k5+vHNQhJnOs+KH1nVupz8RhHugZlmM=; b=aw/HuZg3haOPTYewihUG5somEC6aKiTmr/fq7s0eQyV9rZBGVGbspXShnLJj0gfqbTAKud Q7eTG25Dcf+tgV2qwmNbhHWoLr7F+zu4SEaa7Ymf5uLin07506Gj8Plgxe6oQbS+ZJESBu aJhfhqO5u6IsGS4GVIW6YXFiSQNEGlk= X-MC-Unique: taoUm8TmNAegQx5IKlOPqA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 26/51] qemuxml2argvtest: Consolidate tests for usb controllers Date: Tue, 5 Sep 2023 16:23:53 +0200 Message-ID: <8bc272c5f7e686bbd1983a383326c8cb64b75fb2.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1693923973389100005 Content-Type: text/plain; charset="utf-8" Move all controller related tests together and consolidate naming of the test cases. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...gs =3D> usb-controller-ich9-autoassign.args} | 0 ...xml =3D> usb-controller-ich9-autoassign.xml} | 0 ...rgs =3D> usb-controller-ich9-companion.args} | 0 ....xml =3D> usb-controller-ich9-companion.xml} | 0 ...rgs =3D> usb-controller-ich9-ehci-addr.args} | 0 ....xml =3D> usb-controller-ich9-ehci-addr.xml} | 0 ...r =3D> usb-controller-ich9-no-companion.err} | 0 ...l =3D> usb-controller-ich9-no-companion.xml} | 0 ...troller.args =3D> usb-controller-piix3.args} | 0 ...ontroller.xml =3D> usb-controller-piix3.xml} | 0 tests/qemuxml2argvtest.c | 89 ++++++++++--------- ...ntroller-ich9-ehci-addr.x86_64-latest.xml} | 0 ...=3D> usb-controller-piix3.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 4 +- 14 files changed, 48 insertions(+), 45 deletions(-) rename tests/qemuxml2argvdata/{usb-ich9-autoassign.args =3D> usb-controlle= r-ich9-autoassign.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-autoassign.xml =3D> usb-controller= -ich9-autoassign.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-companion.args =3D> usb-controller= -ich9-companion.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-companion.xml =3D> usb-controller-= ich9-companion.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.args =3D> usb-controller= -ich9-ehci-addr.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.xml =3D> usb-controller-= ich9-ehci-addr.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.err =3D> usb-controll= er-ich9-no-companion.err} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.xml =3D> usb-controll= er-ich9-no-companion.xml} (100%) rename tests/qemuxml2argvdata/{usb-piix3-controller.args =3D> usb-controll= er-piix3.args} (100%) rename tests/qemuxml2argvdata/{usb-piix3-controller.xml =3D> usb-controlle= r-piix3.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.x86_64-latest.xml =3D>= usb-controller-ich9-ehci-addr.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml = =3D> usb-controller-piix3.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxm= l2argvdata/usb-controller-ich9-autoassign.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-autoassign.args rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml b/tests/qemuxml= 2argvdata/usb-controller-ich9-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-autoassign.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml= 2argvdata/usb-controller-ich9-companion.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-companion.args rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.args diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml b/tests/qemuxml2= argvdata/usb-controller-ich9-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-companion.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml= 2argvdata/usb-controller-ich9-ehci-addr.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.args rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2= argvdata/usb-controller-ich9-ehci-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.err b/tests/qemux= ml2argvdata/usb-controller-ich9-no-companion.err similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-no-companion.err rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml b/tests/qemux= ml2argvdata/usb-controller-ich9-no-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-no-companion.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemux= ml2argvdata/usb-controller-piix3.args similarity index 100% rename from tests/qemuxml2argvdata/usb-piix3-controller.args rename to tests/qemuxml2argvdata/usb-controller-piix3.args diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml b/tests/qemuxm= l2argvdata/usb-controller-piix3.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-piix3-controller.xml rename to tests/qemuxml2argvdata/usb-controller-piix3.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 00cde55b5a..6c10af0ec2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1500,19 +1500,59 @@ mymain(void) DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_NOCAPS("usb-none"); + DO_TEST_NOCAPS("usb-controller"); - DO_TEST("usb-piix3-controller", + DO_TEST("usb-controller-piix3", QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-ich9-ehci-addr", + DO_TEST("usb-controller-ich9-ehci-addr", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_NOCAPS("input-usbmouse-addr"); - DO_TEST("usb-ich9-companion", + DO_TEST("usb-controller-ich9-companion", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_PARSE_ERROR("usb-ich9-no-companion", + DO_TEST_PARSE_ERROR("usb-controller-ich9-no-companion", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-ich9-autoassign", + DO_TEST("usb-controller-ich9-autoassign", QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_HUB); + DO_TEST("usb1-usb2", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_USB_HUB, + QEMU_CAPS_ICH9_USB_EHCI1); + + DO_TEST("usb-controller-default-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_FAILURE("usb-controller-default-unavailable-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST("usb-controller-explicit-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI); + DO_TEST("usb-controller-xhci", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST("usb-xhci-autoassign", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI, + QEMU_CAPS_USB_HUB); + DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); + DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable"); + DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", + QEMU_CAPS_DEVICE_QEMU_XHCI); + + DO_TEST_NOCAPS("input-usbmouse-addr"); DO_TEST("usb-hub", QEMU_CAPS_USB_HUB); DO_TEST("usb-hub-autoadd", @@ -1558,47 +1598,10 @@ mymain(void) QEMU_CAPS_USB_REDIR_FILTER, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST_CAPS_LATEST("usb-redir-unix"); - DO_TEST("usb1-usb2", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_NOCAPS("usb-none"); DO_TEST_PARSE_ERROR_NOCAPS("usb-none-other"); DO_TEST_PARSE_ERROR("usb-none-hub", QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR_NOCAPS("usb-none-usbtablet"); - DO_TEST("usb-controller-default-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-default-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-controller-explicit-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-controller-xhci", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-xhci-autoassign", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); - DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable"); - DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", - QEMU_CAPS_DEVICE_QEMU_XHCI); DO_TEST_NOCAPS("smbios"); DO_TEST_PARSE_ERROR_NOCAPS("smbios-date"); diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml = b/tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-lat= est.xml diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xm= l b/tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 87bd6389a6..a958daf56d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -483,7 +483,8 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-none"); DO_TEST_CAPS_LATEST("usb-controller"); - DO_TEST_CAPS_LATEST("usb-piix3-controller"); + DO_TEST_CAPS_LATEST("usb-controller-piix3"); + DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_LATEST("usb-controller-explicit-q35"); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); @@ -573,7 +574,6 @@ mymain(void) DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune"); DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement"); DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset"); - DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_LATEST("tpm-passthrough"); DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); --=20 2.41.0 From nobody Tue May 14 22:22:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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=1693924043; cv=none; d=zohomail.com; s=zohoarc; b=ng1V0IC30aCq7C9EK1kZXQJYUJBjJIh/qgVU4Q35iM1vk3GnB+5hb6L2IkbnrlqowZiWGQ0mxWEND6ocmJkhzUeufkXXKvQrwEFJg0HplUfSBxXi3sLxdCdmh6fTc8efKD8RR9hNeC+fv04n0NFiHt3vFhO6HY7pZnh+CuhZ5Nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924043; 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=c/IHV1AouZOwXPJs2RcGmPITVMRBZlOt8lSbmBV55ME=; b=WcuEwSQgmOTyTARczjJhPoohebrCloQEQ+s8iMJ8yvPK1Iqdu3/M4ofH6XGAeFoMM/NIei7P04u6tGpo4VaUMcKZ6tTPnbidw8TdZ2gBj5pLpBpdRFxAa3JBOQgNQS+x8LYpnImsVSoywBGMR6FAQ5pWc0c0chx2OKuTDVFcaBk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693924043920747.3120057313105; Tue, 5 Sep 2023 07:27:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-cO6QqXZ6O2aq1hYYN1bAeA-1; Tue, 05 Sep 2023 10:26:00 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AB9E7927A0C; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93A4C46F523; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 745FE19465B3; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DDFDF1946589 for ; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B188E1121314; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEB441121319 for ; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) X-MC-Unique: cO6QqXZ6O2aq1hYYN1bAeA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 27/51] qemuxml2argvtest: Add tests for auto-added USB controllers Date: Tue, 5 Sep 2023 16:23:54 +0200 Message-ID: <567a98ad1088976f25bb9373d1d498cdb868eebc.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1693924045896100003 Content-Type: text/plain; charset="utf-8" There are per-machine type variations on which usb controller will be picked on an x86_64 machine. Add test cases where a USB controller is completely missing to cover all 3 cases ('isapc', 'pc', 'q35') when an USB controller is not explicitly requested by the user. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...troller-implicit-i440fx.x86_64-latest.args | 32 ++++++++++++++ .../usb-controller-implicit-i440fx.xml | 15 +++++++ ...ntroller-implicit-isapc.x86_64-latest.args | 32 ++++++++++++++ .../usb-controller-implicit-isapc.xml | 15 +++++++ ...controller-implicit-q35.x86_64-latest.args | 36 ++++++++++++++++ .../usb-controller-implicit-q35.xml | 15 +++++++ tests/qemuxml2argvtest.c | 3 ++ ...ntroller-implicit-i440fx.x86_64-latest.xml | 29 +++++++++++++ ...ontroller-implicit-isapc.x86_64-latest.xml | 25 +++++++++++ ...-controller-implicit-q35.x86_64-latest.xml | 43 +++++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 11 files changed, 248 insertions(+) create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x= 86_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x= ml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.x8= 6_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_= 64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx= .x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.= x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x8= 6_64-latest.xml diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-l= atest.args b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-l= atest.args new file mode 100644 index 0000000000..e4be4266bb --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.a= rgs @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml b/te= sts/qemuxml2argvdata/usb-controller-implicit-i440fx.xml new file mode 100644 index 0000000000..fc48ea3cde --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml @@ -0,0 +1,15 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-la= test.args b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-lat= est.args new file mode 100644 index 0000000000..62dc26ee8b --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.ar= gs @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine isapc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acp= i=3Doff \ +-accel tcg \ +-cpu 486 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-boot strict=3Don \ +-usb \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml b/tes= ts/qemuxml2argvdata/usb-controller-implicit-isapc.xml new file mode 100644 index 0000000000..21be5b8cdf --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml @@ -0,0 +1,15 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-late= st.args b/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.= args new file mode 100644 index 0000000000..9a660060a9 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-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-shutdown \ +-boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml b/tests= /qemuxml2argvdata/usb-controller-implicit-q35.xml new file mode 100644 index 0000000000..ddeeadca97 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml @@ -0,0 +1,15 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6c10af0ec2..45df4f4bae 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1500,6 +1500,9 @@ mymain(void) DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-q35"); DO_TEST_NOCAPS("usb-none"); DO_TEST_NOCAPS("usb-controller"); diff --git a/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64= -latest.xml b/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_6= 4-latest.xml new file mode 100644 index 0000000000..89631180ac --- /dev/null +++ b/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest= .xml @@ -0,0 +1,29 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + +