From nobody Mon Feb 9 23:04:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689688717; cv=none; d=zohomail.com; s=zohoarc; b=PZxzOrBze/Tgh2zpavdqZi95IMXyDBF9b1Q0Hzu7NQYQOTutSCREXfGer71dNJXfw3HmGEzDQDbu9Iu0k/jcf7UPyd1n6cYs2ZnMwq6LWOCzb5mNohVeSLpkuo4yoAPVFJAaVLM3XZAIxsdJiboFEDJ4rsY1npBtYeAA2Zi4kFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689688717; 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=zQFHg5tQhVfZVu1kqB+B3OZOxyf4M3kFoyR1Rlo42o8=; b=UOeNzN1dVHJz95YuCDY4j8aQSIkruum3ARdWKvvItcrZSiHf/4cQBLHilGnKW9rEBgyI4pVW7i+9yS6wUJmzPaFNC2ejHORIIwsJpI9KDUS4KiDyqpmEO62r2tJ94rwx1qw4aMbLhwKNU+jiPjwXGosOhUX6rjx0w4S/PAu4tIo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1689688717926160.17198019667137; Tue, 18 Jul 2023 06:58:37 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-646-CqjN6qVVNRa1ZJ1jb-xUZw-1; Tue, 18 Jul 2023 09:58:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DBCA1C4766B; Tue, 18 Jul 2023 13:58:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18F4640C206F; Tue, 18 Jul 2023 13:58:26 +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 493141946594; Tue, 18 Jul 2023 13:57:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 53EF2194658D for ; Tue, 18 Jul 2023 13:57:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 346BF2166B27; Tue, 18 Jul 2023 13:57:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC2302166B25 for ; Tue, 18 Jul 2023 13:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689688713; 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=zQFHg5tQhVfZVu1kqB+B3OZOxyf4M3kFoyR1Rlo42o8=; b=ALWPKvsUy4OiAhm1BVObNCMfq3Qd11jJOXJtzyFwFSFHo+7GyFAtoCyLFjD1QyBjv3zfb4 xeOCK49w5Vm+KYwa2puTq5ahEFHS+ZmXs5kz7xjR6cLwfrL/DQ1IQyRfZjba+g7B9QAxvo 2A2DxEduDm1yWKrD5KFmfy7mJ1SBjFY= X-MC-Unique: CqjN6qVVNRa1ZJ1jb-xUZw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] qemu: Always assume support for QEMU_CAPS_SCSI_DISK_WWN Date: Tue, 18 Jul 2023 15:57:05 +0200 Message-ID: <95a8832331ec31b4872f8891bd766c3b6e518f03.1689688600.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.1 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: 1689688718488100001 Content-Type: text/plain; charset="utf-8" The support for configuring the 'wwn' of a SCSI disk was added in qemu commit 27395add759ff4caeb0 (v1.0-3326-g27395add75) and can't be compiled out. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 18 ------------------ tests/qemuxml2xmltest.c | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e09e2c52f..56fd562b70 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2860,14 +2860,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, "by this QEMU")); return -1; } - - if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_WWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting wwn for scsi disk is not supported " - "by this QEMU")); - return -1; - } } if (disk->vendor || disk->product) { @@ -2876,16 +2868,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, _("Only scsi disk supports vendor and product")= ); return -1; } - - /* Properties wwn, vendor and product were introduced in the - * same QEMU release (1.2.0). - */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_WWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting vendor or product for scsi disk is n= ot " - "supported by this QEMU")); - return -1; - } } if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_LUN) { diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b66274beb8..5d5ab4cabe 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -593,7 +593,7 @@ mymain(void) DO_TEST_NOCAPS("numad-static-vcpu-no-numatune"); DO_TEST("disk-scsi-disk-vpd", - QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK= _WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST_NOCAPS("disk-source-pool"); DO_TEST_NOCAPS("disk-source-pool-mode"); --=20 2.41.0 From nobody Mon Feb 9 23:04:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689688694; cv=none; d=zohomail.com; s=zohoarc; b=ZU+B43FjCFaW4GJ7ENM9t69CAVCICB8WzoXwg6IpQcUfLAcPW23CxI6kXKqaAFWqmqKAdKlc8w5+wu3ZvTFuUUhDvngZp/iGOLPKpWql7VVCxdfR7C9fgJ/gnjZEUT7wrgr0gRaSkqB3ekVreEt6Ra7Uvp9ivR9DdqZ2L6mVl1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689688694; 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=9lQotGdMH4vp8RCMTipXSi3JkGMe27gUKb3/RHwbook=; b=V628m5eDttfZtwMmtmQI5Q/3wJlzCLO8CPjfZPbdqJSICmvdmnUGxqhkNzPGLGlw8hduQmjKpAt/zyINYBpzOQDDylcfPPfYdy5FkVngXpLz89P0l4ehBdOa7vkQ7n9489tSdij3ppgA5J1CHqxW2mQqEq1uaVGf7fftVTqynB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1689688694002266.53143328703845; Tue, 18 Jul 2023 06:58:14 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-426-8srkEFBbP0qYUnV5OXrqIA-1; Tue, 18 Jul 2023 09:58:07 -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 89F26101A54E; Tue, 18 Jul 2023 13:58:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76C82492B01; Tue, 18 Jul 2023 13:58:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A2C5819465B6; Tue, 18 Jul 2023 13:57:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 24DE319465B5 for ; Tue, 18 Jul 2023 13:57:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 09BB22166B25; Tue, 18 Jul 2023 13:57:11 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81C2A2166B28 for ; Tue, 18 Jul 2023 13:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689688692; 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=9lQotGdMH4vp8RCMTipXSi3JkGMe27gUKb3/RHwbook=; b=LAQmF5ktaAnlILpJMHJP0esDD/JTBny1J1rq39M4QHny912NsFi6/KarRBanyijZbhHaiw oaFUEektq1OeSKJmKieCeGrzc/BtlbF5kc+Ajgxp50YHG21tQOJ7QqeEtpYAl92inbIWR6 0kqwOdnEfnrDbSOO9tQB+D0ysCmM1jg= X-MC-Unique: 8srkEFBbP0qYUnV5OXrqIA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] qemu: Always assume support for QEMU_CAPS_IDE_DRIVE_WWN Date: Tue, 18 Jul 2023 15:57:06 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689688694478100001 Content-Type: text/plain; charset="utf-8" The support for configuring the 'wwn' of a IDE disk was added in qemu commit 95ebda85e09 (v1.0-1869-g95ebda85e0) and can't be compiled out. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 56fd562b70..03a35bbef6 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2852,14 +2852,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, _("Only ide and scsi disk support wwn")); return -1; } - - if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_IDE && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_IDE_DRIVE_WWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting wwn for ide disk is not supported " - "by this QEMU")); - return -1; - } } if (disk->vendor || disk->product) { --=20 2.41.0 From nobody Mon Feb 9 23:04:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689688708; cv=none; d=zohomail.com; s=zohoarc; b=T0XF4rfIs5BwOCMmQDbweScU260WCMRJtqCjt8AucGuptP7ZN7iIGtzCToK9xewKXKfWrrtL9vNUTmqcQ7m+//n6O+faBmlPf1ET/zcf6R4gWxuJK74ut0YLr8OJKhNDQ4TdZVhQs7f6DwmZf1cqG4m92XdfL2BxEcjJoCSDcVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689688708; 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=OC/rrgcr05lWTdzZKExKsWn1f5u54NYhW7zIzAlKQzo=; b=R9+UM+800KOWBMvTRFFtWw0jkEG3TelhGbhV0eenULp89ShK476dzTtzSKqG/HzsmnrKOy37QtGO18xwf1UgZr+PaSbZk0oreVNr87ubbft8LfU3c+NmgnvqdFDR8GRHJ9tQ97ca+qrvwU7cbWruK6W+//X+opFkiDFmU9EkEL4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1689688708790305.15342377150444; Tue, 18 Jul 2023 06:58:28 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-558-IG3qPjPKMV6OvIl8340GvA-1; Tue, 18 Jul 2023 09:58:24 -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 3C8611C47668; Tue, 18 Jul 2023 13:58:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 295FD492B02; Tue, 18 Jul 2023 13:58:20 +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 D85BB1946A44; Tue, 18 Jul 2023 13:57:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 27CA4194658D for ; Tue, 18 Jul 2023 13:57:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 142142166B29; Tue, 18 Jul 2023 13:57:12 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 618B82166B28 for ; Tue, 18 Jul 2023 13:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689688707; 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=OC/rrgcr05lWTdzZKExKsWn1f5u54NYhW7zIzAlKQzo=; b=GBtm/CrEZ8TD4IycXOEqdfa2UIe7cYNOxLzlMovbyCpEt66T31HtDDUZhWnV8y5zfQ+DMZ /nt+/SqN4aSNr5UVy6uZRV8Gi7b9MRYn6PeeFemAZEJ42JR2hYcViXIspEYYovL57f7wJW 7Ee20Z2f2Muex08nGNRfxdS7qV7jy/8= X-MC-Unique: IG3qPjPKMV6OvIl8340GvA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN Date: Tue, 18 Jul 2023 15:57:07 +0200 Message-ID: <9578253bff6e6bda9ba139a6d2b10cdcf888f1ef.1689688600.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689688710442100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 4 ++-- tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 2 -- 37 files changed, 4 insertions(+), 71 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 338608f0a2..84ced8661c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -213,8 +213,8 @@ VIR_ENUM_IMPL(virQEMUCaps, "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ /* 105 */ - "ide-drive.wwn", /* QEMU_CAPS_IDE_DRIVE_WWN */ - "scsi-disk.wwn", /* QEMU_CAPS_SCSI_DISK_WWN */ + "ide-drive.wwn", /* X_QEMU_CAPS_IDE_DRIVE_WWN */ + "scsi-disk.wwn", /* X_QEMU_CAPS_SCSI_DISK_WWN */ "seccomp-sandbox", /* QEMU_CAPS_SECCOMP_SANDBOX */ "reboot-timeout", /* X_QEMU_CAPS_REBOOT_TIMEOUT */ "dump-guest-core", /* X_QEMU_CAPS_DUMP_GUEST_CORE */ @@ -1452,12 +1452,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCa= psDevicePropsVfioPCI[] =3D { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[]= =3D { { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, - { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[]= =3D { - { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2460fa7fa0..dc48ad9ae9 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -191,8 +191,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ /* 105 */ - QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */ - QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */ + X_QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */ + X_QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */ QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */ X_QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0_aarch64.xml index 6a7f33e3c6..7a27cae27f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml @@ -21,8 +21,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0_ppc64.xml index 2064f07c9c..a8f2d91c10 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -21,8 +21,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0_s390x.xml index b440d9d538..8ee177f860 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml @@ -11,7 +11,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0_x86_64.xml index b45d4a6293..055b326f80 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -28,8 +28,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_aarch64.xml index a2b7214b8a..43dbb9473e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml @@ -21,8 +21,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0_ppc64.xml index 16333ba499..83a077f3d2 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -21,8 +21,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_riscv64.xml index 09a71875ef..addf67987b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml @@ -25,8 +25,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0_x86_64.xml index 5331cf0113..c32d027ba1 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -28,8 +28,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0_sparc.xml index bc5b3e6fac..1d51c2856a 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml @@ -9,7 +9,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0_x86_64.xml index 1c3d3ea2a9..0b234fc158 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -28,8 +28,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_aarch64.xml index b1c5c21abb..2b9b795f98 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -21,8 +21,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0_ppc64.xml index 9db85dafef..f47f526a2d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml @@ -21,8 +21,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_riscv64.xml index 4d03004fa1..746ae74ff7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml @@ -25,8 +25,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0_s390x.xml index 38a3f70a5e..1ae0e4cefe 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml @@ -11,7 +11,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0_x86_64.xml index 654fec58fe..0444eaf556 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -28,8 +28,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0_aarch64.xml index 6faf407a97..c80b4d8d60 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -20,8 +20,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0_s390x.xml index a63263e7e5..a97519f2ff 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml @@ -11,7 +11,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0_x86_64.xml index b1bf3caecf..19bf0f3a24 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0_x86_64.xml index 13d909e382..d1c33788d2 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0_aarch64.xml index e312801b89..096412a7e2 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -25,8 +25,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml index e6b0bc03f4..11e3eebc2b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -22,8 +22,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index e1758396b0..997ab321d3 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/= qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index 3517e81d15..fc0207db47 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -24,8 +24,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0_aarch64.xml index 58db75d1d7..030eccf1b5 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -25,8 +25,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml index 40130f180f..fc9e50bcc0 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index b7446435a6..14bd25ce2a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml index 6bc39b85f7..3b4dde0953 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -26,8 +26,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 6492695705..10b6a97075 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml index f190be552a..28c77e6df3 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index c08a99e734..66805f8671 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -26,8 +26,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index 37933c0848..e8bb732a88 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_8.0.0_riscv64.xml index 4c5e72ba56..a78b576df3 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -19,8 +19,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index cd5341f4fa..d9739f9d3b 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -27,8 +27,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.1.0_s390x.xml index 88c7ac89db..35751ed441 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -9,7 +9,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index 475496a8c8..c15b0afa2e 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -27,8 +27,6 @@ - - --=20 2.41.0