[PATCH 04/17] conf: change virDomainShmemDefInsert() to return void

It can't fail. Signed-off-by: Laine Stump <laine(a)redhat.com&gt; --- 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 b5b15b7768..2e74f75a13 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15968,13 +15968,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 cb19f0fb29..0dd2d6f1d2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4203,8 +4203,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 d295f24cb3..f1be2ca2d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6824,8 +6824,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.1