From nobody Sun May  5 08:15:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 207.211.31.120 as permitted sender) client-ip=207.211.31.120;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1592294129; cv=none;
	d=zohomail.com; s=zohoarc;
	b=DZv/p/I1nl3OnrtXeyWWNhlwYx2BzW3EZZCDZTiR/y6780aF6fmCfNj9CCUzuVe7iWD8AIKhsZFxKJIYbtBnQkB3Xi4m2Rcbau3eMU6VHGSWIItpsdraRp0SqJG+zJi2WYe5b0xGSyuh4tOQ3IYcUbBDHLBI+KAjezj7AqCeKq8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592294129;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=cOPXjJMA/BefbROZpDM2nnCGWX5B9su2iXcDN2HiYc8=;
	b=KEvajPYky5DToTiTn0NF/8ZxqNdSctBjm85dZpwBpnv4kzbGN0l7Da/2BqH9rXbEDVnHDCmiEXp933pU49opvEM7C44dQLX3gSA4Qcs8nv3YFCw/8ghvNX6j3qTuub3WiG4c2wuGEn+SaX7kPokUOmJMq7lefR5ZXuAfbn40GS8=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
 [207.211.31.120]) by mx.zohomail.com
	with SMTPS id 159229412985244.26345191104747;
 Tue, 16 Jun 2020 00:55:29 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-45-Js332M2POA-JzXKq7VJ95Q-1; Tue, 16 Jun 2020 03:55:26 -0400
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
 [10.5.11.16])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E228E914;
	Tue, 16 Jun 2020 07:55:21 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C8C855C1C3;
	Tue, 16 Jun 2020 07:55:20 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id B7B5A833C1;
	Tue, 16 Jun 2020 07:55:18 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
	[10.11.54.5])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05G7tG96005024 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 16 Jun 2020 03:55:17 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DA87682861; Tue, 16 Jun 2020 07:55:16 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id D522982863
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:15 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[205.139.110.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D97978007A4
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:14 +0000 (UTC)
Received: from EUR04-VI1-obe.outbound.protection.outlook.com
	(mail-eopbgr80049.outbound.protection.outlook.com [40.107.8.49]) (Using
	TLS) by relay.mimecast.com with ESMTP id
	us-mta-282-EKBf_YGmO2OlrmZ0LXDBjg-2; Tue, 16 Jun 2020 03:55:11 -0400
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17)
	by AM6PR04MB5765.eurprd04.prod.outlook.com (2603:10a6:20b:ae::26)
	with Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21;
	Tue, 16 Jun 2020 07:55:10 +0000
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55]) by AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55%4]) with mapi id 15.20.3088.029;
	Tue, 16 Jun 2020 07:55:10 +0000
Received: from t440p.gns.novell.com (114.255.249.163) by
	SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) with Microsoft SMTP Server
	(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
	id 15.20.3088.19 via Frontend Transport;
	Tue, 16 Jun 2020 07:55:07 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592294128;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=cOPXjJMA/BefbROZpDM2nnCGWX5B9su2iXcDN2HiYc8=;
	b=VarDiiQgnZTYxHi6zd2ZtK5XhcEuT/3YxFizvBUluLWTD8bDk4lzG1OyEfoZjxTBhzqJBA
	6NdaOCBzMV9DbcE6iMyScbB1X5sNdiM9JXJgVgrWSCYKwpQea1FftyFPQ9Xmam4eowzjmZ
	rPFaVSvwvCKpAico656xJFQMfBGjdTo=
X-MC-Unique: Js332M2POA-JzXKq7VJ95Q-1
X-MC-Unique: EKBf_YGmO2OlrmZ0LXDBjg-2
From: Lin Ma <lma@suse.com>
To: libvir-list@redhat.com
Subject: [libvirt] [PATCH 1/5] conf: Add support for discard granularity
Date: Tue, 16 Jun 2020 15:54:34 +0800
Message-ID: <20200616075438.5726-2-lma@suse.com>
In-Reply-To: <20200616075438.5726-1-lma@suse.com>
References: <20200616075438.5726-1-lma@suse.com>
X-ClientProxiedBy: SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) To AM6PR04MB5782.eurprd04.prod.outlook.com
	(2603:10a6:20b:aa::17)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-Originating-IP: [114.255.249.163]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 800e2010-f02d-4ed7-1c28-08d811ca9765
X-MS-TrafficTypeDiagnostic: AM6PR04MB5765:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: 
 <AM6PR04MB576571BE22AAE052BA8264FEC59D0@AM6PR04MB5765.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2512;
X-Forefront-PRVS: 04362AC73B
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
 kOnYl1T/dL66FQJgC2/wVrt3QfKBj1/Qk9k8DD6HzJd7nINHnEPTicCVLl9RX7t+jf5ozEseiiSmeLhWvKcU3cR/raZvFks6K+ZHoL7eZazT8nn0Clob1CUvhEbXKPO8du0mN9vEh6aTkTOlcX2OlV4EjdD0yzvLXQig8wh87MxvZuNc0zIydMGckzVvjoRMgrbl32I0bhzpfB1BSyi0opgN767Az68mPMV7i7xb9fHnNEHB9XRy5l5s5juD5bd0rdxcWRHTT6xeZEuJXvS8mnQf2g/abC6AHSSoy9jQFaaVrzdUEJ7OsLIku4FRZKfiSc47R7GGQMZG8NLhHdGlEDwxmiWuX/fL5q6uKA/sUVcCUUc+ovxXeuv43i95R7Q7
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
	IPV:NLI; SFV:NSPM; H:AM6PR04MB5782.eurprd04.prod.outlook.com;
	PTR:; CAT:NONE; SFTY:;
	SFS:(346002)(39860400002)(136003)(366004)(396003)(376002)(2906002)(508600001)(6486002)(6512007)(316002)(1076003)(6506007)(83380400001)(52116002)(186003)(16526019)(8676002)(8936002)(26005)(2616005)(956004)(86362001)(66556008)(66476007)(66946007)(6666004)(5660300002)(6916009)(4326008)(36756003)(107886003)(19607625011);
	DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: 
 QbkU6lnyl/b93HlBSm6GCl+KO46eFo5ZPpIQSs3WXcJEthDbpf1AWcLwj8x7gwd9aqpACZDU/GA5NyV2HNPa25MdmnnHwyzYACyEMkcqwYJHH5LNMyAS5EHM/VqOqAm3+l21oU8X7Zc+56wiSeGSNio/OxIkBgYTAFY6z+aiHmzaCBTInSlE9MfjTAXGlt2u+llk+v2waHJF5FO9HNvg/c+BixJZvN8WQGOosBN3DVyK+ZCUjlPg+Wz4fEXU8816sCtxpYPFt0jbqD3KB0hz2TnKtRXrIBfgGOxP1sH3vS9f23XPxgCDaOif1nRDElzKoMm43LPF/ZKb9VF+E37325w1uMQoETTA4Oa9IPRCmCLmrhu0XUQIsD7JOUPJ+BStF5x4zO5q+jUHEcbd4dnCBiuqezIN7Dgieh34q6p99EyG47kpnRdT8iBk68QgBmoGcML2tKn9sUFHL1N1qAbqYsVQ3aCBFK5hlTcH2mgEQCM=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 800e2010-f02d-4ed7-1c28-08d811ca9765
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2020 07:55:10.0383 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 VsqCGaSc6Vg37V+n4RhO+Ujn1/5JeWUvvld1V6m9aS03kVeAJudl65G5v+N1pn9L
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5765
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 05G7tG96005024
X-loop: libvir-list@redhat.com
Cc: Lin Ma <lma@suse.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Lin Ma <lma@suse.com>
---
 docs/formatdomain.html.in     |  6 +++++-
 docs/schemas/domaincommon.rng |  5 +++++
 src/conf/domain_conf.c        | 19 ++++++++++++++++++-
 src/conf/domain_conf.h        |  1 +
 src/qemu/qemu_domain.c        |  2 ++
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 20c28a47e3..59ee50225a 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3019,7 +3019,7 @@
     &lt;driver name=3D'qemu' type=3D'raw'/&gt;
     &lt;source dev=3D'/dev/sda'/&gt;
     &lt;geometry cyls=3D'16383' heads=3D'16' secs=3D'63' trans=3D'lba'/&gt;
