From nobody Mon Apr 29 10:54:02 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=1666016872; cv=none; d=zohomail.com; s=zohoarc; b=hOINxWIeEQ85o2pgbxCJoZocPXyKSO6dDuX3vaA/K/3Dwlneloa3hVzhGCPkAuBGkFMzqhxEWNa39G17gvasDIhNehTVecwlSBHFw2WlGrOlQr50+5VBxfU8BIzY8IG4vnOzssZ3CNyGhRZF7IcQKTdN2vY3Q+5Y2KWv79P7FmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666016872; 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=Fv/rOcCWZ/AEYSfTZN6yuvrKsOQ1mcsfksLlFyeiizE=; b=RWw5PEjtWM5rZvOFja6HwZAVSmIgzpZeeSPiNRlcDQc3C8FK4N0bc4+tl2vBTiazV68mpk9GKvDQjTVdl8lioP4duY61JYzD97psAIs9/N5rpBTZNnHdpbDEuWfUfzV1RX3fWrndKOjKuxM2OBDrA63PhHMJNzo4NpzhDAno8Is= 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 1666016872445471.2093866204199; Mon, 17 Oct 2022 07:27:52 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-LDE6MDvJOLKK1VLTSGyImg-1; Mon, 17 Oct 2022 10:27:44 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB13D86EB20; Mon, 17 Oct 2022 14:27:42 +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 C7700415502; Mon, 17 Oct 2022 14:27:42 +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 A005E1946594; Mon, 17 Oct 2022 14:27:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 85C2D194658F for ; Mon, 17 Oct 2022 14:27:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 78C4D415501; Mon, 17 Oct 2022 14:27:41 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E69E49BB61 for ; Mon, 17 Oct 2022 14:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666016871; 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=Fv/rOcCWZ/AEYSfTZN6yuvrKsOQ1mcsfksLlFyeiizE=; b=agu4R1jX3HJnMJpy6sPEknc/xPRNrAdjAVQaIf2Sh67LzXLnW/GDB8jw0HXZlfjjP68UZQ lq1nL4wr+ZI6G2FQON0ctke+prXOo+TEocWqGvS5LLGOXWlT5FZ+WW+HK4m4qHKgMMNEPv yYewHAOiNBD3mgv3C5+H4P7ADeD+ur0= X-MC-Unique: LDE6MDvJOLKK1VLTSGyImg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] schema: domain: Allow interleaving of 'tpm' config elements Date: Mon, 17 Oct 2022 16:27:25 +0200 Message-Id: <11dc2a9048dc3c445c3daf2ae057ea682e2715da.1666016827.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666016874021100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Peter Krempa Signed-off-by: Peter Krempa --- src/conf/schemas/domaincommon.rng | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index d346442510..6e30512c73 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -5530,13 +5530,15 @@ - - - - - - - + + + + + + + + + =20 @@ -5551,10 +5553,12 @@ - emulator + emulator - - + + + + --=20 2.37.3 From nobody Mon Apr 29 10:54:02 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=1666016870; cv=none; d=zohomail.com; s=zohoarc; b=ZYrgxpa+bVlF/xg46N/kzVII1fW5VzNOQjtX/zoFio3Tl4D9qx0IgX68f1Fx7eDe01g1kVErFAUtX05LxlVQYPN9wFEfgtkTByCm325g9xzRdOu0mD7OybkCmhr+S47zvisB05XD2yylh9SjpPRxcGWosIufLMlG5+LCzxra92M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666016870; 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=FVu1JRCr1B7Ixvr6+4fa631HQlU9sas5qC7rkgmGqec=; b=iPoCWaIVsz/cKp/YjK5kx4X0jkahWPxo6rNG7uvbb2lNtupJuN2XMys4PMuDdtVb/S+/jw2GRmL/DIFbWlzTewXrPLpv/gy+Is5zoVzzVHehWIdlihhLX7zjIJgzvyGbUZ/qdfb4x3MB0CbZmszrGMwuD2BNiQvdqQDV9enPlMI= 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 1666016870617895.3404839586057; Mon, 17 Oct 2022 07:27:50 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-50-M05kqa8NNaaaabYOBUgO_g-1; Mon, 17 Oct 2022 10:27:47 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A957686EB22; Mon, 17 Oct 2022 14:27:43 +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 9532F207B378; Mon, 17 Oct 2022 14:27:43 +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 7893D1946594; Mon, 17 Oct 2022 14:27:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 22474194658F for ; Mon, 17 Oct 2022 14:27:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 167C449BB61; Mon, 17 Oct 2022 14:27:42 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0474415501 for ; Mon, 17 Oct 2022 14:27:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666016869; 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=FVu1JRCr1B7Ixvr6+4fa631HQlU9sas5qC7rkgmGqec=; b=V3chPoVIo2ACl6VXzLDgPSO64z+3+zwtpic6A8K//2K/uTrAG50fLuOdh082RvrZaGU3t/ t3x1VkFFmrl1nnh9Q5QJBv2rrllJ5OgtssWP9iIPm4SdBZ/+KfbTgSFq7nLuz+M3Ueih3H 40yDM2mS0sw8U2+NDRltBzdICgWGluM= X-MC-Unique: M05kqa8NNaaaabYOBUgO_g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] qemu: tpm: fix spacing Date: Mon, 17 Oct 2022 16:27:26 +0200 Message-Id: <7804c3caee914b27566bde326c85ae69965884e5.1666016827.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666016871976100001 Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index dc09c94a4d..789f00fb69 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -213,7 +213,7 @@ qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm, static void qemuTPMEmulatorDeleteStorage(virDomainTPMDef *tpm) { - g_autofree char *path =3D g_path_get_dirname(tpm->data.emulator.stora= gepath); + g_autofree char *path =3D g_path_get_dirname(tpm->data.emulator.storag= epath); =20 ignore_value(virFileDeleteTree(path)); } --=20 2.37.3 From nobody Mon Apr 29 10:54:02 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=1666016943; cv=none; d=zohomail.com; s=zohoarc; b=PGe5MMXJTvuBawoXHOqegpKyJ8/Mf9IWzS+S9CJcY86vM7OKDLpOD6U5aDDBxAJ/A5daIOJzRl3vrICMfbq015TiZis/sjQ/rBXFlCV0J9f/CszlwO7oho7shEsPSAQZ9tk8QPlnEABi8JLmnTNIzKBwQmaCf1SM94rllHmZnYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666016943; 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=eJOHCr47JrFH5WrZDEwDaEhStx89v2oYTeV0Em3Uvx4=; b=GijxpZ00RkVXGjyrsTynXLGEVyh/bqfXAJ5Tge1OTc8W7MLYPUAJLev+qTRx/qHDxv+qaBExDW55Gss6zCReiCIxMPiB+u90i1cCogWWVzjxomdw9mSmV9PCNI9WxjBpE7pqcMYpJm6OaVGW/J54tVwgyly4s2sVOb/gvTvXowY= 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 1666016943214452.9695471665541; Mon, 17 Oct 2022 07:29:03 -0700 (PDT) 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-265-Ly7ysVNeMLSfl0HEvQwU3w-1; Mon, 17 Oct 2022 10:27:47 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED5143C1104A; Mon, 17 Oct 2022 14:27:43 +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 D1A1FC15BB3; Mon, 17 Oct 2022 14:27:43 +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 C252819465B5; Mon, 17 Oct 2022 14:27:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EF2061946594 for ; Mon, 17 Oct 2022 14:27:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E0228415503; Mon, 17 Oct 2022 14:27:42 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E522415501 for ; Mon, 17 Oct 2022 14:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666016941; 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=eJOHCr47JrFH5WrZDEwDaEhStx89v2oYTeV0Em3Uvx4=; b=hItxeDOAMFvy4FhSvEoHh0qRYdTMpLhSE7l8e/aI0UtD8FyxMbeGqjD0gfbsdrSAOZOovA FwoCJ5roEGgD2e/pH6NK5nZGYbO61k39Ne8NXR3NbNE/2IuRi25AxMfTCba+OFBM1gb/rN m2XnEsaTNKgFsqj4lBGDnYLpAfg6T1Y= X-MC-Unique: Ly7ysVNeMLSfl0HEvQwU3w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] qemu: add external backend for tpm Date: Mon, 17 Oct 2022 16:27:27 +0200 Message-Id: <8f9d918da78a56a811040f0a1460b8d365d800af.1666016827.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666016944484100001 Introduce a new backend type 'external' for connecting to a swtpm daemon not managed by libvirtd. Mostly in one commit, thanks to -Wswitch and the way we generate capabilities. https://bugzilla.redhat.com/show_bug.cgi?id=3D2063723 Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_audit.c | 11 +++++ src/conf/domain_conf.c | 16 ++++++++ src/conf/domain_conf.h | 4 ++ src/conf/domain_validate.c | 1 + src/conf/schemas/domaincommon.rng | 18 +++++++++ src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_command.c | 11 ++++- src/qemu/qemu_domain.c | 3 ++ src/qemu/qemu_namespace.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + tests/qemuxml2argvdata/tpm-external.xml | 40 +++++++++++++++++++ .../tpm-external.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 57 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/tpm-external.xml create mode 120000 tests/qemuxml2xmloutdata/tpm-external.x86_64-latest.xml diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 974df5a037..82cf6ab749 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -556,6 +556,17 @@ virDomainAuditTPM(virDomainObj *vm, virDomainTPMDef *t= pm, "virt=3D%s resrc=3Dtpm-emulator reason=3D%s %s uuid=3D%s= %s", virt, reason, vmname, uuidstr, device); break; + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: + path =3D tpm->data.external.source->data.nix.path; + if (!(device =3D virAuditEncode("device", VIR_AUDIT_STR(path)))) { + VIR_WARN("OOM while encoding audit message"); + goto cleanup; + } + + VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, + "virt=3D%s resrc=3Dtpm-external reason=3D%s %s uuid=3D%s= %s", + virt, reason, vmname, uuidstr, device); + break; case VIR_DOMAIN_TPM_TYPE_LAST: default: break; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7dba65cfeb..2059c60a63 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1280,6 +1280,7 @@ VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST, "passthrough", "emulator", + "external", ); =20 VIR_ENUM_IMPL(virDomainTPMVersion, @@ -3291,6 +3292,9 @@ void virDomainTPMDefFree(virDomainTPMDef *def) g_free(def->data.emulator.logfile); virBitmapFree(def->data.emulator.activePcrBanks); break; + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: + virObjectUnref(def->data.external.source); + break; case VIR_DOMAIN_TPM_TYPE_LAST: break; } @@ -10322,6 +10326,13 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, virBitmapSetBitExpand(def->data.emulator.activePcrBanks, bank); } break; + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: + if (!(def->data.external.source =3D virDomainChrSourceDefNew(xmlop= t))) + goto error; + path =3D virXPathString("string(./backend/source/@path)", ctxt); + def->data.external.source->type =3D VIR_DOMAIN_CHR_TYPE_UNIX; + def->data.external.source->data.nix.path =3D g_steal_pointer(&path= ); + break; case VIR_DOMAIN_TPM_TYPE_LAST: goto error; } @@ -20513,6 +20524,7 @@ virDomainTPMDefCheckABIStability(virDomainTPMDef *s= rc, break; =20 case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: break; } @@ -24095,6 +24107,10 @@ virDomainTPMDefFormat(virBuffer *buf, virXMLFormatElement(&backendChildBuf, "active_pcr_banks", NULL= , &activePcrBanksBuf); } break; + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: + virBufferEscapeString(&backendChildBuf, "\n", + def->data.external.source->data.nix.path); + break; case VIR_DOMAIN_TPM_TYPE_LAST: break; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8f8a54bc41..91d9afeb11 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1421,6 +1421,7 @@ typedef enum { typedef enum { VIR_DOMAIN_TPM_TYPE_PASSTHROUGH, VIR_DOMAIN_TPM_TYPE_EMULATOR, + VIR_DOMAIN_TPM_TYPE_EXTERNAL, =20 VIR_DOMAIN_TPM_TYPE_LAST } virDomainTPMBackendType; @@ -1462,6 +1463,9 @@ struct _virDomainTPMDef { bool persistent_state; virBitmap *activePcrBanks; } emulator; + struct { + virDomainChrSourceDef *source; + } external; } data; }; =20 diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 81f6d5dbd5..3104899192 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2712,6 +2712,7 @@ virDomainTPMDevValidate(const virDomainTPMDef *tpm) break; =20 case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: break; } diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 6e30512c73..3da210faca 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -5565,6 +5565,12 @@ + + + external + + + @@ -5589,6 +5595,18 @@ =20 + + + + + + + + + + + + diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 40da6f1b50..561f56c658 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6313,8 +6313,10 @@ virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemu= Caps, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH)) VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYPE_PA= SSTHROUGH); if (virTPMHasSwtpm()) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR)) { VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYP= E_EMULATOR); + VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYP= E_EXTERNAL); + } if (virTPMSwtpmSetupCapsGet(VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2)) { VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendVersion, VIR_DOMAIN_TPM_V= ERSION_1_2); tpm->backendVersion.report =3D true; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index d6f27a5a4d..2020e6f2ab 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -375,6 +375,7 @@ qemuSetupTPMCgroup(virDomainObj *vm, case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: return qemuSetupChrSourceCgroup(vm, dev->data.passthrough.source); case VIR_DOMAIN_TPM_TYPE_EMULATOR: + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: break; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 150824f2e1..2811aeb0eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9145,7 +9145,10 @@ qemuBuildTPMBackendStr(virDomainTPMDef *tpm, { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 - virBufferAsprintf(&buf, "%s", virDomainTPMBackendTypeToString(tpm->typ= e)); + if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EXTERNAL) + virBufferAddLit(&buf, "emulator"); + else + virBufferAsprintf(&buf, "%s", virDomainTPMBackendTypeToString(tpm-= >type)); virBufferAsprintf(&buf, ",id=3Dtpm-%s", tpm->info.alias); =20 switch (tpm->type) { @@ -9157,6 +9160,7 @@ qemuBuildTPMBackendStr(virDomainTPMDef *tpm, virQEMUBuildBufferEscapeComma(&buf, qemuFDPassGetPath(passcancel)); break; case VIR_DOMAIN_TPM_TYPE_EMULATOR: + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: virBufferAddLit(&buf, ",chardev=3Dchrtpm"); break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -9199,6 +9203,11 @@ qemuBuildTPMCommandLine(virCommand *cmd, return -1; break; =20 + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: + if (qemuBuildChardevCommand(cmd, tpm->data.external.source, "chrtp= m", priv->qemuCaps) < 0) + return -1; + break; + case VIR_DOMAIN_TPM_TYPE_LAST: virReportEnumRangeError(virDomainTPMBackendType, tpm->type); return -1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4c14fc2aef..f675b1811f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11643,6 +11643,9 @@ qemuDomainDeviceBackendChardevForeachOne(virDomainD= eviceDef *dev, case VIR_DOMAIN_TPM_TYPE_EMULATOR: return cb(dev, dev->data.tpm->data.emulator.source, opaque); =20 + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: + return cb(dev, dev->data.tpm->data.external.source, opaque); + case VIR_DOMAIN_TPM_TYPE_LAST: return 0; } diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 311c66d46e..5e46962664 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -433,6 +433,7 @@ qemuDomainSetupTPM(virDomainTPMDef *dev, break; =20 case VIR_DOMAIN_TPM_TYPE_EMULATOR: + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: /* nada */ break; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 21cebae694..6c90e407c2 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1697,6 +1697,7 @@ virSecurityDACSetTPMFileLabel(virSecurityManager *mgr, tpm->data.emulator.sourc= e, false, false); break; + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: break; } @@ -1720,6 +1721,7 @@ virSecurityDACRestoreTPMFileLabel(virSecurityManager = *mgr, break; case VIR_DOMAIN_TPM_TYPE_EMULATOR: /* swtpm will have removed the Unix socket upon termination */ + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: break; } diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index a296cb7613..05e1f8cc4e 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1658,6 +1658,7 @@ virSecuritySELinuxSetTPMFileLabel(virSecurityManager = *mgr, if (rc < 0) return -1; break; + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: break; } @@ -1693,6 +1694,7 @@ virSecuritySELinuxRestoreTPMFileLabelInt(virSecurityM= anager *mgr, break; case VIR_DOMAIN_TPM_TYPE_EMULATOR: /* swtpm will have removed the Unix socket upon termination */ + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: case VIR_DOMAIN_TPM_TYPE_LAST: break; } diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-q35.x86_64.xml index 5b83883e39..5b19bf95fe 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -211,6 +211,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-tcg.x86_64.xml index ab55ec2452..e8ae7197e7 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -226,6 +226,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_4.2.0.x86_64.xml index a6eaf7962f..b3a6b387c5 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -211,6 +211,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-q35.x86_64.xml index 232f1f0e12..2900350fa5 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -213,6 +213,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-tcg.x86_64.xml index ce2c08f205..ff6436ffea 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -228,6 +228,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.0.0-virt.aarch64.xml index 9215371d0c..4234454f76 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -172,6 +172,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincaps= data/qemu_5.0.0.aarch64.xml index fcc77ad8db..1e4f4a8f64 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -170,6 +170,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.0.0.ppc64.xml index 711ccc2cb0..545407bbe1 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -137,6 +137,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.0.0.x86_64.xml index f52613f584..90eceb8eeb 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -213,6 +213,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-q35.x86_64.xml index 542d32b018..4f36f72fa7 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -214,6 +214,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-tcg.x86_64.xml index 8bd5c6073c..4510d7eb20 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -228,6 +228,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.1.0.x86_64.xml index 5c48efc8c6..b6678864d0 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -214,6 +214,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-q35.x86_64.xml index 70c4f3cbd1..50448cecd8 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -214,6 +214,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-tcg.x86_64.xml index 636a84e55f..deb0c353ea 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -228,6 +228,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.2.0-virt.aarch64.xml index 900d10f720..06f39e2b2b 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -172,6 +172,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincaps= data/qemu_5.2.0.aarch64.xml index fcc77ad8db..1e4f4a8f64 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -170,6 +170,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.2.0.ppc64.xml index 99c2767276..c0fc259abb 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -137,6 +137,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.2.0.x86_64.xml index db22085e31..e016915059 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -214,6 +214,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-q35.x86_64.xml index 395eb3b9eb..3a098cbe99 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -215,6 +215,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-tcg.x86_64.xml index 769a1147b6..d2e71470f8 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -229,6 +229,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.0.0-virt.aarch64.xml index 2f56e36c28..d7df5b3fb6 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -173,6 +173,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincaps= data/qemu_6.0.0.aarch64.xml index 4639a84c1d..a6f98d553a 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -171,6 +171,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.0.0.x86_64.xml index 2be8f3e33b..9196297486 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -215,6 +215,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-q35.x86_64.xml index f23e758b1a..3009149945 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -216,6 +216,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-tcg.x86_64.xml index f78abdefc5..a3775a6093 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -229,6 +229,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.1.0.x86_64.xml index 9de18c682e..f0667c1afb 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -216,6 +216,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-q35.x86_64.xml index dff92d65aa..f4b06e3c66 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -216,6 +216,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-tcg.x86_64.xml index f027eb25a5..c26cc37766 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -230,6 +230,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.2.0-virt.aarch64.xml index c572b0481c..f25b74eb91 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -175,6 +175,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincaps= data/qemu_6.2.0.aarch64.xml index eb521a0cfa..910c5b398f 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -173,6 +173,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_6.2.0.ppc64.xml index 7797b94cf2..1cb156b248 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -135,6 +135,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.2.0.x86_64.xml index aff2ee6662..9c4a69751f 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -216,6 +216,7 @@ passthrough emulator + external 1.2 diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-q35.x86_64.xml index e70b0990a7..8f82388648 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -218,6 +218,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-tcg.x86_64.xml index 03c5411c4e..0a1b2eebcd 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -232,6 +232,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_7.0.0-virt.aarch64.xml index 59f89afd9b..cbb1acb3f8 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -175,6 +175,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincaps= data/qemu_7.0.0.aarch64.xml index 1e6bf544dc..b11f513d28 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -173,6 +173,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.0.0.ppc64.xml index 76da1f4f7d..d99a7ba511 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -137,6 +137,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.0.0.x86_64.xml index da23f5703a..d10687f304 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -218,6 +218,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-q35.x86_64.xml index 05b36ee79e..15ce55416d 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -217,6 +217,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-tcg.x86_64.xml index 0786cd8430..cf9d335fa3 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -230,6 +230,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.1.0.ppc64.xml index d430e54caa..0b83d37f79 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -130,6 +130,7 @@ passthrough emulator + external 2.0 diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.1.0.x86_64.xml index ae67a16947..d8a8f1561b 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -217,6 +217,7 @@ passthrough emulator + external 2.0 diff --git a/tests/qemuxml2argvdata/tpm-external.xml b/tests/qemuxml2argvda= ta/tpm-external.xml new file mode 100644 index 0000000000..fe47f1e963 --- /dev/null +++ b/tests/qemuxml2argvdata/tpm-external.xml @@ -0,0 +1,40 @@ + + TPM-VM + 11d7cd22-da89-3094-6212-079a48a309a1 + 2097152 + 512288 + 1 + + hvm + + + + + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + + + + + + +