From 2f8fde66809c3de1f371c3d68fcbd3a6f8b597f7 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Tue, 11 Feb 2025 16:55:33 -0500 Subject: [PATCH] conf: change virDomainShmemDefInsert() to return void It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 4 +--- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_driver.c | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 65d02bf92f..b7fdf47d6a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15981,13 +15981,11 @@ virDomainRedirdevDefRemove(virDomainDef *def, size_t idx) } -int +void virDomainShmemDefInsert(virDomainDef *def, virDomainShmemDef *shmem) { VIR_APPEND_ELEMENT(def->shmems, def->nshmems, shmem); - - return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3d9f9c532e..42408841bf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4210,8 +4210,8 @@ virDomainMemoryFindByDeviceAlias(virDomainDef *def, const char *alias) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; -int virDomainShmemDefInsert(virDomainDef *def, virDomainShmemDef *shmem) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +void virDomainShmemDefInsert(virDomainDef *def, virDomainShmemDef *shmem) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); bool virDomainShmemDefEquals(virDomainShmemDef *src, virDomainShmemDef *dst) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; ssize_t virDomainShmemDefFind(virDomainDef *def, virDomainShmemDef *shmem) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 60ac5ecf10..a5122d0cd6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6806,8 +6806,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuration")); return -1; } - if (virDomainShmemDefInsert(vmdef, shmem) < 0) - return -1; + virDomainShmemDefInsert(vmdef, shmem); dev->data.shmem = NULL; break; -- 2.47.3