-    &lt;blockio logical_block_size=3D'512' physical_block_size=3D'4096'/&g=
t;
+    &lt;blockio logical_block_size=3D'512' physical_block_size=3D'4096' di=
scard_granularity=3D'4096'/&gt;
     &lt;target dev=3D'hdj' bus=3D'ide'/&gt;
   &lt;/disk&gt;
   &lt;disk type=3D'volume' device=3D'disk'&gt;
@@ -4067,6 +4067,10 @@
             BLKPBSZGET ioctl and describes the disk's hardware sector
             size which can be relevant for the alignment of disk data.
           </dd>
+          <dt><code>discard_granularity</code></dt>
+          <dd>Its value impacts the Optimal Unmap Granularity field in
+            the block limits VPD page. <span class=3D"since">Since 6.5.0</=
span>
+          </dd>
         </dl>
       </dd>
     </dl>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index e3bf7f5d55..5206c4e246 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2177,6 +2177,11 @@
           <data type=3D"integer"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name=3D"discard_granularity">
+          <data type=3D"integer"/>
+        </attribute>
+      </optional>
     </element>
   </define>
   <!--
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e9336fd72d..7a6a124ffd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10425,6 +10425,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlo=
pt,
     g_autofree char *vendor =3D NULL;
     g_autofree char *product =3D NULL;
     g_autofree char *domain_name =3D NULL;
+    g_autofree char *discard_granularity =3D NULL;
=20
     if (!(def =3D virDomainDiskDefNew(xmlopt)))
         return NULL;
@@ -10522,6 +10523,16 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xml=
opt,
                                physical_block_size);
                 goto error;
             }
+            discard_granularity =3D
+                virXMLPropString(cur, "discard_granularity");
+            if (discard_granularity &&
+                virStrToLong_ui(discard_granularity, NULL, 0,
+                                &def->blockio.discard_granularity) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("invalid granularity size '%s'"),
+                               discard_granularity);
+                goto error;
+            }
         } else if (!virDomainDiskGetDriver(def) &&
                    virXMLNodeNameEqual(cur, "driver")) {
             if (virDomainVirtioOptionsParseXML(cur, &def->virtio) < 0)
@@ -24958,7 +24969,8 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf,
                               virDomainDiskDefPtr def)
 {
     if (def->blockio.logical_block_size > 0 ||
-        def->blockio.physical_block_size > 0) {
+        def->blockio.physical_block_size > 0 ||
+        def->blockio.discard_granularity > 0) {
         virBufferAddLit(buf, "<blockio");
         if (def->blockio.logical_block_size > 0) {
             virBufferAsprintf(buf,
@@ -24970,6 +24982,11 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf,
                               " physical_block_size=3D'%u'",
                               def->blockio.physical_block_size);
         }
+        if (def->blockio.discard_granularity > 0) {
+            virBufferAsprintf(buf,
+                              " discard_granularity=3D'%u'",
+                              def->blockio.discard_granularity);
+        }
         virBufferAddLit(buf, "/>\n");
     }
 }
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index bda8fb6bce..9056e5e9b6 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -549,6 +549,7 @@ struct _virDomainDiskDef {
     struct {
         unsigned int logical_block_size;
         unsigned int physical_block_size;
+        unsigned int discard_granularity;
     } blockio;
=20
     virDomainBlockIoTuneInfo blkdeviotune;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2dad823a86..c582550def 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8743,6 +8743,8 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr dis=
k,
              "blockio logical_block_size", false);
     CHECK_EQ(blockio.physical_block_size,
              "blockio physical_block_size", false);
+    CHECK_EQ(blockio.discard_granularity,
+             "blockio discard_granularity", false);
=20
     CHECK_EQ(blkdeviotune.total_bytes_sec,
              "blkdeviotune total_bytes_sec",
--=20
2.26.0


From nobody Sun May  5 08:15:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.61 as permitted sender) client-ip=205.139.110.61;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1592294130; cv=none;
	d=zohomail.com; s=zohoarc;
	b=j63d+dkUPlg++S1yG49cPdb2CjvpWpAZK6KRdtzG/4u74F+CppnThIhsFP9UeYdM5y/SmVRag60CWrEXTK4+OP7eDi2seyJ9KyVLZ7d0xIxQ0Li2ZYjhuo56CSNdLc9jWVPOv50cStR0USf0+HciSRqKLX5/J4y44OBQJmMZyWA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592294130;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=STzzNqN6HYCA0arYVAMi69NXvxaelyOhS/2R3Be4BSE=;
	b=AWCqVrG6WMbL3TZRmrzE3LhYwQrXy+a3f609DIfCqoojum/HWbUuYNjYmFjng8h8R1FAPcLel8N0HQJl9Lq75PXa3wRO66ivPV3mUbllcxXJ0wDrfRU/NBMYEiQZ8pKtV34dbbkpQn8PptQ8DvEBYy5daJH18qL3QxphF5Sgqsg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com
 [205.139.110.61]) by mx.zohomail.com
	with SMTPS id 1592294130671941.8445767825349;
 Tue, 16 Jun 2020 00:55:30 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-338-7bTCTVbwNqWJV6LYBJg8gA-1; Tue, 16 Jun 2020 03:55:26 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 752BAE915;
	Tue, 16 Jun 2020 07:55:21 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4DF616EDBE;
	Tue, 16 Jun 2020 07:55:21 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id F12651809554;
	Tue, 16 Jun 2020 07:55:20 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
	[10.11.54.4])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05G7tJmb005037 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 16 Jun 2020 03:55:19 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 46A462028CD2; Tue, 16 Jun 2020 07:55:19 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D7742014E15
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:16 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[205.139.110.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4703C18A6668
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:16 +0000 (UTC)
Received: from EUR04-VI1-obe.outbound.protection.outlook.com
	(mail-eopbgr80049.outbound.protection.outlook.com [40.107.8.49]) (Using
	TLS) by relay.mimecast.com with ESMTP id
	us-mta-282-rYPz53EVNNip_xjGYNMe8A-3; Tue, 16 Jun 2020 03:55:13 -0400
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17)
	by AM6PR04MB5765.eurprd04.prod.outlook.com (2603:10a6:20b:ae::26)
	with Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21;
	Tue, 16 Jun 2020 07:55:12 +0000
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55]) by AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55%4]) with mapi id 15.20.3088.029;
	Tue, 16 Jun 2020 07:55:12 +0000
