From nobody Sun May 19 04:56:03 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=1676457768; cv=none; d=zohomail.com; s=zohoarc; b=ZuzOZopKUnuKqh9qe9Gtu9eIh3VCVHfM7KcRn8XFwvht24XEe3PeaN5txe6mn+VsPbaFWTf0/KA9z2rWVGFTMKJUhkM/pAlv+L4sWPv8ysrSP1yGX3Q+S51kOjgvzB5WhurtFyf9Y0hUdQmXi/b9dqgI4fbloqxKd0zVcw9204I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457768; 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=DrikbKS2Za+lRXken1reYQNdwolCnzqZbVhWnkn2VYE=; b=MNMhNeFiArZH803UXe/2vOpbk0JznPySfHPGhuzxNaIN1yhdP8h140SaZwENSa1VDJNX7hnfhzWj+CAVRgiBuxoJYz8BR/nVG7tSOiG4ffiwx+9btKn0iEVgZZJelM76+udAs2tsaCh3OoOwP9Xc0HOwciHm015dykMcbZYa8RA= 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 1676457768605679.6419279314438; Wed, 15 Feb 2023 02:42:48 -0800 (PST) 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-121-_6mbDK8yMXao1cVi2LfKVg-1; Wed, 15 Feb 2023 05:42:45 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B6EDD85A5B1; Wed, 15 Feb 2023 10:42:37 +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 9AA361121319; Wed, 15 Feb 2023 10:42:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9082C194658C; Wed, 15 Feb 2023 10:42:37 +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 4F80A1946586 for ; Wed, 15 Feb 2023 10:42:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 41AB21415108; Wed, 15 Feb 2023 10:42:33 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3F89140EBF4 for ; Wed, 15 Feb 2023 10:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457767; 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=DrikbKS2Za+lRXken1reYQNdwolCnzqZbVhWnkn2VYE=; b=Z/19EHQplz6n01+3j84TWcmlaKVJS3fs8jAOkm3YGR5U3hWjpCcBSjV9sMkqlX3hZj6J0g dqW8OqNmHBU1T5FVwdu4KFhVLByHy1OI2wMhbw3zKEI8IfS+KKJgY4b+YqWvWg1fMPDN1+ A2mEzwoodFY0rjliPv1XUb8nSez2KBk= X-MC-Unique: _6mbDK8yMXao1cVi2LfKVg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 01/33] docs: Fix documentation for loader.stateless attribute Date: Wed, 15 Feb 2023 11:41:58 +0100 Message-Id: <20230215104230.980815-2-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-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.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1676457769704100004 Content-Type: text/plain; charset="utf-8"; x-default="true" It works exactly the other way around. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 36c6d87907..8407bab1ba 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -255,7 +255,7 @@ harddisk, cdrom, network) determining where to obtain/f= ind the boot image. is assumed that there will be a writable NVRAM available. In some cases, however, it may be desirable for the loader to run without any NVRAM, d= iscarding any config changes on shutdown. The ``stateless`` flag (:since:`Since 8= .6.0`) - can be used to control this behaviour, when set to ``no`` NVRAM will ne= ver + can be used to control this behaviour, when set to ``yes`` NVRAM will n= ever be created. ``nvram`` Some UEFI firmwares may want to use a non-volatile memory to store some --=20 2.39.1 From nobody Sun May 19 04:56:03 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=1676457764; cv=none; d=zohomail.com; s=zohoarc; b=EleOosWmTnOpUBFcC7axizuIZ/l4/bVhpiO7lGQnrQRIKj6B+Y2cuHf0DwtBk4Welb+XsMY5Jn0ElW5Qd1OUDbn2xoEgEJczn02eoUUgyzN6v1LUWDnmrCtlQu3b8niTkYkZh1yaZDtPuo6f8Edsuo7LHiXWtkXGMWbYAQViR4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457764; 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=hMfrtQNGDSP3R27qPvd5BseEY+bU24VNV0zL5cv2Wms=; b=FSRyVjTGsZvwgrO6JBHtF+XLnhEd3b6eQHR0axgoPCG8+A8eWQSzZYN0Bux7J512rvPi9WVLfh4yvAGSlUL4KO+8x/p02oe+ih1Ng396+UV3Dpx+gz8HeX4icMmrfZDiZHLFy6pBqnVK0mGp1LZFXl/29FBLA7UXKFGE3u++Pmw= 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 1676457764475529.2681718152675; Wed, 15 Feb 2023 02:42:44 -0800 (PST) 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-673-4UGNv3kvOGuw7zxnVlJ1xw-1; Wed, 15 Feb 2023 05:42:41 -0500 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 AED66802C16; Wed, 15 Feb 2023 10:42:36 +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 68A022166B31; Wed, 15 Feb 2023 10:42:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1F5721946588; Wed, 15 Feb 2023 10:42:36 +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 131161946586 for ; Wed, 15 Feb 2023 10:42:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 06F261415108; Wed, 15 Feb 2023 10:42:34 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89C7A140EBF4 for ; Wed, 15 Feb 2023 10:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457763; 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=hMfrtQNGDSP3R27qPvd5BseEY+bU24VNV0zL5cv2Wms=; b=CTjgRiDMKEBsrT8O10mv80fr8AmyzG4Y8uDgO6Pw2MS3w56cQcv3TthKsEEKlgyzRJCmvg Uu4QzacL5hb+Wxnq1HJU3mMFAPzzxVX+CIqvt5mFdttKAcCRT8D7gOCgsObexWooPCllFc m9aJCkhTwGpiwsUEhDbQsrT4In5qPug= X-MC-Unique: 4UGNv3kvOGuw7zxnVlJ1xw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 02/33] tests: Set nvramDir in qemuxml2xmltest Date: Wed, 15 Feb 2023 11:41:59 +0100 Message-Id: <20230215104230.980815-3-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-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: 1676457765674100003 Content-Type: text/plain; charset="utf-8"; x-default="true" We already do this in qemuxml2argvtest. Right now setting this doesn't change anything, but it will become relevant later. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- tests/qemuxml2xmltest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ae9716062d..907762190b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -163,6 +163,9 @@ mymain(void) cfg =3D virQEMUDriverGetConfig(&driver); driver.privileged =3D true; =20 + VIR_FREE(cfg->nvramDir); + cfg->nvramDir =3D g_strdup("/var/lib/libvirt/qemu/nvram"); + if (!(conn =3D virGetConnect())) goto cleanup; =20 --=20 2.39.1 From nobody Sun May 19 04:56:03 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=1676457768; cv=none; d=zohomail.com; s=zohoarc; b=TyL+T5JcM6fyGwLZK1ZM1PjOgW4taXduSdE6EJ8efKh6VoW3Z7qom+4VQMueJe+CeZFcht2gxfXHRMfNSIlBz98xOHXKxpmwBk+dOMBfF4NYDh1294AzK75YVuoxpJ0Skp7rW6kU298NfIng+c3XDvE7N+0BeWmopY7eg1An8j4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457768; 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=W3ey7rtma8crQCQvCK6uXWghcmKlobrJlPX/DUoekP8=; b=cMNunk6ph6gtM2O+3YbXmioIZYCa9Bxx0YfiE3BLW0/EJQIOzv+Luys8qOAzt2KIh6Ea8KcHD/615AC1PX32Kr3RMFydQ5a4/bsT8frG8SHnFCPRIOwH/w1yKL5s+e4g8V9fPHdiUyVbbVqrB3n2+65zOJYlnyoL9tzP9L4m6Tk= 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 1676457768064997.2523475339872; Wed, 15 Feb 2023 02:42:48 -0800 (PST) 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-675-sljtL_I4Mi6DDJu9JrMmKw-1; Wed, 15 Feb 2023 05:42:41 -0500 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 C84A4100F906; Wed, 15 Feb 2023 10:42:36 +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 AD6612166B30; Wed, 15 Feb 2023 10:42:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5B37A19465B6; Wed, 15 Feb 2023 10:42:36 +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 D2EE61946586 for ; Wed, 15 Feb 2023 10:42:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C1B7214171BE; Wed, 15 Feb 2023 10:42:34 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E729140EBF4 for ; Wed, 15 Feb 2023 10:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457767; 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=W3ey7rtma8crQCQvCK6uXWghcmKlobrJlPX/DUoekP8=; b=Wz1zJwkGwywoSdrG6yWEWhxyO2d0u/JsS2cI2zQAsdvYvZRL9ajw0l+ansUw2uCyQsHLsL Uu7ik62SpzSteAyHCmfJ8q3U7nis6GPNZByUJ5mhvsDOpNv3nV7m+2+ycFpo3JNUxjN8r1 SNASDdJvWpA/0fm9CWMchRIxzr95afk= X-MC-Unique: sljtL_I4Mi6DDJu9JrMmKw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 03/33] tests: Rename firmware-manual-efi-rw* tests Date: Wed, 15 Feb 2023 11:42:00 +0100 Message-Id: <20230215104230.980815-4-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-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: 1676457769665100003 Content-Type: text/plain; charset="utf-8"; x-default="true" These test cases deal with EFI, not BIOS. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...rgs =3D> firmware-manual-efi-rw-implicit.x86_64-latest.args} | 0 ...os-rw-implicit.xml =3D> firmware-manual-efi-rw-implicit.xml} | 0 ...-latest.args =3D> firmware-manual-efi-rw.x86_64-latest.args} | 0 ...firmware-manual-bios-rw.xml =3D> firmware-manual-efi-rw.xml} | 0 tests/qemuxml2argvtest.c | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw-implicit.x86_64-lat= est.args =3D> firmware-manual-efi-rw-implicit.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw-implicit.xml =3D> f= irmware-manual-efi-rw-implicit.xml} (100%) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw.x86_64-latest.args = =3D> firmware-manual-efi-rw.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw.xml =3D> firmware-m= anual-efi-rw.xml} (100%) diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64= -latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_6= 4-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-= latest.args rename to tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-lat= est.args diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.xml b/= tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.ar= gs rename to tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-rw.xml b/tests/qem= uxml2argvdata/firmware-manual-efi-rw.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-rw.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-rw.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ae0afb6f1c..f8ea0b6d10 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1129,8 +1129,8 @@ mymain(void) DO_TEST_NOCAPS("firmware-manual-efi"); DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-features"); - DO_TEST_CAPS_LATEST("firmware-manual-bios-rw"); - DO_TEST_CAPS_LATEST("firmware-manual-bios-rw-implicit"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-rw"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit"); DO_TEST("firmware-manual-efi-secure", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, --=20 2.39.1 From nobody Sun May 19 04:56:03 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=1676457788; cv=none; d=zohomail.com; s=zohoarc; b=OccxX4WS4MJFedrub4sFCamHQcPbJULlHor+8OmT8JHLg/ySGmdGWCGgEO/HhJ8ZfqvrIvYM165odjEZYbB21E3gZJMXkR9gnc1mqbIqMBncFtWGHD7gCLytwYd7Qzrx6s4d0j/or1BOfYWTcG0mNwnuuGL4mtYVBEdYYwlIPdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457788; 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=zlrDWVwlfV/AFZ2uVJeQa8IX2dpo5dFEcISfmgelUqU=; b=cO16gFdzdhHMVDXF7TThPLs+VNqn+WDFsP2/OM8JfySJrL9YrYnNp3ALNPVFkyj2ritWoULO1kMNe+UC+XU27T4I7ArS0purUD+Y8AcmH5pqa+zaLl1Nyt2hW7SlwN9OC6ynBgFepQoULXDbKMQ53ojDLH4Iy0KisgLgAs5Wfdc= 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 1676457788630306.1036131585337; Wed, 15 Feb 2023 02:43:08 -0800 (PST) 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-141-sCg1GmNROeGt86lBFn_-Iw-1; Wed, 15 Feb 2023 05:42:41 -0500 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 2BABE183B3E3; Wed, 15 Feb 2023 10:42:37 +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 172DB492B15; Wed, 15 Feb 2023 10:42:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C94CE1946589; Wed, 15 Feb 2023 10:42:36 +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 A13831946586 for ; Wed, 15 Feb 2023 10:42:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 86B931415108; Wed, 15 Feb 2023 10:42:35 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 14908140EBF4 for ; Wed, 15 Feb 2023 10:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457787; 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=zlrDWVwlfV/AFZ2uVJeQa8IX2dpo5dFEcISfmgelUqU=; b=QhNI8Y5QNwwRziOok1yX8TJyqmXe/3KXXXTiURjzDCUA7+htIriYeYX2qTzuLZDUc6Tcb8 v0en4FzCiHK5Z2qJeMhfWplse1b1c2mO2JmT+NfC8mTX68llDk4VJBM0vfaEgd7AH+yDtT OgHsjbOA2yCAZGbIflpuGFgu1MrmblQ= X-MC-Unique: sCg1GmNROeGt86lBFn_-Iw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 04/33] tests: Use x86_64 for all x86 firmware tests Date: Wed, 15 Feb 2023 11:42:01 +0100 Message-Id: <20230215104230.980815-5-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-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.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: 1676457789846100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Most test cases are on 64-bit architectures already, but there are a couple of exceptions. Right now this works, but it will no longer fly after some upcoming changes. Prepare for those by switching away from 32-bit architectures. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml | 4 ++-- tests/qemuxml2argvdata/firmware-manual-bios-stateless.args | 2 +- tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml | 4 ++-- tests/qemuxml2argvdata/firmware-manual-bios.args | 2 +- tests/qemuxml2argvdata/firmware-manual-bios.xml | 4 ++-- tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml | 4 ++-- tests/qemuxml2xmloutdata/firmware-manual-bios.xml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml = b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml index b60878ca0b..6e5f87354a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml @@ -4,11 +4,11 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args b/t= ests/qemuxml2argvdata/firmware-manual-bios-stateless.args index 4f2ac0c682..3aa4fa90fa 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml b/te= sts/qemuxml2argvdata/firmware-manual-bios-stateless.xml index 9d6f4e4c83..fa644af8b9 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml @@ -4,11 +4,11 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.args b/tests/qemux= ml2argvdata/firmware-manual-bios.args index 4f2ac0c682..3aa4fa90fa 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.xml b/tests/qemuxm= l2argvdata/firmware-manual-bios.xml index 3e1946029c..f5c33bc306 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios.xml @@ -4,11 +4,11 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml b/= tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml index de5ecb96dc..2fb7b49a79 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml b/tests/qemu= xml2xmloutdata/firmware-manual-bios.xml index 75bb6038ca..47432ac525 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 --=20 2.39.1 From nobody Sun May 19 04:56:03 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=1676457767; cv=none; d=zohomail.com; s=zohoarc; b=PNkSpaReIB0ubVaQeINCQ5AEp/tKUixOF1eEcu/9i6rnknysZ2RD35jEqZMc/q17HQ6e6MFisf8S4eqvIl0b2SVh3ZYrU/K7ew38KwvKXgR365RJV4+M4O7bashzf6QQKPYsrBTCdxN8s51z0b6hHaCfK02ye7Ig04eoY5zgbNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457767; 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=gz2EJU+N4hB3Dh5JlXZ7iiL46QFNhEuNTOz6SIqG3qk=; b=BKJFVJHWh1GhI5gIuCQ3OR68mEniQow+yxc5tCNRWp7jpS204A3Wxjr5csbYLLCbLGsA5apGL9i8jl7b0HMk+S8rzH9B0zaNofd9mFMXY3izwCOD1Las9rzdB7LsuK60esJmUfbi4NrqxmB56Gji7ZN6BK6ka+je63WvC1e9inI= 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 1676457767457572.585198623547; Wed, 15 Feb 2023 02:42:47 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-T5NldXtUPw-2MjaFI6fQ3w-1; Wed, 15 Feb 2023 05:42:41 -0500 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 7F0412807D87; Wed, 15 Feb 2023 10:42:37 +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 5CE0C2166B30; Wed, 15 Feb 2023 10:42:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0A6E819466DF; Wed, 15 Feb 2023 10:42:37 +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 AAF661946595 for ; Wed, 15 Feb 2023 10:42:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9B9C1141510F; Wed, 15 Feb 2023 10:42:36 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05D071415108 for ; Wed, 15 Feb 2023 10:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457765; 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=gz2EJU+N4hB3Dh5JlXZ7iiL46QFNhEuNTOz6SIqG3qk=; b=Vgrydm21Ju3N5VAWb9Yykd4W+gbOQfChizmPQmAcDb3CRE++DF/Ov5gLWrSgVHHM8IA1hx uxxohifuZfdex+7VtlU7KObnAUPs1po/b8W3cilmGajALesJkQwEBXtUKqzlrzCRx+Vd1o B6P+5FiOEdmlyR2N3ytDZH0E9heqW8g= X-MC-Unique: T5NldXtUPw-2MjaFI6fQ3w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 05/33] tests: Move firmware tests to CAPS_LATEST Date: Wed, 15 Feb 2023 11:42:02 +0100 Message-Id: <20230215104230.980815-6-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-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: 1676457767810100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This is already the case for the vast majority, but a few are using explicit capabilities lists. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...nual-bios-not-stateless.x86_64-latest.err} | 0 ...-manual-bios-stateless.x86_64-latest.args} | 7 ++-- ...> firmware-manual-bios.x86_64-latest.args} | 7 ++-- ...nual-efi-acpi-aarch64.aarch64-latest.args} | 7 ++-- ...re-manual-efi-acpi-q35.x86_64-latest.args} | 7 ++-- ...ware-manual-efi-no-path.x86_64-latest.err} | 0 ...al-efi-noacpi-aarch64.aarch64-latest.args} | 7 ++-- ...e-manual-efi-noacpi-q35.x86_64-latest.err} | 0 ...ware-manual-efi-secure.x86_64-latest.args} | 7 ++-- ...=3D> firmware-manual-efi.x86_64-latest.args} | 7 ++-- ...ual-noefi-acpi-aarch64.aarch64-latest.err} | 0 ...-manual-noefi-acpi-q35.x86_64-latest.args} | 7 ++-- ...-noefi-noacpi-aarch64.aarch64-latest.args} | 7 ++-- ...anual-noefi-noacpi-q35.x86_64-latest.args} | 7 ++-- tests/qemuxml2argvtest.c | 36 ++++++++----------- ...e-manual-bios-stateless.x86_64-latest.xml} | 3 ++ ...=3D> firmware-manual-bios.x86_64-latest.xml} | 3 ++ ... =3D> firmware-manual-efi.x86_64-latest.xml} | 3 ++ tests/qemuxml2xmltest.c | 6 ++-- 19 files changed, 76 insertions(+), 45 deletions(-) rename tests/qemuxml2argvdata/{firmware-manual-bios-not-stateless.err =3D>= firmware-manual-bios-not-stateless.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-bios-stateless.args =3D> fi= rmware-manual-bios-stateless.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-bios.args =3D> firmware-man= ual-bios.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-aarch64.args =3D> = firmware-manual-efi-acpi-aarch64.aarch64-latest.args} (73%) rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.args =3D> firm= ware-manual-efi-acpi-q35.x86_64-latest.args} (75%) rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.err =3D> firmwa= re-manual-efi-no-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-aarch64.args =3D= > firmware-manual-efi-noacpi-aarch64.aarch64-latest.args} (73%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-q35.err =3D> fir= mware-manual-efi-noacpi-q35.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.args =3D> firmwa= re-manual-efi-secure.x86_64-latest.args} (76%) rename tests/qemuxml2argvdata/{firmware-manual-efi.args =3D> firmware-manu= al-efi.x86_64-latest.args} (75%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-aarch64.err =3D>= firmware-manual-noefi-acpi-aarch64.aarch64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-q35.args =3D> fi= rmware-manual-noefi-acpi-q35.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-aarch64.args = =3D> firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args} (65%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-q35.args =3D> = firmware-manual-noefi-noacpi-q35.x86_64-latest.args} (68%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios-stateless.xml =3D> f= irmware-manual-bios-stateless.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios.xml =3D> firmware-ma= nual-bios.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{firmware-manual-efi.xml =3D> firmware-man= ual-efi.x86_64-latest.xml} (90%) diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err = b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-latest.e= rr similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err rename to tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-= latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args b/t= ests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-bios-stateless.args rename to tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-late= st.args index 3aa4fa90fa..20953097ef 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.a= rgs @@ -9,11 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -no-acpi \ -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-bios.args b/tests/qemux= ml2argvdata/firmware-manual-bios.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-bios.args rename to tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args index 3aa4fa90fa..20953097ef 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args @@ -9,11 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -no-acpi \ -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-acpi-aarch64.args b= /tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args similarity index 73% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-l= atest.args index 411ac0ee7c..d6ed7b879c 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-lates= t.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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 '{"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,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-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 \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -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-acpi-q35.args b/tes= ts/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args similarity index 75% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest= .args index 641b7482ef..1d95deed9f 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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":"/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 q35,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pflash0-for= mat,pflash1=3Dlibvirt-pflash1-format \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflas= h0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -31,4 +33,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.err b/tests= /qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-path.err rename to tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.= err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args= b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest= .args similarity index 73% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64= -latest.args index 3dbd36f066..3ecd28d85e 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-lat= est.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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 '{"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,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-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 \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -30,4 +32,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-acpi \ -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-noacpi-q35.err b/te= sts/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-late= st.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests= /qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args similarity index 76% rename from tests/qemuxml2argvdata/firmware-manual-efi-secure.args rename to tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.a= rgs index 7a879c3822..d394efedd9 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args @@ -9,15 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/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":"/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 q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlibvirt-pf= lash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backend=3Dpc.= ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -32,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.args b/tests/qemuxm= l2argvdata/firmware-manual-efi.x86_64-latest.args similarity index 75% rename from tests/qemuxml2argvdata/firmware-manual-efi.args rename to tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args index 1ee322bf08..9a0a941372 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/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":"/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 pc,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pflash0-form= at,pflash1=3Dlibvirt-pflash1-format \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -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-noefi-acpi-aarch64.err = b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.= err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64= -latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args b/t= ests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-late= st.args index 814396d3fc..18991fa32c 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.a= rgs @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.ar= gs b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-la= test.args similarity index 65% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch= 64-latest.args index b587534c49..fab02e14e2 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-l= atest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -26,4 +28,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-acpi \ -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-noefi-noacpi-q35.args b= /tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-la= test.args index 4eff029173..089871f9fa 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest= .args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f8ea0b6d10..885daff5f7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1120,23 +1120,15 @@ mymain(void) DO_TEST_NOCAPS("reboot-timeout-disabled"); DO_TEST_NOCAPS("reboot-timeout-enabled"); =20 - DO_TEST("firmware-manual-bios", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("firmware-manual-bios-stateless", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_PARSE_ERROR("firmware-manual-bios-not-stateless", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_NOCAPS("firmware-manual-efi"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path"); + DO_TEST_CAPS_LATEST("firmware-manual-bios"); + 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("firmware-manual-efi-secure", - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("firmware-manual-efi-secure"); 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"); @@ -1146,14 +1138,14 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-stateless"); =20 /* Make sure all combinations of ACPI and UEFI behave as expected */ - DO_TEST_NOCAPS("firmware-manual-efi-acpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-efi-acpi-q35"); - DO_TEST_NOCAPS("firmware-manual-efi-noacpi-aarch64"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-noacpi-q35"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-noefi-acpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-noefi-acpi-q35"); - DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-acpi-aarch64", "aarch64"= ); + DO_TEST_CAPS_LATEST("firmware-manual-efi-acpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-noacpi-aarch64", "aarch6= 4"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-noacpi-q35"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("firmware-manual-noefi-acpi-aarch= 64", "aarch64"); + DO_TEST_CAPS_LATEST("firmware-manual-noefi-acpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-noacpi-aarch64", "aarc= h64"); + DO_TEST_CAPS_LATEST("firmware-manual-noefi-noacpi-q35"); =20 DO_TEST_CAPS_LATEST("firmware-auto-bios"); DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless"); diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml b/= tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml rename to tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-la= test.xml index 2fb7b49a79..186df8c386 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest= .xml @@ -9,6 +9,9 @@ /usr/share/seabios/bios.bin + + qemu64 + destroy restart diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml b/tests/qemu= xml2xmloutdata/firmware-manual-bios.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/firmware-manual-bios.xml rename to tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml index 47432ac525..98b7becb2c 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml @@ -9,6 +9,9 @@ /usr/share/seabios/bios.bin + + qemu64 + destroy restart diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi.xml b/tests/qemux= ml2xmloutdata/firmware-manual-efi.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/firmware-manual-efi.xml rename to tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml index 7e6b3ad432..189f68cb1c 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-efi.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml @@ -13,6 +13,9 @@ + + qemu64 + destroy restart diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 907762190b..b242f1e9ac 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -937,9 +937,9 @@ mymain(void) DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); =20 - DO_TEST_NOCAPS("firmware-manual-bios"); - DO_TEST_NOCAPS("firmware-manual-bios-stateless"); - DO_TEST_NOCAPS("firmware-manual-efi"); + DO_TEST_CAPS_LATEST("firmware-manual-bios"); + DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless"); + DO_TEST_CAPS_LATEST("firmware-manual-efi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file"); --=20 2.39.1 From nobody Sun May 19 04:56:03 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=1676457844; cv=none; d=zohomail.com; s=zohoarc; b=dAutQNbFokQRhVV7r4i1CQnCN3ClH9JJtiQMcc3LL5nKO3amyvq9wGg0dBDZ1Qt0AFlcCgqy9WWaPfBUZ3V7HBwty9eYBHrGZYMeXEv4j5sqrzkSvgfBjkZxSgluOAO8NmUMdwlGNYV908PqX8ilxEoHLHF1SBSgFivn2G+JxYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457844; 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=DCIDqDg0Y/yZmpzf5foJomoIYQKaPm1uGb2cNKsjbS0=; b=QTeMlEBKvcvsEi7ZyEepuIZrszZNU81vrkPYRmgmMurcsmW89DfrxavF/k2nmcLqOKmAE+Kp6GfLR1kRF2p3A6pVrNfUuCNbcdWQ/nuue4Xy7WDWKeknV19Xf/+xbPerBgpVcSlSZZZRV7PeYMxCdhwNNlCmTDex49kdARs2WmM= 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 1676457844137638.8035152129273; Wed, 15 Feb 2023 02:44:04 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-225-sLbEM7X8P8mzohF9mQH8dQ-1; Wed, 15 Feb 2023 05:42:46 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 834A61C05152; Wed, 15 Feb 2023 10:42:39 +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 662521121314; Wed, 15 Feb 2023 10:42:39 +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 562DD1946588; Wed, 15 Feb 2023 10:42:39 +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 C994C1946586 for ; Wed, 15 Feb 2023 10:42:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id ABA8114171BA; Wed, 15 Feb 2023 10:42:37 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6F451415108 for ; Wed, 15 Feb 2023 10:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457843; 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=DCIDqDg0Y/yZmpzf5foJomoIYQKaPm1uGb2cNKsjbS0=; b=WvB7Y2xQTr2+I5j48ip9na1F0sc2coDJZag3lmYwVwceFZgQeYvz7H0wu2rcWT0Ip9FJZ+ omXCYfHi1M/SBTMqt8FsaWHgO+86nykYJ6tjFFtp1zfcVmiR7haQ+wHK/aByhJZ+9kjCX0 FuGNpjIwkZVHNYQAproH0qxVVkS4ieY= X-MC-Unique: sLbEM7X8P8mzohF9mQH8dQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 06/33] tests: Unify input files for firmware tests Date: Wed, 15 Feb 2023 11:42:03 +0100 Message-Id: <20230215104230.980815-7-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-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.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1676457846291100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Most of the differences, such as those in the domain name or amount of memory, are fairly harmless, but they still make it more cumbersome than necessary to directly compare different input (and output) files. More importantly, the use of unversioned machine types in some of the test cases results in the descriptor-based autoselection logic being effectively skipped, because the compatible machine types as listed in them are only the versioned variants. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- .../firmware-auto-bios-not-stateless.xml | 4 ++-- .../firmware-auto-bios-nvram.xml | 6 +++--- ...ware-auto-bios-stateless.x86_64-latest.args | 16 ++++++++-------- .../firmware-auto-bios-stateless.xml | 4 ++-- .../firmware-auto-bios.x86_64-latest.args | 16 ++++++++-------- tests/qemuxml2argvdata/firmware-auto-bios.xml | 4 ++-- ...rmware-auto-efi-aarch64.aarch64-latest.args | 16 ++++++++-------- .../firmware-auto-efi-aarch64.xml | 4 ++-- ...mware-auto-efi-enrolled-keys-no-secboot.xml | 4 ++-- ...e-auto-efi-enrolled-keys.x86_64-latest.args | 18 +++++++++--------- .../firmware-auto-efi-enrolled-keys.xml | 4 ++-- .../firmware-auto-efi-loader-insecure.xml | 4 ++-- .../firmware-auto-efi-loader-path.xml | 4 ++-- ...e-auto-efi-loader-secure.x86_64-latest.args | 18 +++++++++--------- .../firmware-auto-efi-loader-secure.xml | 4 ++-- ...uto-efi-no-enrolled-keys.x86_64-latest.args | 18 +++++++++--------- .../firmware-auto-efi-no-enrolled-keys.xml | 4 ++-- ...ware-auto-efi-no-secboot.x86_64-latest.args | 18 +++++++++--------- .../firmware-auto-efi-no-secboot.xml | 4 ++-- .../firmware-auto-efi-nvram.x86_64-latest.args | 18 +++++++++--------- .../firmware-auto-efi-nvram.xml | 6 +++--- ...irmware-auto-efi-secboot.x86_64-latest.args | 18 +++++++++--------- .../firmware-auto-efi-secboot.xml | 4 ++-- ...mware-auto-efi-stateless.x86_64-latest.args | 16 ++++++++-------- .../firmware-auto-efi-stateless.xml | 4 ++-- .../firmware-auto-efi.x86_64-latest.args | 18 +++++++++--------- tests/qemuxml2argvdata/firmware-auto-efi.xml | 4 ++-- .../firmware-manual-bios-not-stateless.xml | 6 +++--- ...re-manual-bios-stateless.x86_64-latest.args | 16 ++++++++-------- .../firmware-manual-bios-stateless.xml | 6 +++--- .../firmware-manual-bios.x86_64-latest.args | 16 ++++++++-------- .../qemuxml2argvdata/firmware-manual-bios.xml | 6 +++--- ...manual-efi-acpi-aarch64.aarch64-latest.args | 6 +++--- .../firmware-manual-efi-acpi-aarch64.xml | 6 +++--- ...ware-manual-efi-acpi-q35.x86_64-latest.args | 6 +++--- .../firmware-manual-efi-acpi-q35.xml | 6 +++--- .../firmware-manual-efi-features.xml | 6 +++--- .../firmware-manual-efi-no-path.xml | 6 +++--- ...nual-efi-noacpi-aarch64.aarch64-latest.args | 6 +++--- .../firmware-manual-efi-noacpi-aarch64.xml | 6 +++--- .../firmware-manual-efi-noacpi-q35.xml | 6 +++--- ...re-manual-efi-nvram-file.x86_64-latest.args | 18 +++++++++--------- .../firmware-manual-efi-nvram-file.xml | 8 ++++---- ...-efi-nvram-network-iscsi.x86_64-latest.args | 16 ++++++++-------- ...firmware-manual-efi-nvram-network-iscsi.xml | 6 +++--- ...al-efi-nvram-network-nbd.x86_64-latest.args | 16 ++++++++-------- .../firmware-manual-efi-nvram-network-nbd.xml | 6 +++--- .../firmware-manual-efi-nvram-stateless.xml | 8 ++++---- ...are-manual-efi-nvram-template-stateless.xml | 6 +++--- ...anual-efi-nvram-template.x86_64-latest.args | 18 +++++++++--------- .../firmware-manual-efi-nvram-template.xml | 6 +++--- ...e-manual-efi-rw-implicit.x86_64-latest.args | 18 +++++++++--------- .../firmware-manual-efi-rw-implicit.xml | 8 ++++---- .../firmware-manual-efi-rw.x86_64-latest.args | 18 +++++++++--------- .../firmware-manual-efi-rw.xml | 8 ++++---- ...rmware-manual-efi-secure.x86_64-latest.args | 18 +++++++++--------- .../firmware-manual-efi-secure.xml | 8 ++++---- ...are-manual-efi-stateless.x86_64-latest.args | 16 ++++++++-------- .../firmware-manual-efi-stateless.xml | 6 +++--- .../firmware-manual-efi.x86_64-latest.args | 18 +++++++++--------- tests/qemuxml2argvdata/firmware-manual-efi.xml | 8 ++++---- .../firmware-manual-noefi-acpi-aarch64.xml | 4 ++-- ...re-manual-noefi-acpi-q35.x86_64-latest.args | 4 ++-- .../firmware-manual-noefi-acpi-q35.xml | 4 ++-- ...al-noefi-noacpi-aarch64.aarch64-latest.args | 4 ++-- .../firmware-manual-noefi-noacpi-aarch64.xml | 4 ++-- ...-manual-noefi-noacpi-q35.x86_64-latest.args | 4 ++-- .../firmware-manual-noefi-noacpi-q35.xml | 4 ++-- ...mware-auto-bios-stateless.x86_64-latest.xml | 6 +++--- .../firmware-auto-bios.x86_64-latest.xml | 6 +++--- ...irmware-auto-efi-aarch64.aarch64-latest.xml | 4 ++-- ...re-auto-efi-enrolled-keys.x86_64-latest.xml | 6 +++--- ...re-auto-efi-loader-secure.x86_64-latest.xml | 6 +++--- ...auto-efi-no-enrolled-keys.x86_64-latest.xml | 6 +++--- ...mware-auto-efi-no-secboot.x86_64-latest.xml | 6 +++--- .../firmware-auto-efi-nvram.x86_64-latest.xml | 8 ++++---- ...firmware-auto-efi-secboot.x86_64-latest.xml | 6 +++--- .../firmware-auto-efi.x86_64-latest.xml | 6 +++--- ...are-manual-bios-stateless.x86_64-latest.xml | 6 +++--- .../firmware-manual-bios.x86_64-latest.xml | 6 +++--- ...are-manual-efi-nvram-file.x86_64-latest.xml | 8 ++++---- ...l-efi-nvram-network-iscsi.x86_64-latest.xml | 6 +++--- ...ual-efi-nvram-network-nbd.x86_64-latest.xml | 6 +++--- .../firmware-manual-efi.x86_64-latest.xml | 8 ++++---- 84 files changed, 362 insertions(+), 362 deletions(-) diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml b/= tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml index b2c8fc1122..a1f21e9bb4 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml b/tests/qe= muxml2argvdata/firmware-auto-bios-nvram.xml index 6dad1e1f7f..c87debdb01 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml +++ b/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml @@ -1,11 +1,11 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm - /path/to/fedora_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lates= t.args index 8bef5a34f8..ae94fae47e 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args @@ -1,21 +1,21 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml b/test= s/qemuxml2argvdata/firmware-auto-bios-stateless.xml index 4847951346..540f61a2b8 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args b= /tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args index 8bef5a34f8..ae94fae47e 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args @@ -1,21 +1,21 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.xml b/tests/qemuxml2= argvdata/firmware-auto-bios.xml index 06bb0bea9d..1911b40ae7 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios.xml +++ b/tests/qemuxml2argvdata/firmware-auto-bios.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-lates= t.args b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.ar= gs index b8959f89f4..05b27e84e8 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args @@ -1,18 +1,18 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-aarch64test \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ --name guest=3Daarch64test,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-aarch64test/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/aarch6= 4test_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,= "discard":"unmap"}' \ +-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 \ @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml b/tests/q= emuxml2argvdata/firmware-auto-efi-aarch64.xml index 1e8dfffb5b..5c6c5192ba 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml @@ -1,6 +1,6 @@ - aarch64test - 496d7ea8-9739-544b-4ebd-ef08be936e8b + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secb= oot.xml b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot= .xml index 722793684c..897da8e126 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64= -latest.args index 966697d860..e76fb1c38d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml b/t= ests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml index b6ee05447f..01bba19a32 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml b= /tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml index 33bd7b0ac1..08ddfe3cfe 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml b/tes= ts/qemuxml2argvdata/firmware-auto-efi-loader-path.xml index a40f5e730c..5cf67730fd 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64= -latest.args index 966697d860..e76fb1c38d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml b/t= ests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml index 34fa6d090e..e67e3a0844 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_= 64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.= x86_64-latest.args index b02460dbc6..1a6966abe7 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args @@ -1,24 +1,24 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml = b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml index e9717000a3..019faa29b9 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lates= t.args index b02460dbc6..1a6966abe7 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args @@ -1,24 +1,24 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml b/test= s/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml index 749d364ba5..7ddeb2d230 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args index 0c131b529d..c848ea369a 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/fedora_VARS.fd","node-nam= e":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml b/tests/qem= uxml2argvdata/firmware-auto-efi-nvram.xml index 17de8e380a..4ea37550e0 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml @@ -1,11 +1,11 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm - /path/to/fedora_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest= .args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args index 966697d860..e76fb1c38d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml b/tests/q= emuxml2argvdata/firmware-auto-efi-secboot.xml index 8a0b414f55..b2c18cdd54 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-late= st.args b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.= args index c89612d7bf..3989b9fa6b 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args @@ -1,22 +1,22 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF.sev.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"}' \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format \ -accel kvm \ -cpu qemu64 \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml b/tests= /qemuxml2argvdata/firmware-auto-efi-stateless.xml index 1be0f4fd96..575d756265 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/= tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args index 966697d860..e76fb1c38d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 8 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-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 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.xml b/tests/qemuxml2a= rgvdata/firmware-auto-efi.xml index 55b9be1aec..8bf079a1c7 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi.xml @@ -1,7 +1,7 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 + 1048576 1 hvm diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml = b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml index 6e5f87354a..8581e941f0 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-l= atest.args index 20953097ef..4f7e0d8df5 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.a= rgs @@ -1,16 +1,16 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml b/te= sts/qemuxml2argvdata/firmware-manual-bios-stateless.xml index fa644af8b9..0d20ad256f 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args= b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args index 20953097ef..4f7e0d8df5 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args @@ -1,16 +1,16 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.xml b/tests/qemuxm= l2argvdata/firmware-manual-bios.xml index f5c33bc306..0749f94c40 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch6= 4-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aar= ch64-latest.args index d6ed7b879c..536b0894b2 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-lates= t.args @@ -12,16 +12,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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,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 1024 \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml b/= tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml index b18c5f55f0..4ccb2ac4a5 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml @@ -1,12 +1,12 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + 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/firmware-manual-efi-acpi-q35.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-lates= t.args index 1d95deed9f..f3706f0169 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args @@ -12,16 +12,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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":"/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 q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflas= h0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml b/test= s/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml index ea5289da2e..dd13bd27dd 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml @@ -1,12 +1,12 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-features.xml b/test= s/qemuxml2argvdata/firmware-manual-efi-features.xml index 69cc71eb2a..8e5aff7559 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-features.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-features.xml @@ -1,10 +1,10 @@ - test - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml b/tests= /qemuxml2argvdata/firmware-manual-efi-no-path.xml index 435f01dab4..66ad0804ae 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarc= h64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64= .aarch64-latest.args index 3ecd28d85e..4a2d43efdf 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-lat= est.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-lat= est.args @@ -12,16 +12,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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,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 1024 \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml = b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml index 3799a5181c..7689d36fe2 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml @@ -1,12 +1,12 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml b/te= sts/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml index 9b080fe31c..792c3315d4 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml @@ -1,12 +1,12 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-l= atest.args index d3ee7c0fee..ec950b8792 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.a= rgs @@ -1,27 +1,27 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/nvram/guest_VARS.= fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"= unmap"}' \ +-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,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml b/te= sts/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml index beed93adc1..46c20b2408 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml @@ -1,13 +1,13 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi= .x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-netw= ork-iscsi.x86_64-latest.args index 07f2180cd8..c4c50a7721 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64= -latest.args @@ -1,28 +1,28 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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"}' \ -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0",= "data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.201= 3-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","p= assword-secret":"libvirt-pflash1-storage-auth-secret0","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,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi= .xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml index efc60341ab..af925e7ce7 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x= 86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-networ= k-nbd.x86_64-latest.args index f2864f6086..431f2f30fd 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-l= atest.args @@ -1,27 +1,27 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","auto-rea= d-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x= ml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml index 60a963ca22..133c08e63d 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml= b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml index 717712e89b..4de3f30192 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml @@ -1,13 +1,13 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/= OVMF/OVMF_CODE.fd - + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stat= eless.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-state= less.xml index a6d7079b78..e4f9d04aed 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x= ml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x= ml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/= OVMF/OVMF_CODE.fd diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_= 64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.= x86_64-latest.args index 1d24a734c6..8cd1b5750a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-late= st.args @@ -1,27 +1,27 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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/test-b= ios_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"d= iscard":"unmap"}' \ +-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,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml = b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml index 0d7e43a26c..647c6166cf 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64= -latest.args index 7a0d663f81..7a88cfe5fd 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.= args @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-b= ios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discar= d":"unmap"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name= ":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash0-storage"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml b/t= ests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml index 6279bf2eb4..87fd1317f4 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml @@ -1,11 +1,11 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm - /var/lib/libvirt/qemu/nvram/test-bios.fd + hvm + /path/to/guest_BOTH.fd diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args index 7a0d663f81..7a88cfe5fd 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-b= ios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discar= d":"unmap"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name= ":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash0-storage"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml b/tests/qemu= xml2argvdata/firmware-manual-efi-rw.xml index 1dc9432523..c98480c119 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml @@ -1,11 +1,11 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm - /var/lib/libvirt/qemu/nvram/te= st-bios.fd + hvm + /path/to/guest_BOTH.fd diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-lates= t.args b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.ar= gs index d394efedd9..b8c5708a7f 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args @@ -1,20 +1,20 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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":"/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 q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backend=3Dpc.= ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-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 tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml b/tests/= qemuxml2argvdata/firmware-manual-efi-secure.xml index 090e37cecd..740b7968a8 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml @@ -1,12 +1,12 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVM= F/OVMF_CODE.secboot.fd - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-la= test.args b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-lat= est.args index e87c2d6638..2fca20dffd 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.ar= gs @@ -1,25 +1,25 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml b/tes= ts/qemuxml2argvdata/firmware-manual-efi-stateless.xml index 6f2a4963b1..641c0f275f 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml @@ -1,10 +1,10 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/= OVMF/OVMF_CODE.fd diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args = b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args index 9a0a941372..ec950b8792 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args @@ -1,27 +1,27 @@ LC_ALL=3DC \ PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test-bios \ +HOME=3D/tmp/lib/domain--1-guest \ USER=3Dtest \ LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ --name guest=3Dtest-bios,debug-threads=3Don \ +-name guest=3Dguest,debug-threads=3Don \ -S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/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":"/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 pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -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 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.xml b/tests/qemuxml= 2argvdata/firmware-manual-efi.xml index bbc4641da8..5bbb50764a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.xml +++ b/tests/qemuxml2argvdata/firmware-manual-efi.xml @@ -1,12 +1,12 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml = b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml index 12052e2f43..6a9095634e 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml @@ -1,10 +1,10 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-l= atest.args index 18991fa32c..1caf8cd150 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.a= rgs @@ -10,14 +10,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml b/te= sts/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml index 2b3ae78169..cd619db5a6 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml @@ -1,10 +1,10 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aa= rch64-latest.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aar= ch64.aarch64-latest.args index fab02e14e2..677d610e33 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-l= atest.args @@ -10,14 +10,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ -m 1024 \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xm= l b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml index 72d7bf2ed5..e96c83550c 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml @@ -1,10 +1,10 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64= -latest.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_= 64-latest.args index 089871f9fa..783abd6983 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest= .args @@ -10,14 +10,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ -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 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml b/= tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml index 2150c33b1c..a5cfd48a34 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml @@ -1,10 +1,10 @@ guest - 496d7ea8-9739-544b-4ebd-ef08be936e8b + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1 - hvm + hvm /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-l= atest.xml b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-la= test.xml index 7609ded09a..9d42e210c3 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.x= ml +++ b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.x= ml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml = b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml index 3c48ff19c6..11f95f04eb 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-lat= est.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest= .xml index a926869046..5f4432db36 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml @@ -1,6 +1,6 @@ - aarch64test - 496d7ea8-9739-544b-4ebd-ef08be936e8b + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1048576 1 diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_6= 4-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86= _64-latest.xml index e411c0e614..3923d1d4f2 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-lates= t.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-lates= t.xml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_6= 4-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86= _64-latest.xml index 3ba6ec2b86..c655d81454 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-lates= t.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-lates= t.xml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x8= 6_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-ke= ys.x86_64-latest.xml index 58745a4b1a..326b1d5faf 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-la= test.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-la= test.xml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-l= atest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-la= test.xml index 7625ef219a..9e8107cb4d 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.x= ml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.x= ml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml index f6243bc43a..2090a770c6 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml @@ -1,12 +1,12 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm - /path/to/fedora_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-late= st.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.x= ml index 1c66ca23a1..22a26554c8 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml b= /tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml index b9b119fd21..72f2ea1321 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml @@ -1,8 +1,8 @@ - fedora + guest 63840878-0deb-4095-97e6-fc444d9bc9fa - 8192 - 8192 + 1048576 + 1048576 1 hvm diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64= -latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_6= 4-latest.xml index 186df8c386..5787482b36 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest= .xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest= .xml @@ -1,11 +1,11 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xm= l b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml index 98b7becb2c..56932d7fee 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml @@ -1,11 +1,11 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64= -latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_6= 4-latest.xml index b78cafecc4..482d7987f6 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest= .xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest= .xml @@ -1,14 +1,14 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - + diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-isc= si.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-n= etwork-iscsi.x86_64-latest.xml index 16de5e7387..5a2e8715a0 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_= 64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_= 64-latest.xml @@ -1,11 +1,11 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd= .x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-net= work-nbd.x86_64-latest.xml index 1adbd9e60e..208257bb5b 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64= -latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64= -latest.xml @@ -1,11 +1,11 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml= b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml index 189f68cb1c..97a9a6c5e6 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml @@ -1,13 +1,13 @@ - test-bios - 362d1fc1-df7d-193e-5c18-49a71bd1da66 + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa 1048576 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd --=20 2.39.1 From nobody Sun May 19 04:56:03 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=1676457772; cv=none; d=zohomail.com; s=zohoarc; b=UtHD8wH2YRfJwvJgFpd32Mgd0GgbY/FRHGmnooz015/hPl3OV9R4/OPACjk98JZGj9ZU6BziQmuquPO+fPwadGmAaSYiLeZz8c+JVTejGE+WPeQBVasp5jbjCN8c9pxFHnBi7xuUe7XIuyb8GIiBIqu5obASJJ+TC0S83ylGKnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457772; 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=xXJr4zSAafDni4ZZt1oG4QV6EXP2Eat+JsJUed9hUSY=; b=KdALLA/SI43a7l5R2402UBeMzPNw7YBC8moSs8+0LCAV1euJpTQRzbkIP2dIQQUAMdTYk3GhcC1AStygbcUm4YkCmlLYCh5MlY2k/vPX6FXgJZ+2sOcBGc41oVocR3Li25GcIbgH3c9rkdYXMeW9LK7MqevnxW+Gs4sDfsSr6HA= 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 1676457772351489.7041045072933; Wed, 15 Feb 2023 02:42:52 -0800 (PST) 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-s2Ch7OYlPySXq9_w5K6ygQ-1; Wed, 15 Feb 2023 05:42:47 -0500 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 1C7291823619; Wed, 15 Feb 2023 10:42:41 +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 073C818EC2; Wed, 15 Feb 2023 10:42:41 +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 CB47819465A3; Wed, 15 Feb 2023 10:42:40 +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 E465A1946586 for ; Wed, 15 Feb 2023 10:42:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C91401401C32; Wed, 15 Feb 2023 10:42:38 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56C4B14171C9 for ; Wed, 15 Feb 2023 10:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457770; 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=xXJr4zSAafDni4ZZt1oG4QV6EXP2Eat+JsJUed9hUSY=; b=G2bAR0sd8vyoreosyTz8qQsHhNuD8XZ6FYalnfK3E8BxbKO++46hJykQdgxSjtloVaqXkh cOgHKl4dsu6kBBt5ER0BGI2DPgcSX2Zn/HzqgNGF4A95GmhBCyo7qo6i5BJ1fyON+7mfss OKg0jTI7+mUoLEG9+1Tj/6ZAnxdsKVQ= X-MC-Unique: s2Ch7OYlPySXq9_w5K6ygQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 07/33] tests: Enable qemuxml2xml for more firmware tests Date: Wed, 15 Feb 2023 11:42:04 +0100 Message-Id: <20230215104230.980815-8-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-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: 1676457773803100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Some of the test cases had only been added to the xml2argv test program and not to the xml2xml one. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ...mware-auto-efi-stateless.x86_64-latest.xml | 35 ++++++++++++++++++ ...manual-efi-acpi-aarch64.aarch64-latest.xml | 31 ++++++++++++++++ ...ware-manual-efi-acpi-q35.x86_64-latest.xml | 36 ++++++++++++++++++ ...nual-efi-noacpi-aarch64.aarch64-latest.xml | 30 +++++++++++++++ ...anual-efi-nvram-template.x86_64-latest.xml | 32 ++++++++++++++++ ...e-manual-efi-rw-implicit.x86_64-latest.xml | 31 ++++++++++++++++ .../firmware-manual-efi-rw.x86_64-latest.xml | 31 ++++++++++++++++ ...rmware-manual-efi-secure.x86_64-latest.xml | 37 +++++++++++++++++++ ...are-manual-efi-stateless.x86_64-latest.xml | 31 ++++++++++++++++ ...re-manual-noefi-acpi-q35.x86_64-latest.xml | 34 +++++++++++++++++ ...al-noefi-noacpi-aarch64.aarch64-latest.xml | 28 ++++++++++++++ ...-manual-noefi-noacpi-q35.x86_64-latest.xml | 31 ++++++++++++++++ tests/qemuxml2xmltest.c | 13 +++++++ 13 files changed, 400 insertions(+) create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-efi-stateless.x8= 6_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-acpi-aarch= 64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-acpi-q35.x= 86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-noacpi-aar= ch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-temp= late.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-rw-implici= t.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-rw.x86_64-= latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-secure.x86= _64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-efi-stateless.= x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-noefi-acpi-q35= .x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-noefi-noacpi-a= arch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-noefi-noacpi-q= 35.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-stateless.x86_64-la= test.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-stateless.x86_64-late= st.xml new file mode 100644 index 0000000000..143756dbff --- /dev/null +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-stateless.x86_64-latest.xml @@ -0,0 +1,35 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1048576 + 1 + + hvm + + + + + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + +
+ + + + +