]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Remove now obsolete assignment of default network card model for s390 hosts
authorPeter Krempa <pkrempa@redhat.com>
Fri, 5 Apr 2013 09:58:26 +0000 (11:58 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 9 Apr 2013 13:47:58 +0000 (15:47 +0200)
This effectively reverts commit 539d73dbf64cb35558ffd3992f82e0b482cd0e70 as the
changes aren't needed after introduction of the XML post parse callbacks.

src/qemu/qemu_command.c

index 7351cf46d5d3ccd4bc10f075bbc1a4e26eb29b5c..173938b646700c8b55de8ab303dc0ee084e4b399 100644 (file)
@@ -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;