Received: from t440p.gns.novell.com (114.255.249.163) by
	SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) with Microsoft SMTP Server
	(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
	id 15.20.3088.19 via Frontend Transport;
	Tue, 16 Jun 2020 07:55:10 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592294129;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=STzzNqN6HYCA0arYVAMi69NXvxaelyOhS/2R3Be4BSE=;
	b=KyIQi/N595ziR9rB2WI6dBWd6ZtOsz6I7pGqAyl1Ln1RZHr9tTCU82qJPLMs/ai5fYR04T
	1stzdck+/NcB/kKvqP3bxwdNWOI/GuvABRLCUB0bpvun7qYj/odUN587xVjoh2QAG5VJfq
	b1+uNfBMDP8OCa7l+ZxaQm5p00oicSY=
X-MC-Unique: 7bTCTVbwNqWJV6LYBJg8gA-1
X-MC-Unique: rYPz53EVNNip_xjGYNMe8A-3
From: Lin Ma <lma@suse.com>
To: libvir-list@redhat.com
Subject: [libvirt] [PATCH 2/5] qemu: Add Support for discard granularity
Date: Tue, 16 Jun 2020 15:54:35 +0800
Message-ID: <20200616075438.5726-3-lma@suse.com>
In-Reply-To: <20200616075438.5726-1-lma@suse.com>
References: <20200616075438.5726-1-lma@suse.com>
X-ClientProxiedBy: SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) To AM6PR04MB5782.eurprd04.prod.outlook.com
	(2603:10a6:20b:aa::17)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-Originating-IP: [114.255.249.163]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: b88dfdfa-0677-4fb7-4fab-08d811ca98e8
X-MS-TrafficTypeDiagnostic: AM6PR04MB5765:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: 
 <AM6PR04MB576556CAFC206EAB38DD4141C59D0@AM6PR04MB5765.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2512;
X-Forefront-PRVS: 04362AC73B
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
 mJdS45p5ra98FnotLFNawCP76wN4x9n/iHILNeZ11iMzhnyyU9cFOImmbrdIiiWgEGZSttKMXHGRIlxbi53tI+M7DYo3q2xAIbwXsoDvSDt6pG+CaSRVdACZK3Q8XIUH3NpWYfHkw1u3LrftlGdyA+L80bH0WxOdvmRdt3LsqNb6eYKH3mXIWU2wuS0F4u+Z3E0xgncmJQGPbSGbVzJrUKKNDtoho62cU3zJTUc9X0fdtAzgwnhVuETJXpvO8rC3iNvGwRNDz54OgzeNSXBR2yQsXTEaEajrqz1TEEHvlT7iry+EnC/ZHlbv3rlrnu/buStUcHlIXpoKJ7K0jmm50w==
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
	IPV:NLI; SFV:NSPM; H:AM6PR04MB5782.eurprd04.prod.outlook.com;
	PTR:; CAT:NONE; SFTY:;
	SFS:(346002)(39860400002)(136003)(366004)(396003)(376002)(2906002)(508600001)(6486002)(6512007)(316002)(1076003)(6506007)(83380400001)(52116002)(186003)(16526019)(8676002)(8936002)(26005)(2616005)(956004)(86362001)(66556008)(66476007)(66946007)(6666004)(5660300002)(6916009)(4326008)(36756003)(107886003);
	DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: 
 +9+knAJg6OhtZTGvrdAl6fRYuY46JxLAYEfrvAgp1O5CxYk8eP5F6DJXGWAvcG2kUqGJtAJbAjFzj+GiU/9V9OF0z4o9AoWG3jkhTNp4/G+ZgU6Y2fPjgmxXTErBt/khT4EU3s3XRSUtWxddtrnpGSJZPx1YlQe8fgAxHR/DkRI/+g3+V4+lLuARucVSnglL3DiP6gn+ZMOGr/MNrFB7cv2JuTEfe4KCziDYNHqQZKCP5nqKtpjGKpvb1xTTjnpyNsUfOnuCELPOqhCdL/swGlfo7nN3trD+7oWP/FfRkv3Rb+CMZZPHBM7MF4sc4UDvDh1JsqihRG1hw+a8ytyKjbM+PkqyO+SKG4sQnYMXvi/TpKGmzxLGheBpQyqvIdbP5qds93d7snibpd2oT24ymQsbJNkXAkWR39F4gAuip6SF3Yliy+bJ3ngnxWs1yWAkOOOn5PQI8G6YLVhXL3am2eqaJgroGEwQryirPpRbyCA=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 b88dfdfa-0677-4fb7-4fab-08d811ca98e8
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2020 07:55:12.4609 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 3NlrpYLTnzK0SAYsB4lT6Q9bUGiENkAEDKpbMFzo+1PkGTG6jkRcqLrsX65rcfAQ
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5765
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 05G7tJmb005037
X-loop: libvir-list@redhat.com
Cc: Lin Ma <lma@suse.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

The default discard granularity is set to the logical block size or 4k
by qemu, whichever is largest.

The Optimal Unmap Granularity field in the block limits VPD page is
impacted by it:
  Optimal Unmap Granularity =3D discard granularity / logical block size

Signed-off-by: Lin Ma <lma@suse.com>
---
 src/qemu/qemu_command.c                  | 3 +++
 tests/qemuxml2argvdata/disk-blockio.args | 2 +-
 tests/qemuxml2argvdata/disk-blockio.xml  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f27246b4c6..43f3a4c2a3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1849,6 +1849,9 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
         if (disk->blockio.physical_block_size > 0)
             virBufferAsprintf(&opt, ",physical_block_size=3D%u",
                               disk->blockio.physical_block_size);
+        if (disk->blockio.discard_granularity > 0)
+            virBufferAsprintf(&opt, ",discard_granularity=3D%u",
+                              disk->blockio.discard_granularity);
     }
=20
     if (disk->wwn) {
diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvd=
ata/disk-blockio.args
index 72aa592fef..b02f833692 100644
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -30,5 +30,5 @@ readonly=3Don \
 -device ide-cd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \
 -drive file=3D/tmp/idedisk.img,format=3Draw,if=3Dnone,id=3Ddrive-ide0-0-2 \
 -device ide-hd,bus=3Dide.0,unit=3D2,drive=3Ddrive-ide0-0-2,id=3Dide0-0-2,b=
ootindex=3D1,\
-logical_block_size=3D512,physical_block_size=3D512 \
+logical_block_size=3D512,physical_block_size=3D512,discard_granularity=3D4=
096 \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3
diff --git a/tests/qemuxml2argvdata/disk-blockio.xml b/tests/qemuxml2argvda=
ta/disk-blockio.xml
index 1f78b38cb6..8ae53cdeb5 100644
--- a/tests/qemuxml2argvdata/disk-blockio.xml
+++ b/tests/qemuxml2argvdata/disk-blockio.xml
@@ -23,7 +23,7 @@
       <source file=3D'/tmp/idedisk.img'/>
       <target dev=3D'hdc' bus=3D'ide'/>
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'2'/>
-      <blockio logical_block_size=3D'512' physical_block_size=3D'512'/>
+      <blockio logical_block_size=3D'512' physical_block_size=3D'512' disc=
ard_granularity=3D'4096'/>
     </disk>
     <controller type=3D'usb' index=3D'0'/>
     <controller type=3D'ide' index=3D'0'/>
--=20
2.26.0


From nobody Sun May  5 08:15:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.61 as permitted sender) client-ip=205.139.110.61;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1592294145; cv=none;
	d=zohomail.com; s=zohoarc;
	b=QqSFK0ikwrUY4wrBdtP1XHV2DE14wEZrMKWkcyGkCuX72aFzRQ5MBD6tXErVoX8BMRF32dLpFKz49vtv7KmFrH0Iv//sOu53lXe3sfztcnlEapk7fkzCGVelbZWqm+JYhHmTXoJs8Zx1jzC3dl+nP1GZGGUEIn5YFUFxMip4Sg0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592294145;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=FbQfhfwZFYZBSUtqUxMCNHn5mCrpwj0zgwTdS7EvVRo=;
	b=dMXF8lFXrq5n3zQnRspNLJehqJucM0TlZsbc3EXRyR/QNRTecblEZh34MvhUSdengHTE/k8QUJOozdOLG9QKwMtdwxApSADx4nANfeBkDtlXWzkTtSeh5U4G8q7ZoGDhoGko+PvSUx6d5SIJZuze1lt46oNLxrB7X3QjkgULtDc=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com
 [205.139.110.61]) by mx.zohomail.com
	with SMTPS id 1592294145680206.91933940850595;
 Tue, 16 Jun 2020 00:55:45 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-228-FblaM4IBOjiG7FF-a_pHyw-1; Tue, 16 Jun 2020 03:55:42 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BC72873426;
	Tue, 16 Jun 2020 07:55:37 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 14872100164C;
	Tue, 16 Jun 2020 07:55:37 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id DD3CB833CD;
	Tue, 16 Jun 2020 07:55:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05G7tJNp005032 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 16 Jun 2020 03:55:19 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0BBBE2157F23; Tue, 16 Jun 2020 07:55:19 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 069962166BA0
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:19 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[205.139.110.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB23D8007B1
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:18 +0000 (UTC)
Received: from EUR05-DB8-obe.outbound.protection.outlook.com
	(mail-db8eur05on2040.outbound.protection.outlook.com [40.107.20.40])
	(Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-220-_TrTjwBcMn6MdGJhfLvI_g-1; Tue, 16 Jun 2020 03:55:16 -0400
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17)
	by AM6PR04MB4278.eurprd04.prod.outlook.com (2603:10a6:209:4f::28)
	with Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21;
	Tue, 16 Jun 2020 07:55:14 +0000
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55]) by AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55%4]) with mapi id 15.20.3088.029;
	Tue, 16 Jun 2020 07:55:14 +0000
