From nobody Mon Feb 9 09:34:12 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=1692964358; cv=none; d=zohomail.com; s=zohoarc; b=L5OGBuL4cQXWPsjrvdOR2DZnN2T5S3x6saQjYXuLAT4uD8HHiqoxdHpIL534WEBCd/7qJyFR7mTMAFZ3cTn0mlblgc6BPHTlMwf4XA6dCgCRf6lW8fof7ylTuAt9AKlK7iFIRDTaTNlk35BD/pWWaInko0wPxzdsPXURhKe/psQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692964358; 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=hgoulDhCuOcvAmWxGfywWW6jglfsHbVUd3RADB2Qllo=; b=TRc3D4usCqm2CjUjGjwXXIw5mwYd3Dn9FfZdmuV5bSZCpo7iENgZyKWQlvXSXXKKgAW8m7nosx2DpLZlpFppW7WeLpysTbwh/RaWDH9MyzpTvOHuFq62znV3gNXlrh0i09KD0nE0uY/U3GFBHk7QJFQsaozaP5zrcVYUX6yKRso= 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 16929643588531020.4868608849689; Fri, 25 Aug 2023 04:52:38 -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-403-cvSrvPV3MGGtR1kSEv2mAg-1; Fri, 25 Aug 2023 07:52:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E5C3185A78B; Fri, 25 Aug 2023 11:52:33 +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 1820D2166B26; Fri, 25 Aug 2023 11:52:32 +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 7C8521946A41; Fri, 25 Aug 2023 11:52:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8712D19465A8 for ; Fri, 25 Aug 2023 11:52:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7B783492C14; Fri, 25 Aug 2023 11:52:21 +0000 (UTC) Received: from fedora.. (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 228CB4021B9 for ; Fri, 25 Aug 2023 11:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692964357; 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=hgoulDhCuOcvAmWxGfywWW6jglfsHbVUd3RADB2Qllo=; b=M0qzgcPPMHPdFE/vbMj8Jg2rbDHmSZhqZeOnvRyFrXy6nuaWMUj13dpEzs/O1vdYRzpe8w 2RD5zZ4lH7SJ0UkftCBztIXEtzhsni1JkifZz2kxz45HD71YlySm2UcmQXy+0e8cIYSdTN qELefpOLq6y7EK3sEtusiWTWFkOYcSk= X-MC-Unique: cvSrvPV3MGGtR1kSEv2mAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/2] qemu: add support for discard_granularity Date: Fri, 25 Aug 2023 13:52:15 +0200 Message-ID: <022f442628a03f04c082eeb24474e696fde9e6c7.1692964080.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.6 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: 1692964360729100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This commit adds building of `discard_granularity` disk option for qemu commandline. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1849570 Signed-off-by: Kristina Hanicova Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 2 ++ src/vz/vz_utils.c | 3 ++- tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6bcf2fdadd..b228820b5f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1760,6 +1760,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, unsigned int bootindex =3D 0; unsigned int logical_block_size =3D disk->blockio.logical_block_size; unsigned int physical_block_size =3D disk->blockio.physical_block_size; + unsigned int discard_granularity =3D disk->blockio.discard_granularity; g_autoptr(virJSONValue) wwn =3D NULL; g_autofree char *serial =3D NULL; virTristateSwitch removable =3D VIR_TRISTATE_SWITCH_ABSENT; @@ -1939,6 +1940,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "p:bootindex", bootindex, "p:logical_block_size", logical_block_size, "p:physical_block_size", physical_block_size, + "p:discard_granularity", discard_granularity, "A:wwn", &wwn, "p:rotation_rate", disk->rotation_rate, "S:vendor", disk->vendor, diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 7db7dbd419..de707df883 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -279,7 +279,8 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk) } =20 if (disk->blockio.logical_block_size || - disk->blockio.physical_block_size) { + disk->blockio.physical_block_size || + disk->blockio.discard_granularity) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting disk block sizes is not " "supported by vz driver.")); diff --git a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-blockio.x86_64-latest.args index 7270613573..15f31ae60d 100644 --- a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1,"logical_block_size":512,"physical_block_= size":512}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1,"logical_block_size":512,"physical_block_= size":512,"discard_granularity":4096}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-blockio.xml b/tests/qemuxml2argvda= ta/disk-blockio.xml index 170728371f..84943719d4 100644 --- a/tests/qemuxml2argvdata/disk-blockio.xml +++ b/tests/qemuxml2argvdata/disk-blockio.xml @@ -23,7 +23,7 @@
- + --=20 2.41.0