External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: XMLToNative: Don't open vhostfd

Browse Source 
Just skip the vhost command line generation, since this won't work if
attempting to run manually.
This commit is contained in:
Cole Robinson 2014-03-13 15:10:09 -04:00
parent e8400564c8
commit 3b79321ad0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_command.c
View File

@ -7521,7 +7521,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
int vlan, int vlan,
int bootindex, int bootindex,
enum virNetDevVPortProfileOp vmop) enum virNetDevVPortProfileOp vmop,
bool standalone)
{ {
int ret = -1; int ret = -1;
char *nic = NULL, *host = NULL; char *nic = NULL, *host = NULL;
@ -7579,10 +7580,11 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd,
goto cleanup; goto cleanup;
} }
if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || if ((actualType == VIR_DOMAIN_NET_TYPE_NETWORK ||
actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE ||
actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET ||
actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { actualType == VIR_DOMAIN_NET_TYPE_DIRECT) &&
!standalone) {
/* Attempt to use vhost-net mode for these types of /* Attempt to use vhost-net mode for these types of
network device */ network device */
vhostfdSize = net->driver.virtio.queues; vhostfdSize = net->driver.virtio.queues;
@ -8759,7 +8761,8 @@ qemuBuildCommandLine(virConnectPtr conn,
vlan = i; vlan = i;
if (qemuBuildInterfaceCommandLine(cmd, driver, conn, def, net, if (qemuBuildInterfaceCommandLine(cmd, driver, conn, def, net,
qemuCaps, vlan, bootNet, vmop) < 0) qemuCaps, vlan, bootNet, vmop,
standalone) < 0)
goto error; goto error;
last_good_net = i; last_good_net = i;
bootNet = 0; bootNet = 0;