Received: from t440p.gns.novell.com (114.255.249.163) by
	SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) with Microsoft SMTP Server
	(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
	id 15.20.3088.19 via Frontend Transport;
	Tue, 16 Jun 2020 07:55:12 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592294144;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=FbQfhfwZFYZBSUtqUxMCNHn5mCrpwj0zgwTdS7EvVRo=;
	b=R39sqCGl7iQxS6oQw0SGOB1s6YHa0gZZCbtr2BhIC6iFQ20z9ycWbxxurav8BE0Dy3tfaP
	yebXmj7lyJLaDECTHMfmAqTkwJYgcNzZKZ/tiCOZl02PtmeQOvPvOueyjaGG1wHf7V4cC5
	A3A0KM0XWF4PqT3xdBxxUz4HkgBUqyk=
X-MC-Unique: FblaM4IBOjiG7FF-a_pHyw-1
X-MC-Unique: _TrTjwBcMn6MdGJhfLvI_g-1
From: Lin Ma <lma@suse.com>
To: libvir-list@redhat.com
Subject: [libvirt] [PATCH 3/5] conf: Add support for unmap limit
Date: Tue, 16 Jun 2020 15:54:36 +0800
Message-ID: <20200616075438.5726-4-lma@suse.com>
In-Reply-To: <20200616075438.5726-1-lma@suse.com>
References: <20200616075438.5726-1-lma@suse.com>
X-ClientProxiedBy: SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) To AM6PR04MB5782.eurprd04.prod.outlook.com
	(2603:10a6:20b:aa::17)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-Originating-IP: [114.255.249.163]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 904d2a1f-25ba-43b2-6a26-08d811ca9a5c
X-MS-TrafficTypeDiagnostic: AM6PR04MB4278:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: 
 <AM6PR04MB427863D1E2EE96099D68D26CC59D0@AM6PR04MB4278.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:190;
X-Forefront-PRVS: 04362AC73B
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
 CZsKu5lguKfA0/UT0f6zYpfkw8vvxXE+QYt3vgFDTtLhqhUBY9ShSp/OOqTiuMjJTznbe1Dgtd/THqB1aXrLMSaYESAZh9upMQWglK4oKxe8oFT6VBOZWxqqH5zrJ7K/oZwd03zUIbR9dZwFx1SsdttarbYOZU6QqrSxZYnM/ri8hdy2pMNk7tOKVXOdk2ytqUSZ5aTtGXLlLJ9OshU9i/ETRrnHziOmc8KSMrgkniBcz1ZrzaqogbxUaS2PUX8Bp8URtnjHgXpA6HHtsYfaSYkZvP9VqkuUcmyHwn8MbijAQoko+mGCOpI4UeC2L9LCmRAm92e3F7u/A8+clij2TGv2KBP/3CYtuVo/Ku9pmHwqv1738oIGROfazAHrGgxv
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
	IPV:NLI; SFV:NSPM; H:AM6PR04MB5782.eurprd04.prod.outlook.com;
	PTR:; CAT:NONE; SFTY:;
	SFS:(136003)(39860400002)(396003)(366004)(376002)(346002)(8676002)(2906002)(8936002)(6916009)(107886003)(6486002)(5660300002)(508600001)(4326008)(6512007)(956004)(2616005)(16526019)(186003)(26005)(66946007)(66476007)(66556008)(83380400001)(6666004)(6506007)(86362001)(316002)(52116002)(36756003)(1076003)(19607625011);
	DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: 
 XPmzhFiRi+Ighgy+1nrlg5xZlpfDM+Jf8jcRNOQL9K45wzTZGYmToMs4i4R3LCiHgSZX8fiAcrwiR6tlqzuVD2wKbgLiQcvu8vnfhRzUlEobVHPKajDRapdZw+pT5zVdhQlAXanTzzYw6BEsvzrR+6chshbsCJpK65pubdrKjjLOZctmL1L1WHHIqSiXaxa+lt8CCz1iZy2/kgrYxD1LIW4SxZ9q8D0rb/YnwmxKeDDtInnAU1E1jBHG7RdZMAEV2YHcrgFqPsbx+83e8gkh0A7/zc+vcEjjMY464jn7yxruksdwS9oMprebQryCBEjukU16RCGYPPR8VZsXw06H0MJQTjjyPLq2lz6LAK8Yna6liYsUSDpGt0g5asgf1jYFfTRkv5XxkL4J2tEWzxXsrUGp+6meAPtK4C5cQ8XTSVhzB/iqewwK4VvMN5jd6E8//AyiyNjqBZNTTFcHsIXeRFXRNO4nFJ6Pw5tnETxEyfE=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 904d2a1f-25ba-43b2-6a26-08d811ca9a5c
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2020 07:55:14.8256 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 lD+dLIMt+I3oZ1hYLVvuZzDBhWelFkzzLFFDij2naVUeKWti4ccTGXtEjf4Vzo9T
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4278
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 05G7tJNp005032
X-loop: libvir-list@redhat.com
Cc: Lin Ma <lma@suse.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Lin Ma <lma@suse.com>
---
 docs/formatdomain.html.in     | 12 ++++++++++++
 docs/schemas/domaincommon.rng |  5 +++++
 src/conf/domain_conf.c        | 26 +++++++++++++++++++++++++-
 src/conf/domain_conf.h        |  1 +
 src/qemu/qemu_domain.c        |  2 ++
 5 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 59ee50225a..c4c510ab5f 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3015,6 +3015,13 @@
     &lt;target dev=3D'sda' bus=3D'scsi'/&gt;
     &lt;address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'3' uni=
t=3D'0'/&gt;
   &lt;/disk&gt;
+  &lt;disk type=3D'file' device=3D'disk'&gt;
+    &lt;driver name=3D'qemu' type=3D'qcow2'/&gt;
+    &lt;source file=3D'/var/lib/libvirt/images/domain.qcow2'/&gt;
+    &lt;blockio max_unmap_size=3D'1073741824'/&gt;
+    &lt;target dev=3D'sdb' bus=3D'scsi'/&gt;
+    &lt;address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' uni=
t=3D'0'/&gt;
+  &lt;/disk&gt;
   &lt;disk type=3D'block' device=3D'disk'&gt;
     &lt;driver name=3D'qemu' type=3D'raw'/&gt;
     &lt;source dev=3D'/dev/sda'/&gt;
