External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-15 16:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: fix typo in name - should be VHOST_NET, not VNET_HOST

Browse Source 
NB: the enum that uses the string vnet-host (now changed to vhost-net)
is used in XML, but fortunately that hasn't been in an official
release yet, so it can still be fixed.
This commit is contained in:
Laine Stump 2011-05-23 13:38:32 -04:00
parent 58765b58a3
commit 51781b82f7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -85,7 +85,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
"netdev",
"rtc", /* 30 */
"vnet-host",
"vhost-net",
"rtc-td-hack",
"no-hpet",
"no-kvm-pit",
@ -983,7 +983,7 @@ qemuCapsComputeCmdFlags(const char *help,
qemuCapsSet(flags, QEMU_CAPS_VNET_HDR);
if (strstr(help, ",vhost=")) {
qemuCapsSet(flags, QEMU_CAPS_VNET_HOST);
qemuCapsSet(flags, QEMU_CAPS_VHOST_NET);
}
/*

2
src/qemu/qemu_capabilities.h
View File

@ -66,7 +66,7 @@ enum qemuCapsFlags {
QEMU_CAPS_SMP_TOPOLOGY = 28, /* Is sockets=s,cores=c,threads=t available for -smp? */
QEMU_CAPS_NETDEV = 29, /* The -netdev flag & netdev_add/remove monitor commands */
QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */
QEMU_CAPS_VNET_HOST = 31, /* vnet-host support is available in qemu */
QEMU_CAPS_VHOST_NET = 31, /* vhost-net support is available in qemu */
QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */
QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */
QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */

2
src/qemu/qemu_command.c
View File

@ -320,7 +320,7 @@ qemuOpenVhostNet(virDomainDefPtr def,
/* If qemu doesn't support vhost-net mode (including the -netdev command
* option), don't try to open the device.
*/
if (!(qemuCapsGet(qemuCaps, QEMU_CAPS_VNET_HOST) &&
if (!(qemuCapsGet(qemuCaps, QEMU_CAPS_VHOST_NET) &&
qemuCapsGet(qemuCaps, QEMU_CAPS_NETDEV) &&
qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE))) {
if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST) {

8
tests/qemuhelptest.c
View File

@ -333,7 +333,7 @@ mymain(void)
QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_RTC,
QEMU_CAPS_VNET_HOST,
QEMU_CAPS_VHOST_NET,
QEMU_CAPS_NO_KVM_PIT,
QEMU_CAPS_TDF,
QEMU_CAPS_PCI_CONFIGFD,
@ -374,7 +374,7 @@ mymain(void)
QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_RTC,
QEMU_CAPS_VNET_HOST,
QEMU_CAPS_VHOST_NET,
QEMU_CAPS_NO_HPET,
QEMU_CAPS_NO_KVM_PIT,
QEMU_CAPS_TDF,
@ -415,7 +415,7 @@ mymain(void)
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV,
QEMU_CAPS_RTC,
QEMU_CAPS_VNET_HOST,
QEMU_CAPS_VHOST_NET,
QEMU_CAPS_NO_HPET,
QEMU_CAPS_NO_KVM_PIT,
QEMU_CAPS_TDF,
@ -456,7 +456,7 @@ mymain(void)
QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_RTC,
QEMU_CAPS_VNET_HOST,
QEMU_CAPS_VHOST_NET,
QEMU_CAPS_NO_KVM_PIT,
QEMU_CAPS_TDF,
QEMU_CAPS_PCI_CONFIGFD,