From: Dmitry Guryanov Date: Tue, 7 Apr 2015 20:35:06 +0000 (+0300) Subject: parallels: don't fill net adapter model for containers X-Git-Tag: v1.2.15-rc1~245 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b16868a135cb25cbe5d71c32d4478eb82181c63b;p=thirdparty%2Flibvirt.git parallels: don't fill net adapter model for containers Network adapter model has no sense for container, so we shouldn't set it to e1000 in parallelsDomainDeviceDefPostParse. Signed-off-by: Dmitry Guryanov --- diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 3102007e5e..c3285dbe1b 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -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;