From 230c631917f293865856cf675172f1b36cb7e680 Mon Sep 17 00:00:00 2001 From: Boris Fiuczynski Date: Thu, 28 Jul 2016 15:15:49 +0200 Subject: [PATCH] qemu: remove panic dev models s390 and pseries when migrating MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The panic devices with models s390 and pseries are autogenerated. For backwards compatibility reasons the devices are to be removed when migrating. Signed-off-by: Boris Fiuczynski Signed-off-by: Ján Tomko --- src/qemu/qemu_domain.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9b439df3b3..0a3cf0e9c3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3308,6 +3308,15 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, virDomainControllerDefFree(usb); } + /* Remove the panic device for selected models if present */ + for (i = 0; i < def->npanics; i++) { + if (def->panics[i]->model == VIR_DOMAIN_PANIC_MODEL_S390 || + def->panics[i]->model == VIR_DOMAIN_PANIC_MODEL_PSERIES) { + VIR_DELETE_ELEMENT(def->panics, i, def->npanics); + break; + } + } + for (i = 0; i < def->nchannels; i++) qemuDomainChrDefDropDefaultPath(def->channels[i], driver); } -- GitLab