diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 71a54a5ea93b60e5ba8546e3e478a283c6402f80..c69cf1db08da495ca95d20484e6519b5a58d474a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -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); } /* diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ab47f224afe41508c84d38e041a7d5b3027a48f4..4c1ad631db8d2709f41c8b45e1a4dd441126c0fd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -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 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 316f0ec6f2d5a346d09fa62ac36e939e5d584b79..ef2d002c7dce991c1978c9b27a980d1f6104227e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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) { diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 2522396482cc03fafb7315dc5b7369ae5f08dfef..71780d8a8fd6db738636d3662f45bb8154b6c9bc 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -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,