1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00

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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-01-24 08:58:00 +01:00
parent 7e57285eec
commit 9198b7090b
3 changed files with 7 additions and 11 deletions

View File

@ -2733,11 +2733,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);
@ -2800,8 +2799,6 @@ virDomainChrSourceDefCopy(virDomainChrSourceDef *dest,
case VIR_DOMAIN_CHR_TYPE_LAST:
break;
}
return 0;
}
static void

View File

@ -3348,8 +3348,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,

View File

@ -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));
}
}