External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 00:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Move watchdog model validation into the validation code

Browse Source 
Report the error from 'qemuValidateDomainWatchdogDef' rather than
'qemuBuildWatchdogDevStr'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-16 17:12:40 +01:00
parent fd2aed1ab5
commit 605a1e9d2e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_command.c
View File

@ -3688,14 +3688,10 @@ qemuBuildWatchdogDevStr(const virDomainDef *def,
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
const char *model = virDomainWatchdogModelTypeToString(dev->model);
if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("missing watchdog model"));
return NULL;
}
virBufferAsprintf(&buf, "%s,id=%s",
virDomainWatchdogModelTypeToString(dev->model),
dev->info.alias);
virBufferAsprintf(&buf, "%s,id=%s", model, dev->info.alias);
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;

4
src/qemu/qemu_validate.c
View File

@ -2143,7 +2143,9 @@ qemuValidateDomainWatchdogDef(const virDomainWatchdogDef *dev,
break;
case VIR_DOMAIN_WATCHDOG_MODEL_LAST:
break;
default:
virReportEnumRangeError(virDomainWatchdogModel, dev->model);
return -1;
}
return 0;