From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 5 Apr 2013 09:58:26 +0000 (+0200)
Subject: qemu: Remove now obsolete assignment of default network card model for s390 hosts
X-Git-Tag: v1.0.5-rc1~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0216da8ee23d10eb2562c2f11dc8b3028deb0c2;p=thirdparty%2Flibvirt.git

qemu: Remove now obsolete assignment of default network card model for s390 hosts

This effectively reverts commit 539d73dbf64cb35558ffd3992f82e0b482cd0e70 as the
changes aren't needed after introduction of the XML post parse callbacks.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7351cf46d5..173938b646 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -919,11 +919,6 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def,
     }
 
     for (i = 0; i < def->nnets ; i++) {
-        if ((def->os.arch == VIR_ARCH_S390 ||
-             def->os.arch == VIR_ARCH_S390X) &&
-            def->nets[i]->model == NULL) {
-            def->nets[i]->model = strdup("virtio");
-        }
         if (STREQ(def->nets[i]->model,"virtio") &&
             def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
             def->nets[i]->info.type = type;