From nobody Sat Feb 7 08:13:46 2026 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896239; cv=none; d=zohomail.com; s=zohoarc; b=iCJiCM81uQoso4KE0KCGzw+dFikyLWJ7zxUiTW6jcruMxRe6C+MuP8d2/H70mLeSZ7L2ZWGzu9csgZDfqSGLrxlQPw76GSBoiIh8BDukJBb902YdqvJUdd77/TH58S6mxQ85FqVwLoTYTmUgFw5P9KJh8tTeZlUtP0zfEPspmfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896239; 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=H9u0gReN2qJsAJyHpbl0Guh+hKchWDS898Ut50Ag4z4=; b=DH/pRXOHhj6EXCPT8ta+Valuin73Y9DuWEhN1uXv/W6rmaJipTH2F1N06kHgS+BzwTmUDKWQw8F8QJBN3ndv3Vit69wtu8kvmM9utC+Gqt8c8f+gn4FvQkNvzG/2w3lA3rxaoh5jAEnOxorguLvc2AgVjhF+iHpFoV/nxpsb7Uk= 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=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.129.124]) by mx.zohomail.com with SMTPS id 1667896239093457.9213006020617; Tue, 8 Nov 2022 00:30:39 -0800 (PST) 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-651-lpP8BvusMcmPOyujUxFaqg-1; Tue, 08 Nov 2022 03:30:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1AC44882836; Tue, 8 Nov 2022 08:30: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 052962018061; Tue, 8 Nov 2022 08:30: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 DAE6A19465A2; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9A0D71946594 for ; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 796C84EA48; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D9EB35429 for ; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896238; 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=H9u0gReN2qJsAJyHpbl0Guh+hKchWDS898Ut50Ag4z4=; b=ZaF9wLKk7gWReHGipUAXM+KODRlrgZUsLe1FTMtMHNouBYng18eHSd2tRDiys6+nXDS9zu pYMJlmxzCBIPhJpH3b3MEoIchAvkK4HCnOv119ug5nEPsLI4bhGIfCz2KlMSKDPT1Sg8wM dmmrovx1m6OImGMy2Lx8T1A+Hw6s6b8= X-MC-Unique: lpP8BvusMcmPOyujUxFaqg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 37/48] qemu: Assume QEMU_CAPS_BLOCKIO Date: Tue, 8 Nov 2022 09:29:39 +0100 Message-Id: <16b1391d6e022d646fb8bfd993eefd83ce1b4f59.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.4 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: 1667896240904100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v0.13.0-rc0~1072 the .logical_block_size attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 256ef4912c..b0c9fb7059 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1751,8 +1751,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, g_autofree char *chardev =3D NULL; g_autofree char *drive =3D NULL; unsigned int bootindex =3D 0; - unsigned int logical_block_size =3D 0; - unsigned int physical_block_size =3D 0; + unsigned int logical_block_size =3D disk->blockio.logical_block_size; + unsigned int physical_block_size =3D disk->blockio.physical_block_size; g_autoptr(virJSONValue) wwn =3D NULL; g_autofree char *serial =3D NULL; virTristateSwitch removable =3D VIR_TRISTATE_SWITCH_ABSENT; @@ -1886,11 +1886,6 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) bootindex =3D disk->info.effectiveBootIndex; =20 - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKIO)) { - logical_block_size =3D disk->blockio.logical_block_size; - physical_block_size =3D disk->blockio.physical_block_size; - } - if (disk->wwn) { unsigned long long w =3D 0; =20 --=20 2.37.4