@@ -4071,6 +4078,11 @@
           <dd>Its value impacts the Optimal Unmap Granularity field in
             the block limits VPD page. <span class=3D"since">Since 6.5.0</=
span>
           </dd>
+          <dt><code>max_unmap_size</code></dt>
+          <dd>Available for scsi disks only. It impacts the Maximum
+            Unmap LBA count field in the block limits VPD page.
+            <span class=3D"since">Since 6.5.0 (QEMU 2.0)</span>
+          </dd>
         </dl>
       </dd>
     </dl>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 5206c4e246..8d037c4d07 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2182,6 +2182,11 @@
           <data type=3D"integer"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name=3D"max_unmap_size">
+          <data type=3D"integer"/>
+        </attribute>
+      </optional>
     </element>
   </define>
   <!--
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7a6a124ffd..a546d9cc6f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6145,6 +6145,13 @@ virDomainDiskDefValidate(const virDomainDef *def,
         return -1;
     }
=20
+    if (disk->blockio.max_unmap_size && disk->bus !=3D VIR_DOMAIN_DISK_BUS=
_SCSI) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("max_unmap_size attribute is only supported by "
+                         "scsi-hd or scsi-block"));
+        return -1;
+    }
+
     if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_VIRTIO &&
         (disk->model =3D=3D VIR_DOMAIN_DISK_MODEL_VIRTIO ||
          disk->model =3D=3D VIR_DOMAIN_DISK_MODEL_VIRTIO_TRANSITIONAL ||
@@ -10426,6 +10433,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlo=
pt,
     g_autofree char *product =3D NULL;
     g_autofree char *domain_name =3D NULL;
     g_autofree char *discard_granularity =3D NULL;
+    g_autofree char *max_unmap_size =3D NULL;
=20
     if (!(def =3D virDomainDiskDefNew(xmlopt)))
         return NULL;
@@ -10533,6 +10541,16 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xml=
opt,
                                discard_granularity);
                 goto error;
             }
+            max_unmap_size =3D
+                virXMLPropString(cur, "max_unmap_size");
+            if (max_unmap_size &&
+                virStrToLong_ui(max_unmap_size, NULL, 0,
+                                &def->blockio.max_unmap_size) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("invalid unmap limits size '%s'"),
+                               max_unmap_size);
+                goto error;
+            }
         } else if (!virDomainDiskGetDriver(def) &&
                    virXMLNodeNameEqual(cur, "driver")) {
             if (virDomainVirtioOptionsParseXML(cur, &def->virtio) < 0)
@@ -24970,7 +24988,8 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf,
 {
     if (def->blockio.logical_block_size > 0 ||
         def->blockio.physical_block_size > 0 ||
-        def->blockio.discard_granularity > 0) {
+        def->blockio.discard_granularity > 0 ||
+        def->blockio.max_unmap_size > 0) {
         virBufferAddLit(buf, "<blockio");
         if (def->blockio.logical_block_size > 0) {
             virBufferAsprintf(buf,
@@ -24987,6 +25006,11 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf,
                               " discard_granularity=3D'%u'",
                               def->blockio.discard_granularity);
         }
+        if (def->blockio.max_unmap_size > 0) {
+            virBufferAsprintf(buf,
+                              " max_unmap_size=3D'%u'",
+                              def->blockio.max_unmap_size);
+        }
         virBufferAddLit(buf, "/>\n");
     }
 }
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9056e5e9b6..79bb30b666 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -550,6 +550,7 @@ struct _virDomainDiskDef {
         unsigned int logical_block_size;
         unsigned int physical_block_size;
         unsigned int discard_granularity;
+        unsigned int max_unmap_size;
     } blockio;
=20
     virDomainBlockIoTuneInfo blkdeviotune;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c582550def..28564f48ec 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8745,6 +8745,8 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr dis=
k,
              "blockio physical_block_size", false);
     CHECK_EQ(blockio.discard_granularity,
              "blockio discard_granularity", false);
+    CHECK_EQ(blockio.max_unmap_size,
+             "blockio max_unmap_size", false);
=20
     CHECK_EQ(blkdeviotune.total_bytes_sec,
              "blkdeviotune total_bytes_sec",
--=20
2.26.0


From nobody Sun May  5 08:15:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.120 as permitted sender) client-ip=205.139.110.120;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1592294152; cv=none;
	d=zohomail.com; s=zohoarc;
	b=YXBVRUfnGRKE3qHUd++s4TBJGLkmxaIxymAIkH8jAlBFj+EPoufoCsQFOEV7P9I3BB2ILfHgP9TimnMkHXMuBYGYRuSM2vKEVcu9uDVxcE+SqDGTvEIgHoEcqg4cqzoGZkgBWbaMlBODCe7P5qFr1gw0iRT7+4tBov0jJL25NkY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592294152;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=ZmctQbazrm+20ledOriQehYRdIYrTem9XxjmWXQ4Oh8=;
	b=L/C2LJCeTjGjPs5TPPqqY5LdMsRoRPUaSi7eCRRi3bie+T/u1WHPuqgLMJrEEjndLBPWkhFZXPLa2ZlucMlpSwZLWHOfIiu8CsESoxQeR8gtDiaAYe0EF9eVU0aI0H3ze/sfmrTlcCtwZPeQnXwkWP+Txm9geAZSaFuim67dKNo=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
 [205.139.110.120]) by mx.zohomail.com
	with SMTPS id 1592294152402830.0686046961656;
 Tue, 16 Jun 2020 00:55:52 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-216-I-1Of3CSO6OvuFyjAJvMcA-1; Tue, 16 Jun 2020 03:55:48 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6ABE587342E;
	Tue, 16 Jun 2020 07:55:39 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B268768B4;
	Tue, 16 Jun 2020 07:55:39 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1B1E0180954D;
	Tue, 16 Jun 2020 07:55:39 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05G7tPTt005063 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 16 Jun 2020 03:55:25 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5132B10F1C06; Tue, 16 Jun 2020 07:55:25 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A4101007257
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:22 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[207.211.31.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C8DC3811768
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:22 +0000 (UTC)
Received: from EUR04-VI1-obe.outbound.protection.outlook.com
	(mail-eopbgr80051.outbound.protection.outlook.com [40.107.8.51]) (Using
	TLS) by relay.mimecast.com with ESMTP id
	us-mta-387-TzW_-8R_OwyCYdiayQRsqw-1; Tue, 16 Jun 2020 03:55:20 -0400
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17)
	by AM6PR04MB5765.eurprd04.prod.outlook.com (2603:10a6:20b:ae::26)
	with Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21;
	Tue, 16 Jun 2020 07:55:17 +0000
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55]) by AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55%4]) with mapi id 15.20.3088.029;
	Tue, 16 Jun 2020 07:55:17 +0000
