From 43afdc3e3f45934e145b33511f938c76f1cae28e Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 24 May 2018 17:01:55 +0200 Subject: [PATCH] qemu: domain: Extract panic device def post parse code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_domain.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e9a8b0c332..a6b879aa76 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5765,6 +5765,23 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, } +static int +qemuDomainDevicePanicDefPostParse(virDomainPanicDefPtr panic, + const virDomainDef *def) +{ + if (panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) { + if (qemuDomainIsPSeries(def)) + panic->model = VIR_DOMAIN_PANIC_MODEL_PSERIES; + else if (ARCH_IS_S390(def->os.arch)) + panic->model = VIR_DOMAIN_PANIC_MODEL_S390; + else + panic->model = VIR_DOMAIN_PANIC_MODEL_ISA; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5794,14 +5811,8 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_PANIC && - dev->data.panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) { - if (qemuDomainIsPSeries(def)) - dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_PSERIES; - else if (ARCH_IS_S390(def->os.arch)) - dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_S390; - else - dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_ISA; - } + qemuDomainDevicePanicDefPostParse(dev->data.panic, def) < 0) + goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER && qemuDomainControllerDefPostParse(dev->data.controller, def,