From nobody Fri Dec 19 16:07:34 2025 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=1658918122; cv=none; d=zohomail.com; s=zohoarc; b=VjuVNYRpPyZ/8jtkZJRBk68xoZZE5YNUqNxnDAdxeByoc/IghniVeiwbnbL/S/W8bzvFaZ0xBGjrsby6/CXqDVftpaclcH3Mw9bI5YB2TBFnls+JfLeHmJDs/O6wJZMaCXCa1qFo8dwT5l8qB+wLiCghBfBYkF5APJKMoSjK5f4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658918122; h=Content-Type:Content-Transfer-Encoding:Cc: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=RPKisTZq4M6hRqLvE6un4vaHtxNcwkCitE4lBiWDwbI=; b=aI8d0P2sz/WT9zHmItnLPMuNfiTQyA0ItgeeuICdCbtjx/XTYGU0GKdo+JqCjkhLJh28MMO0PfXHkvGUaSQ62F5NSV9klCZVZ1S8r5pdV8noDdMs04Q16EqRFcriZE7RPG0VmRGRzmWpZwmdIYEIGoLzu/UhTv8k84Qz15S/W1k= 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 1658918122400164.93255025394262; Wed, 27 Jul 2022 03:35:22 -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-607-TIgtCNd_OWG1QjP91Mn8NA-1; Wed, 27 Jul 2022 06:35:13 -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 D1A5B8039BA; Wed, 27 Jul 2022 10:35:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9CDA90A11; Wed, 27 Jul 2022 10:35:10 +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 8E2601945DB6; Wed, 27 Jul 2022 10:35:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 58B771945D94 for ; Wed, 27 Jul 2022 10:35:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2E3A0C27DB3; Wed, 27 Jul 2022 10:35:08 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 613D1C15D67; Wed, 27 Jul 2022 10:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658918121; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=RPKisTZq4M6hRqLvE6un4vaHtxNcwkCitE4lBiWDwbI=; b=E6y8UDa+WFiIUypf24pioHM2kWxmfA4EI9SZh+meNhWBQxJ/FcRnzmmPznmsTVbNuxiQH6 QlPlamhcTz18oCsM6l3MP8rABkPNdoQht1kJg7G1wFeI05qZ2PFIWbWi9VJ6OriixwZP5c MMxlCvs6i8VjdOUStH1uvJGHpdxcvMw= X-MC-Unique: TIgtCNd_OWG1QjP91Mn8NA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v14 04/15] qemu_command: Separate domain features building into a helper Date: Wed, 27 Jul 2022 12:34:50 +0200 Message-Id: <7ef596aa6e1ee187eb7a2113557d3e2fb3eb53ef.1658917570.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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: , Cc: lin.a.yang@intel.com, jian-feng.ding@intel.com, haibin.huang@intel.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658918123521100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The qemuBuildMachineCommandLine() function is needlessly long. Separate out parts that generate arguments based on domainDef->features[] into qemuAppendDomainFeaturesMachineParam(). Unfortunately, expected outputs for some qemuxml2argvdata cases needed to be updated because the order in which features are generated is changed. But there's no functional change. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 154 ++++++++++-------- ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- ...-auto-efi-loader-secure.x86_64-latest.args | 2 +- ...firmware-auto-efi-nvram.x86_64-latest.args | 2 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 2 +- .../firmware-auto-efi.x86_64-latest.args | 2 +- .../firmware-manual-efi-secure.args | 2 +- .../machine-smm-off.x86_64-latest.args | 2 +- .../machine-smm-on.x86_64-latest.args | 2 +- .../qemuxml2argvdata/machine-vmport-opt.args | 2 +- .../q35-virt-manager-basic.args | 2 +- .../tseg-explicit-size.x86_64-latest.args | 2 +- 12 files changed, 95 insertions(+), 81 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 77f5644b1c..b5f1d7de0a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6956,48 +6956,21 @@ qemuBuildNameCommandLine(virCommand *cmd, return 0; } =20 + static int -qemuBuildMachineCommandLine(virCommand *cmd, - virQEMUDriverConfig *cfg, - const virDomainDef *def, - virQEMUCaps *qemuCaps, - qemuDomainObjPrivate *priv) +qemuAppendDomainFeaturesMachineParam(virBuffer *buf, + const virDomainDef *def, + virQEMUCaps *qemuCaps) { virTristateSwitch vmport =3D def->features[VIR_DOMAIN_FEATURE_VMPORT]; virTristateSwitch smm =3D def->features[VIR_DOMAIN_FEATURE_SMM]; - virCPUDef *cpu =3D def->cpu; - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - size_t i; - - virCommandAddArg(cmd, "-machine"); - virBufferAdd(&buf, def->os.machine, -1); - - /* To avoid the collision of creating USB controllers when calling - * machine->init in QEMU, it needs to set usb=3Doff - */ - virBufferAddLit(&buf, ",usb=3Doff"); =20 if (vmport !=3D VIR_TRISTATE_SWITCH_ABSENT) - virBufferAsprintf(&buf, ",vmport=3D%s", + virBufferAsprintf(buf, ",vmport=3D%s", virTristateSwitchTypeToString(vmport)); =20 - if (smm) - virBufferAsprintf(&buf, ",smm=3D%s", virTristateSwitchTypeToString= (smm)); - - if (def->mem.dump_core) { - virBufferAsprintf(&buf, ",dump-guest-core=3D%s", - virTristateSwitchTypeToString(def->mem.dump_core= )); - } else { - virBufferAsprintf(&buf, ",dump-guest-core=3D%s", - cfg->dumpGuestCore ? "on" : "off"); - } - - if (def->mem.nosharepages) - virBufferAddLit(&buf, ",mem-merge=3Doff"); - - if (def->keywrap && - !qemuAppendKeyWrapMachineParms(&buf, qemuCaps, def->keywrap)) - return -1; + if (smm !=3D VIR_TRISTATE_SWITCH_ABSENT) + virBufferAsprintf(buf, ",smm=3D%s", virTristateSwitchTypeToString(= smm)); =20 if (def->features[VIR_DOMAIN_FEATURE_GIC] =3D=3D VIR_TRISTATE_SWITCH_O= N) { bool hasGICVersionOption =3D virQEMUCapsGet(qemuCaps, @@ -7025,7 +6998,7 @@ qemuBuildMachineCommandLine(virCommand *cmd, return -1; } =20 - virBufferAsprintf(&buf, ",gic-version=3D%s", + virBufferAsprintf(buf, ",gic-version=3D%s", virGICVersionTypeToString(def->gic_version)); break; =20 @@ -7036,38 +7009,13 @@ qemuBuildMachineCommandLine(virCommand *cmd, } } =20 - if (def->iommu) { - switch (def->iommu->model) { - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: - virBufferAddLit(&buf, ",iommu=3Dsmmuv3"); - break; - - case VIR_DOMAIN_IOMMU_MODEL_INTEL: - case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: - /* These IOMMUs are formatted in qemuBuildIOMMUCommandLine */ - break; - - case VIR_DOMAIN_IOMMU_MODEL_LAST: - default: - virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model= ); - return -1; - } - } - - for (i =3D 0; i < def->nmems; i++) { - if (def->mems[i]->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { - virBufferAddLit(&buf, ",nvdimm=3Don"); - break; - } - } - if (def->features[VIR_DOMAIN_FEATURE_IOAPIC] !=3D VIR_DOMAIN_IOAPIC_NO= NE) { switch ((virDomainIOAPIC) def->features[VIR_DOMAIN_FEATURE_IOAPIC]= ) { case VIR_DOMAIN_IOAPIC_QEMU: - virBufferAddLit(&buf, ",kernel_irqchip=3Dsplit"); + virBufferAddLit(buf, ",kernel_irqchip=3Dsplit"); break; case VIR_DOMAIN_IOAPIC_KVM: - virBufferAddLit(&buf, ",kernel_irqchip=3Don"); + virBufferAddLit(buf, ",kernel_irqchip=3Don"); break; case VIR_DOMAIN_IOAPIC_NONE: case VIR_DOMAIN_IOAPIC_LAST: @@ -7078,12 +7026,12 @@ qemuBuildMachineCommandLine(virCommand *cmd, if (def->features[VIR_DOMAIN_FEATURE_HPT] =3D=3D VIR_TRISTATE_SWITCH_O= N) { =20 if (def->hpt_resizing !=3D VIR_DOMAIN_HPT_RESIZING_NONE) { - virBufferAsprintf(&buf, ",resize-hpt=3D%s", + virBufferAsprintf(buf, ",resize-hpt=3D%s", virDomainHPTResizingTypeToString(def->hpt_re= sizing)); } =20 if (def->hpt_maxpagesize > 0) { - virBufferAsprintf(&buf, ",cap-hpt-max-page-size=3D%lluk", + virBufferAsprintf(buf, ",cap-hpt-max-page-size=3D%lluk", def->hpt_maxpagesize); } } @@ -7091,34 +7039,100 @@ qemuBuildMachineCommandLine(virCommand *cmd, if (def->features[VIR_DOMAIN_FEATURE_HTM] !=3D VIR_TRISTATE_SWITCH_ABS= ENT) { const char *str; str =3D virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEA= TURE_HTM]); - virBufferAsprintf(&buf, ",cap-htm=3D%s", str); + virBufferAsprintf(buf, ",cap-htm=3D%s", str); } =20 if (def->features[VIR_DOMAIN_FEATURE_NESTED_HV] !=3D VIR_TRISTATE_SWIT= CH_ABSENT) { const char *str; str =3D virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEA= TURE_NESTED_HV]); - virBufferAsprintf(&buf, ",cap-nested-hv=3D%s", str); + virBufferAsprintf(buf, ",cap-nested-hv=3D%s", str); } =20 if (def->features[VIR_DOMAIN_FEATURE_CCF_ASSIST] !=3D VIR_TRISTATE_SWI= TCH_ABSENT) { const char *str; str =3D virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEA= TURE_CCF_ASSIST]); - virBufferAsprintf(&buf, ",cap-ccf-assist=3D%s", str); + virBufferAsprintf(buf, ",cap-ccf-assist=3D%s", str); } =20 if (def->features[VIR_DOMAIN_FEATURE_CFPC] !=3D VIR_DOMAIN_CFPC_NONE) { const char *str =3D virDomainCFPCTypeToString(def->features[VIR_DO= MAIN_FEATURE_CFPC]); - virBufferAsprintf(&buf, ",cap-cfpc=3D%s", str); + virBufferAsprintf(buf, ",cap-cfpc=3D%s", str); } =20 if (def->features[VIR_DOMAIN_FEATURE_SBBC] !=3D VIR_DOMAIN_SBBC_NONE) { const char *str =3D virDomainSBBCTypeToString(def->features[VIR_DO= MAIN_FEATURE_SBBC]); - virBufferAsprintf(&buf, ",cap-sbbc=3D%s", str); + virBufferAsprintf(buf, ",cap-sbbc=3D%s", str); } =20 if (def->features[VIR_DOMAIN_FEATURE_IBS] !=3D VIR_DOMAIN_IBS_NONE) { const char *str =3D virDomainIBSTypeToString(def->features[VIR_DOM= AIN_FEATURE_IBS]); - virBufferAsprintf(&buf, ",cap-ibs=3D%s", str); + virBufferAsprintf(buf, ",cap-ibs=3D%s", str); + } + + return 0; +} + + +static int +qemuBuildMachineCommandLine(virCommand *cmd, + virQEMUDriverConfig *cfg, + const virDomainDef *def, + virQEMUCaps *qemuCaps, + qemuDomainObjPrivate *priv) +{ + virCPUDef *cpu =3D def->cpu; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + size_t i; + + virCommandAddArg(cmd, "-machine"); + virBufferAdd(&buf, def->os.machine, -1); + + /* To avoid the collision of creating USB controllers when calling + * machine->init in QEMU, it needs to set usb=3Doff + */ + virBufferAddLit(&buf, ",usb=3Doff"); + + if (def->mem.dump_core) { + virBufferAsprintf(&buf, ",dump-guest-core=3D%s", + virTristateSwitchTypeToString(def->mem.dump_core= )); + } else { + virBufferAsprintf(&buf, ",dump-guest-core=3D%s", + cfg->dumpGuestCore ? "on" : "off"); + } + + if (def->mem.nosharepages) + virBufferAddLit(&buf, ",mem-merge=3Doff"); + + if (def->keywrap && + !qemuAppendKeyWrapMachineParms(&buf, qemuCaps, def->keywrap)) + return -1; + + if (qemuAppendDomainFeaturesMachineParam(&buf, def, qemuCaps) < 0) + return -1; + + if (def->iommu) { + switch (def->iommu->model) { + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + virBufferAddLit(&buf, ",iommu=3Dsmmuv3"); + break; + + case VIR_DOMAIN_IOMMU_MODEL_INTEL: + case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: + /* These IOMMUs are formatted in qemuBuildIOMMUCommandLine */ + break; + + case VIR_DOMAIN_IOMMU_MODEL_LAST: + default: + virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model= ); + return -1; + } + } + + for (i =3D 0; i < def->nmems; i++) { + if (def->mems[i]->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { + virBufferAddLit(&buf, ",nvdimm=3Don"); + break; + } } =20 if (cpu && cpu->model && diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64= -latest.args index 7479b05af4..a9391d7921 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,smm=3Don,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64= -latest.args index 7479b05af4..a9391d7921 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,smm=3Don,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args index 1061e93554..9795dedc7c 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/fedora_VARS.fd","node-nam= e":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,smm=3Don,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest= .args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args index 7479b05af4..a9391d7921 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,smm=3Don,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/= tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args index 7479b05af4..a9391d7921 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,smm=3Don,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests= /qemuxml2argvdata/firmware-manual-efi-secure.args index fe0f78599b..1a5f83e489 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,smm=3Don \ -accel tcg \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -drive file=3D/usr/share/OVMF/OVMF_CODE.secboot.fd,if=3Dpflash,format=3Dra= w,unit=3D0,readonly=3Don \ diff --git a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args b/te= sts/qemuxml2argvdata/machine-smm-off.x86_64-latest.args index 46f6a4a70c..83462bec68 100644 --- a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine q35,usb=3Doff,smm=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,smm=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args b/tes= ts/qemuxml2argvdata/machine-smm-on.x86_64-latest.args index 6fde375523..53a03124b4 100644 --- a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backend=3Dpc.= ram \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,smm=3Don,memory-backend=3Dpc.= ram \ -accel tcg \ -cpu qemu64 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml= 2argvdata/machine-vmport-opt.args index c95c972803..769f3d67e5 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,vmport=3Doff \ -accel tcg \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.args index 32875f291c..b4c9715717 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dspice \ -name guest=3Dvirt-manager-basic,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-virt= -manager-basic/master-key.aes \ --machine q35,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,vmport=3Doff \ -accel kvm \ -m 4096 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b= /tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index 3371199be5..e05f295c4f 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-q35-2.10,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram \ +-machine pc-q35-2.10,usb=3Doff,dump-guest-core=3Doff,smm=3Don,memory-backe= nd=3Dpc.ram \ -accel tcg \ -global mch.extended-tseg-mbytes=3D48 \ -cpu qemu64 \ --=20 2.35.1