]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: remove panic dev models s390 and pseries when migrating
authorBoris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Thu, 28 Jul 2016 13:15:49 +0000 (15:15 +0200)
committerJán Tomko <jtomko@redhat.com>
Mon, 1 Aug 2016 12:15:08 +0000 (14:15 +0200)
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 <fiuczy@linux.vnet.ibm.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_domain.c

index 9b439df3b3a8d3630104421e4bce80f7720a6cb0..0a3cf0e9c3c8ec5ffa3db37aa4465b978d7806e9 100644 (file)
@@ -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);
     }