From nobody Wed May 14 16:56:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522324321794888.4761766518907; Thu, 29 Mar 2018 04:52:01 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 3B97D80E7D; Thu, 29 Mar 2018 11:51:30 +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 04C8F5D781; Thu, 29 Mar 2018 11:51:30 +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 B9D7C4CA9D; Thu, 29 Mar 2018 11:51:29 +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 w2TBpJN7016293 for ; Thu, 29 Mar 2018 07:51:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 788E910B00A0; Thu, 29 Mar 2018 11:51:19 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 024D21102E2B; Thu, 29 Mar 2018 11:51:18 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 29 Mar 2018 13:51:01 +0200 Message-Id: <96a14bd19e44f2d06fe9a729b59d5258dbb9243f.1522323985.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 04/14] conf: Extract logic for updating 'detect_zeroes' mode X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 29 Mar 2018 11:51:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" For some reason we've decided to silently translate the disk detect_zeroes mode if it would be invalid. Extract the logic so that it does not need to be copypasta'd across the code base. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 22 ++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 15 ++------------- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ac3a3d9966..ef16431aaf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29362,3 +29362,25 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefP= tr def) virStoragePoolDefFree(pooldef); return ret; } + + +/** + * virDomainDiskGetDetectZeroesMode: + * @discard: disk/image sector discard setting + * @detect_zeroes: disk/image zero sector detection mode + * + * As a convenience syntax, if discards are ignored and zero detection is = set + * to 'unmap', then simply behave like zero detection is set to 'on'. But + * don't change it in the XML for easier adjustments. This behaviour is + * documented. + */ +int +virDomainDiskGetDetectZeroesMode(virDomainDiskDiscard discard, + virDomainDiskDetectZeroes detect_zeroes) +{ + if (discard !=3D VIR_DOMAIN_DISK_DISCARD_UNMAP && + detect_zeroes =3D=3D VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP) + return VIR_DOMAIN_DISK_DETECT_ZEROES_ON; + + return detect_zeroes; +} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 650901c1f4..bd17bd99ae 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3528,5 +3528,8 @@ virDomainNetResolveActualType(virDomainNetDefPtr ifac= e) int virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def); +int +virDomainDiskGetDetectZeroesMode(virDomainDiskDiscard discard, + virDomainDiskDetectZeroes detect_zeroes); #endif /* __DOMAIN_CONF_H */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 96a0a6de52..8d5509a8a8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -326,6 +326,7 @@ virDomainDiskErrorPolicyTypeToString; virDomainDiskFindByBusAndDst; virDomainDiskGeometryTransTypeFromString; virDomainDiskGeometryTransTypeToString; +virDomainDiskGetDetectZeroesMode; virDomainDiskGetDriver; virDomainDiskGetFormat; virDomainDiskGetSource; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 89fd08b642..6a13714eae 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1729,6 +1729,8 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { virBuffer opt =3D VIR_BUFFER_INITIALIZER; + int detect_zeroes =3D virDomainDiskGetDetectZeroesMode(disk->discard, + disk->detect_zero= es); if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) goto error; @@ -1809,19 +1811,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, } if (disk->detect_zeroes) { - int detect_zeroes =3D disk->detect_zeroes; - - /* - * As a convenience syntax, if discards are ignored and - * zero detection is set to 'unmap', then simply behave - * like zero detection is set to 'on'. But don't change - * it in the XML for easier adjustments. This behaviour - * is documented. - */ - if (disk->discard !=3D VIR_DOMAIN_DISK_DISCARD_UNMAP && - detect_zeroes =3D=3D VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP) - detect_zeroes =3D VIR_DOMAIN_DISK_DETECT_ZEROES_ON; - virBufferAsprintf(&opt, ",detect-zeroes=3D%s", virDomainDiskDetectZeroesTypeToString(detect_zer= oes)); } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list