From nobody Sat May 18 07:31:19 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=1662496994; cv=none; d=zohomail.com; s=zohoarc; b=eml8u6QnXO1fwRzOEzY1Trg8alRpPOhA32eFl+BZc40UqrHXL1Mc4Pl+CZj/rKAFv6ad2SEUI24NoMOq1RXO2fVSh3ERvyNxw0bgccrcfx6rSpOVHaHqhj5Kpb/kXojp7OMRrHZxuYej8In20fq0WZbC7E5ZIQ0KRDjqFjxMdkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662496994; 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=i3wkRc2z/9WFWEIrch+gQU+85WNnIYoVYtbCB47en4A=; b=Nd2SFiRFH1AkMCl73iyA/AypCAUSu1NphqU+jsJZrldDaIg4UNkDmuQUSnyWAM7ZOaD91u7zTR0CEbAMyZxXR7JBtlEbTZUWMoc/Vbf6YfHoyJCKa4S8HKLnYtQxbO+7frhk8/+wVdm+eFD9uU4yhitsMG/eFvxuZV+zw0ZoZ+Q= 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 1662496994145805.2959355305998; Tue, 6 Sep 2022 13:43:14 -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-554-ZrkHDoc0OIydBxyDt45FHg-1; Tue, 06 Sep 2022 16:43:08 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E557E1C0CE77; Tue, 6 Sep 2022 20:43:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B2664C816; Tue, 6 Sep 2022 20:43:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6A12A1946A49; Tue, 6 Sep 2022 20:43:06 +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 353741946A45 for ; Tue, 6 Sep 2022 20:43:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 27494492C3B; Tue, 6 Sep 2022 20:43:05 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 223EB492CA2 for ; Tue, 6 Sep 2022 20:43:05 +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 01BE41C0CE78 for ; Tue, 6 Sep 2022 20:43:05 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70082.outbound.protection.outlook.com [40.107.7.82]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-148-HWVyzUg9P565g6WceEEkmA-2; Tue, 06 Sep 2022 16:42:59 -0400 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AM5PR04MB3297.eurprd04.prod.outlook.com (2603:10a6:206:3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Tue, 6 Sep 2022 20:42:57 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::3fa0:968d:6c6b:a047]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::3fa0:968d:6c6b:a047%3]) with mapi id 15.20.5612.012; Tue, 6 Sep 2022 20:42:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662496992; 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=i3wkRc2z/9WFWEIrch+gQU+85WNnIYoVYtbCB47en4A=; b=C55aXMjMDvsZqVyP2JAuNQpe4L2NSNupB6yrWwmdbQEze+RGl5XFwcKAlvjkT22fZBziUK qzftlbYMudhfk4JD54iq25vKMjDtyg77iRgUjBKcVRwZX4HbjXv/mU/Tkr2lrMFNSmRv4A hcjMuAqayhzMOn5o722o981othmLqTM= X-MC-Unique: ZrkHDoc0OIydBxyDt45FHg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: HWVyzUg9P565g6WceEEkmA-2 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 1/3] conf: Add USB redirect devices to domain capabilities Date: Tue, 6 Sep 2022 14:42:49 -0600 Message-ID: <20220906204251.16044-2-jfehlig@suse.com> In-Reply-To: <20220906204251.16044-1-jfehlig@suse.com> References: <20220906204251.16044-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0018.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::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_|AM5PR04MB3297:EE_ X-MS-Office365-Filtering-Correlation-Id: 497efb0e-3d4b-4442-7d94-08da90486180 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: MdbkKr74myzQa/gmNXRSq2RC9vAfDIvMbdCOsydavp9vrwOfWt6cp6usFbSQjykG4/rknBMP7xnhwr99zLpjUSBdLzc+AuqtxLYPs/4QhwEcQ/p9HZIkaDKii66zOhGYnB+K7ZWc/42L+OkOhUgfedq2f7EGMTPg5YlBTEn1KsEOd6q3az4/bYx7je/VnNFBUcTzAd4NB6YUDtg9nTm0K52Q4rKQ3JVrFs0LMV8BdDg6cWhIAYTfRVdqdElTDwD0B9194nc7g5fKAhX6tO+wCujNyW9sWLUWQ+iq8KXkSZbV4Cp097ckQzc3cwn0ZwTUbBrgCmumkYTXXceuzeS8JNSIniYpxOJwe7hvvojrObEBE7QM57z9S2YyjYj/s9gfjdH5gAWo7ESOrQyjngrIZSco37T8zccv5NxygJOP6lTq9W22wla2kyOL/o6QPJD2UsDFOG/OPEUn38s/5bNemE+kfLbBxktLhpDaGCJC5RLEhSyni2fogp8v+5h0Pk8WyzdFNgmWi3tRr/+xjkSFN7DXe70OJE8pvPh5Q+0GVdoe0bNuple4IkCF9PvjyP/sD+rGV/0ZSp7pYDNEetaXHMFXjrNdoqDWOzW0I5o0Guc36Zzn5d1Y2z0g/FDM1DQ5Wr0vCxSLSts6GVqkDiy2eRGlTsQ/Ofyjtbc8dTvzpABCq5J6nB98MhJIdMDf9rMjJdYEN0SZwtfik3QyKUCvrw== 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:(13230016)(366004)(136003)(346002)(39860400002)(396003)(376002)(66476007)(8936002)(478600001)(41300700001)(6512007)(66946007)(86362001)(5660300002)(6666004)(66556008)(2906002)(30864003)(8676002)(38100700002)(26005)(316002)(2616005)(186003)(1076003)(6506007)(36756003)(6916009)(6486002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VCjggWiPF4GpMG1onf/ClhAoGLgZIeC7/QBWnyfjbK3ar0iqAQMxw0/EerdU?= =?us-ascii?Q?N54ysqvgYAHpLSsKZlDXQdf5BRzQ/1nEyU1lvZPdT2SLfv2UM4bdqMkcTiSo?= =?us-ascii?Q?FYzCX+eO2GsBvEQn8ruaVr5oZXSF5QHkRmyJWXUjetIrBJtlZ2HLE2COuNHi?= =?us-ascii?Q?3XsNECOMUy+6486R59o2xHEumtGoweASHPOZYOaga/RmlgtiTjdLc62y+Wub?= =?us-ascii?Q?agmJdPL+7gQOHMMHYYlzVgYZeZN7qL/As6iz5Eeai6lvtLhtQEWPEj5aoR0m?= =?us-ascii?Q?/wSIDlTFW9WrY4qdRQJbIxJZIQNrM5hPCAfb/8zKEMnSBiN1hRNr+y7QaQIH?= =?us-ascii?Q?v8xgqN3X1UVX1Xjo6bojs5bgEepsJy4BNZ+UNc8y+fUNTsM4XnEzRrcXsh0v?= =?us-ascii?Q?PtOStoIMfn3aYRPPugd2DlOVUFfFBVvH6owHI4NSTopw68Nzg7uKzeLwuLrp?= =?us-ascii?Q?FF08WA4PumvzB3vt92jrLa9OaIVnHvUrP2fzNcXYNXwdtIDhtQulFQhqtLXq?= =?us-ascii?Q?dAGvCeERD+hLE/ntjuEmVUJUiBr8fHYdLfUko9GWd1dAUuXzjn6Rruejj8fU?= =?us-ascii?Q?yEIisVXGFfXi2FfedXqAQlMOokcvGaO3UoPWL+PrSQtwTf2hPH8RHUod9iBx?= =?us-ascii?Q?KQrc+Gw7/6kTDrg0DjfcQpbZiJciyZTYYc1JfTsbrfwO+WNJc7S4WLlZ4KLJ?= =?us-ascii?Q?oUmN1oYU2pO3XlPsFp4QE2SVbO0qSV1xUWlz/cG9uFPwMzKwiNQmp9oiCNeh?= =?us-ascii?Q?D5Ku4BBeB5buzbreOrKvraPU6fDd53SMOL7nRHLwxl045vimfQh/VJEOldea?= =?us-ascii?Q?aWwZGXLI7/GQhn6cbfruioPMaSBHlogf0yQ+3t8yk3MlWHWtavTqVoZFfH5B?= =?us-ascii?Q?P/6fQ5g89iZgeoAy2966QbhzU311VGZVjVws43se/KL1hSui2Lxy6TeaDbLT?= =?us-ascii?Q?DvkR77vim5MQ1rxfnwv1KiMNFTgTgelZvXus67vhFrXUCh05hQuqNRU4WLpW?= =?us-ascii?Q?OE4rWDfEtQLc2G/cLPsKXoWwZppEhSbbJuRptUHYn+sjY45wbBWbpst6xPZN?= =?us-ascii?Q?o6ugX39UsYUWVwl+ugpC5N4vS4rAzVcxjgSTdGEBgAhRkEpoPwa7B2xBw3hQ?= =?us-ascii?Q?amVffRXS2Yd6+jruNXRz3PQEnroQ5qWcgpJFoad/bHTK/VHXABylTQelOO48?= =?us-ascii?Q?RMePy96ZUeI+z1MTBRHM5xYK0Eg2fcqA0wI7k3gdtm9xNOmpU+5DqPgug4tP?= =?us-ascii?Q?ENZqgEZYqoIuzHzMyN7lCy0O3Fxo+Chp3x5CxpkfmGVGMZVaZg62ORHzS5A4?= =?us-ascii?Q?Y0Zcx3qPhR/tilj5a9YROHapzmpbL1obScBdP7lo1NE41ZSqZmCbEwzwjz5h?= =?us-ascii?Q?l9QqYWvxmuNn+5pUrkLyMl2Ij6S7KZpzvYiiZybr6RAUbZAN4f9iq0qnhstE?= =?us-ascii?Q?OyfoMzKhs3+O53DkRePYSoZhW0EA5TYF3g9RN+I+iGJ26NFk+EBV2+kJgYgS?= =?us-ascii?Q?9gGMedj4YFwBm4l4l0CD674p9UqhMi3tAVivQIbNLWEa2U/zK8dZwFw2KXJk?= =?us-ascii?Q?lxWikfvFpdg7xxsMGlUGDwzf68is8HiAjRCGSKa6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 497efb0e-3d4b-4442-7d94-08da90486180 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 20:42:57.9045 (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: Mri3BYjPxwaG76YplRFaGRbRmncBzTvd+YBywPAS1Earnwe6btXFQgBO4+eg8z3EOAwvkg4/MqM90f3YywJmog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3297 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 2.85 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 2.79 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662496996289100001 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 --- 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 70f46b972a..557b61bf26 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -529,6 +529,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 653123f293..9cb1dbe7bd 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -559,6 +559,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 @@ -672,6 +684,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 a526969cda..de2a89c963 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 { @@ -225,6 +232,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 9cbc2467ab..8da3fbb352 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -195,6 +195,9 @@ + + + =20 @@ -247,6 +250,13 @@ =20 + + + + + + + diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 71018b4f6b..7d99050fa9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6342,6 +6342,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 @@ -6477,6 +6492,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); @@ -6509,6 +6525,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 382c357a78..85b989368f 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 0ec4c570ac..a39ada0182 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 4e0cb08b72..e054993aaf 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 05d606967b..579ca0eed7 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 f19ad5e6db..1632c85d7a 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 8ea7ad5714..909feac47c 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 fb162ea578..1c3877ec0c 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 d8793bb38a..666a974489 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 036e446c64..e6625bcdbc 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 4df4e86cf1..9e1ffe3a4d 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 bb8500baa6..631bb6b15f 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 e7227d092f..dcf8d22806 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 cac329fd08..fcfc2266d2 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 e901d12918..f08278cfbf 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 df1572c901..814f81defc 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 3a6dc7b5fc..6391383da7 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 e0e8e0ed12..5dd7efe165 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 6a49f568be..8b4c1dd954 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 f41f47c346..3306a14ba0 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 dfd792c031..4571622c4c 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 e7227d092f..dcf8d22806 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 88e4837ec3..bc43fb6a38 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 2a2ca8abcf..041c1ede15 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 0a6f72df7e..6147fc84b8 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 40df34edf0..3e36847385 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 e563b0cb59..d622f67ef3 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 958c40437f..9bf854869f 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 4164bf49f7..fbd48cac00 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 13fa3a637e..880ea5062a 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 eb60a2105f..84e575829d 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 0480a086c6..a25fa7bacc 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 7baecb0c73..2972e119e7 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 9cbe93ad46..60da420044 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 07b951b81f..61d43e6599 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 367e656b31..057a67c034 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 99c0fc03fd..2843599b57 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 8e04508694..45806a8f10 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 0bbe501383..cc3a45618c 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 f363cf1b79..56fae62434 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 136dadaeb4..5e4d4d48da 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 c684759356..8a18d45fca 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 1d6f29db9f..8e3313f383 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 73097470f8..f25ab0b796 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 7765c941c5..c43c63c741 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 0f9a65ef1b..410cc84977 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 30082712f4..3b5a846342 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 bcca02f0a4..dd7b8c2ab9 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 f377b8e3a9..d8c83e03f3 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.1 From nobody Sat May 18 07:31:19 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=1662496997; cv=none; d=zohomail.com; s=zohoarc; b=L+NTPXvFbyOR0lO/y9hW/ncs8kSS0zfajjjlNEef+OIphgswlrSnuEb+kMM+N/LV0cO8FHQRfFN4UEaZ6dUizDqqiIfBlBu/zuDmC1IiApZDnsh2nw88VMWKwnXLycTwWYoCLoXFqWHlDvjWZlxXG/5ZXPe91oDZQu3hF+5et0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662496997; 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=uCcP6pTBbLuffEYlRz3RnxjuofD9FTETLFiT4hQ+Tc0=; b=Jo/K+dz6S4yiTtDEVO2B7X5B3hLZEKJ51McMcW1UmnIkLKYdFShAYKmUWt0dcFAvNfEyN78BqjkuLnBCM4xbCylYrJB9PLHZvrFDiOIYaqCHluz9rZbf4bTNDb3FPuI8kBLe61x8IVCBi1aK9XrXY7LQHD4qv0iZqbVHA2HDF0g= 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 1662496997363417.32534721001264; Tue, 6 Sep 2022 13:43:17 -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-54-yeeNAc1bMGKkUI3nFV9LNQ-1; Tue, 06 Sep 2022 16:43:15 -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 3B09D811E80; Tue, 6 Sep 2022 20:43:08 +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 21811C15BC5; Tue, 6 Sep 2022 20:43:08 +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 0A3041946A48; Tue, 6 Sep 2022 20:43:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AAF071946A5D for ; Tue, 6 Sep 2022 20:43:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 806C940B40CB; Tue, 6 Sep 2022 20:43:06 +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 7B44540B40C9 for ; Tue, 6 Sep 2022 20:43:06 +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 5AF552999B2C for ; Tue, 6 Sep 2022 20:43:06 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70047.outbound.protection.outlook.com [40.107.7.47]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-ShF6NeTiMKadN2upB6I9JQ-1; Tue, 06 Sep 2022 16:43:04 -0400 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AM5PR04MB3297.eurprd04.prod.outlook.com (2603:10a6:206:3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Tue, 6 Sep 2022 20:43:01 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::3fa0:968d:6c6b:a047]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::3fa0:968d:6c6b:a047%3]) with mapi id 15.20.5612.012; Tue, 6 Sep 2022 20:43:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662496996; 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=uCcP6pTBbLuffEYlRz3RnxjuofD9FTETLFiT4hQ+Tc0=; b=QGN4288epOTYHkSB5JLra8QsS1GaI1sgVDbKvz5huVJiDwBjO328Z4hOg/lPikAD0/Dv9R NBoJHsZJ2fPK3lUlFB2X5WeqH7HNywPv09+6qGDuIjxLufg5UPouA2MlYLCKAO/wAaNz5O FkjbQL4851f+9fweOCcaAnBdTh+aOUs= X-MC-Unique: yeeNAc1bMGKkUI3nFV9LNQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ShF6NeTiMKadN2upB6I9JQ-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 2/3] conf: Add channel devices to domain capabilities Date: Tue, 6 Sep 2022 14:42:50 -0600 Message-ID: <20220906204251.16044-3-jfehlig@suse.com> In-Reply-To: <20220906204251.16044-1-jfehlig@suse.com> References: <20220906204251.16044-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0004.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::23) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|AM5PR04MB3297:EE_ X-MS-Office365-Filtering-Correlation-Id: b2baa0be-e563-4d72-946f-08da904863a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: fLLn67avw2h56D1EsVnmu2GBWW9OS8VDqnwLI0OMr++WvjI8nW+2mHQAVii8X/RcERWVvrzi09QM5gRWXok1l5SPdh+WLtO0gBXs+h6G7eswfVq78M4uOjwZMqBERH9rjx48Eenl6Rcl7l3FezyYl605bJYGCH2Eu5F7cT6x8i2DlpTmuurOsoWUQysJ5QECnx2j6Ww4DwFsp6I/9ZXi+9AHJ2z2ZIzzMGsAahAf7NabjZz14owyXHR+xjnm31huVt5luBUa+CQ+APX9YOiv/jlop4ROcSsG9uSidkQqodXVEoUcuAo6bSVuO5doNqK+tTYUMj4wksE/a3SMqBy3/Fr0rGDG/rvqw+9ro9lniFqFdhV0LGwxOFSuAZ6NnV4BwxKmpSufw4ghtmXwQ+qtC76cuRpmN82CqMn7yGeNNlBc5xZfqUP99/TusvjsnvTNT5YE14ce3qXpkQgdS60vRLdLf3wyjR49xRQe4DE3n48pdLf3Q70QEoUKX/NLS5yAXurmZ4uTGHgWQ3HE0PNgYwhH9jTeHvi6ySyNXgjv4sajvcTAKo2z0mI9Rlgd1vHgyTi1nsVBKnG5IGUlR1z4GJupTHgoaU7HzGfbLrm/5HSEvIN4b2K1KCbixCPjH1Q8OwWo5GGdWcyYTa9ALg8modNrjUjw02GBM9lDEukuXBa0rsXefateFq+Z1nXyl8Cd 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:(13230016)(366004)(136003)(346002)(39860400002)(396003)(376002)(66476007)(8936002)(478600001)(41300700001)(6512007)(66946007)(86362001)(5660300002)(6666004)(66556008)(2906002)(30864003)(8676002)(38100700002)(26005)(316002)(2616005)(186003)(1076003)(6506007)(83380400001)(36756003)(6916009)(6486002)(579004); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qy3MuWAA5qGdw6Om//Vx4LxS99DFAqln9Zp57qOzTIJvkNRbA+oPlrhhFz5s?= =?us-ascii?Q?VIcLEAySbi6BOEO9euIFWU5Ro1SMmr4WqBg6ism2sCK02nhH2YRwQF7YKMot?= =?us-ascii?Q?Zjs9V+oAhAztYCXDBlWpNCK9jAUChhB7l+vp976m+Cqbsbt9rkO6SCcewGPE?= =?us-ascii?Q?ZriCixpPZhEatl+I7sZAhG58XZYVNmuqMeHeLcrzuruPXUnUZ+YBYHriEnu1?= =?us-ascii?Q?+eV3U6/+GvPp1OLNtgoxutv4B+f4V4UCR8d+bAAlNt/7Xmk6RChCRr2kJVOq?= =?us-ascii?Q?wWtnLaoqoK+bymTCnUwyqmjjfKzCb3QkP+JcUSc3jIGQXMClE0Ex2LeeSZkP?= =?us-ascii?Q?HGElwo8qUYDjvr4Ta9Q49P458vCYSWm98xJIDbuRDAzD92YT+BSheITa4zmv?= =?us-ascii?Q?Qact5EejMQgW/PyhWscxboidkPl/4AJwy8wfKfjC3QpMVFC5x6UokTEjriEl?= =?us-ascii?Q?5/UVC2u5Va1B0WiApMW00YeXxoBn9cGKxb6XM9vWoL58U5lMPwmg6SWQpKaH?= =?us-ascii?Q?lBrvfAuKy7vEqdnNK/5uOdmi+jWaAiOz4CV5OgkXvcYl5XKnOYn8Gy1MJGA5?= =?us-ascii?Q?6l1BzlHigMotEfRrSn56eFuH/+1iPW6XmsB2rkmAojfn8tPPcuXNrmQlrbKV?= =?us-ascii?Q?RwD79sH3sSIh5TBXLP53bSXLAjYNbp9oeu1T40ozShNFJwFXhhTg9BJ93P84?= =?us-ascii?Q?EvXHV3RzFdjUKlTNk/jUhtyhuIEzqBZtoLdJc2gnzvgQjngvEzvEnEnher5o?= =?us-ascii?Q?b1WSSiVSo05bv11OSfGULILDAOFQxVP3EV5wLNleBnP+ej0+DyxG3oeR2aeQ?= =?us-ascii?Q?q3TMb14+1ukrADL5uOQpd5CEGHpMlBcFxpGx03JlXw0f8xY+mHGboqIFp18X?= =?us-ascii?Q?gvD7pL0+m6fYJYi+W0e1g5DFGPCSZWqWtZbyMZcow+qG9fAsarP/n7KD7XVT?= =?us-ascii?Q?qULssg373G/4fbdUGucLS4lG3rhAKdiihtVYHEqxK1ZSMK4QQysx7/5BVsx8?= =?us-ascii?Q?4WLOt+a2bSf6lL+p3wNT2wnmgQ1SiMsRfTySp6Bhq7B4pVivF7WQqM873H3D?= =?us-ascii?Q?SkHZR0Wms96gXFSlnYG9i99NIunouw0JK7F4UwU3xoiAF13WZe8+djYY5FxV?= =?us-ascii?Q?z0VSIcJuP1jDj1ttLLI+3ww6efvfBCosNcRjzw3ALNEicImNyBntI9D6giAI?= =?us-ascii?Q?UU+JRmgmLe32ndvQup+eh912X/zcCe2IK5YI6dVOldR2GpVcDPVcNu9vXi7s?= =?us-ascii?Q?2Zu3K8EM/ePD/WdaqjwfhS3GQpLTiicW7QVnX5uvaifBpaj5ghsmwxPToYUN?= =?us-ascii?Q?EsUvqdcCjj3KCkeHsmdF6ztY+SHygVssZ3/n4rnedUYBHngLEFN2PmaVbpo1?= =?us-ascii?Q?FGrRoDw6CLf+3UBQfQQL3mob1ojzYdkxDyOce9XotZskBXGnf0vugVckip0Q?= =?us-ascii?Q?VAxZww3LBRJn9wyzFuiq9qGLbeLZHjKy21Aq7BDFUvAL36NXEnnj0nS+QgtR?= =?us-ascii?Q?tpQnWMcSRiK6BG0WxoAmTUu4VSsSuUCpN21hjKRBMNIJFIhmb5Qcd0VLJ+ve?= =?us-ascii?Q?vGIpSMbAqMtzsOb5u+YWA6cc0tTaXTUyIcAuJ/ip?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2baa0be-e563-4d72-946f-08da904863a9 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 20:43:01.2793 (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: b40/iSVITx7GklYacYQH7IYQpFZiX2lQV/0EQP9zspdTY1l8bsnMvKvJkB6NYBk9rbWobSqb/S+IFZ24L/ShSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3297 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 2.84 on 10.11.54.1 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 2.85 on 10.11.54.8 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: 1662496998380100004 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 557b61bf26..38db50fb0d 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -551,6 +551,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 9cb1dbe7bd..d9d18a2a0b 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -571,6 +571,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 @@ -685,6 +697,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 de2a89c963..5023840e21 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 { @@ -233,6 +240,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 8da3fbb352..35b8f41b07 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -198,6 +198,9 @@ + + + =20 @@ -257,6 +260,13 @@ =20 + + + + + + + diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7d99050fa9..e894424652 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1394,6 +1394,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 @@ -6356,6 +6357,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: @@ -6493,6 +6507,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); @@ -6526,6 +6541,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 85b989368f..33263ad0aa 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 a39ada0182..c4524d800a 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 e054993aaf..f384c5a822 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 579ca0eed7..a7a415e112 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 1632c85d7a..ea93e248c1 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 909feac47c..2258d4e83b 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 1c3877ec0c..10f096d4f7 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 666a974489..2f79d16197 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 e6625bcdbc..58bc2f01ab 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 9e1ffe3a4d..6363589806 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 631bb6b15f..1df5f0c873 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 dcf8d22806..50a48f3f19 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 fcfc2266d2..82405aa464 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 f08278cfbf..a6d55951a6 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 814f81defc..d0528ac9d5 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 6391383da7..be5a3fc7ab 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 5dd7efe165..0bece4e96c 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 8b4c1dd954..605665e67b 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 3306a14ba0..978ed38684 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 4571622c4c..2140650fc6 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 dcf8d22806..50a48f3f19 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 bc43fb6a38..818031df4e 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 041c1ede15..1b915d9bd3 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 6147fc84b8..aeec10fe90 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 3e36847385..253375faa6 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 d622f67ef3..9e419da2d4 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 9bf854869f..07ace92151 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 fbd48cac00..7a9563e64d 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 880ea5062a..62701d9a2e 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 84e575829d..9d448f5b8b 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 a25fa7bacc..bb435213e7 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 2972e119e7..353fa2b2d8 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 60da420044..c3e104af34 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 61d43e6599..82a351a1e5 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 057a67c034..48f5f7a930 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 2843599b57..e0b8f22cfd 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 45806a8f10..3b466685a0 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 cc3a45618c..a9d1083288 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 56fae62434..d54ccd4355 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 5e4d4d48da..e20dd2d448 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 8a18d45fca..c88ce551cd 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 8e3313f383..4975a898c8 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 f25ab0b796..9a23202eb8 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 c43c63c741..e6d60c6eba 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 410cc84977..e7fb5bdc55 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 3b5a846342..5d38d864eb 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 dd7b8c2ab9..21fb87de51 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 d8c83e03f3..dac73a91f1 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 c5a7a7e9dc..0c1573912e 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 ec74c80bc4..b5d4958daf 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 a8706a1b65..e756864903 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 dabf2f505f..3a1b1bd1ee 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 becfb1788d..81f189ed2b 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 b7ad59760e..57f523e478 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 4ef0efdcd0..624828b990 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 f2fd699bfc..52b903c19d 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 e5cb039901..aefdb41e04 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 0067b7ba8b..c8a4746665 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 3b2fd0eac8..c0e9925bec 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 2b4deea5f1..5cf7abbb45 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 f168ec4e6b..6a1b60af08 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 de961e0569..0dc4856b02 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.1 From nobody Sat May 18 07:31:19 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=1662496997; cv=none; d=zohomail.com; s=zohoarc; b=KtfB7v+xl50MJLrHAo8izpPOKp27ZLpEDGzVecQRl8rLyS9UCItVkII5BLGysXS10HPdn4JICiIeIoF9MLJZk6IMb0aimcK4CqYUXKI1/N+HQUSbm65VpX+Kggfevcpa3wK+PyXiODjFZ2eETUPpV2/rlLONQFL9wB2bu609LJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662496997; 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=dhhwc/69BUFXkbHOdiOVucOPsZdaer2TA8n87elgyf8=; b=ZPrEEK/7HmG1DYZnv2vPq2yTseigYr3mi40p/bnJ3YfVY1Dv6FhnxFVJnH9h3BUk1GNhYLiFTB0bnpQgJ3pwGmWoQidPtP8NmTFMs/A69ILKt/MPReHXB4Ia6V90rJueX0o7KXJ3evvh9fgZBA72GuZHNfmBsaoV7yAll56z4Hw= 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 1662496997144304.11135520705966; Tue, 6 Sep 2022 13:43:17 -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-549-_zFnd1QeOX-QCSXR4aPESQ-1; Tue, 06 Sep 2022 16:43:11 -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 F000238149B6; Tue, 6 Sep 2022 20:43:08 +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 DB7A5492C3B; Tue, 6 Sep 2022 20:43:08 +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 BE6F91946A49; Tue, 6 Sep 2022 20:43:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A24EC1946A45 for ; Tue, 6 Sep 2022 20:43:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 783BC40C1421; Tue, 6 Sep 2022 20:43:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 73B0840C141D for ; Tue, 6 Sep 2022 20:43:07 +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 58306823F62 for ; Tue, 6 Sep 2022 20:43:07 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70047.outbound.protection.outlook.com [40.107.7.47]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-vnsQWP2UPnSvN-SByNhnBg-2; Tue, 06 Sep 2022 16:43:05 -0400 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AM5PR04MB3297.eurprd04.prod.outlook.com (2603:10a6:206:3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Tue, 6 Sep 2022 20:43:04 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::3fa0:968d:6c6b:a047]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::3fa0:968d:6c6b:a047%3]) with mapi id 15.20.5612.012; Tue, 6 Sep 2022 20:43:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662496996; 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=dhhwc/69BUFXkbHOdiOVucOPsZdaer2TA8n87elgyf8=; b=Q+HJD8VvS3ARV0pj546+MjZl3GOHy1MAMoi9a2EpNJbLBp2ddJ7HRVIg3H6X9phYYBjKIL VxVDaipT/aTv5s/d6FCCZ5plwaPtEY+/dYUS/6zCQ+xs4Rfh5R4fkX0BJdjJFlqYh7QRkq TS/SXSctH+K0M635XYkg2a/GKWiibpE= X-MC-Unique: _zFnd1QeOX-QCSXR4aPESQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: vnsQWP2UPnSvN-SByNhnBg-2 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 3/3] qemu: Use command line to properly check for spice support Date: Tue, 6 Sep 2022 14:42:51 -0600 Message-ID: <20220906204251.16044-4-jfehlig@suse.com> In-Reply-To: <20220906204251.16044-1-jfehlig@suse.com> References: <20220906204251.16044-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0018.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::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_|AM5PR04MB3297:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c8968ba-8589-4e67-2608-08da9048658b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: SSgrOytoUIO83wwO7TkYSggxBAGGixIT8alxMVirf6HuuXvOpHbltL0T/VJmjN5R9WDB0Wa4eSDXkM5DNK+ryIBgnmBAxQyW9q5jJolxZSFnbeS8zW1x84zV3c4Vkk4gunXo35Ht5fxtLmRlTmCtPp+LTC51Qi0jZ8r8T8ew/yyLW3tbozI6babB4edolu/Syc9KL/JzkCUnc7VI0n2cmYRt9rVJj+Bb8rBhYwtG2ta5gzHiGtg708j+eTE8/jb8t6xZjPwSHcrkHOqwGt4bthMn8APWgCEcSntrvn5mFsVa7f42etILGkGCWypAT+d3vmmz4CKfLPK1FDmI057EliExNxSyIoRsWKnRz+4tr6MUCJ2P4iXaoT7kjNdy3WtqTiwqR+JBaQtdbq21WO9ak6HLX+ICd7sOOf/wQrhquZLfoa1jTVGyJzxt65uHXgtA/HTXWKP/nma/d7fVcE3ii4JcPV/p1Pd/IG7g6B7HQXlAlpm49XwTrzcrcJPzd2zppKdzmzQqfD1F9osVa0Fp3A9V3j6i6hB8tc9HHZgkTbODvPKMhx2CRt2xVhA4bid1zmnXZivhBCzPu4WsDECODkMudiIXVk9tp2vLPY4sB7Y35TP8/L1BC1SyUrYmiayc1EyCM7vj4+YudfQ4IGoaC4EIMw390LVrjVxSsRz4razzrC70eCZf4P0cQTXfi2/DoOIhTTDdchfQpJKEiTeugQ== 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:(13230016)(366004)(136003)(346002)(39860400002)(396003)(376002)(66476007)(8936002)(478600001)(41300700001)(6512007)(66946007)(86362001)(5660300002)(6666004)(66556008)(2906002)(8676002)(38100700002)(26005)(316002)(2616005)(186003)(1076003)(6506007)(83380400001)(36756003)(6916009)(6486002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yI5Y5oRo23Q4GJIm0iOEJ2+gfJxCxQbGFO17E8fVaG/p96KIprAidyr3HeVl?= =?us-ascii?Q?fJXXm31aHtwIeGgE0QzLEO4koxga6cWNEjrpJl2uUNpwfGNTzWWQ4DpsWpeb?= =?us-ascii?Q?s4cVz0v9lAiEwlCraHks/kyrU8braG407FJvMqJHtLzO4Uicb3L5hsKNmDXU?= =?us-ascii?Q?0lq5XAS/NbINdtxiDUhH3bjoZTlliYCO5v3XnzR2+Axo34WjqxwWys2ERv7J?= =?us-ascii?Q?wWKeBBekd8Ou1sHoXH8nrMvSKbBddLUl6xF4e7LdKZWDCXB0GA+FCYi2tjER?= =?us-ascii?Q?/6FxT1WBaNk9iHQ6qHLTynEWF3uAmzX3+UxemQQw2jnXM4OLvSHYYpy3u25P?= =?us-ascii?Q?mUWimDHDreOc5Jib1l3cTDOjFLbKBbJliOCqzBU8qxHG5m00aG6Vy1foOSZR?= =?us-ascii?Q?Z+5r20YwLqI+AoaSqwLnh9bbZGWx2x/SK4VetobNhjKFQtIRIM8oE3W7OgWN?= =?us-ascii?Q?7t33NFEqjZqm/6Rx0e3N8hQpuQfkf5AYPWFTnKK9DLMgLdivtkYjfpPVJap9?= =?us-ascii?Q?yhn4RxqNzDGAOBdPPmsjM6WRqUdTxeuZUiS3v1uchwtZL8i1ZOtW0+ZtPmIE?= =?us-ascii?Q?9YRvx3DDGCx0YDS3Lt8GiKFV+Ix6poKXoWvxP0mA8XMGYRRSQd679Nz0g410?= =?us-ascii?Q?+jpsjf7z2wObHizdltRvt4RdsCJaNQmVIKDd5be7YWbWvMNQyGFe5rqDpEZx?= =?us-ascii?Q?NNxlwAFtfv7AiUF2A1EpRTkUPHM6KkRnS809hBnmIg/DhHfEfP9c3XDNQsgh?= =?us-ascii?Q?zcbpR4CsR5EUcNmvAcTVlSmeHJHViTwahc0p1+gauRAIfgEIReiNF7Y4/W93?= =?us-ascii?Q?aYxRdn5TfXrjOCRhtvrGSs0b7aaHEc1cTALS9ynYzKG8Z8D8+70aEame20hm?= =?us-ascii?Q?5t0345aPw0atd30SgJ1eZwWQ3dOmtBgK/I/8ty2egqAOi1ovNHhBtOF3Aphb?= =?us-ascii?Q?/JV7MU/1cL2GwArR5XS7TiLTX6Mwlg6NBLQ+wFpIiSMrwYGHY5FhxODZEWvw?= =?us-ascii?Q?1JtwDN7kYq/dClLkP6YNDDcO9MUPQVRZp2lTRonaUNp4LITilhV/QoaOXVwt?= =?us-ascii?Q?xMRJOF9JwFJiOQsPMbRN/v1N6wxsP9fwYIj3K8bUvSfouRjBWqw0EJJzJXXv?= =?us-ascii?Q?Gv3oryf8llb5KOHDNT++65PISluVNrYhJwk6jTaOWbuNApWFYbV2yAsztHWl?= =?us-ascii?Q?Sn/42L/6IhJ1VMlrP1sOZXsAAKJxXiR+ByvXLaKuiNk7+SgwmqkjxXHmLBJP?= =?us-ascii?Q?sn5qp2PPLhmxEmQUkPkqbd2KRc9UaIDqeU9Pi8JO6B8COxQ/K/WMVU1MyewU?= =?us-ascii?Q?o686jaV44tqIyWinUTWb6MkIOivdR5CIL8I2rckVEXaiUfAtMh2TluUr/dk0?= =?us-ascii?Q?1kY7Ps2tT0BHAI8WoajizS1QKakQhqcsT0i6DmCciAuvjA7thLL3RDUu6vFQ?= =?us-ascii?Q?2mMr6+YarLegk6AdrqV5lMlKDaz+aLyErEuAC104xQVf6U4HkNnArqqAHv4q?= =?us-ascii?Q?KQzfbazD1SiF8+Q8O4kVCl///Dnmxgz+Jo/Ro9+q3kGV1plFqVN7DqwMpSmJ?= =?us-ascii?Q?E9YZhD4zuXIQNiJkpo+pvqVl3mV8eElq3ungdFEl?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c8968ba-8589-4e67-2608-08da9048658b X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 20:43:04.5134 (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: zQDL/9i1vcnCevvPmTSOkNVdTfLoZo+iHHsXc9/CGpqI3aK7KWGzzr+QbEtg8chucv+UegBxjQuD+8AzSoUiTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3297 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 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 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: 1662496998233100003 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 --- 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 e894424652..36e10d6e45 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 }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, @@ -3271,6 +3270,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.1