[PATCH 14/22] virDomainDiskGetDetectZeroesMode: Return proper type

Change the return value type to 'virDomainDiskGetDetectZeroes'. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_block.c | 4 ++-- src/qemu/qemu_command.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80f467ae7a..fa97def9f7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30592,7 +30592,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDef *def) * don't change it in the XML for easier adjustments. This behaviour is * documented. */ -int +virDomainDiskDetectZeroes virDomainDiskGetDetectZeroesMode(virDomainDiskDiscard discard, virDomainDiskDetectZeroes detect_zeroes) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 98f99721f0..7c0e017038 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4406,7 +4406,7 @@ virDomainNetResolveActualType(virDomainNetDef *iface) int virDomainDiskTranslateSourcePool(virDomainDiskDef *def); -int +virDomainDiskDetectZeroes virDomainDiskGetDetectZeroesMode(virDomainDiskDiscard discard, virDomainDiskDetectZeroes detect_zeroes); diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index ca68b9ab66..1fa9627444 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1270,8 +1270,8 @@ qemuBlockStorageSourceGetBlockdevFormatCommonProps(virStorageSource *src) { const char *detectZeroes = NULL; const char *discard = NULL; - int detectZeroesMode = virDomainDiskGetDetectZeroesMode(src->discard, - src->detect_zeroes); + virDomainDiskDetectZeroes detectZeroesMode = virDomainDiskGetDetectZeroesMode(src->discard, + src->detect_zeroes); g_autoptr(virJSONValue) props = NULL; g_autoptr(virJSONValue) cache = NULL; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fd0f12f304..98e7fa3d80 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1680,8 +1680,8 @@ static char * qemuBuildDriveStr(virDomainDiskDef *disk) { g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; - int detect_zeroes = virDomainDiskGetDetectZeroesMode(disk->discard, - disk->detect_zeroes); + virDomainDiskDetectZeroes detect_zeroes = virDomainDiskGetDetectZeroesMode(disk->discard, + disk->detect_zeroes); if (qemuBuildDriveSourceStr(disk, &opt) < 0) return NULL; -- 2.41.0