External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 02:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix domxml-to-native network model conversion

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

Conflicts:
	src/qemu/qemu_driver.c
This commit is contained in:
Cole Robinson 2012-10-20 22:28:34 -04:00
parent c1e7b1fbd1
commit b50e896cee
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_driver.c
View File

@ -4608,6 +4608,8 @@ static char *qemuDomainXMLToNative(virConnectPtr conn,
for (i = 0 ; i < def->nnets ; i++) { for (i = 0 ; i < def->nnets ; i++) {
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
int bootIndex = net->info.bootIndex; int bootIndex = net->info.bootIndex;
char *model = net->model;
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
int actualType = virDomainNetGetActualType(net); int actualType = virDomainNetGetActualType(net);
const char *brname; const char *brname;
@ -4665,7 +4667,9 @@ static char *qemuDomainXMLToNative(virConnectPtr conn,
net->data.ethernet.dev = brname; net->data.ethernet.dev = brname;
net->data.ethernet.ipaddr = ipaddr; net->data.ethernet.ipaddr = ipaddr;
} }
net->info.bootIndex = bootIndex; net->info.bootIndex = bootIndex;
net->model = model;
} }
for (i = 0 ; i < def->ngraphics ; i++) { for (i = 0 ; i < def->ngraphics ; i++) {
if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&