From nobody Fri Mar 29 04:47:47 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=1679081282; cv=none; d=zohomail.com; s=zohoarc; b=VvZnJKePg728/ZolanGcpzxVFmWKqsX2Rn5samw2JGI2hq3vOMz49h/sNloElLAcKkA+6OTf/1Us3uCPreBD1Vqia4ITrl1SlNKiQoGs9juHobFHvvyHSAd5GdjHKimlx5keN14zQX23X44YqdgBamf/VqIOHDXsNK3THzn6JtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679081282; 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=hLMEYbx9mfLeRlJwu4Lz6xUzK4ZdRigRMKYC+iaJ69c=; b=EyJ357PZt1a6kdey3esxBoyjaRCkkz2vFoHvUDHvitGIK4vPUnFvw2puofXZLMVxm7p0ytTYuQh0EdiuC2gQ6wFIluLS2xSAYSFFm5gKjWDz7r3A0toyo6wuvPjjgMyWW5SQxRQAWHKMlGpLpsZL//XtGx/YFTPEOboAuIAUDaM= 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 1679081282408309.54236163634494; Fri, 17 Mar 2023 12:28:02 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-499-RdQz8HnlOtG4peupCnOL6Q-1; Fri, 17 Mar 2023 15:27:56 -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 7F40988647D; Fri, 17 Mar 2023 19:27:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D41B340C6E67; Fri, 17 Mar 2023 19:27:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6686A1946A66; Fri, 17 Mar 2023 19:27:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3D83519466DF for ; Fri, 17 Mar 2023 19:27:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1553640C6E68; Fri, 17 Mar 2023 19:27:50 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C84540C6E67 for ; Fri, 17 Mar 2023 19:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679081281; 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=hLMEYbx9mfLeRlJwu4Lz6xUzK4ZdRigRMKYC+iaJ69c=; b=DovIUhIgSLe8oMkiCuIul+8HdSFaHfY4LlsRux6OJiDJGc8mbEEzLoJnWIz3dxAlIJVboS ep5jsXsn4gC8TerdjSrxd/nF1gg//tNDBw7k78sKMZjrKlv+FW5ZOMEAXmODP3b+Hmkr3I aKG9Xyb8Yi4B8xDmiiC1DnnyNrvb4RM= X-MC-Unique: RdQz8HnlOtG4peupCnOL6Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 01/15] tests: Rename a few firmware tests Date: Fri, 17 Mar 2023 20:27:33 +0100 Message-Id: <20230317192747.1311223-2-abologna@redhat.com> In-Reply-To: <20230317192747.1311223-1-abologna@redhat.com> References: <20230317192747.1311223-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: 1679081284583100003 Content-Type: text/plain; charset="utf-8"; x-default="true" This unifies the naming between the manual and automatic selection cases, clarifies the contents of the tests and makes room for more tests being added in the future. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...ware-auto-efi-loader-path-nonstandard.x86_64-latest.err} | 0 ...th.xml =3D> firmware-auto-efi-loader-path-nonstandard.xml} | 0 ...=3D> firmware-manual-efi-loader-no-path.x86_64-latest.err} | 0 ...i-no-path.xml =3D> firmware-manual-efi-loader-no-path.xml} | 0 ...=3D> firmware-manual-efi-loader-secure.x86_64-latest.args} | 0 ...efi-secure.xml =3D> firmware-manual-efi-loader-secure.xml} | 0 tests/qemuxml2argvtest.c | 6 +++--- ... =3D> firmware-manual-efi-loader-secure.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 2 +- 9 files changed, 4 insertions(+), 4 deletions(-) rename tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest= .err =3D> firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err} (100= %) rename tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.xml =3D> firm= ware-auto-efi-loader-path-nonstandard.xml} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.x86_64-latest.e= rr =3D> firmware-manual-efi-loader-no-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.xml =3D> firmwa= re-manual-efi-loader-no-path.xml} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.x86_64-latest.ar= gs =3D> firmware-manual-efi-loader-secure.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.xml =3D> firmwar= e-manual-efi-loader-secure.xml} (100%) rename tests/qemuxml2xmloutdata/{firmware-manual-efi-secure.x86_64-latest.= xml =3D> firmware-manual-efi-loader-secure.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-la= test.err b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard= .x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-lat= est.err rename to tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.= x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml b/tes= ts/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml rename to tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.= xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-late= st.err b/tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.x86_64-l= atest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-lates= t.err rename to tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.x86_64-= latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml b/tests= /qemuxml2argvdata/firmware-manual-efi-loader-no-path.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-lates= t.args b/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-la= test.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest= .args rename to tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-l= atest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml b/tests/= qemuxml2argvdata/firmware-manual-efi-loader-secure.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-secure.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 293aea60d5..9a2950f8ad 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1084,11 +1084,11 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-bios-not-stateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi"); - DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-no-path"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-features"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit"); - DO_TEST_CAPS_LATEST("firmware-manual-efi-secure"); + 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("firmware-manual-efi-stateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-st= ateless"); @@ -1116,7 +1116,7 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-insecure"); - DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-path"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-path-nonstan= dard"); DO_TEST_CAPS_LATEST("firmware-auto-efi-secboot"); DO_TEST_CAPS_LATEST("firmware-auto-efi-no-secboot"); DO_TEST_CAPS_LATEST("firmware-auto-efi-enrolled-keys"); diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-secure.x86_64-lat= est.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-loader-secure.x86_64= -latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/firmware-manual-efi-secure.x86_64-late= st.xml rename to tests/qemuxml2xmloutdata/firmware-manual-efi-loader-secure.x86_64= -latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3d4c038c70..73bcfcc8b7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -924,7 +924,7 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-manual-efi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit"); - DO_TEST_CAPS_LATEST("firmware-manual-efi-secure"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-loader-secure"); 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-network-iscsi"); --=20 2.39.2 From nobody Fri Mar 29 04:47:47 2024 Delivered-To: importer@patchew.org Received-SPF: permerror (zohomail.com: Error in processing SPF Record) client-ip=216.145.221.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=permerror (zohomail.com: Error in processing SPF Record) 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=1679081361; cv=none; d=zohomail.com; s=zohoarc; b=FV5QZhQ7cG3l978n+zYwZ/hev+FDqtf4GyaOjhUXpHlIZ7ms2/I9LtQ1fKj0MAf04X2LC53j6Jbr4UxZWqKd8KZxjIBSBK+zNY7CxyiV6Ii41SJwWv/tuUmsUCBzZJaUTe6nvHjLngleKuKn/qjUfUNKH3hC4wOnB7DXr2UzZTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679081361; 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=pWAhWSl4ERDmH5Yjvoxbb/BStrLuPTQXKXwa0SZJf0I=; b=fYdqI/wS29oX2PWKxHjbK6XRwGoKnSr0u5VclOYreBD4pKNrIIpRIgJGdG8JIM9YEel7loRUjJMXEh4ZzN5CUWgkuaDl3bb1XD/hPJgJlK6uzMiFngHlAWezNyhjtFe11lDA0DXcJQkGhDNZMltiEet7PWxkSHwRBBevXziJOyA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=permerror (zohomail.com: Error in processing SPF Record) 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 [216.145.221.124]) by mx.zohomail.com with SMTPS id 1679081361508529.2046625238379; Fri, 17 Mar 2023 12:29: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-320-Be5OastUM12fCQ5GU6Nx0A-1; Fri, 17 Mar 2023 15:28:14 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D0D6101A553; Fri, 17 Mar 2023 19:28:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 176F9483EC1; Fri, 17 Mar 2023 19:28:04 +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 B5E481946A61; Fri, 17 Mar 2023 19:27:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DFF7F19466DF for ; Fri, 17 Mar 2023 19:27:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C3F2940C6E68; Fri, 17 Mar 2023 19:27:50 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58B8D40C6E67 for ; Fri, 17 Mar 2023 19:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679081360; 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=pWAhWSl4ERDmH5Yjvoxbb/BStrLuPTQXKXwa0SZJf0I=; b=YCQTj4WL5/r2eS1N2VkrefCBYcdYqR3/26hXCUy6mxba3kXewWi4uQ5cTsF2sRHZr9wl23 nKfLhkqAWyIw/u1M35HA/k+hOKaxOFyBYijlpXR7AETinng4bl86mfpEX9CV1BVwUa0umh ErsC8axKoHH4RiKvdKPxKIqARuQvWUk= X-MC-Unique: Be5OastUM12fCQ5GU6Nx0A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 02/15] tests: Fix firmware-auto-efi-loader-path-nonstandard Date: Fri, 17 Mar 2023 20:27:34 +0100 Message-Id: <20230317192747.1311223-3-abologna@redhat.com> In-Reply-To: <20230317192747.1311223-1-abologna@redhat.com> References: <20230317192747.1311223-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1679081363056100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This test is intended to simulate the use of an OVMF firmware image installed under a non-standard path. In order to make such a configuration work, the user would have to provide additional information. Right now it doesn't matter, because the configuration is rejected anyway, but the behavior is going to change slightly in the future. Prepare by making the configuration more complete and realistic. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- .../firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err | 2 +- .../firmware-auto-efi-loader-path-nonstandard.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstanda= rd.x86_64-latest.err b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path= -nonstandard.x86_64-latest.err index e551fafd03..3f90a88791 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x86_= 64-latest.err +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x86_= 64-latest.err @@ -1 +1 @@ -loader attribute 'type' cannot be specified when firmware autoselection is= enabled +loader attribute 'readonly' cannot be specified when firmware autoselectio= n is enabled diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstanda= rd.xml b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x= ml index 5cf67730fd..daec5989d5 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.xml @@ -5,7 +5,7 @@ 1 hvm - /path/to/OVMF_CODE.fd + /path/to/OVMF_CODE.fd --=20 2.39.2 From nobody Fri Mar 29 04:47:47 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=1679081294; cv=none; d=zohomail.com; s=zohoarc; b=FfUDBLU8KUAuw1gdQGrdvcHBJeDkyg30G3LZAhMZHjAHGcSsObwHOdtgeAXN1FQxVttmFUbA2iAc+CPp0475ILIK3TyfJ4cSidRWIKXHY8ZYHWOnd8u44YpLxmphbQk2h02x/STWzhrg+usnDVzLwsP9Z6mqaJWEQklbIx31GTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679081294; 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=oqu1Z/gG5XPXyS0FILkzsgbP2rObSTmC3EeGJFChAdM=; b=DXLzmH7e+DO/msvSLPsR6RbFmzcHhWbM61ApemQDmLgtNziVg58mOPSUlGuLx0iI0Y8AUjaHZHs5q67JKMBL2dmEzI+PlTGQQI0iqE703j8Vx/9YK3V3Y6rlUFwlbNwgrwwEe1N6bLV3UFt/x0w/JJtLQM2IAJtvFXtx/E0k2Jg= 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 1679081294413751.5857199004818; Fri, 17 Mar 2023 12:28:14 -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-203-m7Rdsl2PMcGU3mb_aj3eeg-1; Fri, 17 Mar 2023 15:28:10 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C55CE88B7B7; Fri, 17 Mar 2023 19:27:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0D80492B02; Fri, 17 Mar 2023 19:27:58 +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 8CE781946A4A; Fri, 17 Mar 2023 19:27:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9C1091946A72 for ; Fri, 17 Mar 2023 19:27:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7FA4740C6E68; Fri, 17 Mar 2023 19:27:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1391D40C6E67 for ; Fri, 17 Mar 2023 19:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679081293; 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=oqu1Z/gG5XPXyS0FILkzsgbP2rObSTmC3EeGJFChAdM=; b=RwjjncAe33dZ4H1go4y1XDJhqmfrlT1FGW6gOJldQNJW/XYBas6RJdw4Fz56CBlqS2tbXZ yZquKAgFsDnUoh2glqXRf6JTFKAWIYrduWreTxnv8tA448Um6ssgE1EtTr4usSKUXQofTE E7U0relMHcGb6Rs99xHtm0RM1WK65NY= X-MC-Unique: m7Rdsl2PMcGU3mb_aj3eeg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 03/15] tests: Add firmware-auto-efi-loader-path Date: Fri, 17 Mar 2023 20:27:35 +0100 Message-Id: <20230317192747.1311223-4-abologna@redhat.com> In-Reply-To: <20230317192747.1311223-1-abologna@redhat.com> References: <20230317192747.1311223-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1679081294737100004 Content-Type: text/plain; charset="utf-8"; x-default="true" This is identical to the existing firmware-auto-efi-loader-path-nonstandard test case, but uses a standard firmware path. Right now the two test cases behave identically, but that's going to change in the future. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...ware-auto-efi-loader-path.x86_64-latest.err | 1 + .../firmware-auto-efi-loader-path.xml | 18 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 20 insertions(+) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x8= 6_64-latest.err create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-la= test.err b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-late= st.err new file mode 100644 index 0000000000..3f90a88791 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.err @@ -0,0 +1 @@ +loader attribute 'readonly' cannot be specified when firmware autoselectio= n is enabled diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml b/tes= ts/qemuxml2argvdata/firmware-auto-efi-loader-path.xml new file mode 100644 index 0000000000..3e0af7ee4d --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml @@ -0,0 +1,18 @@ + + 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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9a2950f8ad..3175f59c48 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1116,6 +1116,7 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-insecure"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-path"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-path-nonstan= dard"); DO_TEST_CAPS_LATEST("firmware-auto-efi-secboot"); DO_TEST_CAPS_LATEST("firmware-auto-efi-no-secboot"); --=20 2.39.2 From nobody Fri Mar 29 04:47:47 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=1679081279; cv=none; d=zohomail.com; s=zohoarc; b=hpXV/gJ0ok2yNlvkD1uyNLhd1oIxZwVfwGeslhQcco3H5oLmu4KSd/XrVLA6hNP7Blb1K0gY5v/WeT/glqnqFpvSxKJJXWpGJKVX34rYwL7/MVtQ7qmRZX9aqe3MJeQf7SItG7QFsYJnrs/zbNjooob/3iwmQyl30lsJ/WBK2Ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679081279; 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=EuwE6HM32LATcpaBBvgEbkLQz1/nIqwctiPOXxUOFCE=; b=RVuGt579cHj8dJOn9KBWyhGci84qMJ2XMU974nomvLrUT7/Zsq4k+FX8VuPqJWNXT5qz20vRF0vjN95GHrDNxCU5IJs0HxMKDDDBG8V9ntkwGBRRJOJq+1Owszxnh5hgFftqMsLmmaD2eB3LHce66HE+XLDjOqKtF8X+NXVEa9I= 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 1679081279417812.3816487708231; Fri, 17 Mar 2023 12:27:59 -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-634-sf6t3GBOO5uhVWFJ7HMraw-1; Fri, 17 Mar 2023 15:27:55 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BBFDA88B7A1; Fri, 17 Mar 2023 19:27:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A715B492B03; Fri, 17 Mar 2023 19:27: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 6AFF51946A63; Fri, 17 Mar 2023 19:27:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7729219466DF for ; Fri, 17 Mar 2023 19:27:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5C5B540C6E6A; Fri, 17 Mar 2023 19:27:52 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C340640C6E67 for ; Fri, 17 Mar 2023 19:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679081278; 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=EuwE6HM32LATcpaBBvgEbkLQz1/nIqwctiPOXxUOFCE=; b=Vkc11p17zFb01/LDdxTczyi++GWrXV4ZzrpNGx9AIaIpHd9ZWD/LTv5WC+/LkKAlJeUWRe bJxznTjOl0/XVIKdJHMWDUFUy6oOTcFICX+hpEEbWc+EvjTWI8YlCxaPwDdkprJplI7u8l gmE/SVQ39LIoOoCx1ZPRf2rOskBkVLA= X-MC-Unique: sf6t3GBOO5uhVWFJ7HMraw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 04/15] tests: Add more tests for manual Secure Boot configuration Date: Fri, 17 Mar 2023 20:27:36 +0100 Message-Id: <20230317192747.1311223-5-abologna@redhat.com> In-Reply-To: <20230317192747.1311223-1-abologna@redhat.com> References: <20230317192747.1311223-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1679081280687100001 Content-Type: text/plain; charset="utf-8"; x-default="true" These cover the same scenarios as the matching test cases for autoselection. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...al-efi-no-enrolled-keys.x86_64-latest.args | 38 +++++++++++++++++++ .../firmware-manual-efi-no-enrolled-keys.xml | 20 ++++++++++ ...e-manual-efi-no-secboot.x86_64-latest.args | 37 ++++++++++++++++++ .../firmware-manual-efi-no-secboot.xml | 19 ++++++++++ ...ware-manual-efi-secboot.x86_64-latest.args | 38 +++++++++++++++++++ .../firmware-manual-efi-secboot.xml | 20 ++++++++++ tests/qemuxml2argvtest.c | 3 ++ ...ual-efi-no-enrolled-keys.x86_64-latest.xml | 37 ++++++++++++++++++ ...re-manual-efi-no-secboot.x86_64-latest.xml | 36 ++++++++++++++++++ ...mware-manual-efi-secboot.x86_64-latest.xml | 37 ++++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 11 files changed, 288 insertions(+) create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-= keys.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-= keys.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x= 86_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x= ml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_= 64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-secboot.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolle= d-keys.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-no-secboot= .x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-secboot.x8= 6_64-latest.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x8= 6_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-k= eys.x86_64-latest.args new file mode 100644 index 0000000000..a1481d834f --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x86_64-la= test.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":"/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 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 1024 \ +-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.xm= l b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.xml new file mode 100644 index 0000000000..bc715f704b --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.xml @@ -0,0 +1,20 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVM= F/OVMF_CODE.secboot.fd + /path/to/guest_VARS.f= d + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-l= atest.args new file mode 100644 index 0000000000..5e5359ab71 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-latest.a= rgs @@ -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":"/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 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 1024 \ +-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.xml b/te= sts/qemuxml2argvdata/firmware-manual-efi-no-secboot.xml new file mode 100644 index 0000000000..463a431c44 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.xml @@ -0,0 +1,19 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd<= /loader> + /path/to/guest_VARS.f= d + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-late= st.args b/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.= args new file mode 100644 index 0000000000..a1481d834f --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secboot.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":"/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 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 1024 \ +-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.xml b/tests= /qemuxml2argvdata/firmware-manual-efi-secboot.xml new file mode 100644 index 0000000000..1850c2b241 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secboot.xml @@ -0,0 +1,20 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + /usr/share/OVM= F/OVMF_CODE.secboot.fd + /path/to/gues= t_VARS.fd + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3175f59c48..23e48b251c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1089,6 +1089,9 @@ mymain(void) 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("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_PARSE_ERROR("firmware-manual-efi-nvram-template-st= ateless"); diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolled-keys.= x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolle= d-keys.x86_64-latest.xml new file mode 100644 index 0000000000..4caa7950ce --- /dev/null +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolled-keys.x86_64-= latest.xml @@ -0,0 +1,37 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1048576 + 1 + + hvm + /usr/share/OVM= F/OVMF_CODE.secboot.fd + /path/to/guest_VARS.f= d + + + + + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + +
+ + + + +