]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
parallels: don't fill net adapter model for containers
authorDmitry Guryanov <dguryanov@parallels.com>
Tue, 7 Apr 2015 20:35:06 +0000 (23:35 +0300)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 10 Apr 2015 07:50:29 +0000 (09:50 +0200)
Network adapter model has no sense for container,
so we shouldn't set it to e1000 in
parallelsDomainDeviceDefPostParse.

Signed-off-by: Dmitry Guryanov <dguryanov@parallels.com>
src/parallels/parallels_driver.c

index 3102007e5ef167c59edaa6c64a7fb78965e5fe15..c3285dbe1b3c3b0fb838b22ce0d9f9038f19b468 100644 (file)
@@ -174,7 +174,7 @@ parallelsDomainDefPostParse(virDomainDefPtr def,
 
 static int
 parallelsDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
-                                  const virDomainDef *def ATTRIBUTE_UNUSED,
+                                  const virDomainDef *def,
                                   virCapsPtr caps ATTRIBUTE_UNUSED,
                                   void *opaque ATTRIBUTE_UNUSED)
 {
@@ -184,6 +184,7 @@ parallelsDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
         (dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK ||
          dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) &&
         !dev->data.net->model &&
+        STREQ(def->os.type, "hvm") &&
         VIR_STRDUP(dev->data.net->model, "e1000") < 0)
         goto cleanup;