Received: from t440p.gns.novell.com (114.255.249.163) by
	SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) with Microsoft SMTP Server
	(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
	id 15.20.3088.19 via Frontend Transport;
	Tue, 16 Jun 2020 07:55:15 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592294151;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=ZmctQbazrm+20ledOriQehYRdIYrTem9XxjmWXQ4Oh8=;
	b=dzpE0Y//yP6suUfdYkwIOUpoHXQ+Cog5E5iN5MYOKImaR54CYCfbXFv0zZF8eTGNvYM+JC
	ZTgtYmVLw94lGDgjeU+CTCWGWPs9SpLYaQnWM/wIF0KHzTQy+iqUcJ0W1BPAsfGGDoKD9N
	RiOYGAukwJSQyU29Di9/wLQRYUMoQrI=
X-MC-Unique: I-1Of3CSO6OvuFyjAJvMcA-1
X-MC-Unique: TzW_-8R_OwyCYdiayQRsqw-1
From: Lin Ma <lma@suse.com>
To: libvir-list@redhat.com
Subject: [libvirt] [PATCH 4/5] qemu: caps: Add max_unmap_size property of
	scsi-disk
Date: Tue, 16 Jun 2020 15:54:37 +0800
Message-ID: <20200616075438.5726-5-lma@suse.com>
In-Reply-To: <20200616075438.5726-1-lma@suse.com>
References: <20200616075438.5726-1-lma@suse.com>
X-ClientProxiedBy: SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) To AM6PR04MB5782.eurprd04.prod.outlook.com
	(2603:10a6:20b:aa::17)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-Originating-IP: [114.255.249.163]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 3a836458-68d1-4804-e0bd-08d811ca9bc1
X-MS-TrafficTypeDiagnostic: AM6PR04MB5765:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: 
 <AM6PR04MB5765587C8D3E5DB7FECB064BC59D0@AM6PR04MB5765.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:288;
X-Forefront-PRVS: 04362AC73B
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
 onDfLCm1sGU4AQkEL8lEag46HT6fhtOlBKy50rf8wxCC3BbeFoOUdw2trusp3Gs4xtzPsA02q3HyMlzR4zyJYSosDN65QDCrznnRbIGABq5oCePCowO0RblOcogdMOARqM0kel+wXOsp44oQsKBj0CamVANUS8Hot/Y5S0XBTRgq4+Cf3hkSLAcywoyDdgFJXjq2x2ezDbHD6sBXIE5pVZjec+S0WXklx/mTekC3agqK6eJEp6pWgPn0aMDrUh24HXqn9xxWyY0QF6QHi8OCxGm5L8OzsxxkNuTcPsL86wxtDm3ClQVi7nywHw8ZQqkVRD2kvK1i2RXW+K7jdv5MkA==
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
	IPV:NLI; SFV:NSPM; H:AM6PR04MB5782.eurprd04.prod.outlook.com;
	PTR:; CAT:NONE; SFTY:;
	SFS:(346002)(39860400002)(136003)(366004)(396003)(376002)(30864003)(2906002)(508600001)(6486002)(6512007)(316002)(1076003)(6506007)(83380400001)(52116002)(186003)(16526019)(8676002)(8936002)(26005)(2616005)(956004)(86362001)(66556008)(66476007)(66946007)(6666004)(5660300002)(6916009)(4326008)(36756003)(107886003);
	DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: 
 u+B0+X2e/PHi4HStVCW9ao7A5vm9AOGX2hEPiZNd4knsxVt/E7age7mk/Wc1OpEgVm93UoUCP1/8GANsMDV0SZpotcLsGIvV2vJDy0FgC3cFzonLQFyrB2BVpr7MIb7E+99yxx7KKPDBGhqi1w6EroFS2sBnvGeJ5sRHSUSjaW+hWD9QZgHaEx8XCMxJaW8p5UXoq81HXLsWjZ/+7dEgNvfvxD/iPXZXgMiIt9HkHHFIiuz28X/hGFJimLWL6nzgNx+lEPqcoo7GHmOa7nS80igMbGn/nXq60O1A4jtzqnns22HCb7nknd1MEMXoSB3oih8DVPCZ3/tu4YrsCf4Avfk3KpziI0oESMZ1VMTwoZd1VcDeYr4xvNx3Hju8ZOmv4emcHu6/4j4XPDEqQC6eLiedCBXwdqwPz6KTb5ibPaCfUQpVzv+EqJ+BBjBKQWCxEfHint5oX97acLy0oYUN80bVnC8E+qJqWFExUi/h+F4=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 3a836458-68d1-4804-e0bd-08d811ca9bc1
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2020 07:55:17.4841 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 H23DJymY7axLCZcpIMR2MWSGzzIM7PXlqREdu5BA6Q4iAtToH5Ri+ThSXW9GvZZn
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5765
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 05G7tPTt005063
X-loop: libvir-list@redhat.com
Cc: Lin Ma <lma@suse.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Lin Ma <lma@suse.com>
---
 src/qemu/qemu_capabilities.c                       | 2 ++
 src/qemu/qemu_capabilities.h                       | 1 +
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml    | 1 +
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml    | 1 +
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml    | 1 +
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml    | 1 +
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml    | 1 +
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml    | 1 +
 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml  | 1 +
 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml    | 1 +
 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml    | 1 +
 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml    | 1 +
 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml  | 1 +
 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml    | 1 +
 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml    | 1 +
 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml    | 1 +
 tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml    | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml   | 1 +
 48 files changed, 49 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index aa90eab229..0046cc6498 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -587,6 +587,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "cpu.migratable",
               "query-cpu-model-expansion.migratable",
               "fw_cfg",
+              "scsi-disk.max_unmap_size",
     );
