[PATCH 04/11] virDomainChrSourceDefCopy: return void
This function never returns an error, make it void then. And
while at it, make the @src argument const to make it obvious it's
never changed inside the function.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/domain_conf.c | 9 +++------
src/conf/domain_conf.h | 4 ++--
src/qemu/qemu_process.c | 5 ++---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e4abe1854f..bb887d4a3b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2732,11 +2732,10 @@ virDomainChrSourceDefClear(virDomainChrSourceDef *def)
}
/* Almost deep copies the contents of src into dest. Some parts are not copied
- * though.
- * Returns -1 and report error on failure. */
-int
+ * though. */
+void
virDomainChrSourceDefCopy(virDomainChrSourceDef *dest,
- virDomainChrSourceDef *src)
+ const virDomainChrSourceDef *src)
{
virDomainChrSourceDefClear(dest);
@@ -2799,8 +2798,6 @@ virDomainChrSourceDefCopy(virDomainChrSourceDef *dest,
case VIR_DOMAIN_CHR_TYPE_LAST:
break;
}
-
- return 0;
}
static void
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9bf54eee48..764e025448 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3347,8 +3347,8 @@ void virDomainSmartcardDefFree(virDomainSmartcardDef *def);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainSmartcardDef, virDomainSmartcardDefFree);
void virDomainChrDefFree(virDomainChrDef *def);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainChrDef, virDomainChrDefFree);
-int virDomainChrSourceDefCopy(virDomainChrSourceDef *dest,
- virDomainChrSourceDef *src)
+void virDomainChrSourceDefCopy(virDomainChrSourceDef *dest,
+ const virDomainChrSourceDef *src)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void virDomainSoundCodecDefFree(virDomainSoundCodecDef *def);
ssize_t virDomainSoundDefFind(const virDomainDef *def,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 336f0bab2e..c9ceec4e19 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2129,9 +2129,8 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObj *vm,
chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) {
/* yes, the first console is just an alias for serials[0] */
i = 1;
- if (virDomainChrSourceDefCopy(chr->source,
- ((vm->def->serials[0])->source)) <
0)
- return -1;
+ virDomainChrSourceDefCopy(chr->source,
+ ((vm->def->serials[0])->source));
}
}
--
2.34.1