提交 b50e896c 编写于 作者: C Cole Robinson

qemu: Fix domxml-to-native network model conversion

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

Conflicts:
	src/qemu/qemu_driver.c
上级 c1e7b1fb
...@@ -4608,6 +4608,8 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, ...@@ -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, ...@@ -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 &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册