=20
=20
@@ -1401,6 +1402,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps=
DevicePropsSCSIDisk[] =3D {
     { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
     { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID, NULL },
     { "werror", QEMU_CAPS_STORAGE_WERROR, NULL },
+    { "max_unmap_size", QEMU_CAPS_SCSI_DISK_MAX_UNMAP_SIZE, NULL },
 };
=20
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[]=
 =3D {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0839c50bc4..cfa52f7eb6 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -568,6 +568,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for =
syntax-check */
     QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=3Don|off */
     QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-exp=
ansion supports migratable:false */
     QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */
+    QEMU_CAPS_SCSI_DISK_MAX_UNMAP_SIZE, /* scsi-hd.max_unmap_size */
=20
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_2.1.1.x86_64.xml
index 050e3c7059..a4253fc6c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -110,6 +110,7 @@
   <flag name=3D'i8042'/>
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2001001</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem=
ucapabilitiesdata/caps_2.10.0.aarch64.xml
index 0848b1e18b..98d0619d1c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -143,6 +143,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc=
apabilitiesdata/caps_2.10.0.ppc64.xml
index 82a37edd9c..51e3cc3949 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -143,6 +143,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc=
apabilitiesdata/caps_2.10.0.s390x.xml
index 7a1ad3d173..c66b0fa8b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -109,6 +109,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu=
capabilitiesdata/caps_2.10.0.x86_64.xml
index cca369de2c..9ce9bd77a1 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -187,6 +187,7 @@
   <flag name=3D'pvscsi'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc=
apabilitiesdata/caps_2.11.0.s390x.xml
index 1108aa46d0..069be41087 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -116,6 +116,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100288</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu=
capabilitiesdata/caps_2.11.0.x86_64.xml
index 0dc0252c8e..fe075ad676 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -193,6 +193,7 @@
   <flag name=3D'pvscsi'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100288</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem=
ucapabilitiesdata/caps_2.12.0.aarch64.xml
index 78070c0401..a8d42c8d88 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -159,6 +159,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc=
apabilitiesdata/caps_2.12.0.ppc64.xml
index 45d3baf080..ce6fddc4c9 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -160,6 +160,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc=
apabilitiesdata/caps_2.12.0.s390x.xml
index f9b92d11f2..9950ce1001 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -128,6 +128,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu=
capabilitiesdata/caps_2.12.0.x86_64.xml
index 6387b5b77e..b6d615d986 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -203,6 +203,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_2.4.0.x86_64.xml
index 310f69499f..68e3c81180 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -137,6 +137,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_2.5.0.x86_64.xml
index af9b9e96fd..f4170be8f7 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -143,6 +143,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemu=
capabilitiesdata/caps_2.6.0.aarch64.xml
index ec17ca5c27..aa9212465d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -126,6 +126,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_2.6.0.ppc64.xml
index 13e6df006e..4cb63f8233 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -122,6 +122,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_2.6.0.x86_64.xml
index c25731997e..8149fdeacd 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -155,6 +155,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemuca=
pabilitiesdata/caps_2.7.0.s390x.xml
index 2421b46f35..7fe337bdaa 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -93,6 +93,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100245</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_2.7.0.x86_64.xml
index 9f25bd17ec..dc3ed5ea83 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -160,6 +160,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100245</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca=
pabilitiesdata/caps_2.8.0.s390x.xml
index 083562f641..a952cd0606 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -98,6 +98,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2007093</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100246</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_2.8.0.x86_64.xml
index 5426e8a54b..9c44ca00a2 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -163,6 +163,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100246</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_2.9.0.ppc64.xml
index fe49896e72..49e2e3bd26 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -135,6 +135,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900247</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca=
pabilitiesdata/caps_2.9.0.s390x.xml
index 32861f67ba..3b7c58f43d 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -103,6 +103,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100247</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_2.9.0.x86_64.xml
index 66eed229b4..608dbdf0fd 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -181,6 +181,7 @@
   <flag name=3D'pvscsi'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100247</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_3.0.0.ppc64.xml
index 95f982eadf..9e8e2779c5 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -162,6 +162,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>2012050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemu=
capabilitiesdata/caps_3.0.0.riscv32.xml
index 35d08c67ec..59b3c38268 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -98,6 +98,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemu=
capabilitiesdata/caps_3.0.0.riscv64.xml
index 42635c2e6d..a141226761 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -98,6 +98,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemuca=
pabilitiesdata/caps_3.0.0.s390x.xml
index 96d8953496..ad3fc5b57b 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -131,6 +131,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_3.0.0.x86_64.xml
index 58863ffdc2..d77955b3a1 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -209,6 +209,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_3.1.0.ppc64.xml
index 3a21eb3aab..ca959c2e8c 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -167,6 +167,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>3000091</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_3.1.0.x86_64.xml
index 4cb80d0b59..2a725a81ea 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -212,6 +212,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>3000092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu=
capabilitiesdata/caps_4.0.0.aarch64.xml
index b1047ca044..344ab25058 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -173,6 +173,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_4.0.0.ppc64.xml
index a4916c2279..f484916393 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -181,6 +181,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu=
capabilitiesdata/caps_4.0.0.riscv32.xml
index ec7c6b05e1..4edea4bace 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -174,6 +174,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu=
capabilitiesdata/caps_4.0.0.riscv64.xml
index d8924a10e8..5098dce962 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -174,6 +174,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca=
pabilitiesdata/caps_4.0.0.s390x.xml
index 671c28cb82..557cee3a9a 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -139,6 +139,7 @@
   <flag name=3D'storage.werror'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_4.0.0.x86_64.xml
index a8a0284829..a318d59ecc 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -217,6 +217,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_4.1.0.x86_64.xml
index 18d39faf90..523a3e4d14 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -223,6 +223,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu=
capabilitiesdata/caps_4.2.0.aarch64.xml
index 11d487eefe..ae97581ab2 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -185,6 +185,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_4.2.0.ppc64.xml
index 4d44cd4ac6..54dc4ad17f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -186,6 +186,7 @@
   <flag name=3D'tcg'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca=
pabilitiesdata/caps_4.2.0.s390x.xml
index 6db5926aaa..65f95b05a3 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -149,6 +149,7 @@
   <flag name=3D'virtio.packed'/>
   <flag name=3D'tcg'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_4.2.0.x86_64.xml
index d3592ea5c4..6edf492b7d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -231,6 +231,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu=
capabilitiesdata/caps_5.0.0.aarch64.xml
index 7f993b38e1..f768e28d79 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -194,6 +194,7 @@
   <flag name=3D'virtio-blk-pci.scsi.default.disabled'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_5.0.0.ppc64.xml
index 409120262e..f742dca59b 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -202,6 +202,7 @@
   <flag name=3D'virtio-blk-pci.scsi.default.disabled'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu=
capabilitiesdata/caps_5.0.0.riscv64.xml
index fb4956f144..1545a6ee81 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -190,6 +190,7 @@
   <flag name=3D'virtio-blk-pci.scsi.default.disabled'/>
   <flag name=3D'pvscsi'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_5.0.0.x86_64.xml
index d4afc2e3f6..22b295f820 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -237,6 +237,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_5.1.0.x86_64.xml
index f798a7c361..5cb0f9013c 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -237,6 +237,7 @@
   <flag name=3D'cpu.migratable'/>
   <flag name=3D'query-cpu-model-expansion.migratable'/>
   <flag name=3D'fw_cfg'/>
+  <flag name=3D'scsi-disk.max_unmap_size'/>
   <version>5000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
--=20
2.26.0


From nobody Sun May  5 08:15:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 207.211.31.81 as permitted sender) client-ip=207.211.31.81;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1592294145; cv=none;
	d=zohomail.com; s=zohoarc;
	b=HGJm5TIzJKCFKE0v5nOw0MDNBYLB+zNpFBU/mflVsMn4wdjhYXjPCEY/PvLAKsRH8zC8ecXAidc50zlQjOUTMekx4oHxWxTAXftyP69zR03+zP8pB4LwalbAoJ+ys75zw5W2koaA2Gq9JpPudeq9uR1vr04hRNX+K7o0gN7z73U=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592294145;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=BFdxBukX31JonRF3KPsrV07rzYJI5tlUTIprGKTjDug=;
	b=cJzNgYIp+QLx+4X0plq6OAHeD1Z7jALTapoiMbPd5VLYhWyAbABvDM189OtkrBa45dnMNtgybOGl+3XOq82a5KQXddlEJ43fMKN50snfsvHgXaajcfip/X2CP4f1WDFlkYN9cNGxuL5wOiTyfrj8KR/39aDU1ZFmHbgUEsMdyAY=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
 [207.211.31.81]) by mx.zohomail.com
	with SMTPS id 1592294145499556.4242994025843;
 Tue, 16 Jun 2020 00:55:45 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-105-PT8X-_2NOhKyu69Pm2yM_w-1; Tue, 16 Jun 2020 03:55:42 -0400
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39774E913;
	Tue, 16 Jun 2020 07:55:37 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 179B219D71;
	Tue, 16 Jun 2020 07:55:37 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id DDEF2833CE;
	Tue, 16 Jun 2020 07:55:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05G7tP11005062 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 16 Jun 2020 03:55:25 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 50D5A1004C75; Tue, 16 Jun 2020 07:55:25 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A1F81006F8D
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:24 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[207.211.31.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 38F06858EFE
	for <libvir-list@redhat.com>; Tue, 16 Jun 2020 07:55:24 +0000 (UTC)
Received: from EUR04-VI1-obe.outbound.protection.outlook.com
	(mail-eopbgr80051.outbound.protection.outlook.com [40.107.8.51]) (Using
	TLS) by relay.mimecast.com with ESMTP id
	us-mta-387-J-i0xHm0Mh21sTqF9pew1Q-2; Tue, 16 Jun 2020 03:55:21 -0400
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17)
	by AM6PR04MB5765.eurprd04.prod.outlook.com (2603:10a6:20b:ae::26)
	with Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21;
	Tue, 16 Jun 2020 07:55:19 +0000
Received: from AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55]) by AM6PR04MB5782.eurprd04.prod.outlook.com
	([fe80::d848:9dea:7742:a55%4]) with mapi id 15.20.3088.029;
	Tue, 16 Jun 2020 07:55:19 +0000
