From nobody Thu Sep 19 00:53:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1719834413961763.5104362707367; Mon, 1 Jul 2024 04:46:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D84A9126F; Mon, 1 Jul 2024 07:46:52 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 146DB1472; Mon, 1 Jul 2024 07:42:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C2C6D1291; Mon, 1 Jul 2024 07:42:22 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 082851291 for ; Mon, 1 Jul 2024 07:42:08 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-g-5uoiqmOzqcm-fN_Wwgnw-1; Mon, 01 Jul 2024 07:42:06 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 869A51944D29 for ; Mon, 1 Jul 2024 11:42:05 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A06BD19773F9 for ; Mon, 1 Jul 2024 11:42:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719834127; h=from:from: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; bh=PVuUoqEp3bxOvTn0VdDQdeWO1gBLeuua1B+UgMLM3kY=; b=g8Pbuy50rQntn/SIppliFHkYWVdErZ1AYXOGaeCskVmMR4Z5N6Nc+6nL/FitdCXhKojZlR nFUT9MQx0Hu/qq7RYIa32TLidVScvNh9/OBs6+c/ORrO4z4PiwtWVmubraekDAYpcmIXyC p4nqsDlNQGfUf4rhE+GG4LytK4e4BAg= X-MC-Unique: g-5uoiqmOzqcm-fN_Wwgnw-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 8/9] qemu_capabilities: Retire QEMU_CAPS_VXHS Date: Mon, 1 Jul 2024 13:41:42 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CHC4UVSYPXKHMRYFTO2G6HIWQE4UO2DF X-Message-ID-Hash: CHC4UVSYPXKHMRYFTO2G6HIWQE4UO2DF X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1719834414792100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The support for VXHS device was removed in QEMU commit v5.1.0-rc1~16^2~10. Since we require QEMU-5.2.0 at least there's no QEMU that has the device and thus the corresponding capability can be retired. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_process.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 92004634da..17db563b09 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -440,7 +440,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-net.tx_queue_size", /* X_QEMU_CAPS_VIRTIO_NET_TX_QUE= UE_SIZE */ "chardev-reconnect", /* QEMU_CAPS_CHARDEV_RECONNECT */ "virtio-gpu.max_outputs", /* X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTP= UTS */ - "vxhs", /* QEMU_CAPS_VXHS */ + "vxhs", /* X_QEMU_CAPS_VXHS */ "virtio-blk.num-queues", /* X_QEMU_CAPS_VIRTIO_BLK_NUM_QUEUE= S */ =20 /* 270 */ @@ -1539,7 +1539,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioIOMMU[] =3D =20 /* see documentation for virQEMUQAPISchemaPathGet for the query format */ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] =3D { - { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS}, { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_D= ROP_CACHE }, { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME }, { "blockdev-add/arg-type/+file/aio/^io_uring", QEMU_CAPS_AIO_IO_URING = }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cbd1e73289..910181993c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -419,7 +419,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */ X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-= outputs=3D */ - QEMU_CAPS_VXHS, /* -drive file.driver=3Dvxhs via query-qmp-schema */ + X_QEMU_CAPS_VXHS, /* -drive file.driver=3Dvxhs via query-qmp-schema */ X_QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ =20 /* 270 */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b9b6ccf1de..7cbe521a6e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5380,8 +5380,7 @@ qemuProcessStartValidateDisks(virDomainObj *vm, * option exists, but we cannot determine whether the running QEMU * was build with '--enable-vxhs'. */ if (src->type =3D=3D VIR_STORAGE_TYPE_NETWORK && - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_VXHS && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VXHS)) { + src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_VXHS) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("VxHS protocol is not supported with this QEM= U binary")); return -1; --=20 2.44.2