From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 21 Oct 2012 02:28:34 +0000 (-0400)
Subject: qemu: Fix domxml-to-native network model conversion
X-Git-Tag: v0.9.11.7~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b50e896ceebd7518c6add45b8fd6dde78a69e4da;p=thirdparty%2Flibvirt.git

qemu: Fix domxml-to-native network model conversion

https://bugzilla.redhat.com/show_bug.cgi?id=636832
(cherry picked from commit 9a2975786b74aa0fe75e3eadb39aa0f9b37e57bb)

Conflicts:
	src/qemu/qemu_driver.c
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 26515d74b7..305db18b58 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4608,6 +4608,8 @@ static char *qemuDomainXMLToNative(virConnectPtr conn,
     for (i = 0 ; i < def->nnets ; i++) {
         virDomainNetDefPtr net = def->nets[i];
         int bootIndex = net->info.bootIndex;
+        char *model = net->model;
+
         if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             int actualType = virDomainNetGetActualType(net);
             const char *brname;
@@ -4665,7 +4667,9 @@ static char *qemuDomainXMLToNative(virConnectPtr conn,
             net->data.ethernet.dev = brname;
             net->data.ethernet.ipaddr = ipaddr;
         }
+
         net->info.bootIndex = bootIndex;
+        net->model = model;
     }
     for (i = 0 ; i < def->ngraphics ; i++) {
         if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&