Received: from t440p.gns.novell.com (114.255.249.163) by
	SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) with Microsoft SMTP Server
	(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
	id 15.20.3088.19 via Frontend Transport;
	Tue, 16 Jun 2020 07:55:17 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592294144;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=BFdxBukX31JonRF3KPsrV07rzYJI5tlUTIprGKTjDug=;
	b=CBu+K2Nbx9P3PJEFFoOlHDHKoLIX0obx1+E/eTbw8McAWq0TyBqFqusdKLDglIlvCndz7r
	GUDVPQkeFd4dVWHQxmfqnv02WootSzTTSaa05BPb2fca2g6bg9sO56fDz+YIUo7uWgefA+
	z5lctnZWdYKGB63dquQER3i8hhxKCt4=
X-MC-Unique: PT8X-_2NOhKyu69Pm2yM_w-1
X-MC-Unique: J-i0xHm0Mh21sTqF9pew1Q-2
From: Lin Ma <lma@suse.com>
To: libvir-list@redhat.com
Subject: [libvirt] [PATCH 5/5] qemu: Add support for max_unmap_size property
	of scsi-disk
Date: Tue, 16 Jun 2020 15:54:38 +0800
Message-ID: <20200616075438.5726-6-lma@suse.com>
In-Reply-To: <20200616075438.5726-1-lma@suse.com>
References: <20200616075438.5726-1-lma@suse.com>
X-ClientProxiedBy: SN4PR0201CA0062.namprd02.prod.outlook.com
	(2603:10b6:803:20::24) To AM6PR04MB5782.eurprd04.prod.outlook.com
	(2603:10a6:20b:aa::17)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-Originating-IP: [114.255.249.163]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 9f94f799-0d5e-490a-01b0-08d811ca9d56
X-MS-TrafficTypeDiagnostic: AM6PR04MB5765:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: 
 <AM6PR04MB5765356645D77F09E559175AC59D0@AM6PR04MB5765.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2201;
X-Forefront-PRVS: 04362AC73B
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
 1TWTjWafexdH8Up98ZueC57FdQ1XD0YrFY6Ah8Br868HiXDx050c9gr9ufGzc918h90pOlBmFJw6YXTnM9N5pxnd8M+cOW27guX+sGueQGG3fgb9owVeByf01xmX81/ZL4jJjvf6ThegHznTI8wjEL1JwJVX430eSxlATHep3gTZg+zi0HFY1IjAiWjru5JpoRFrt986x6wmmpg6qbq6DPNTNmlXELl75OPSC4gOU2saud8261EM+yoPMqXgmmO/dlRXm9Gip7panknT2f6R6bCtsHYmgjHLxn7BdpQXrJoNIgtp0BbqOYvskOgC9m6n51MZ12NFrhp3qeuXRC3e6Q==
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
	IPV:NLI; SFV:NSPM; H:AM6PR04MB5782.eurprd04.prod.outlook.com;
	PTR:; CAT:NONE; SFTY:;
	SFS:(346002)(39860400002)(136003)(366004)(396003)(376002)(2906002)(508600001)(6486002)(6512007)(316002)(1076003)(6506007)(83380400001)(52116002)(186003)(16526019)(8676002)(8936002)(26005)(2616005)(956004)(86362001)(66556008)(66476007)(66946007)(6666004)(5660300002)(6916009)(4326008)(36756003)(107886003);
	DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: 
 LoCJ4KN7LgbQZlzLaFrAXptkgFyRMbLwcLTIuh5CskCMtLDX2JuSyohQMO2tkk6pxwYeH0y3Fv+ChvdOl7uHqjGlkyHQD5VvXD9dcWxXp0QUj7bNlRMUGz6GhFaqzRoR/hbptiZlEOiNAsdcwSuF7fvBuexVIp+snNPlYuZLc8GT8A45fsvu520JFnOiJldZvqmcE6NHwGdW3j0feQZlfGjD4MdU53Z5zEUPkzbjlmiY40GNvu0QZwXjUvOX01o+2zBUN3kULMY4xElEXGliKjF4UBdLAA2fKqrilAywxj/TNuP5eZjLIe3xaNf8RZdDRBAcz/CFXBzqXGSc8ljRXLCUeZVNQAYMCi3UWSZwP8qA+a27qMV2NiLqRy5Emp/um/RQkqvqwOGlIAxOrO+AD0NIQOkEhni6uqW+hIqKHIgXigfClOXLdjl8NDPy6UzPjJNvGbv0CcZCPDhqjlFiqfsYloUn2Fw+MY4/tg+SbIA=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 9f94f799-0d5e-490a-01b0-08d811ca9d56
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2020 07:55:19.7348 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 +Ww6A3m12BqI2cNNSuVP5ksHmVsnwKwSrlVZhEgAEWq3IewGTwCvz9ESBZ/sdXyQ
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5765
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 05G7tP11005062
X-loop: libvir-list@redhat.com
Cc: Lin Ma <lma@suse.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

The default max_unmap_size is set to 1GB by qemu. The Maximum unmap LBA
count field in the block limits VPD page is impacted by it:
  Maximum unmap LBA count =3D max unmap size / logical block size

Signed-off-by: Lin Ma <lma@suse.com>
---
 src/qemu/qemu_command.c                       | 10 ++++++
 .../disk-scsi-disk-max_unmap_size.args        | 32 +++++++++++++++++++
 .../disk-scsi-disk-max_unmap_size.xml         | 28 ++++++++++++++++
 tests/qemuxml2argvtest.c                      |  4 +++
 4 files changed, 74 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.ar=
gs
 create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.xml

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 43f3a4c2a3..78f856766e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1852,6 +1852,16 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
         if (disk->blockio.discard_granularity > 0)
             virBufferAsprintf(&opt, ",discard_granularity=3D%u",
                               disk->blockio.discard_granularity);
+        if (disk->blockio.max_unmap_size > 0) {
+            if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_MAX_UNMAP_SI=
ZE)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("max_unmap_size property isn't supported =
by "
+                                 "this QEMU binary"));
+                return NULL;
+            }
+            virBufferAsprintf(&opt, ",max_unmap_size=3D%u",
+                              disk->blockio.max_unmap_size);
+        }
     }
=20
     if (disk->wwn) {
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.args b/te=
sts/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.args
new file mode 100644
index 0000000000..1d399ca451
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.args
@@ -0,0 +1,32 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-i386 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \
+-usb \
+-drive file=3D/var/lib/libvirt/images/guest.raw,format=3Draw,if=3Dnone,id=
=3Ddrive-scsi0-0-0-0 \
+-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv=
e-scsi0-0-0-0,\
+id=3Dscsi0-0-0-0,bootindex=3D1,max_unmap_size=3D1073741824 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.xml b/tes=
ts/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.xml
new file mode 100644
index 0000000000..06c20e3431
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.xml
@@ -0,0 +1,28 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/var/lib/libvirt/images/guest.raw'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+      <blockio max_unmap_size=3D'1073741824'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'/>
+    <memballoon model=3D'virtio'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 02f8846e57..632dcd1ad8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1262,6 +1262,10 @@ mymain(void)
             QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-serial",
             QEMU_CAPS_KVM);
+    DO_TEST("disk-scsi-disk-max_unmap_size",
+            QEMU_CAPS_BLOCKIO,
+            QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_SCSI_DISK_MAX_UNMAP_SIZE);
     DO_TEST_PARSE_ERROR("disk-fdc-incompatible-address",
                         NONE);
     DO_TEST_PARSE_ERROR("disk-ide-incompatible-address",
--=20
2.26.0