From nobody Thu Apr 25 16:23:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1617041058; cv=none; d=zohomail.com; s=zohoarc; b=H4O+d9D3Y2PitFBk3Xnz9Kf2XIKDde1IEWxVkJBrhxqhtsGKpg2H8VrxEwXXlPqgIUrOwPoxQ6zmYUCbt+hL+pY+b+gsEM67oUSPpmNwv1F3ZlcaNLnSVH1roEOXdwrBfD5OJF/o6wb39Ml3YPYwOJNgvkFTSyQx4GfR3C7cY8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617041058; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ZyvyZa+RUGv9VncHMtALQ/srg8oRCK1A7Oa9zI4/prk=; b=cJWHbMADfGjEiZkKspS4A+mMXV1LD6P4tkQNZ17W44E6X1qGBgbHMudF5kJdpnAoYxDCDFMz+Af4LBJReXyGdZRelS5J4Xt5upFUxLxYTwoGbDI/k8u/PRz1k0iMrupzJlyB81F+HtcVdiiwOUh7CQ/P5vlRZADBiV2+u633UdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1617041058490464.957684713503; Mon, 29 Mar 2021 11:04:18 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-165-bzy-Y7WdOA2oIDxlibSIKw-1; Mon, 29 Mar 2021 14:04:13 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD9F0501FB; Mon, 29 Mar 2021 18:04:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 030D55D6AB; Mon, 29 Mar 2021 18:04:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CCD704BB7C; Mon, 29 Mar 2021 18:04:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12TI3xvY000816 for ; Mon, 29 Mar 2021 14:03:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id A047C60C03; Mon, 29 Mar 2021 18:03:59 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-228.ams2.redhat.com [10.36.114.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 734C060C5B; Mon, 29 Mar 2021 18:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617041057; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZyvyZa+RUGv9VncHMtALQ/srg8oRCK1A7Oa9zI4/prk=; b=Rzr8Xe4KwtqW7t6m3U84jzfonCrfcqdxQGRVdKh6JBxO/Gsu6B40moByOeyjRuI/xN8r3Z jc0n1R+9jvKK7xHU5OVK2MdbzxByzV0YT8eLKIgBvAIgOk8owHBhFRgfI1Cssgn90LMXVF DwtvpWhb4bN3/RaxgTSI7XkbtMRkpCY= X-MC-Unique: bzy-Y7WdOA2oIDxlibSIKw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] conf: remove duplicated firmware type attribute Date: Mon, 29 Mar 2021 19:03:52 +0100 Message-Id: <20210329180352.101829-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Pavel Hrdina X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The repeats the firmware attribute twice. This has no functional benefit, as evidenced by fact that we use a single struct field to store both attributes, while needlessly introducing an error scenario. The XML can just be simplified to: which also means that we don't need to emit the empty element for all existing configs too. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/formatdomain.rst | 8 ---- docs/schemas/domaincommon.rng | 10 +--- src/conf/domain_conf.c | 48 ++++++------------- .../os-firmware-efi-no-enrolled-keys.xml | 2 +- .../os-firmware-invalid-type.xml | 28 ----------- tests/qemuxml2argvtest.c | 1 - ...aarch64-os-firmware-efi.aarch64-latest.xml | 1 - .../os-firmware-bios.x86_64-latest.xml | 1 - .../os-firmware-efi-secboot.x86_64-latest.xml | 1 - .../os-firmware-efi.x86_64-latest.xml | 1 - tests/vmx2xmldata/vmx2xml-firmware-efi.xml | 1 - 11 files changed, 18 insertions(+), 84 deletions(-) delete mode 100644 tests/qemuxml2argvdata/os-firmware-invalid-type.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 9392c80113..741130bf21 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -158,14 +158,6 @@ harddisk, cdrom, network) determining where to obtain/= find the boot image. ``firmware`` :since:`Since 7.2.0 QEMU/KVM only` =20 - When used together with ``firmware`` attribute of ``os`` element the ``= type`` - attribute must have the same value. - - List of mandatory attributes: - - - ``type`` (accepted values are ``bios`` and ``efi``) same as the ``fir= mware`` - attribute of ``os`` element. - When using firmware auto-selection there are different features enabled= in the firmwares. The list of features can be used to limit what firmware = should be automatically selected for the VM. The list of features can be speci= fied diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1dbfc68f18..f5ced5b7a2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -278,13 +278,7 @@ - - - bios - efi - - - + @@ -296,7 +290,7 @@ - + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b0eba9f7bd..d050a519c6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19590,31 +19590,21 @@ virDomainDefParseBootFirmwareOptions(virDomainDef= Ptr def, xmlXPathContextPtr ctxt) { g_autofree char *firmware =3D virXPathString("string(./os/@firmware)",= ctxt); - g_autofree char *type =3D virXPathString("string(./os/firmware/@type)"= , ctxt); g_autofree xmlNodePtr *nodes =3D NULL; g_autofree int *features =3D NULL; int fw =3D 0; int n =3D 0; size_t i; =20 - if (!firmware && !type) + if (!firmware) return 0; =20 - if (firmware && type && STRNEQ(firmware, type)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("firmware attribute and firmware type has to be t= he same")); - return -1; - } - - if (!type) - type =3D g_steal_pointer(&firmware); - - fw =3D virDomainOsDefFirmwareTypeFromString(type); + fw =3D virDomainOsDefFirmwareTypeFromString(firmware); =20 if (fw <=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown firmware value %s"), - type); + firmware); return -1; } =20 @@ -29491,30 +29481,22 @@ virDomainDefFormatInternalSetRootName(virDomainDe= fPtr def, virBufferAsprintf(buf, ">%s\n", virDomainOSTypeToString(def->os.type)); =20 - if (def->os.firmware) { - virBufferAsprintf(buf, "os.firmw= are)); - - if (def->os.firmwareFeatures) { - virBufferAddLit(buf, ">\n"); - - virBufferAdjustIndent(buf, 2); + if (def->os.firmwareFeatures) { + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); =20 - for (i =3D 0; i < VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_LAST; i++= ) { - if (def->os.firmwareFeatures[i] =3D=3D VIR_TRISTATE_BOOL_A= BSENT) - continue; + for (i =3D 0; i < VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_LAST; i++) { + if (def->os.firmwareFeatures[i] =3D=3D VIR_TRISTATE_BOOL_ABSEN= T) + continue; =20 - virBufferAsprintf(buf, "\n", - virTristateBoolTypeToString(def->os.firm= wareFeatures[i]), - virDomainOsDefFirmwareFeatureTypeToStrin= g(i)); - } + virBufferAsprintf(buf, "\= n", + virTristateBoolTypeToString(def->os.firmware= Features[i]), + virDomainOsDefFirmwareFeatureTypeToString(i)= ); + } =20 - virBufferAdjustIndent(buf, -2); + virBufferAdjustIndent(buf, -2); =20 - virBufferAddLit(buf, "\n"); - } else { - virBufferAddLit(buf, "/>\n"); - } + virBufferAddLit(buf, "\n"); } =20 virBufferEscapeString(buf, "%s\n", diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml b/= tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml index 8944ce70bb..352908f745 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml +++ b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml @@ -6,7 +6,7 @@ 1 hvm - + diff --git a/tests/qemuxml2argvdata/os-firmware-invalid-type.xml b/tests/qe= muxml2argvdata/os-firmware-invalid-type.xml deleted file mode 100644 index 41360df0f7..0000000000 --- a/tests/qemuxml2argvdata/os-firmware-invalid-type.xml +++ /dev/null @@ -1,28 +0,0 @@ - - fedora - 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 - 1 - - hvm - - - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd - - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 12c2b68fd7..3439f34ef1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3582,7 +3582,6 @@ mymain(void) DO_TEST_CAPS_LATEST("os-firmware-efi"); DO_TEST_CAPS_LATEST("os-firmware-efi-secboot"); DO_TEST_CAPS_LATEST("os-firmware-efi-no-enrolled-keys"); - DO_TEST_CAPS_LATEST_PARSE_ERROR("os-firmware-invalid-type"); DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64"); =20 DO_TEST_CAPS_LATEST("vhost-user-vga"); diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-lates= t.xml b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml index cb4f3ccfce..627e285ae1 100644 --- a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml @@ -6,7 +6,6 @@ 1 hvm - /aarch64.kernel /aarch64.initrd earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/= tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml index 016c5b863f..df6f61421a 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml @@ -6,7 +6,6 @@ 1 hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml index fa5eaa3148..c383546cc6 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml @@ -6,7 +6,6 @@ 1 hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/t= ests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml index 382146c23b..04d57860e7 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml @@ -6,7 +6,6 @@ 1 hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd diff --git a/tests/vmx2xmldata/vmx2xml-firmware-efi.xml b/tests/vmx2xmldata= /vmx2xml-firmware-efi.xml index fa10daf3a6..fee707fe71 100644 --- a/tests/vmx2xmldata/vmx2xml-firmware-efi.xml +++ b/tests/vmx2xmldata/vmx2xml-firmware-efi.xml @@ -6,7 +6,6 @@ 1 hvm - destroy --=20 2.30.2