]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: fix virDomainDefFormatInternal for parallels
authorDmitry Guryanov <dguryanov@parallels.com>
Tue, 7 Apr 2015 20:35:12 +0000 (23:35 +0300)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 10 Apr 2015 11:39:29 +0000 (13:39 +0200)
We should add input devices with proper bus,
not VIR_DOMAIN_INPUT_BUS_XEN.

Signed-off-by: Dmitry Guryanov <dguryanov@parallels.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c

index 1ff42f9e7cd190eb2b74941d625977b6372854cc..880b89cc435432d0d053207a39c6e246e36729bc 100644 (file)
@@ -21177,12 +21177,18 @@ virDomainDefFormatInternal(virDomainDefPtr def,
         /* If graphics is enabled, add the implicit mouse/keyboard */
         if ((ARCH_IS_X86(def->os.arch)) || def->os.arch == VIR_ARCH_NONE) {
             virDomainInputDef autoInput = {
-                VIR_DOMAIN_INPUT_TYPE_MOUSE,
-                STREQ(def->os.type, "hvm") ?
-                VIR_DOMAIN_INPUT_BUS_PS2 : VIR_DOMAIN_INPUT_BUS_XEN,
-                { .alias = NULL },
+                .type = VIR_DOMAIN_INPUT_TYPE_MOUSE,
+                .info = { .alias = NULL },
             };
 
+            if (STREQ(def->os.type, "hvm"))
+                autoInput.bus = VIR_DOMAIN_INPUT_BUS_PS2;
+            else if (STREQ(def->os.type, "exe") &&
+                     def->virtType == VIR_DOMAIN_VIRT_PARALLELS)
+                autoInput.bus = VIR_DOMAIN_INPUT_BUS_PARALLELS;
+            else
+               autoInput.bus = VIR_DOMAIN_INPUT_BUS_XEN;
+
             if (virDomainInputDefFormat(buf, &autoInput, flags) < 0)
                 goto error;