From 605a1e9d2e866c4b75310f6fc72422451ed8fad1 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 16 Mar 2021 17:12:40 +0100 Subject: [PATCH] qemu: Move watchdog model validation into the validation code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Report the error from 'qemuValidateDomainWatchdogDef' rather than 'qemuBuildWatchdogDevStr'. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_command.c | 10 +++------- src/qemu/qemu_validate.c | 4 +++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 22b0f85fe3..b7f85e2b71 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index c7b8d18434..45a9a9bb19 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -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;