From nobody Sun May 5 18:58:22 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1665617129; cv=none; d=zohomail.com; s=zohoarc; b=iXecn2EUfShF8i+/ffH6fUKbLHsSeVVB5Gf69U/bkk3+zBqWUTbg/cvovRVlJW4mi4UifQpjSyR37SKpjX9fu1fT5nr8Tgn7OiY5JQMUqzK10T2C8liB5KW8C+yXoWpxz8nBQxwepxr5RR81rbIka0vbl6TygBktJGraVJ+aezk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665617129; 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=m8ByfBELFO9GRgu75BlEfxnAHkPKQWr/7pE8y3/iEDY=; b=Qi0Od9o3ONnt39lV4tdx3j8H2DflB3gk1izMJLI8C2FKGXKQLNTqMaVm79WLj70N1ln5wPhgsekmUPW48pnXVLHnXBUzHh2yTG0XnDcDBGnyw0fKtIo137/z6XOOuzbn/EVjjikNCvmuuvROnl0L+Hc8WPa2p7oXg3aSBe6r7nY= 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=fail header.from= (p=quarantine dis=quarantine) 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 1665617129689236.98168137119455; Wed, 12 Oct 2022 16:25:29 -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-58-wKJa1UVJOFquINlJS7gnsw-1; Wed, 12 Oct 2022 19:25:26 -0400 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 CA9751C05151; Wed, 12 Oct 2022 23:25:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABAE2112D18B; Wed, 12 Oct 2022 23:25:23 +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 6513E1946A69; Wed, 12 Oct 2022 23:25:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 76E6A194658F for ; Wed, 12 Oct 2022 23:25:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 654AE492B0A; Wed, 12 Oct 2022 23:25:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CC34492B05 for ; Wed, 12 Oct 2022 23:25:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39A7B3806707 for ; Wed, 12 Oct 2022 23:25:18 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2083.outbound.protection.outlook.com [40.107.20.83]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-634-O-D6aJEJOE2HTeQvEsbOug-3; Wed, 12 Oct 2022 19:25:16 -0400 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by PR3PR04MB7340.eurprd04.prod.outlook.com (2603:10a6:102:93::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Wed, 12 Oct 2022 23:25:13 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::9d86:e0fa:f725:194]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::9d86:e0fa:f725:194%7]) with mapi id 15.20.5709.015; Wed, 12 Oct 2022 23:25:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665617127; 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=m8ByfBELFO9GRgu75BlEfxnAHkPKQWr/7pE8y3/iEDY=; b=eeeJFsHoBqxX7kPoH/Mr7r7t2eNAJhatY/yus6+Wg0CtxBlGao89PoRavX1Vz73Nt6+yGx bTSgjCVhlI3r6ZqZeV2NWKFm65QS7VCPBMm1VZsIMkF7xGlDx9zd3dQdbFAAIJoZf8X4Np KVQm+K9df4uYTEi9gbbVMH981XItB7o= X-MC-Unique: wKJa1UVJOFquINlJS7gnsw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: O-D6aJEJOE2HTeQvEsbOug-3 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V2 1/3] conf: Add USB redirect devices to domain capabilities Date: Wed, 12 Oct 2022 17:24:48 -0600 Message-ID: <20221012232450.20888-2-jfehlig@suse.com> In-Reply-To: <20221012232450.20888-1-jfehlig@suse.com> References: <20221012232450.20888-1-jfehlig@suse.com> X-ClientProxiedBy: FR0P281CA0040.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::11) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|PR3PR04MB7340:EE_ X-MS-Office365-Filtering-Correlation-Id: 0dfac605-4bcb-4ab1-d857-08daaca8f9ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: lHKFcMkSJkmxMAZnBkQT3ly0wcL7SGZc0xOG4o06mBmxTZJuQiwCUIvZEB0uKlwWIN7NEr5WwJWj4+1CO9Dj97cOURx+0asAyy5LzcvzxxjNS+YZzYgi/srOlmSJr2pe3wWxan/21u8+WEQlpszmav1sPO1dvGOzNqjZl8sHIWbmhoXL4ZmE0h6RTnOxDOoSej08IIVAQGOcXy6yVUvv6nrdMlXZfHw4PxW90W2s5xuXEEdf98NQBhsMXkZnHW0CVP/SatwlUK1xn2vvEjL0Z8+uUMqHPeKHkA8AvE/OTZxtICrivq3x/YLggqgb7coMuwFuzV97EUzer17uTV04sys/egC8L0qsWA2NCbNC2mKC1iigeYad8oz8ZztmU0lUSmVytMRXSwWXkvDUVO9dMvknHYsKhoengmB7gFMzwG3DLF036+RJAUnWSak7k39e7KiLQcIMuGSlzgPe2zeIIVX5IoXoFUZIDSukFJv1pyApO3Mked/1wGc59skpZtQCD+1u30FcQKHMa+neyvNJK3jZVXetBR7R7rjWlbYLmJLsn9itdN/uim2ysp5fxYSSemT8DjALDHivzIqjsdUvhL7dyjKK0mzryVCjpDAks/gOT8obH4F1S68FrpC80sntWRSEwgxdP8piE1owWceE22ZpL+3eHFmtN9y6juAlDaKkzA+uY3t1v/rnVLC749b9 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(376002)(366004)(39860400002)(136003)(346002)(451199015)(478600001)(6486002)(86362001)(41300700001)(6916009)(38100700002)(36756003)(66476007)(66556008)(66946007)(8676002)(30864003)(6506007)(26005)(316002)(186003)(1076003)(6666004)(2906002)(2616005)(8936002)(6512007)(5660300002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rvxBYNe8yXI0OdiSEbF3heHDUYgR+Gtbrhb5jNW4t0ZE/ujUJ8lv2PPhJJ54?= =?us-ascii?Q?5ncAE70fNkujg5ChpJ6ChaNStutQUmT5KVeS89NsaKmcuJrlA/mWexheZlBc?= =?us-ascii?Q?Nmx/rQkPdRGB+ror+zf2OZu0xoa+G4IDVHBM7p02rg8e70OSrUFsMvALOFlT?= =?us-ascii?Q?W5PUr5uA64/AoB7aAGk71r/Y03imFji8p5ZdnCoXO4OEfD0MMOhIV+b3Gmpd?= =?us-ascii?Q?as95pcVWz1aDXxT3JY+N1qD4Ja/+8y0GWX9kN18LJhByAFh9UWqEhTPg/JVR?= =?us-ascii?Q?9QJKmbxkqOrN/6SvUWmkcgV4x5D3NG0Btqu5uBgYlQZbdA4BAHVwTdbGO+i1?= =?us-ascii?Q?UMgm7ejkdviSKEZu1UBz5VmVpdbQDpsUPNvIurpj4JjPwPAQzoHm723s88r7?= =?us-ascii?Q?i6DHowqIYNRcdV3gc/D855ZNShjPPtSIoSPAk1BbFBdAFwlVH6ktp5oEVBbz?= =?us-ascii?Q?2zEaxGA5awoOSuCjcXJrByzENPJirSn/md2yh32SereaGuweY7srqV6BuPK/?= =?us-ascii?Q?477UIBbG9QzYDdSVXsuMJlzisfz2+7zHkCWZeuC/dKW1qtuXn1ITuH41uMo5?= =?us-ascii?Q?5VM5DHGZo4L2RLE5KbJAtjEAVvoeCDeL/v5GddxuNtFPwSpm1L5rFErkxFmj?= =?us-ascii?Q?fGe4/STmbHCnKn5sOrnNnBXRddB2r8DzxzqGLxowxySx2TrxuduP+0MI+6tL?= =?us-ascii?Q?W6DR2QUMtDw8/w1bTHbLKhN84CjzVoCRkvv/ZyhJxNdU+LMJ/1yJbODEFtQg?= =?us-ascii?Q?gcHQMyAtXqFwPn+lFdSnMt1D5Qd7OfD4x69aBeaHESz5pUMYNuKElRF5SW3q?= =?us-ascii?Q?ySNiQyB+rLSA7ufEUrmvZjanVi89A6O2kn/C6Xk34XSWaAuw4HjuSrH43gWQ?= =?us-ascii?Q?FYqOkBlipkehwCNiQoC2Ecw2LfcWnwbxrX72vc9m01aH2u/IQmqTfzGLFazr?= =?us-ascii?Q?kwZv5wSwG4wkcWHuicIiDftvKcZABDxV799UhIIFtiVGJn651XZRbyyYW7CQ?= =?us-ascii?Q?mTYivZmd3VXaH/hO9VTbS+FcCmgCi0F0x01OCJr+LGGjuRiPzdV8JDa0RG/W?= =?us-ascii?Q?Uult+2ACdumoCffBXHo0++p1POC0yygbLA2os38KBMUVtdltI151f0HTEU8A?= =?us-ascii?Q?lmQu5NxWep3PsP2liq4NBMk50evEHh1bSJfc9hTgXD+SPm8wNIoSNfN3WEoB?= =?us-ascii?Q?mnabuPaiFcYmkkttJvvxcY7w+KuHMVBaFktEqLRdwJTxrhZU0KMyTloh5wBP?= =?us-ascii?Q?UPmTSxYLfClipGJ+2HvtbnTaVP6MfIdfpEDnSi6lGGGMAblJqvt+3Xw/loTZ?= =?us-ascii?Q?e2JI+NOPqeXEu5bNWpcyAmXdOKhi/LPgKmn4o9Zif4Kd0CF9/9hCKKY9xsnw?= =?us-ascii?Q?khMBy6lztOytp8JqpIXCn0WREY9xoVRf1Kf398HV7l4g8emCmgupgT9MoUkh?= =?us-ascii?Q?3CJHMnyxtPXhgjeAoRgqZ359Hs4/5omuCV3Q5BV6W8uxpzGHnOIHl1Ab7r15?= =?us-ascii?Q?2kSmFGyDlhJYOAl/ZYyceuHVChaWhjF1xuwQ/B4ffqiJW62jSRdukhBkS8Wn?= =?us-ascii?Q?4GAShd7iNsY0fjDO2eAzWY8X/iGiXewl0K7o1ug1?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0dfac605-4bcb-4ab1-d857-08daaca8f9ca X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 23:24:57.6806 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GKw7rsxETQPT86FnDgJc7x7TOrleyfEeI0l2rEiQ2AkKWqN5UxgFs31gzKEJUKA4Tu58LLOcdRjAi3+S9jfLNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7340 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1665617131782100003 Content-Type: text/plain; charset="utf-8" As qemu becomes more modularized, it is important for libvirt to advertise availability of the modularized functionality through capabilities. This change adds USB redirect devices to domain capabilities, allowing clients such as virt-install to avoid using redirdev devices when not supported by the target qemu. Signed-off-by: Jim Fehlig Reviewed-by: Michal Privoznik --- docs/formatdomaincaps.rst | 22 +++++++++++++++++++ src/conf/domain_capabilities.c | 13 +++++++++++ src/conf/domain_capabilities.h | 8 +++++++ src/conf/schemas/domaincaps.rng | 10 +++++++++ src/qemu/qemu_capabilities.c | 17 ++++++++++++++ src/qemu/qemu_capabilities.h | 3 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 +++++ .../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 | 5 +++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 +++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 +++++ .../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.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_6.2.0-virt.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_7.0.0-virt.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 +++++ 54 files changed, 265 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index afade16bc0..93d36f2702 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -543,6 +543,28 @@ TPM device capabilities are exposed under the ``tpm`` = element. For instance: ``backendVersion`` Options for the ``version`` attribute of the ```` elemen= t. =20 +USB redirect device +^^^^^^^^^^^^^^^^^^^ + +USB redirdev device capabilities are exposed under the ``redirdev`` elemen= t. For instance: + +:: + + + ... + + + + usb + + + ... + + + +``bus`` + Options for the ``bus`` attribute of the ```` element. + Features ~~~~~~~~ =20 diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index b5d8288982..f8b2f88376 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -562,6 +562,18 @@ virDomainCapsDeviceFilesystemFormat(virBuffer *buf, } =20 =20 +static void +virDomainCapsDeviceRedirdevFormat(virBuffer *buf, + const virDomainCapsDeviceRedirdev *redir= dev) +{ + FORMAT_PROLOGUE(redirdev); + + ENUM_PROCESS(redirdev, bus, virDomainRedirdevBusTypeToString); + + FORMAT_EPILOGUE(redirdev); +} + + /** * virDomainCapsFeatureGICFormat: * @buf: target buffer @@ -675,6 +687,7 @@ virDomainCapsFormat(const virDomainCaps *caps) virDomainCapsDeviceRNGFormat(&buf, &caps->rng); virDomainCapsDeviceFilesystemFormat(&buf, &caps->filesystem); virDomainCapsDeviceTPMFormat(&buf, &caps->tpm); + virDomainCapsDeviceRedirdevFormat(&buf, &caps->redirdev); =20 virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "\n"); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index f5fa1fb8e3..ba7c2a5e42 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -130,6 +130,13 @@ struct _virDomainCapsDeviceTPM { virDomainCapsEnum backendVersion; /* virDomainTPMVersion */ }; =20 +STATIC_ASSERT_ENUM(VIR_DOMAIN_REDIRDEV_BUS_LAST); +typedef struct _virDomainCapsDeviceRedirdev virDomainCapsDeviceRedirdev; +struct _virDomainCapsDeviceRedirdev { + virTristateBool supported; + virDomainCapsEnum bus; /* virDomainRedirdevBus */ +}; + STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST); typedef struct _virDomainCapsDeviceFilesystem virDomainCapsDeviceFilesyste= m; struct _virDomainCapsDeviceFilesystem { @@ -226,6 +233,7 @@ struct _virDomainCaps { virDomainCapsDeviceRNG rng; virDomainCapsDeviceFilesystem filesystem; virDomainCapsDeviceTPM tpm; + virDomainCapsDeviceRedirdev redirdev; /* add new domain devices here */ =20 virDomainCapsFeatureGIC gic; diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.= rng index c4cb9afeba..cf7a1d1d89 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -198,6 +198,9 @@ + + + =20 @@ -250,6 +253,13 @@ =20 + + + + + + + diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 04b2eef215..5a664ec628 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6333,6 +6333,21 @@ virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemu= Caps, } =20 =20 +void +virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceRedirdev *redir= dev) +{ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR)) { + redirdev->supported =3D VIR_TRISTATE_BOOL_YES; + redirdev->bus.report =3D true; + VIR_DOMAIN_CAPS_ENUM_SET(redirdev->bus, VIR_DOMAIN_REDIRDEV_BUS_US= B); + } else { + redirdev->supported =3D VIR_TRISTATE_BOOL_NO; + } +} + + + /** * virQEMUCapsSupportsGICVersion: * @qemuCaps: QEMU capabilities @@ -6468,6 +6483,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceRNG *rng =3D &domCaps->rng; virDomainCapsDeviceFilesystem *filesystem =3D &domCaps->filesystem; virDomainCapsDeviceTPM *tpm =3D &domCaps->tpm; + virDomainCapsDeviceRedirdev *redirdev =3D &domCaps->redirdev; virDomainCapsMemoryBacking *memoryBacking =3D &domCaps->memoryBacking; =20 virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps); @@ -6500,6 +6516,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virQEMUCapsFillDomainDeviceRNGCaps(qemuCaps, rng); virQEMUCapsFillDomainDeviceFSCaps(qemuCaps, filesystem); virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, tpm); + virQEMUCapsFillDomainDeviceRedirdevCaps(qemuCaps, redirdev); virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4b2782c462..051bfbc0a1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -830,6 +830,9 @@ void virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qem= uCaps, void virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceTPM *tpm); =20 +void virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceRedirdev *= redirdev); + bool virQEMUCapsGuestIsNative(virArch host, virArch guest); =20 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 dab12e5888..5b83883e39 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -216,6 +216,11 @@ 1.2 + + + usb + + 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 6dc6decf1e..ab55ec2452 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -231,6 +231,11 @@ 1.2 + + + usb + + diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_4.2.0-virt.aarch64.xml index 51581c1816..e0af576d5c 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -165,6 +165,7 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincaps= data/qemu_4.2.0.aarch64.xml index c993e0e7d1..61839a1983 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -163,6 +163,7 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_4.2.0.ppc64.xml index 7093c35355..1626d9b186 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -136,6 +136,7 @@ 1.2 + diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_4.2.0.s390x.xml index 3187e637d3..ee07f4c274 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -238,6 +238,11 @@ + + + usb + + diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_4.2.0.x86_64.xml index d9c12424c6..a6eaf7962f 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -216,6 +216,11 @@ 1.2 + + + usb + + 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 52c5d235bb..232f1f0e12 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -218,6 +218,11 @@ 1.2 + + + usb + + 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 8a0f20b06f..ce2c08f205 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ 1.2 + + + usb + + diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.0.0-virt.aarch64.xml index 8fe15c0bcb..9215371d0c 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -177,6 +177,7 @@ 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincaps= data/qemu_5.0.0.aarch64.xml index 49380bd218..fcc77ad8db 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -175,6 +175,7 @@ 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.0.0.ppc64.xml index b944723885..711ccc2cb0 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -142,6 +142,7 @@ 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 d9b7c31448..f52613f584 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -218,6 +218,11 @@ 1.2 + + + usb + + 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 0917fb3e94..542d32b018 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -219,6 +219,11 @@ 1.2 + + + usb + + 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 b2dc0cecca..8bd5c6073c 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ 1.2 + + + usb + + diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsda= ta/qemu_5.1.0.sparc.xml index 5c1c0c4680..ea4d1d28dd 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -105,6 +105,11 @@ + + + usb + + diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.1.0.x86_64.xml index abddcd6e62..5c48efc8c6 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -219,6 +219,11 @@ 1.2 + + + usb + + 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 f441139af2..70c4f3cbd1 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -219,6 +219,11 @@ 1.2 + + + usb + + 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 690fba9fc2..636a84e55f 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ 1.2 + + + usb + + diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.2.0-virt.aarch64.xml index a6363b0aad..900d10f720 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -177,6 +177,7 @@ 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincaps= data/qemu_5.2.0.aarch64.xml index 49380bd218..fcc77ad8db 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -175,6 +175,7 @@ 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.2.0.ppc64.xml index 71f47c8748..99c2767276 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -142,6 +142,7 @@ 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_5.2.0.s390x.xml index 84820332e4..bdade9c5bb 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -240,6 +240,11 @@ + + + usb + + diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.2.0.x86_64.xml index 27a3af5ba0..db22085e31 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -219,6 +219,11 @@ 1.2 + + + usb + + 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 56f2ee8b15..395eb3b9eb 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -221,6 +221,11 @@ 2.0 + + + usb + + 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 dab11a82d6..769a1147b6 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.0.0-virt.aarch64.xml index 68f3a523f4..2f56e36c28 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -179,6 +179,7 @@ 2.0 + diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincaps= data/qemu_6.0.0.aarch64.xml index c9830c3b25..4639a84c1d 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -177,6 +177,7 @@ 2.0 + diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsda= ta/qemu_6.0.0.s390x.xml index d0375c68ef..25abcac608 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -241,6 +241,11 @@ + + + usb + + diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.0.0.x86_64.xml index 338a9a7494..2be8f3e33b 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -221,6 +221,11 @@ 2.0 + + + usb + + 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 c023a72dec..f23e758b1a 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -222,6 +222,11 @@ 2.0 + + + usb + + 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 18da71d0a7..f78abdefc5 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.1.0.x86_64.xml index de17a784f6..9de18c682e 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -222,6 +222,11 @@ 2.0 + + + usb + + 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 f767ded170..dff92d65aa 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -222,6 +222,11 @@ 2.0 + + + usb + + 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 5122df5419..f027eb25a5 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -236,6 +236,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.2.0-virt.aarch64.xml index c356fc21d4..c572b0481c 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -181,6 +181,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincaps= data/qemu_6.2.0.aarch64.xml index 9e817d15e4..eb521a0cfa 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -179,6 +179,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_6.2.0.ppc64.xml index bf2c679c51..7797b94cf2 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -141,6 +141,7 @@ 2.0 + diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.2.0.x86_64.xml index bdce41d4db..aff2ee6662 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -222,6 +222,11 @@ 2.0 + + + usb + + 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 e7850eafcf..e70b0990a7 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -223,6 +223,11 @@ 2.0 + + + usb + + 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 53b0de03e7..03c5411c4e 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -237,6 +237,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_7.0.0-virt.aarch64.xml index 96c8fbfdf3..59f89afd9b 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -180,6 +180,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincaps= data/qemu_7.0.0.aarch64.xml index ce0a313bb9..1e6bf544dc 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -178,6 +178,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.0.0.ppc64.xml index 8f6f9f57e1..76da1f4f7d 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -142,6 +142,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.0.0.x86_64.xml index ccee94df7a..da23f5703a 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -223,6 +223,11 @@ 2.0 + + + usb + + 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 6e3df1e24b..05b36ee79e 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -222,6 +222,11 @@ 2.0 + + + usb + + 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 61aa269741..0786cd8430 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ 2.0 + + + usb + + diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.1.0.x86_64.xml index e1218e3f16..ae67a16947 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -222,6 +222,11 @@ 2.0 + + + usb + + --=20 2.37.3 From nobody Sun May 5 18:58:22 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1665617131; cv=none; d=zohomail.com; s=zohoarc; b=boQ8v097rqBweSbUdshF5xAhmJC/TronLQNa1KhgPGG/FkcEyFoNnD2rc0/4TJhnun28DhFGv+UKT6En0cYhwRshtBvxGfCrrCW32BZjTDrCRBKxwDJ5x+GqdkUnbaFc6CJtC5UzrLfkzutoj4+Y6LI4tA58ETPIDQm8UyImzoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665617131; 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=irbun+jC4fMdqC3tpoK29VG65wfhu18eOJqGquOtX1U=; b=c7C/gFW7miSKFGrK0pV7bJKFoG1tme8LL++VrnUPj3LjqYLZedHAax6F03Unln6G3hId0wRUxWm8K60thXn5TRU6BIVPsWlR32GbQXHqmlc2OvmiHDVMs4PjFfthVp6ZF73Awl8IRTx3r36ksP0Lg/KCTFn23vRdCrhsegfKxUc= 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=fail header.from= (p=quarantine dis=quarantine) 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 1665617131591599.6491161948477; Wed, 12 Oct 2022 16:25:31 -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-397-tM2yJS2zN4S7oVYpFMIzAg-1; Wed, 12 Oct 2022 19:25:27 -0400 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 5FFFC185A7AF; Wed, 12 Oct 2022 23:25:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 496F9112D17F; Wed, 12 Oct 2022 23:25:23 +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 18B7C1946A4F; Wed, 12 Oct 2022 23:25:20 +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 ADF681946A4E for ; Wed, 12 Oct 2022 23:25:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8291F49BB6A; Wed, 12 Oct 2022 23:25:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 79A7149BB64 for ; Wed, 12 Oct 2022 23:25:19 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5439C29AB3E2 for ; Wed, 12 Oct 2022 23:25:19 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2083.outbound.protection.outlook.com [40.107.20.83]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-634--MYyWqgROxyzs56rArbkzQ-4; Wed, 12 Oct 2022 19:25:17 -0400 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by PR3PR04MB7340.eurprd04.prod.outlook.com (2603:10a6:102:93::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Wed, 12 Oct 2022 23:25:13 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::9d86:e0fa:f725:194]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::9d86:e0fa:f725:194%7]) with mapi id 15.20.5709.015; Wed, 12 Oct 2022 23:25:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665617130; 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=irbun+jC4fMdqC3tpoK29VG65wfhu18eOJqGquOtX1U=; b=YLr2r9Hq5xq0INBfPzCJKAqDyNFzSGpHeg7Q2fZmWkoQ5MPbpjxKlumv6BIQlXS8GHRlcS UnpJnVL+No8K1sJVBM3mYOw4/28g9M3O4LSbLfL4quWyWNvVc9v7FMG26CSMhUO3GejaNu ZPyRWwZSBoMjfLwR0cC90UiuTB72HBc= X-MC-Unique: tM2yJS2zN4S7oVYpFMIzAg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: -MYyWqgROxyzs56rArbkzQ-4 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V2 2/3] conf: Add channel devices to domain capabilities Date: Wed, 12 Oct 2022 17:24:49 -0600 Message-ID: <20221012232450.20888-3-jfehlig@suse.com> In-Reply-To: <20221012232450.20888-1-jfehlig@suse.com> References: <20221012232450.20888-1-jfehlig@suse.com> X-ClientProxiedBy: FR0P281CA0037.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::19) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|PR3PR04MB7340:EE_ X-MS-Office365-Filtering-Correlation-Id: 35687dd8-3b16-42c7-b1fc-08daaca8fc17 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: l6qJjSwSwX3gZ/VsbIWd7YYB3IAHe2yiwg60mMvrsV1K8qheGjhkW7snFwOsiB6H1czlqOcLO4DcwsrG1naL2yT+wUlvDDfPZBqHBKDqX/ZEyztjMiZMEqeC6/rBVTGj2rObaUtKkHkpy5MPRUSXWpdhx1WcqhTgjeGCWERwTPImyTPCXz7QHSG/VrQLzwUGE+GpvkzLBif7QBKqQbCNuE9lZjI0bSUMSg1O71T0ei1pyG8gZm684HDAPMzVRjX3bVT/kcwR4Jp47mKmhTJaJHWp+G97wilPu4WLZ+JyC1D93IppP7kdYwWT3BNO+WLCYFow5HWLyNKvSM1BrgKaBXhmi2Q+0mAbn28BSmZqvCo6QXMzMXi1l+0TYN/PMQIZfM00DpYxChNoL7xehrkPVkjcI/gbu1A+9RDswH3A1w0COQ9ITlSJ/05lbh5/lz+ApkmkUufzQBsieCr1T0cHtkeaV9lv1ND0xwfpwodsiHeJY+9ikr0nSGXzjeBx9INtEjQkSkD2HkHywPXyudoQeC0lNk27H1mUkPKDVQ88qTGJpEtFeBXzSlfTBjvOaxtDNc0h1/IlNpN9+p4jkLl6f3CmoKGbft0NxJBRerpNzBy31ulvkELQ1GYesegXloGgpEogks4WsqNwQpCB0z2utA1uDTJBJnR+A6+irRtpIPS5OegjWgaNwNq9/rMewmFpEIxQm6hKc7hsL4YiHrNghQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(376002)(366004)(39860400002)(136003)(346002)(451199015)(478600001)(6486002)(86362001)(41300700001)(6916009)(38100700002)(83380400001)(36756003)(66476007)(66556008)(66946007)(8676002)(30864003)(6506007)(26005)(316002)(186003)(1076003)(6666004)(2906002)(2616005)(8936002)(6512007)(5660300002)(579004); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dIf8wuU/v+n8UtqLZyxvKVJO0VI9ikTkY8mjTzSSYWN1VvHsfIKVuXa0ZRxn?= =?us-ascii?Q?FVB5PBubnpMWydgak+X4jzU7y75HgoWn0uAFcyQmU463IAdOr9NKSto16Irk?= =?us-ascii?Q?n/+rhYAUmQmuqlzcClt+WuFPB+fGdnMMZDQVaofED+uK425pIXrY3xNd2NGp?= =?us-ascii?Q?MbHMBoWmFA2zuTZCnj0vG2g3xLdCd07msoLQCXoOGWHTAlk7lR2dWPzc2FB3?= =?us-ascii?Q?+g+xgXs7s60/X3TYfHcjbzl+w77RtQEVIU5RJA97H5EO7YnSk8gwL/DFbfwT?= =?us-ascii?Q?zVqNAKiaiXhw2Lz8ViUNUpPU4Cwgwu3PCGQ4RrWVEHdIu1sJ9SDMPU8qBkiD?= =?us-ascii?Q?G27Gn89lc6MCKBX19p8Cxf87G10FzaFTdGoFxiY4hY6gRQP06Xfyl7jg0+sX?= =?us-ascii?Q?SLYfAmwx44TmFfEh9GWKPbgnaDEyPP5xc2dD8zDBmiXMDG2bjWOugHk/gK/r?= =?us-ascii?Q?dk1GbYLPPZ7sb8lVrudRgET38Qe/W4e6ksxN3ImXqUlFnhMKYiiAknizIMQe?= =?us-ascii?Q?7ihnep0/CPSKzWEW01xHNvyWDDMGnpvgpfUz4bYxRJWxS4gqo7cSBuA7I9JW?= =?us-ascii?Q?oOCe15BDIF3oH1qqH/HkIA6X14K0v+vA7a7QF7CMrRAc44Tmflu61v3AH1wZ?= =?us-ascii?Q?uDqsgpZyXNGUANI67Npdeazk4Dpn7q87UaNdYS/pUc/Plnk3dyRfe8xmJSxS?= =?us-ascii?Q?cDF2V05Sj89JLrNkD2dyODXe1WpjS29ZOlVeb5MTf7YrmRtIINK6BKWrIhJ3?= =?us-ascii?Q?CjYrn7j4ZaAvSnlCY6I68Z35+HkfKEtYJRBDxv8XytwAaU5UoXuPN79KiX/a?= =?us-ascii?Q?lgsXEp82r7kMSdCHO22eG5UlRnpwwArYfdMNS5bSlkjqIv2QgkBIyundUAyV?= =?us-ascii?Q?FtZ1rt4UkN1z1aTHY5/1WSahtgn3pXuYOnIellqx/OBXm8CumsYsR2QYL0B5?= =?us-ascii?Q?rsb/0/9D5LTPy+507IcWqHDw9gJTgZVvvrXE2QGe+uOZsX4Nyxgyac6ZMZ+N?= =?us-ascii?Q?306F0Li5runc2ZJd8uItcfd7aeiKXoPMDRiPdi0W1jHeis5OlAwuxqYMyMuf?= =?us-ascii?Q?esKKWOOsB8xVu/1DmIR2cWkn+KfvLwX2+VdoWvyftOjT9jVk9sNq2ki7TbdX?= =?us-ascii?Q?/gb2XXJ7ve4KNQkWF5mNQclE3WCGJ/LUmeirQmRk+w/Ha09J59MobdFFbxYo?= =?us-ascii?Q?ICoTToj7Mr1znNf/jQf3jb4MGRRHUDOcRaxmtvV4oP4p5q3Osgom0jAFqBQu?= =?us-ascii?Q?Vy/1LLtJYWlinR3egLtv/+sDtYYQimxOfY1CFqZ1Ir2TlcIAheR8hHwTP1AS?= =?us-ascii?Q?7LOiaJTulnJaTlSIsiI337Bg+xlFvFH5RsFNjMhWVmXUZKH/ow34Jm7lyPjz?= =?us-ascii?Q?miGq9cjQHMMHMAtVYNZiSZDkRtk0aH9lb13u4ISU0qoXYDRyY/rcsf0ykLbx?= =?us-ascii?Q?zRLmZL0VCnRnk0z2x+snt+EqH1LC/WdA6s+Y4C8jhC2goMyPMxfLIqWbEC75?= =?us-ascii?Q?bZMPwa+d8eqci0lXSnHl/uoDNm4jf5XrdCofa1rS9yi1OsXmfLmudrdPii2B?= =?us-ascii?Q?TIvMQK4szuiGj57FvCjFJ6PYBP0q29fmU78jUSAa?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35687dd8-3b16-42c7-b1fc-08daaca8fc17 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 23:25:01.6021 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6MW082I2INOUvdheSgYnoxBGiQO8+iVSjKH+HdGKeDr5dMTRiPD25OO5noL71QVNWh2WmGjdbv8YMQghPsrG3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7340 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false 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.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: 1665617133751100005 Content-Type: text/plain; charset="utf-8" As qemu becomes more modularized, it is important for libvirt to advertise availability of the modularized functionality through capabilities. This change adds channel devices to domain capabilities, allowing clients such as virt-install to avoid using spicevmc channel devices when not supported by the target qemu. Signed-off-by: Jim Fehlig --- docs/formatdomaincaps.rst | 24 +++++++++++++++++++ src/conf/domain_capabilities.c | 13 ++++++++++ src/conf/domain_capabilities.h | 8 +++++++ src/conf/schemas/domaincaps.rng | 10 ++++++++ src/qemu/qemu_capabilities.c | 16 +++++++++++++ src/qemu/qemu_capabilities.h | 3 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 7 ++++++ .../qemu_4.2.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 7 ++++++ .../qemu_5.0.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 7 ++++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 7 ++++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 7 ++++++ .../qemu_5.2.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 7 ++++++ .../qemu_6.0.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 7 ++++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 7 ++++++ .../qemu_6.2.0-virt.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 7 ++++++ .../qemu_7.0.0-virt.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 7 ++++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 ++++++ .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + 68 files changed, 408 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 93d36f2702..f95d3a7083 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -565,6 +565,30 @@ USB redirdev device capabilities are exposed under the= ``redirdev`` element. For ``bus`` Options for the ``bus`` attribute of the ```` element. =20 +Channel device +^^^^^^^^^^^^^^ + +Channel device capabilities are exposed under the ``channel`` element. For= instance: + +:: + + + ... + + + + pty + unix + spicevmc + + + + +``type`` + Options for the ``type`` attribute of the ```` element. + Features ~~~~~~~~ =20 diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index f8b2f88376..a7f256e4ec 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -574,6 +574,18 @@ virDomainCapsDeviceRedirdevFormat(virBuffer *buf, } =20 =20 +static void +virDomainCapsDeviceChannelFormat(virBuffer *buf, + const virDomainCapsDeviceChannel *channel) +{ + FORMAT_PROLOGUE(channel); + + ENUM_PROCESS(channel, type, virDomainChrTypeToString); + + FORMAT_EPILOGUE(channel); +} + + /** * virDomainCapsFeatureGICFormat: * @buf: target buffer @@ -688,6 +700,7 @@ virDomainCapsFormat(const virDomainCaps *caps) virDomainCapsDeviceFilesystemFormat(&buf, &caps->filesystem); virDomainCapsDeviceTPMFormat(&buf, &caps->tpm); virDomainCapsDeviceRedirdevFormat(&buf, &caps->redirdev); + virDomainCapsDeviceChannelFormat(&buf, &caps->channel); =20 virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "\n"); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index ba7c2a5e42..e0cfa75531 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -137,6 +137,13 @@ struct _virDomainCapsDeviceRedirdev { virDomainCapsEnum bus; /* virDomainRedirdevBus */ }; =20 +STATIC_ASSERT_ENUM(VIR_DOMAIN_CHR_TYPE_LAST); +typedef struct _virDomainCapsDeviceChannel virDomainCapsDeviceChannel; +struct _virDomainCapsDeviceChannel { + virTristateBool supported; + virDomainCapsEnum type; /* virDomainChrType */ +}; + STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST); typedef struct _virDomainCapsDeviceFilesystem virDomainCapsDeviceFilesyste= m; struct _virDomainCapsDeviceFilesystem { @@ -234,6 +241,7 @@ struct _virDomainCaps { virDomainCapsDeviceFilesystem filesystem; virDomainCapsDeviceTPM tpm; virDomainCapsDeviceRedirdev redirdev; + virDomainCapsDeviceChannel channel; /* add new domain devices here */ =20 virDomainCapsFeatureGIC gic; diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.= rng index cf7a1d1d89..a6747b20ef 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -201,6 +201,9 @@ + + + =20 @@ -260,6 +263,13 @@ =20 + + + + + + + diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5a664ec628..98849daf4c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1392,6 +1392,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "s390-pv-guest", QEMU_CAPS_S390_PV_GUEST }, { "virtio-mem-pci", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI }, { "virtio-iommu-pci", QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI }, + { "chardev-spicevmc", X_QEMU_CAPS_CHARDEV_SPICEVMC }, }; =20 =20 @@ -6347,6 +6348,19 @@ virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps = *qemuCaps, } =20 =20 +void +virQEMUCapsFillDomainDeviceChannelCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceChannel *channel) +{ + channel->supported =3D VIR_TRISTATE_BOOL_YES; + channel->type.report =3D true; + VIR_DOMAIN_CAPS_ENUM_SET(channel->type, + VIR_DOMAIN_CHR_TYPE_PTY, VIR_DOMAIN_CHR_TYPE_= UNIX); + + if (virQEMUCapsGet(qemuCaps, X_QEMU_CAPS_CHARDEV_SPICEVMC)) + VIR_DOMAIN_CAPS_ENUM_SET(channel->type, VIR_DOMAIN_CHR_TYPE_SPICEV= MC); +} + =20 /** * virQEMUCapsSupportsGICVersion: @@ -6484,6 +6498,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceFilesystem *filesystem =3D &domCaps->filesystem; virDomainCapsDeviceTPM *tpm =3D &domCaps->tpm; virDomainCapsDeviceRedirdev *redirdev =3D &domCaps->redirdev; + virDomainCapsDeviceChannel *channel =3D &domCaps->channel; virDomainCapsMemoryBacking *memoryBacking =3D &domCaps->memoryBacking; =20 virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps); @@ -6517,6 +6532,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virQEMUCapsFillDomainDeviceFSCaps(qemuCaps, filesystem); virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, tpm); virQEMUCapsFillDomainDeviceRedirdevCaps(qemuCaps, redirdev); + virQEMUCapsFillDomainDeviceChannelCaps(qemuCaps, channel); virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 051bfbc0a1..4edbb5d40f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -833,6 +833,9 @@ void virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qe= muCaps, void virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceRedirdev *= redirdev); =20 +void virQEMUCapsFillDomainDeviceChannelCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceChannel *ch= annel); + bool virQEMUCapsGuestIsNative(virArch host, virArch guest); =20 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..def80fe8cd 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -221,6 +221,13 @@ usb + + + pty + unix + spicevmc + + 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..9e920d1ccb 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -236,6 +236,13 @@ usb + + + pty + unix + spicevmc + + diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_4.2.0-virt.aarch64.xml index e0af576d5c..776173e60e 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -166,6 +166,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincaps= data/qemu_4.2.0.aarch64.xml index 61839a1983..b6711fc3a4 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -164,6 +164,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_4.2.0.ppc64.xml index 1626d9b186..88790451b0 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -137,6 +137,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_4.2.0.s390x.xml index ee07f4c274..fa416af038 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -243,6 +243,12 @@ usb + + + pty + unix + + 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..ed9de89dfa 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -221,6 +221,13 @@ usb + + + pty + unix + spicevmc + + 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..af0335eb3a 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -223,6 +223,13 @@ usb + + + pty + unix + spicevmc + + 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..fc09e9ff28 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -238,6 +238,13 @@ usb + + + pty + unix + spicevmc + + 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..88bc77f50b 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -178,6 +178,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincaps= data/qemu_5.0.0.aarch64.xml index fcc77ad8db..5e030047d1 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -176,6 +176,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.0.0.ppc64.xml index 711ccc2cb0..0c5aaade40 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -143,6 +143,12 @@ + + + pty + unix + + 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..5b2a0bc83d 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -223,6 +223,13 @@ usb + + + pty + unix + spicevmc + + 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..fb9f69bb9a 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -224,6 +224,13 @@ usb + + + pty + unix + spicevmc + + 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..ea31348ab1 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -238,6 +238,13 @@ usb + + + pty + unix + spicevmc + + diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsda= ta/qemu_5.1.0.sparc.xml index ea4d1d28dd..5bbf4720dc 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -110,6 +110,13 @@ usb + + + pty + unix + spicevmc + + 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..584dad5a89 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -224,6 +224,13 @@ usb + + + pty + unix + spicevmc + + 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..f1d20991e9 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -224,6 +224,13 @@ usb + + + pty + unix + spicevmc + + 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..cec260f56d 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -238,6 +238,13 @@ usb + + + pty + unix + spicevmc + + 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..be7262211c 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -178,6 +178,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincaps= data/qemu_5.2.0.aarch64.xml index fcc77ad8db..5e030047d1 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -176,6 +176,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.2.0.ppc64.xml index 99c2767276..9367738157 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -143,6 +143,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_5.2.0.s390x.xml index bdade9c5bb..adc197648f 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -245,6 +245,12 @@ usb + + + pty + unix + + 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..a3707e6804 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -224,6 +224,13 @@ usb + + + pty + unix + spicevmc + + 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..7edb84e9bc 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -226,6 +226,13 @@ usb + + + pty + unix + spicevmc + + 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..cc0bfcac2d 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -240,6 +240,13 @@ usb + + + pty + unix + spicevmc + + 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..db9b45d74e 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -180,6 +180,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincaps= data/qemu_6.0.0.aarch64.xml index 4639a84c1d..1a65156544 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -178,6 +178,12 @@ + + + pty + unix + + diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsda= ta/qemu_6.0.0.s390x.xml index 25abcac608..56d87f7a2f 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -246,6 +246,12 @@ usb + + + pty + unix + + 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..3afab2f4c2 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -226,6 +226,13 @@ usb + + + pty + unix + spicevmc + + 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..d0dbadd6d3 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -227,6 +227,13 @@ usb + + + pty + unix + spicevmc + + 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..52071fc2c5 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -240,6 +240,13 @@ usb + + + pty + unix + spicevmc + + 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..17c30b394d 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -227,6 +227,13 @@ usb + + + pty + unix + spicevmc + + 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..c185ae4510 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -227,6 +227,13 @@ usb + + + pty + unix + spicevmc + + 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..7bebc1f8b2 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -241,6 +241,13 @@ usb + + + pty + unix + spicevmc + + 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..3d79cd7486 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -186,6 +186,13 @@ usb + + + pty + unix + spicevmc + + diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincaps= data/qemu_6.2.0.aarch64.xml index eb521a0cfa..4ccffb3695 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -184,6 +184,13 @@ usb + + + pty + unix + spicevmc + + diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_6.2.0.ppc64.xml index 7797b94cf2..ba7bc17a98 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -142,6 +142,12 @@ + + + pty + unix + + 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..ba40728489 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -227,6 +227,13 @@ usb + + + pty + unix + spicevmc + + 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..94c6f3d712 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -228,6 +228,13 @@ usb + + + pty + unix + spicevmc + + 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..c6a02b6512 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -242,6 +242,13 @@ usb + + + pty + unix + spicevmc + + 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..3addb1fc57 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -185,6 +185,13 @@ usb + + + pty + unix + spicevmc + + diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincaps= data/qemu_7.0.0.aarch64.xml index 1e6bf544dc..9f07a10a90 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -183,6 +183,13 @@ usb + + + pty + unix + spicevmc + + diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.0.0.ppc64.xml index 76da1f4f7d..ed6c74aac1 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -147,6 +147,12 @@ usb + + + pty + unix + + 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..5913f44937 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -228,6 +228,13 @@ usb + + + pty + unix + spicevmc + + 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..2d76581915 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -227,6 +227,13 @@ usb + + + pty + unix + spicevmc + + 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..c0b59c0d44 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -240,6 +240,13 @@ usb + + + pty + unix + spicevmc + + 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..a419005ee3 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -227,6 +227,13 @@ usb + + + pty + unix + spicevmc + + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 245a0bd2fb..b07fad7298 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 19edb90927..378e5badd5 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -8,6 +8,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 46bbfac186..250ade9bf4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 93ae1b6d0a..2cba338c29 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -5,6 +5,7 @@ 0 + diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 9dbe8f1ca8..c18bbee27e 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 7b4915b67f..16d2d3df04 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -8,6 +8,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index c71275506a..4d9edb56cf 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 876a5afe43..575531feb4 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index f73c070c9e..bdf2f21746 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 234f386736..93e5a7aea5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -9,6 +9,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index fd57627ad5..446063c08f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 19a6c33353..74106a3d6f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -9,6 +9,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index dc7b041294..b5b030d16c 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 5c60b7cf88..04524a6038 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -10,6 +10,7 @@ + --=20 2.37.3 From nobody Sun May 5 18:58:22 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1665617164; cv=none; d=zohomail.com; s=zohoarc; b=KBEMNijSsOCxx4qlFyZXZdvJPrHse2u4VToAbobIVOd7YfRRpUG7lHn0TUBLhBKtH0IKdGN4I5lfm8UNiVt9JWU3KXgY3jqPSZrsRjOmNIBenq5bsYeHnrpyXTdGk1L5StSptjHy5jr0cCjhB0D/aJExs68k86Xq8XQ5Q18cvEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665617164; 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=oXVua6555RK7aOvUyTrO2jf7rGDUZAXaD6GHmqQVWc4=; b=dpdXaffxd/u8k5HBWN+TzmOfsEIHEnEpahqIKvgpQVl5jAr3zP1yvFAF4yoJbibHi6MxvcKDpf+7aF54kKDw5q/j2Rirl4pA1bt6VSJrStrvyFHDz14R4koZKSscESWBdhx9ABELZh4YZLeM75DVTmnYuaW0WyLqwgOIVc/uWL4= 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=fail header.from= (p=quarantine dis=quarantine) 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 1665617164918467.2722892263471; Wed, 12 Oct 2022 16:26:04 -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-417-oiG8wHXDOduUTEQvGG9vhw-1; Wed, 12 Oct 2022 19:25:25 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 14FDA29DD995; Wed, 12 Oct 2022 23:25:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87011492B0A; Wed, 12 Oct 2022 23:25:22 +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 BEC6519465B7; Wed, 12 Oct 2022 23:25:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8B2171946588 for ; Wed, 12 Oct 2022 23:25:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7D6B12086F7A; Wed, 12 Oct 2022 23:25:17 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CCDB2086F76 for ; Wed, 12 Oct 2022 23:25:17 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F30629AB3EE for ; Wed, 12 Oct 2022 23:25:17 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2083.outbound.protection.outlook.com [40.107.20.83]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-634-yUWoQD0XNvWSC3nDt5IViQ-2; Wed, 12 Oct 2022 19:25:15 -0400 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by PR3PR04MB7340.eurprd04.prod.outlook.com (2603:10a6:102:93::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Wed, 12 Oct 2022 23:25:13 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::9d86:e0fa:f725:194]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::9d86:e0fa:f725:194%7]) with mapi id 15.20.5709.015; Wed, 12 Oct 2022 23:25:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665617164; 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=oXVua6555RK7aOvUyTrO2jf7rGDUZAXaD6GHmqQVWc4=; b=heqqhIayPt1rU8ZpvVuY5LOVmVRvXnRfSr7n4NAf2Enycfa2GHbf6weNOwdG/wxpVhmtxV irC2YWpNcHymUngP/9CpQ7Z81psqbUNz/0Z8pp67HsMguT8Ju5nNsqddCYs4I8yt8yqsuK l4qWAJu6N9s9FWmokXRHuvQqCbtx2Lw= X-MC-Unique: oiG8wHXDOduUTEQvGG9vhw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: yUWoQD0XNvWSC3nDt5IViQ-2 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V2 3/3] qemu: Use command line to properly check for spice support Date: Wed, 12 Oct 2022 17:24:50 -0600 Message-ID: <20221012232450.20888-4-jfehlig@suse.com> In-Reply-To: <20221012232450.20888-1-jfehlig@suse.com> References: <20221012232450.20888-1-jfehlig@suse.com> X-ClientProxiedBy: FR0P281CA0045.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::14) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|PR3PR04MB7340:EE_ X-MS-Office365-Filtering-Correlation-Id: cffcb848-b403-46ea-99f5-08daaca8feb5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: ycrR6tem+na81RQ0o0ux5l7XtlE530BkTiLb5040QeeJ/K0wOzP0UDDm5p/+iH5H9ZOylJOrO9cG0HXJp4GqDEG9jWP1bALVM/QEhYy6eo3LeF7Xm/Xtmg0FUz40V9JMHV7ltMi980AI+kP/dO6xiIByFa63gutn0L4wWENI5cZw1+FQh3CNMpdstMkbItaQCW9px0mUaC7lNm1lb5/gS5GQ6tfUNRKrwVw90tP2mp1+rdECx+uh6NmXGHe4vvxyXovsIXWOYwROkWjl66wG/x0ZzXNGEH1waoo5ngKkUdffi81LHQE78EnXL/uGTEa8LT5YxCMUMPtz1todoX2HWBQZmTe4WZOLMrbEx/U23w+UMHSoP+4fjDcD2s6irLyibWyWWK4tKpMQW2nGdewt9fqBpyijccAtNqv8xSH3VxWAhDeSBWV9xq5fNlhldJ3URA1ZY/dsZWaz97kKoTefoSYlWmPcet6xnvJxrL2koBdMyhzueTFm5aL9eqB34czZeIyYAFTpJtpCmYMsuFsNGEC6MKEvV4VUjdZAyAtIwe4JYYOc/awSOdAPWifBjYmFIwiIIgohp60M/YITVsYgWHeOXOZsrpNWRvTJGCK0svRVe+APHMBdThiKbxGK2KZn//aZCrdqsmMYPaQITKscCyi3S3OSDIhSkxkp0qM9N59N8R9L1Koi5wpodWfwuP8A0IJfqq0M9jmT8UlDBapRxw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(376002)(366004)(39860400002)(136003)(346002)(451199015)(478600001)(6486002)(86362001)(41300700001)(6916009)(38100700002)(83380400001)(36756003)(66476007)(66556008)(66946007)(8676002)(6506007)(26005)(316002)(186003)(1076003)(6666004)(2906002)(2616005)(8936002)(6512007)(5660300002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mNNJRm88Qqre8kXEy5S8RXl1IAnmeyDueOI0P33mdRAKJMZEh7l2/j3wCtXp?= =?us-ascii?Q?LnY5T387fzFwxteEmWhwTc5ulqJ1IwfP2uJvdEs6FrlBDVkzRW0T5CdCUWEL?= =?us-ascii?Q?BeXtV+yIV6Y8DlcVlaw5NnY9x6CriOk/XKQZ/6rj8aChr/BHwfhrZHJsDazi?= =?us-ascii?Q?BSTf9/QSzHi51LKMsA63L28kMIy6YZA4VKJ0hufLBA2z9rpYd4/w8x+RYbpq?= =?us-ascii?Q?CBJKFgwCMnGHutq/m3su5mHHb4lgzz0PFTalDXsidQwnbtL8Dr0G+hRFF2ml?= =?us-ascii?Q?UA2qeGUr67ex3wfNGLgtU786MGrf4h5HhR+fw06KZRGPeRcS6V+3q+8Jo3/5?= =?us-ascii?Q?MZtOl/R5Sk4iv7FS8We55g1Rl9flt+YfBhG/joXP2DxljeiYnlzEBiFLMIIe?= =?us-ascii?Q?Yx+3InG+zcwhgYOj3qDJ8HDt5p1+oXoY2EZvvJM0vXOLuQXT0AG8Yqu36DuO?= =?us-ascii?Q?RxjOzgjHPZ7NTCY5rwaVEcnxbh7nym1A3fBUMDPCUddIRLHm/FkeE8TeHH1e?= =?us-ascii?Q?3BvY4RVhe9Z4NkOK2UECw3/RsWnui8W/31ewkcR/9fnsFdzlV0ljRR/pjMXL?= =?us-ascii?Q?zPM+PGjzKuvVx5/djAvzbKu+gUWi9Kgx9oRgKRkCzQm1Z2IN5ZdnONFM/quj?= =?us-ascii?Q?MqnChyB0wa6iGPxkg6vV6NCGUXjzzg6XP1LH97eDV+U9sGunUIXS5bjxwpUI?= =?us-ascii?Q?wYzJ4jKExtDUnINXtDB3D+BO0KvJL1wV8domAW0qDCKjyzVp1DpBLJp6zUer?= =?us-ascii?Q?cdY+tjfRgOhnNmu8kY5AE21P+n3eaLGEZ468bvejY3/DWhkikB14QG6PuHTH?= =?us-ascii?Q?YF8o/D+hSiI+kMtzucAw6BjlzV1EP8gnyXYyO0TBR11EVN4G3nqh7H+nQqTU?= =?us-ascii?Q?HqMWhhIfAJqGxYhfy3MLxecHnS7DgSq5qt8tUCD9jxvX7xQ2sje7BJQynfg4?= =?us-ascii?Q?I3VS48j9uD4WBhH4pdE/81WpHHmS90xlHkKPZKK7xjz1DN4S0uPS79Al72j5?= =?us-ascii?Q?C4OaAGDaHPwC6i2ruCwhpy9eXhMZiwwgXyLfZtK6wpJ4PN1ZKAl0aZPq/0xC?= =?us-ascii?Q?DbPlJCfgDcq15TatjHCNnSXiQV1dBt3VieYEYHMKl9N0HTOrmb56Gs4WA7eB?= =?us-ascii?Q?S8PRbuU+FPoMZQBzPq2jyYFXXXETe5AfQ5tJ4wRwycgoVrqgTKx003LFEZzc?= =?us-ascii?Q?P+zGs/KD8d49zgSJj1UKgl8Q+2YelJlIiNAgusnIksuyNPfjCdSn2ko4wiNb?= =?us-ascii?Q?L+VvEKn3qGoqERur5w/RWqAArswfLvQTTnaxcyMrLVS+jE605DnDPYaS6Uoo?= =?us-ascii?Q?h3ToDZrcwmXYPorTZPpH9oW57+9d1M88vPD7S3sTFJ69fEqxfyHAHG1zFec1?= =?us-ascii?Q?KBdosTB2sh01AAbbxQmQPjrvXI9F7mISQk/mphacvIDPMncSRkh+JPuvEOay?= =?us-ascii?Q?JRzEvFXN8N4dl47v08JYpJ7h8wj/4cJ1Gsmjmc5cgW4tCeH28gz5LaFZ24go?= =?us-ascii?Q?WQyYjXg5XMddHILcjPlqzfcU9ZXaieu6aA7rUEP1/sur91Fx42RrQvTXU8R6?= =?us-ascii?Q?JSGh/4vMysY0OXlOgta97aQ0lJVPmwAVe9oHYn2e?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cffcb848-b403-46ea-99f5-08daaca8feb5 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 23:25:05.6643 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6rTbyDphp9skE+mKR8T1906bzyHIySEcdett5IDs4lBdK3nWTrf+XTy7zSWvn0hLgwQSh1/Z5Q4AfE9XrwsHQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7340 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1665617165876100001 Content-Type: text/plain; charset="utf-8" domcapabilities reports spice graphics support even against a minimal qemu installation without spice modules. Checking for 'query-spice' in the list of qmp commands supported by qemu is not sufficient to determine spice support. Checking the command line produces acurrate results. Signed-off-by: Jim Fehlig Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 98849daf4c..e40b5c6c00 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1205,7 +1205,6 @@ struct virQEMUCapsStringFlags { =20 =20 struct virQEMUCapsStringFlags virQEMUCapsCommands[] =3D { - { "query-spice", QEMU_CAPS_SPICE }, { "query-vnc", QEMU_CAPS_VNC }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, @@ -3265,6 +3264,7 @@ struct virQEMUCapsCommandLineProps { static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] =3D { { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, + { "spice", NULL, QEMU_CAPS_SPICE }, { "spice", "gl", QEMU_CAPS_SPICE_GL }, { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL }, --=20 2.37.3