From nobody Sun May 19 13:34:31 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=1691686257; cv=none; d=zohomail.com; s=zohoarc; b=EtMsVqOCfc2qmDdxwkTpow9Lg24vKUupIxcGm2s3iMCRlB8URCR+3OuRoTq+YjYS3TwIRBYp1MMtaW5xC/PstDopWJk3Ey18xFlumJmrY0nE7WbGDdbnbHLURn/bMKGrv6PGJ0tK4VsBegUP8nm/L6/BSPil5Au3j9Z4xSkjGU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686257; 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=fqTWxoAL3JOHEbYG6ZzDmvC5Is9P8QlKTsQGYJyQjv8=; b=hXA6uMLl0A3uqBeS6XrkGJyYdZXae9scz8MZZXddgqUaiWVk8nWQeeH52prFnVFuvEozYNGPRvNprtYAZwv6zShGZcGbqrCp2Qrquad7WKugOpMNbMZD2GwDql1XdnuevaTIX0EbPl7v14f6JxY8CLLdtJsVcg676+nh8D8Hrhc= 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 1691686257131130.48107478981342; Thu, 10 Aug 2023 09:50:57 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-554-CjK-CZlDPoiq36ZRSo2Mcw-1; Thu, 10 Aug 2023 12:50:53 -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 DA3B41C06938; Thu, 10 Aug 2023 16:50: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 5F7C65CBFF; Thu, 10 Aug 2023 16:50: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 D8CD01946594; Thu, 10 Aug 2023 16:50:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B35F019465B1 for ; Thu, 10 Aug 2023 16:50:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 77D87140E96F; Thu, 10 Aug 2023 16:50:41 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0358A140E96E for ; Thu, 10 Aug 2023 16:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686256; 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=fqTWxoAL3JOHEbYG6ZzDmvC5Is9P8QlKTsQGYJyQjv8=; b=XMiUAW2SEU4YeeoVh/72OYVN+YR0sQYZmyVh0Bbyqc/jnCyG9H4GzouHC0dycNSkpvAU2l UeUfD2LBMpI5WR/zwI99wjXlKBk3MGWGv06SsLh6Z0Fc7UOOJcvyjmzc08Mcps1rI/Xz1o gE8EUgni1mz/mFx5kifs1Fwe935ydFI= X-MC-Unique: CjK-CZlDPoiq36ZRSo2Mcw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 01/21] tests: Use DO_TEST_CAPS_*_ABI_UPDATE() for ppc64 Date: Thu, 10 Aug 2023 18:50:18 +0200 Message-ID: <20230810165038.169700-2-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686258204100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We have a number of tests that can benefit from this macro instead of open-coding it. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...lug-nvdimm-ppc64-abi-update.ppc64-latest.args} | 0 ...lug-ppc64-nonuma-abi-update.ppc64-latest.args} | 0 ...64-usb-controller-qemu-xhci.ppc64-latest.args} | 0 tests/qemuxml2argvtest.c | 15 +++------------ ...plug-nvdimm-ppc64-abi-update.ppc64-latest.xml} | 0 ...plug-ppc64-nonuma-abi-update.ppc64-latest.xml} | 0 tests/qemuxml2xmltest.c | 8 ++------ 7 files changed, 5 insertions(+), 18 deletions(-) rename tests/qemuxml2argvdata/{memory-hotplug-nvdimm-ppc64-abi-update.args= =3D> memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-ppc64-nonuma-abi-update.args= =3D> memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args} (100%) rename tests/qemuxml2argvdata/{ppc64-usb-controller-qemu-xhci.args =3D> pp= c64-usb-controller-qemu-xhci.ppc64-latest.args} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-ppc64-abi-update.xm= l =3D> memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-ppc64-nonuma-abi-update.xm= l =3D> memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.= args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-= latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.a= rgs rename to tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc= 64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.= args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-= latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.a= rgs rename to tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.ppc= 64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args b/t= ests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args rename to tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.ppc64-lates= t.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c44b9bc494..13cc13b043 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2438,10 +2438,7 @@ mymain(void) DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma", "ppc64"); - DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest", - ARG_END); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma-abi-u= pdate", "ppc64"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-access"); DO_TEST_CAPS_VER("memory-hotplug-nvdimm-label", "5.2.0"); @@ -2453,10 +2450,7 @@ mymain(void) DO_TEST_CAPS_VER("memory-hotplug-nvdimm-readonly", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-readonly"); DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-nvdimm-ppc64", "ppc64"); - DO_TEST_FULL("memory-hotplug-nvdimm-ppc64-abi-update", "", - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest", - ARG_END); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-nvdimm-ppc64-abi-u= pdate", "ppc64"); DO_TEST_CAPS_VER("memory-hotplug-virtio-pmem", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem"); @@ -2495,10 +2489,7 @@ mymain(void) =20 DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller-legacy", "ppc64"); - DO_TEST_FULL("ppc64-usb-controller-qemu-xhci", "", - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest", - ARG_END); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-usb-controller-qemu-xhci", = "ppc64"); =20 DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpmproxy-double", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpm-double", "ppc64"); diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-updat= e.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc= 64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update= .xml rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.p= pc64-latest.xml diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-updat= e.xml b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.ppc= 64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update= .xml rename to tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.p= pc64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5d5ab4cabe..b964d22d02 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -995,9 +995,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-usb-controller", "aarch64"); =20 DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma", "ppc64"); - DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", WHEN_BOTH, - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest", ARG_END); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma-abi-u= pdate", "ppc64"); DO_TEST_NOCAPS("memory-hotplug"); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); @@ -1009,9 +1007,7 @@ mymain(void) DO_TEST("memory-hotplug-nvdimm-readonly", QEMU_CAPS_DEVICE_NVDIMM, QEMU_CAPS_DEVICE_NVDIMM_UNAR= MED); DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-nvdimm-ppc64", "ppc64"); - DO_TEST_FULL("memory-hotplug-nvdimm-ppc64-abi-update", "", WHEN_BOTH, - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest", ARG_END); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-nvdimm-ppc64-abi-u= pdate", "ppc64"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem"); DO_TEST_CAPS_LATEST("memory-hotplug-multiple"); --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686257; cv=none; d=zohomail.com; s=zohoarc; b=aRz3xUq7xtxgFvXn528EjqdfkIXtj64krcufjzzwmgi/Qzle0LEH8IEZUA02yAzsM4xKDoxl6/ErCZmVOjoqZRtHsGwRmAs/vEIRlhwfFgi2+3O7bgDh8+ttlXy+mUtUaXYZAMAJ04JOBaxrVi9wmR0oZfCFArEq5exPG/4iMXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686257; 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=AEeOUivHxwBspi7kvH4NzEQqi09YNWMlQLxO2JhcOWY=; b=kdYF9e93v4DC0Evmzm5W9hkl/9vu4z9oTZFJ8RJ9CBQq4AgxzujIIutKR+6VDwRbCxV1kUzuZtolQjPL4+N+MbL5qhh1aItN7U+9rH4+ZKqprgyK8W9W03EC54tSFSze+2drAya3SKr39qGMA6dH5jAcnhodUIGEK2no2Ha/AjQ= 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 1691686257123597.1033139754653; Thu, 10 Aug 2023 09:50:57 -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-554-JncgHRNSPLq8KHNm6OTjAg-1; Thu, 10 Aug 2023 12:50:53 -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 DA53485CCE2; Thu, 10 Aug 2023 16:50: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 D390740C6F4E; Thu, 10 Aug 2023 16:50: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 E22D81946A4B; Thu, 10 Aug 2023 16:50:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5FECB1946588 for ; Thu, 10 Aug 2023 16:50:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 424B3140E96F; Thu, 10 Aug 2023 16:50:42 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C1239140E96E for ; Thu, 10 Aug 2023 16:50:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686256; 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=AEeOUivHxwBspi7kvH4NzEQqi09YNWMlQLxO2JhcOWY=; b=UVVlGDc23qqfU9mHzKuEOt5yWVYr2jyTZGsHt3nSPydVORcVJYgF72VEYNYuykiK090QrY UBnahp2t2lSIRApxO1p7dGT1jBCzOB3DZMGuXAu838hYFRt2HNOqYdYss/WVXPg0BGMo1n i0pNa63VApjWymDV9X78dCMIAUfbGmc= X-MC-Unique: JncgHRNSPLq8KHNm6OTjAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 02/21] tests: Switch to firmware autoselection for hvf Date: Thu, 10 Aug 2023 18:50:19 +0200 Message-ID: <20230810165038.169700-3-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686258243100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Firmware selection is not relevant to these tests, so adopt the most convenient approach. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- .../hvf-aarch64-virt-headless.aarch64-latest.args | 6 +++--- tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml | 6 ++---- .../hvf-x86_64-q35-headless.x86_64-latest.args | 7 ++++++- tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml | 4 ++-- .../hvf-aarch64-virt-headless.aarch64-latest.xml | 12 ++++++++---- .../hvf-x86_64-q35-headless.x86_64-latest.xml | 11 +++++++++-- 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-lates= t.args b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.ar= gs index 8fae9ebfa6..7559b9885f 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args @@ -10,11 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-s= ilent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":tr= ue,"discard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test_V= ARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel hvf \ -m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml b/tests/q= emuxml2argvdata/hvf-aarch64-virt-headless.xml index 01997b9731..3ae6f93647 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml @@ -4,10 +4,8 @@ 4194304 4194304 2 - - hvm - /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /some/user/nvram/path/guest_VARS.fd + + hvm diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args index 92fbcffd57..abea7bf158 100644 --- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args @@ -10,9 +10,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.= config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test_V= ARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discar= d":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t \ -accel hvf \ -cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml b/tests/qem= uxml2argvdata/hvf-x86_64-q35-headless.xml index cad560e9ca..93980d434c 100644 --- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml +++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml @@ -4,8 +4,8 @@ 4194304 4194304 2 - - hvm + + hvm diff --git a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-lat= est.xml b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest= .xml index 16e8c23a79..69c1d5deb3 100644 --- a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest.xml @@ -4,10 +4,14 @@ 4194304 4194304 2 - - hvm - /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /some/user/nvram/path/guest_VARS.fd + + hvm + + + + + /usr/share/AAVMF/AAVMF_CODE.f= d + /var/lib/libvirt/qe= mu/nvram/test_VARS.fd diff --git a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml index 384241ac3d..032fd43471 100644 --- a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml @@ -4,13 +4,20 @@ 4194304 4194304 2 - - hvm + + hvm + + + + + /usr/share/OVM= F/OVMF_CODE.secboot.fd + /var/lib/libv= irt/qemu/nvram/test_VARS.fd + qemu64 --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686259; cv=none; d=zohomail.com; s=zohoarc; b=D3PZzXpZE5Qaunq/iDnSNhL5v8mQ9Mc1qEz71IIq74PB9YYW+SSZSe7zJy7ZEG0xqAftmQnZCUa2NBDeVnZc3dDxcbwN3ksk6Aq4WgVVrzmcEicx5x5zf3rdirxhUSKjZMXHoVLwD+KPIM+LzuNDEt7s2+/qSYBGY5W+09eV59k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686259; 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=ZWLP67p9v/hU7rmb7SdBZJEKY3wdFq6ycQbYVCqXYyM=; b=D+VWBtde76NGYxe+ZycTt93sDieMP++xoYMQADtqEgJcjUtWcR3c94qtXFnfeRYppBWSCKmcAuQ6ZBa1uWxL1n505zE6Ha7wzh+gRQrmNgxzLVHlXIhqlPl12Py8/Xj+aFuNVfUK3g1LmG6+JpczkdQXl3hjE+JKr71YCKXnDfA= 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 1691686259219874.5673428242121; Thu, 10 Aug 2023 09:50:59 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-113-JewUatCbM1ij_cEtye7ouA-1; Thu, 10 Aug 2023 12:50:53 -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 DAEC71C06939; Thu, 10 Aug 2023 16:50: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 BF04D2026D4B; Thu, 10 Aug 2023 16:50: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 281331946595; Thu, 10 Aug 2023 16:50:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 26B881946A47 for ; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0BAAE140E96F; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8B276140E96E for ; Thu, 10 Aug 2023 16:50:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686258; 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=ZWLP67p9v/hU7rmb7SdBZJEKY3wdFq6ycQbYVCqXYyM=; b=LOLfKzpNjpg8DOQ15z/N57/nL5i86ZH9NfusZT2BiCE5rjYKvZ2g30wVXJx95dAFSKn+jr VW+51mNX2t+K6xs4N2oiE6scbwAnTc2ptwK+lK/rxtpu9/+BVkp0kxyfRL8t5yckrdJXn2 oXoj9yzjhYOrUVelHa1Yao+tyVyo4sQ= X-MC-Unique: JewUatCbM1ij_cEtye7ouA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 03/21] tests: Use virt-4.0 machine type for aarch64 Date: Thu, 10 Aug 2023 18:50:20 +0200 Message-ID: <20230810165038.169700-4-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686260487100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Using the unversioned machine type means that firmware descriptors can't be used to discover additional information about the chosen firmware build. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-graphics.xml | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-headless.xml | 2 +- .../aarch64-virt-graphics.aarch64-latest.xml | 8 ++++++-- .../aarch64-virt-headless.aarch64-latest.xml | 8 ++++++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 2c07824346..1b7b0a70ff 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ -m size=3D4194304k \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemux= ml2argvdata/aarch64-virt-graphics.xml index b1b5e87c22..2b1704ad7b 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -10,7 +10,7 @@ 4194304 4 - hvm + hvm /usr/share/AAVMF/AAVMF_CODE.f= d /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index 734e62ed53..23b514da9a 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ -m size=3D4194304k \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemux= ml2argvdata/aarch64-virt-headless.xml index 27825e9a55..1d1fc071d7 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.xml @@ -10,7 +10,7 @@ 4194304 4 - hvm + hvm /usr/share/AAVMF/AAVMF_CODE.f= d /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml index 24109a11c3..f0a4003655 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml @@ -9,8 +9,12 @@ 4194304 4194304 4 - - hvm + + hvm + + + + /usr/share/AAVMF/AAVMF_CODE.f= d /some/user/nvram/pa= th/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml index 6182da4dc6..ab4126318a 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml @@ -9,8 +9,12 @@ 4194304 4194304 4 - - hvm + + hvm + + + + /usr/share/AAVMF/AAVMF_CODE.f= d /some/user/nvram/pa= th/guest_VARS.fd --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686261; cv=none; d=zohomail.com; s=zohoarc; b=cTgiLdraA+MTbUV1hoUGru7Pl4UH6RdUuL4mR6CpxoEwsQH9cQ31HnZR+QbIbY//kSFRSbeuO7Wc3sc/vUVtenjGrRKWvrZiTMX9azjHsh13p9MYCz49lcHxJBSFOxDk/87nMkt4iCSvFRaNxSdi62bJhnTivM6ZpA2nDSA32tE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686261; 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=GRr05d1fjfSCJgIvLBShkx08heHNcCQFQ0KK/pEKy/o=; b=hmlRe+UJP7EybmMkLe/ik5rFfU2DiSf3+0KYu0X7zuH2jajnG33Oauq1h0nzGf5jDtiqNT1MCxAqtf3lH94aNvcgUUbY24gZ4hbiB6zl+h4joF2uirazf2SJHkoa86REt5bi3KOBcbE3ReEKpRrJv4qGkpQmY9Ja6sWvkHRogi8= 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 1691686261627853.4536743686315; Thu, 10 Aug 2023 09:51:01 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-564-_As1bVFlMIyuNlHpefoAkw-1; Thu, 10 Aug 2023 12:50:56 -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 53A6A3813F39; Thu, 10 Aug 2023 16:50: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 3B9AC140E96F; Thu, 10 Aug 2023 16:50: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 612D11946A42; Thu, 10 Aug 2023 16:50:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E5D8319465A2 for ; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C9FF1140E96F; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 55371140E96E for ; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686260; 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=GRr05d1fjfSCJgIvLBShkx08heHNcCQFQ0KK/pEKy/o=; b=e4h9IFpMrzsvtmpwjWgBlHBa1uTUjJDQZFtUFT0vPNxTYKBsWL2LDnET0w1nKfFDykgAgf eGf6mGAaHgsaNn9iOzF9XAfl88A8JFEq4FygqVDVEKLsW8QHVYosml1zKs9eUgXBDdEq5P LKL95m7ElpkIzKPJWy5xz4rdsDVt93s= X-MC-Unique: _As1bVFlMIyuNlHpefoAkw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 04/21] tests: Consistently use /path/to/guest_VARS.fd Date: Thu, 10 Aug 2023 18:50:21 +0200 Message-ID: <20230810165038.169700-5-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686263057100001 Content-Type: text/plain; charset="utf-8"; x-default="true" That's what we already use in almost all cases. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- .../qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-graphics.xml | 2 +- .../qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-headless.xml | 2 +- .../qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml | 2 +- .../qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 1b7b0a70ff..eaa558747f 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"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 virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemux= ml2argvdata/aarch64-virt-graphics.xml index 2b1704ad7b..3c7da08381 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -12,7 +12,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index 23b514da9a..9d13abb531 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"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 virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemux= ml2argvdata/aarch64-virt-headless.xml index 1d1fc071d7..4cb309037b 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.xml @@ -12,7 +12,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml index f0a4003655..1150aceb02 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml @@ -16,7 +16,7 @@ /usr/share/AAVMF/AAVMF_CODE.f= d - /some/user/nvram/pa= th/guest_VARS.fd + /path/to/guest_VARS= .fd diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml index ab4126318a..68df856a28 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml @@ -16,7 +16,7 @@ /usr/share/AAVMF/AAVMF_CODE.f= d - /some/user/nvram/pa= th/guest_VARS.fd + /path/to/guest_VARS= .fd --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686330; cv=none; d=zohomail.com; s=zohoarc; b=AQYXuVaI2/fdFjoBAm6Oh4DpQTpyGWMF50yE4RoMjf42cSiNICN/02vTcZw4AtiZIZpzg9LMLkAjS2O0mRpvNbb/6B/Ahftwfqv+r7XKISEQMZ6UIw0K6KpYSPqISTygF5jvaysl7kOyQE31P6s5QqLsE9cakp2o/u/gn1op2fk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686330; 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=PhgZBkqaqN9tK0S+ES0sez9Cen7+cyhMzsSdMqUNLAo=; b=Xnj4PmhNlOtmesuASBTJSDmEIw25tHeEkjUaIbaSsvbYKE/qaGYMgi6JhFzfs6fjB3BhCY5beBuFKzFKgCkW+5iECgy2MDmzcdFXxPBUIuBeiY/eOLqPoQZBYT2KC4TTNHumzUP6cqud32CH36vPguzV5W8rdNMXOE5MnDfijOE= 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 1691686330477300.99347011435304; Thu, 10 Aug 2023 09:52:10 -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-503-QMBXcpGdMkWOToPUCTsQmQ-1; Thu, 10 Aug 2023 12:51:16 -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 3CB2E802A7D; Thu, 10 Aug 2023 16:51:12 +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 293C3400DE93; Thu, 10 Aug 2023 16:51:12 +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 E2D941946A7D; Thu, 10 Aug 2023 16:51:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BBED81946A6C for ; Thu, 10 Aug 2023 16:50:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 93A12140E96E; Thu, 10 Aug 2023 16:50:44 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F122140E96F for ; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686329; 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=PhgZBkqaqN9tK0S+ES0sez9Cen7+cyhMzsSdMqUNLAo=; b=QVzCIFHrIdTHB0oYCb51hNUbdtm/KwTWykxuPBrZkSH2Wt7TlgL496tuc2rNh45EpbjMS3 HAF7ss4WMMcoO0xOsgEM3KP/HYKItaJx0dpGNyxkLI9KEo4bTWsreAQ7oJe0puICzp/8Tu ngDWxZWYJx+Jv5ZTy/Ld1phfVKgNGzY= X-MC-Unique: QMBXcpGdMkWOToPUCTsQmQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 05/21] tests: Turn abi-update.xml into a symlink Date: Thu, 10 Aug 2023 18:50:22 +0200 Message-ID: <20230810165038.169700-6-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686332305100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Since the idea behind introducing the abi-update variant of a test is showing that libvirt behaves differently based on whether the configuration is for a newly-defined domain or an existing one, we don't want the input files to ever go out of sync. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- .../firmware-auto-efi-abi-update-aarch64.xml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) mode change 100644 =3D> 120000 tests/qemuxml2argvdata/firmware-auto-efi-ab= i-update-aarch64.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xm= l b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml deleted file mode 100644 index 5c6c5192ba..0000000000 --- a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml +++ /dev/null @@ -1,17 +0,0 @@ - - guest - 63840878-0deb-4095-97e6-fc444d9bc9fa - 1048576 - 1 - - hvm - - - - - - /usr/bin/qemu-system-aarch64 - - - - diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xm= l b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml new file mode 120000 index 0000000000..551082260a --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml @@ -0,0 +1 @@ +firmware-auto-efi-aarch64.xml \ No newline at end of file --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686276; cv=none; d=zohomail.com; s=zohoarc; b=ZvIFizyUK0dJ1cG4PUQOoGzr8yd84TqnQq8Q+kaU9mc79DAIAvF1bU5Y42HW8U8PMuWf4xFeLyeUf34P4d30ztQvpKtcrB9gCYIlk9U/lm0daqkdXvLTk56vIzG1CGtoKuXgYZGloP2PxuiOUcFuCxRnhy77kWsThwhIpMi/oac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686276; 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=3sYL01NIGJL9TxdN59K7woAfLxgiN1JpsyfBPZM/UYA=; b=XmViRsviJx1yCD648iXFpVvO47Lhs7Yl4Zw+M67qbC/tOQNmBfpZHGn0aWeS5ZSKy1BcwONl/pBH8YmN4YWXub76x5ID/32Iv9guA3h4l0SRzN+R0ReSF0H1g4TiwqAfCIEMxyuUUlk3FsxnUucqZntv3Adqw9tFQUPq6NVR6RQ= 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 1691686276875301.60080950907934; Thu, 10 Aug 2023 09:51:16 -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-685-rHeKM_KyNcSj-2_CLGUINg-1; Thu, 10 Aug 2023 12:51:09 -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 3B399185A7A4; Thu, 10 Aug 2023 16:51:06 +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 25F3D40C6F53; Thu, 10 Aug 2023 16:51:06 +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 34A711946594; Thu, 10 Aug 2023 16:51:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6CCD11946A62 for ; Thu, 10 Aug 2023 16:50:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5E7AC140E96F; Thu, 10 Aug 2023 16:50:45 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DCCF8140E971 for ; Thu, 10 Aug 2023 16:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686275; 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=3sYL01NIGJL9TxdN59K7woAfLxgiN1JpsyfBPZM/UYA=; b=A5aAuB9eABm8SyfvyUU51ck8EZXwSrAwYItIQE39BvuBeP8fjR2iPsGpxRAIgeHcwIWWrT 28r8hmCpQG2ihtxvtTM3WOhxvV7s8xchGzBMkGBBkCkjlvBv70k6RXZ42qcv2mqYu9bEIM eoT6biYKpnBy0OI0Y2WSwCyxfZy8XhI= X-MC-Unique: rHeKM_KyNcSj-2_CLGUINg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 06/21] tests: Rename firmware-auto-efi-nvram-path Date: Thu, 10 Aug 2023 18:50:23 +0200 Message-ID: <20230810165038.169700-7-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686277400100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The new name better describes the test scenario and will fit better with the additional tests that we're about to introduce. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...est.args =3D> firmware-auto-efi-nvram-path.x86_64-latest.args} | 0 ...ware-auto-efi-nvram.xml =3D> firmware-auto-efi-nvram-path.xml} | 0 tests/qemuxml2argvtest.c | 2 +- ...atest.xml =3D> firmware-auto-efi-nvram-path.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.x86_64-latest.args = =3D> firmware-auto-efi-nvram-path.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml =3D> firmware-a= uto-efi-nvram-path.xml} (100%) rename tests/qemuxml2xmloutdata/{firmware-auto-efi-nvram.x86_64-latest.xml= =3D> firmware-auto-efi-nvram-path.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.ar= gs rename to tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest= .args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml b/tests/qem= uxml2argvdata/firmware-auto-efi-nvram-path.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml rename to tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 13cc13b043..2f840694e5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1057,7 +1057,6 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi"); DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless"); - DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-insecure"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-path"); @@ -1070,6 +1069,7 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-efi-smm-off"); DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-abi-update-aarc= h64", "aarch64"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-path"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-file"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-nbd"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-iscsi"); diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-path.x86_64-latest.= xml similarity index 100% rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.= xml rename to tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-path.x86_64-late= st.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b964d22d02..6c817cb206 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -886,7 +886,6 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless"); DO_TEST_CAPS_LATEST("firmware-auto-efi"); DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless"); - DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-insecure"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-path"); @@ -898,6 +897,7 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-efi-smm-off"); DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-abi-update-aarc= h64", "aarch64"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-path"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-file"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-nbd"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-iscsi"); --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686267; cv=none; d=zohomail.com; s=zohoarc; b=c+r4hd9nv2RoHbWVxI5PtpWG2RMzUA0aCACRzc/rqDxieYebYgHaUsTmlkdoyV/4NUSj2n31V9K9jPBbxMTQPfvN4AqB7iGk9q7HpF2zYWzCxraUkHKhFDwaBxuYA9uPhL/8jE/b7N7Ll6qifW75fafulXMidQlEd60+KHy4nCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686267; 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=1oR2DqQz4X/R58GfIDOm9uYLBqDCGdSwwzjGK4FXk5A=; b=LYOsrlevr3OBzgWHgUYSvMWSn7NhvRVeMkQIU/2vMoTBsJz/63ZJ15tW7orrCIQVmRDfHyhoJwo+sw6jvSgQFdvxu3AiS8P5kD7d9PPwyNMyMrvttUsCI3/N4j0kH5+oNoRQ9gNpYoIViPuTNcgL2pW+QvZ5mjG3EklCP6WMGTA= 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 1691686267595390.6008970660089; Thu, 10 Aug 2023 09:51:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-180-wgPEmRb9N0Kg89FYm4Ke3A-1; Thu, 10 Aug 2023 12:51:00 -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 1113B28237D2; Thu, 10 Aug 2023 16:50:56 +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 ED89E2166B25; Thu, 10 Aug 2023 16:50: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 B35501946A69; Thu, 10 Aug 2023 16:50:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4A08E1946A62 for ; Thu, 10 Aug 2023 16:50:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 29F54140E971; Thu, 10 Aug 2023 16:50:46 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A85BA140E96F for ; Thu, 10 Aug 2023 16:50:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686266; 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=1oR2DqQz4X/R58GfIDOm9uYLBqDCGdSwwzjGK4FXk5A=; b=TYy1UFunVSADeCqQrAIwaJlWjN6tHR+4RwPq778NTq5fLVmMY7EzJUWB6RXCvJuw1imhQY jD3S1U6k3z4ctKeIaTi5nqxTf8uHfoHCGjeYzRn9viXNL6KlruhIQeLqx+9BBUvy+vDw0Q obAcqZMF1Lc18jpgSVbmzoS1qw3t0bY= X-MC-Unique: wgPEmRb9N0Kg89FYm4Ke3A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 07/21] qemu: Fix return value for qemuFirmwareFillDomainLegacy() Date: Thu, 10 Aug 2023 18:50:24 +0200 Message-ID: <20230810165038.169700-8-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1691686268274100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The documentation states that, just like the Modern() variant, this function should return 1 if a match wasn't found. It currently doesn't do that, and returns 0 instead. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/qemu/qemu_firmware.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index cf9a45dc39..5f030ebce4 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1575,17 +1575,17 @@ qemuFirmwareFillDomainLegacy(virQEMUDriver *driver, size_t i; =20 if (!loader) - return 0; + return 1; =20 if (loader->type !=3D VIR_DOMAIN_LOADER_TYPE_PFLASH) { VIR_DEBUG("Ignoring legacy entries for '%s' loader", virDomainLoaderTypeToString(loader->type)); - return 0; + return 1; } =20 if (loader->stateless =3D=3D VIR_TRISTATE_BOOL_YES) { VIR_DEBUG("Ignoring legacy entries for stateless loader"); - return 0; + return 1; } =20 if (loader->format !=3D VIR_STORAGE_FILE_RAW) { --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686265; cv=none; d=zohomail.com; s=zohoarc; b=KKzWJDl+Pdh47v3qE4HwhHbakksTLG5W0G/zj5YCokWNrf8iQB2U1mMLUA07JpzI1cOl/z89X0WLEiXVNj1oIbUAxk4G80vlT7WZAQ0+BBIRBhhRWooF4QbLBY6rDDCjStjbi8h/qi1L83Iy0ls76i5N6hA/+U/e/73CYrjBcWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686265; 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=LkW/2cIEHhSrlhkjHph7cz7PUy+DHqhNZRsvQ4I9p0s=; b=hi/P/h2tgzzMB8FsMtpQyQvuiVM1q3xr4A3QgWdE46S+NfRqjTGdp9IwltWxQ4XGuiMuN9V2XfrIrNIYlGLIYgBokUN6e+kEcG3OeMKgsWqMJEaf+MxVt+VEXXPyO6uV/7cA1f6goXEb+gEkEFJSR0jm/wT6CONzttH1d90E0oA= 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 1691686264993221.7924640696839; Thu, 10 Aug 2023 09:51:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-288-9JO61p1lMm2gltq4FOuZiA-1; Thu, 10 Aug 2023 12:51:01 -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 AD8AE3813F4A; Thu, 10 Aug 2023 16:50:57 +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 9BD265CBFF; Thu, 10 Aug 2023 16:50:57 +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 143171946595; Thu, 10 Aug 2023 16:50:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EB1161946A62 for ; Thu, 10 Aug 2023 16:50:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E6B01140E971; Thu, 10 Aug 2023 16:50:46 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72A85140E96F for ; Thu, 10 Aug 2023 16:50:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686263; 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=LkW/2cIEHhSrlhkjHph7cz7PUy+DHqhNZRsvQ4I9p0s=; b=h9ECYiuCCkbvWhxEzCMLtKxrpCtscgVRjfjqSBErV2tV2OWrQMYe2BqFzIXqhQbM4Pd+mF VM7DnQn5bZ4F1lSbq6t6UaeB7GNFhkDoaKrD0LLtfhplueG+pJJUp75onu3tMDiMe/hvKZ lMUpwNi6ha/W6DDWXqiX5FhbSQwFyE4= X-MC-Unique: 9JO61p1lMm2gltq4FOuZiA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 08/21] qemu: Fix lookup against stateless/combined pflash Date: Thu, 10 Aug 2023 18:50:25 +0200 Message-ID: <20230810165038.169700-9-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686267070100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Just like the more common split builds, these are of type QEMU_FIRMWARE_DEVICE_FLASH; however, they have no associated NVRAM template, so we can't access the corresponding structure member unconditionally or we'll trigger a crash. https://bugzilla.redhat.com/show_bug.cgi?id=3D2196178 Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/qemu/qemu_firmware.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 5f030ebce4..b1d342563b 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -971,9 +971,12 @@ qemuFirmwareMatchesPaths(const qemuFirmware *fw, if (loader && loader->path && STRNEQ(loader->path, flash->executable.filename)) return false; - if (loader && loader->nvramTemplate && - STRNEQ(loader->nvramTemplate, flash->nvram_template.filename)) - return false; + if (loader && loader->nvramTemplate) { + if (flash->mode !=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) + return false; + if (STRNEQ(loader->nvramTemplate, flash->nvram_template.filena= me)) + return false; + } break; case QEMU_FIRMWARE_DEVICE_MEMORY: if (loader && loader->path && --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686271; cv=none; d=zohomail.com; s=zohoarc; b=U/xaWZHoVtnBYWSvusHZSWZAvW+dwAFBFA+6GfjlA0D3OgOLjc+Ye0vXPFi7nJSXAHepicJy6l94H32FvpooOntLbDfC43ARX5YelW2/T++UlT9Q6nYIMLGFMIlEdVXC/aZJbaC3Imin9w2aVn66BDrEpN7bqGWTpPJDgKjD2Ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686271; 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=cASs3nFARYXJ8q5KuTJv0UUbUsqco+j4vdhXR0W6O5s=; b=VytLuajb7C4Zb9P/u/k+/JM+iQxe5APH/o/uB+pFceckq0kGPHeWC5Hlolzy7AiOrvIIZmVTvhytzBfAwDiOl0sT7CyDRDrk789DfjNJAGcGX1kFqJeO7EEFbR+i5qGv7dbcl9SlSdpbWAhfWCCVbfNsJo3r4XyIVFUYUqrYwSo= 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 1691686271055736.9661312089601; Thu, 10 Aug 2023 09:51:11 -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-82-jYbOzHcUNQmoBT6f6ZaBUg-1; Thu, 10 Aug 2023 12:51:04 -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 E24E1823D77; Thu, 10 Aug 2023 16:51:00 +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 93BD85CC07; Thu, 10 Aug 2023 16:51:00 +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 4C9FE1946A48; Thu, 10 Aug 2023 16:50:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B79B61946588 for ; Thu, 10 Aug 2023 16:50:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B04F0140E973; Thu, 10 Aug 2023 16:50:47 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BA95140E96F for ; Thu, 10 Aug 2023 16:50:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686270; 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=cASs3nFARYXJ8q5KuTJv0UUbUsqco+j4vdhXR0W6O5s=; b=LNYznBpGgCYMS2FYN4ZVuU1bPYqqA85IfN8ZzLjjOTIM3ZSdgssusoHKDH/WlFpUhfWg0B hUf0LqFnSvjMNDAXuuYPE1iUE6sLDYO0LxWRYAu+CFIOntc9dAVXjvGt7SXQFpvDbXUM6R BzvN/7ISvjd3KVzBjDdWUuax/EgBnNA= X-MC-Unique: jYbOzHcUNQmoBT6f6ZaBUg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 09/21] tests: Add some more DO_TEST*ABI_UPDATE* macros Date: Thu, 10 Aug 2023 18:50:26 +0200 Message-ID: <20230810165038.169700-10-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686272461100001 Content-Type: text/plain; charset="utf-8"; x-default="true" These are going to be useful later. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- tests/qemuxml2argvtest.c | 19 +++++++++++++++++++ tests/qemuxml2xmltest.c | 3 +++ 2 files changed, 22 insertions(+) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2f840694e5..e851dd45b0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -834,6 +834,9 @@ mymain(void) # define DO_TEST_CAPS_LATEST(name) \ DO_TEST_CAPS_ARCH_LATEST(name, "x86_64") =20 +# define DO_TEST_CAPS_LATEST_ABI_UPDATE(name) \ + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, "x86_64") + # define DO_TEST_CAPS_VER(name, ver) \ DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) =20 @@ -853,6 +856,11 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \ ARG_FLAGS, FLAG_EXPECT_FAILURE) =20 +# define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_FAILURE(name, arch) \ + DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \ + ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI= _UPDATE, \ + ARG_FLAGS, FLAG_EXPECT_FAILURE) + # define DO_TEST_CAPS_ARCH_VER_FAILURE(name, arch, ver) \ DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \ ARG_FLAGS, FLAG_EXPECT_FAILURE) @@ -860,6 +868,9 @@ mymain(void) # define DO_TEST_CAPS_LATEST_FAILURE(name) \ DO_TEST_CAPS_ARCH_LATEST_FAILURE(name, "x86_64") =20 +# define DO_TEST_CAPS_LATEST_ABI_UPDATE_FAILURE(name) \ + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_FAILURE(name, "x86_64") + # define DO_TEST_CAPS_VER_FAILURE(name, ver) \ DO_TEST_CAPS_ARCH_VER_FAILURE(name, "x86_64", ver) =20 @@ -867,6 +878,11 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \ ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR) =20 +# define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_PARSE_ERROR(name, arch) \ + DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \ + ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI= _UPDATE, \ + ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR) + # define DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, arch, ver) \ DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \ ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR) @@ -874,6 +890,9 @@ mymain(void) # define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR(name, "x86_64") =20 +# define DO_TEST_CAPS_LATEST_ABI_UPDATE_PARSE_ERROR(name) \ + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_PARSE_ERROR(name, "x86_64") + # define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \ DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, "x86_64", ver) =20 diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6c817cb206..9443673a75 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -184,6 +184,9 @@ mymain(void) #define DO_TEST_CAPS_LATEST(name) \ DO_TEST_CAPS_ARCH_LATEST(name, "x86_64") =20 +#define DO_TEST_CAPS_LATEST_ABI_UPDATE(name) \ + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, "x86_64") + #define DO_TEST_CAPS_VER(name, ver) \ DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) =20 --=20 2.41.0 From nobody Sun May 19 13:34:31 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=1691686281; cv=none; d=zohomail.com; s=zohoarc; b=e6kBpd32+28VsSrQ5TZJMKFJqgLnyPEXFS1x3gLsSMXS0t7tGMVBgwNaNAVIZ8VksijdS6a8l/P9Lf2F8G0+0RCDu5vB9z/fPe5c5LTK6dNdKRlzPOr4ffc5fvh9HG9YYBluCdqnZqB5EVuWSuXQa5ib4rH1v8PHCHKkxLRwBdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686281; 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=q2ByoPAOGJ7gqYK56MFwmdow7IcT1ZGPvykyyqCqAho=; b=jfjsoRvEvT/o6wYDiaHi4+dYRcy9L+62Zi5lR6fKgIReoSGFw65rryykH4YYIBWxLGR9GSdhEbF0jhTdl3ExTUDDSl9JX7W/U/0hSfjxgzKois7kkfsk1iblWqCi3P28fPwSEFlOm5DJjY723aEIeVJXjFbzzpsNg9E+fbTqbm4= 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 1691686281238969.9649066345041; Thu, 10 Aug 2023 09:51:21 -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-253-odcUenB8MlyV23om5pF3UA-1; Thu, 10 Aug 2023 12:51:15 -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 71AE1823D6C; Thu, 10 Aug 2023 16:51:12 +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 53FEC400D700; Thu, 10 Aug 2023 16:51:12 +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 6CBCE1946A52; Thu, 10 Aug 2023 16:51:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CA63B1946588 for ; Thu, 10 Aug 2023 16:50:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C5DDB140E972; Thu, 10 Aug 2023 16:50:48 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0734A140E96F for ; Thu, 10 Aug 2023 16:50:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686280; 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=q2ByoPAOGJ7gqYK56MFwmdow7IcT1ZGPvykyyqCqAho=; b=ctobm0T9xKpvaOhBWgWWpSHXB2lwSrxVmszBAhHn1z1XuSulB0T4yYmXNhnIUtLAYqGHUp bxf4Ij2o/o2qpvnHk3Wv37eCcmDlsF/NbNKujiScngcVgfIMsV2/9zhfca5KzlC+Kx/vex Ex3qwwE3mFotbTyhs+4eCPqq2ZaqylQ= X-MC-Unique: odcUenB8MlyV23om5pF3UA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 10/21] tests: Add more tests for firmware selection Date: Thu, 10 Aug 2023 18:50:27 +0200 Message-ID: <20230810165038.169700-11-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1691686282579100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Most of these are just additional coverage, but a few demonstrate bugs in libvirt: * firmware-manual-efi-nvram-template-nonstandard sees the NVRAM template path, which was explicitly provided in the XML, being overridden by the firmware selection machinery; * firmware-auto-efi-rw* and firmware-manual-efi-rw-legacy-paths lose the loader.readonly=3Dno setting and thus behave differently than requested; * firmware-manual-efi-loader-path-nonstandard fails because an NVRAM path doesn't get generated. We're going to address all these issues with upcoming changes. Note that the firmware-auto-efi-nvram-template-nonstandard failure is expected: firmware autoselection has been enabled, but the NVRAM template points to a custom path that's not mentioned in any of the firmware descriptors and so it can't succeed. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...are-auto-efi-abi-update.x86_64-latest.args | 38 +++++++++++++++++ .../firmware-auto-efi-abi-update.xml | 1 + ...-loader-raw-abi-update.aarch64-latest.args | 35 ++++++++++++++++ ...-auto-efi-format-loader-raw-abi-update.xml | 1 + ...oader-secure-abi-update.x86_64-latest.args | 38 +++++++++++++++++ ...ware-auto-efi-loader-secure-abi-update.xml | 1 + ...ram-template-nonstandard.x86_64-latest.err | 1 + ...re-auto-efi-nvram-template-nonstandard.xml | 19 +++++++++ ...auto-efi-nvram-template.x86_64-latest.args | 38 +++++++++++++++++ .../firmware-auto-efi-nvram-template.xml | 18 ++++++++ ...-auto-efi-rw-abi-update.x86_64-latest.args | 38 +++++++++++++++++ .../firmware-auto-efi-rw-abi-update.xml | 1 + .../firmware-auto-efi-rw.x86_64-latest.args | 38 +++++++++++++++++ .../qemuxml2argvdata/firmware-auto-efi-rw.xml | 18 ++++++++ ...i-aarch64-legacy-paths.aarch64-latest.args | 35 ++++++++++++++++ ...rmware-manual-efi-aarch64-legacy-paths.xml | 19 +++++++++ ...-loader-path-nonstandard.x86_64-latest.err | 1 + ...are-manual-efi-loader-path-nonstandard.xml | 19 +++++++++ ...olled-keys-legacy-paths.x86_64-latest.args | 38 +++++++++++++++++ ...nual-efi-no-enrolled-keys-legacy-paths.xml | 20 +++++++++ ...no-secboot-legacy-paths.x86_64-latest.args | 37 +++++++++++++++++ ...are-manual-efi-no-secboot-legacy-paths.xml | 19 +++++++++ ...am-template-nonstandard.x86_64-latest.args | 37 +++++++++++++++++ ...-manual-efi-nvram-template-nonstandard.xml | 19 +++++++++ ...ual-efi-rw-legacy-paths.x86_64-latest.args | 37 +++++++++++++++++ .../firmware-manual-efi-rw-legacy-paths.xml | 18 ++++++++ ...ual-efi-rw-modern-paths.x86_64-latest.args | 35 ++++++++++++++++ .../firmware-manual-efi-rw-modern-paths.xml | 18 ++++++++ ...fi-secboot-legacy-paths.x86_64-latest.args | 38 +++++++++++++++++ ...rmware-manual-efi-secboot-legacy-paths.xml | 20 +++++++++ tests/qemuxml2argvtest.c | 17 ++++++++ ...ware-auto-efi-abi-update.x86_64-latest.xml | 41 +++++++++++++++++++ ...t-loader-raw-abi-update.aarch64-latest.xml | 35 ++++++++++++++++ ...loader-secure-abi-update.x86_64-latest.xml | 41 +++++++++++++++++++ ...ram-template-nonstandard.x86_64-latest.xml | 36 ++++++++++++++++ ...-auto-efi-nvram-template.x86_64-latest.xml | 41 +++++++++++++++++++ ...e-auto-efi-rw-abi-update.x86_64-latest.xml | 41 +++++++++++++++++++ .../firmware-auto-efi-rw.x86_64-latest.xml | 41 +++++++++++++++++++ ...fi-aarch64-legacy-paths.aarch64-latest.xml | 35 ++++++++++++++++ ...-loader-path-nonstandard.x86_64-latest.xml | 36 ++++++++++++++++ ...rolled-keys-legacy-paths.x86_64-latest.xml | 41 +++++++++++++++++++ ...-no-secboot-legacy-paths.x86_64-latest.xml | 40 ++++++++++++++++++ ...ram-template-nonstandard.x86_64-latest.xml | 36 ++++++++++++++++ ...nual-efi-rw-legacy-paths.x86_64-latest.xml | 40 ++++++++++++++++++ ...nual-efi-rw-modern-paths.x86_64-latest.xml | 35 ++++++++++++++++ ...efi-secboot-legacy-paths.x86_64-latest.xml | 41 +++++++++++++++++++ tests/qemuxml2xmltest.c | 17 ++++++++ 47 files changed, 1309 insertions(+) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-abi-update.x86= _64-latest.args create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-abi-update.xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-format-loader-= raw-abi-update.aarch64-latest.args create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-format-loader-= raw-abi-update.xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-= abi-update.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-= abi-update.xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-nvram-template= -nonstandard.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-nvram-template= -nonstandard.xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-nvram-template= .x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-nvram-template= .xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.= x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.= xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-late= st.args create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-rw.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-aarch64-lega= cy-paths.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-aarch64-lega= cy-paths.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-loader-path-= nonstandard.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-loader-path-= nonstandard.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-= keys-legacy-paths.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-= keys-legacy-paths.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-l= egacy-paths.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-l= egacy-paths.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-templa= te-nonstandard.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-templa= te-nonstandard.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-pa= ths.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-pa= ths.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-pa= ths.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-pa= ths.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-secboot-lega= cy-paths.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-secboot-lega= cy-paths.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update.x= 86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-format-loade= r-raw-abi-update.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secur= e-abi-update.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-templa= te-nonstandard.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-templa= te.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-rw-abi-updat= e.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-rw.x86_64-la= test.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-aarch64-le= gacy-paths.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-loader-pat= h-nonstandard.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolle= d-keys-legacy-paths.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-no-secboot= -legacy-paths.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-temp= late-nonstandard.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-rw-legacy-= paths.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-rw-modern-= paths.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-secboot-le= gacy-paths.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update.x86_64-lates= t.args new file mode 100644 index 0000000000..29f76cd20d --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-auto-efi-abi-update.xml b/test= s/qemuxml2argvdata/firmware-auto-efi-abi-update.xml new file mode 120000 index 0000000000..348bfcc7f6 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update.xml @@ -0,0 +1 @@ +firmware-auto-efi.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi= -update.aarch64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-form= at-loader-raw-abi-update.aarch64-latest.args new file mode 100644 index 0000000000..7f8b5e7797 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update= .aarch64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi= -update.xml b/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-ab= i-update.xml new file mode 120000 index 0000000000..bdd4a9f7a0 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update= .xml @@ -0,0 +1 @@ +firmware-auto-efi-format-loader-raw.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-upd= ate.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-se= cure-abi-update.x86_64-latest.args new file mode 100644 index 0000000000..29f76cd20d --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.x86= _64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-auto-efi-loader-secure-abi-upd= ate.xml b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update= .xml new file mode 120000 index 0000000000..a723eb2e08 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.xml @@ -0,0 +1 @@ +firmware-auto-efi-loader-secure.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonsta= ndard.x86_64-latest.err b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-te= mplate-nonstandard.x86_64-latest.err new file mode 100644 index 0000000000..4cfde1bd2e --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.x= 86_64-latest.err @@ -0,0 +1 @@ +operation failed: Unable to find any firmware to satisfy 'efi' diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonsta= ndard.xml b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstan= dard.xml new file mode 100644 index 0000000000..a009fa5fda --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.x= ml @@ -0,0 +1,19 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd<= /loader> + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_64= -latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_= 64-latest.args new file mode 100644 index 0000000000..29f76cd20d --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_64-latest= .args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-auto-efi-nvram-template.xml b/= tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.xml new file mode 100644 index 0000000000..920bf3b583 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.xml @@ -0,0 +1,18 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.x86_64= -latest.args new file mode 100644 index 0000000000..29f76cd20d --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.x86_64-latest.= args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-auto-efi-rw-abi-update.xml b/t= ests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.xml new file mode 120000 index 0000000000..252c7f40a2 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.xml @@ -0,0 +1 @@ +firmware-auto-efi-rw.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-latest.args= b/tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-latest.args new file mode 100644 index 0000000000..29f76cd20d --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-auto-efi-rw.xml b/tests/qemuxm= l2argvdata/firmware-auto-efi-rw.xml new file mode 100644 index 0000000000..6bee044058 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-rw.xml @@ -0,0 +1,18 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-path= s.aarch64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-= legacy-paths.aarch64-latest.args new file mode 100644 index 0000000000..7f8b5e7797 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-paths.aarch= 64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-path= s.xml b/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-paths.xml new file mode 100644 index 0000000000..8ab921d344 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-paths.xml @@ -0,0 +1,19 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/AAVMF/AAVMF_CODE.f= d + + + + + + + /usr/bin/qemu-system-aarch64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstan= dard.x86_64-latest.err b/tests/qemuxml2argvdata/firmware-manual-efi-loader-= path-nonstandard.x86_64-latest.err new file mode 100644 index 0000000000..6a1618a1aa --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.x8= 6_64-latest.err @@ -0,0 +1 @@ +internal error: argument key 'filename' must not have null value diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstan= dard.xml b/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstanda= rd.xml new file mode 100644 index 0000000000..5a3da3c25b --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.xml @@ -0,0 +1,19 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /path/to/OVMF_CODE.fd + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-le= gacy-paths.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-= no-enrolled-keys-legacy-paths.x86_64-latest.args new file mode 100644 index 0000000000..cc4a935474 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-pa= ths.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-accel tcg \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-manual-efi-no-enrolled-keys-le= gacy-paths.xml b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-key= s-legacy-paths.xml new file mode 100644 index 0000000000..cfc27226b5 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-pa= ths.xml @@ -0,0 +1,20 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVM= F/OVMF_CODE.secboot.fd + + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-p= aths.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-sec= boot-legacy-paths.x86_64-latest.args new file mode 100644 index 0000000000..ccc279e4e3 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.x8= 6_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-manual-efi-no-secboot-legacy-p= aths.xml b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-pat= hs.xml new file mode 100644 index 0000000000..f85aeb251b --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.xml @@ -0,0 +1,19 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd<= /loader> + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nons= tandard.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvr= am-template-nonstandard.x86_64-latest.args new file mode 100644 index 0000000000..6d388346a8 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard= .x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-accel kvm \ +-cpu qemu64 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-manual-efi-nvram-template-nons= tandard.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-non= standard.xml new file mode 100644 index 0000000000..db11357455 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard= .xml @@ -0,0 +1,19 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd<= /loader> + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.x86= _64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-path= s.x86_64-latest.args new file mode 100644 index 0000000000..ccc279e4e3 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.x86_64-lat= est.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-manual-efi-rw-legacy-paths.xml= b/tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.xml new file mode 100644 index 0000000000..2abea51318 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.xml @@ -0,0 +1,18 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.x86= _64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-path= s.x86_64-latest.args new file mode 100644 index 0000000000..c26daad29f --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.x86_64-lat= est.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash0-storage"}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-manual-efi-rw-modern-paths.xml= b/tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.xml new file mode 100644 index 0000000000..e0da71db36 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.xml @@ -0,0 +1,18 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/edk2/ovmf/OVMF_CODE= .fd + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-path= s.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-secboot-l= egacy-paths.x86_64-latest.args new file mode 100644 index 0000000000..cc4a935474 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.x86_6= 4-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-accel tcg \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-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/firmware-manual-efi-secboot-legacy-path= s.xml b/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.xml new file mode 100644 index 0000000000..99f2218645 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.xml @@ -0,0 +1,20 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVM= F/OVMF_CODE.secboot.fd + + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e851dd45b0..378cbaa55d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1046,14 +1046,18 @@ mymain(void) ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI= _UPDATE, ARG_END); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-legacy-paths"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-modern-paths"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit"); DO_TEST_CAPS_LATEST("firmware-manual-efi-loader-secure"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-loader-no-path"); + DO_TEST_CAPS_LATEST_FAILURE("firmware-manual-efi-loader-path-nonstanda= rd"); DO_TEST_CAPS_LATEST("firmware-manual-efi-secboot"); DO_TEST_CAPS_LATEST("firmware-manual-efi-no-enrolled-keys"); DO_TEST_CAPS_LATEST("firmware-manual-efi-no-secboot"); DO_TEST_CAPS_LATEST("firmware-manual-efi-stateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template-nonstandard"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-st= ateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd"); @@ -1070,13 +1074,23 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-noacpi-aarch64", "aarc= h64"); DO_TEST_CAPS_LATEST("firmware-manual-noefi-noacpi-q35"); =20 + /* Ensure that legacy firmware paths keep working */ + DO_TEST_CAPS_LATEST("firmware-manual-efi-secboot-legacy-paths"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-no-enrolled-keys-legacy-paths= "); + DO_TEST_CAPS_LATEST("firmware-manual-efi-no-secboot-legacy-paths"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-aarch64-legacy-paths", "= aarch64"); + DO_TEST_CAPS_LATEST("firmware-auto-bios"); DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-not-stateless"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi"); + DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi-abi-update"); DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-rw"); + DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi-rw-abi-update"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); + DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi-loader-secure-abi-up= date"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-insecure"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-path"); DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-loader-path-nonstandard= "); @@ -1089,6 +1103,8 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-abi-update-aarc= h64", "aarch64"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-path"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-template"); + DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-nvram-template-nonstand= ard"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-file"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-nbd"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-iscsi"); @@ -1098,6 +1114,7 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-qcow2-path"); DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-qcow2-network-nbd"= ); DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-format-loader-raw", "aarch= 64"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-format-loader-r= aw-abi-update", "aarch64"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-format-mismatch"); =20 DO_TEST_NOCAPS("clock-utc"); diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update.x86_64-l= atest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update.x86_64-la= test.xml new file mode 100644 index 0000000000..90c5040ca6 --- /dev/null +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update.x86_64-latest.x= ml @@ -0,0 +1,41 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1048576 + 1 + + hvm + + + + + /usr/share/OVM= F/OVMF_CODE.secboot.fd + /var/lib/libv= irt/qemu/nvram/guest_VARS.fd + + + + + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + +
+ + + + +