From nobody Tue Feb 10 05:39:48 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 --- 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