| Message ID | 1519031728-9850-4-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Improvements and clean-ups related to -net | expand |
On 19/02/2018 10:15, Thomas Huth wrote: > According to net/Makefile.objs we only link in the vhost-user code > if CONFIG_POSIX has been set. So the help screen should also only > show this information if CONFIG_POSIX has been defined. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > qemu-options.hx | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 5050a49..b81b53b 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -1998,8 +1998,10 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, > " VALE port (created on the fly) called 'name' ('nmname' is name of the \n" > " netmap device, defaults to '/dev/netmap')\n" > #endif > +#ifdef CONFIG_POSIX > "-netdev vhost-user,id=str,chardev=dev[,vhostforce=on|off]\n" > " configure a vhost-user network, backed by a chardev 'dev'\n" > +#endif > "-netdev hubport,id=str,hubid=n[,netdev=nd]\n" > " configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL) > DEF("net", HAS_ARG, QEMU_OPTION_net, > I would have thought that #ifdef is not allowed within macro arguments, but there is an obvious precedent right in the context, so: Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/qemu-options.hx b/qemu-options.hx index 5050a49..b81b53b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1998,8 +1998,10 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, " VALE port (created on the fly) called 'name' ('nmname' is name of the \n" " netmap device, defaults to '/dev/netmap')\n" #endif +#ifdef CONFIG_POSIX "-netdev vhost-user,id=str,chardev=dev[,vhostforce=on|off]\n" " configure a vhost-user network, backed by a chardev 'dev'\n" +#endif "-netdev hubport,id=str,hubid=n[,netdev=nd]\n" " configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL) DEF("net", HAS_ARG, QEMU_OPTION_net,
According to net/Makefile.objs we only link in the vhost-user code if CONFIG_POSIX has been set. So the help screen should also only show this information if CONFIG_POSIX has been defined. Signed-off-by: Thomas Huth <thuth@redhat.com> --- qemu-options.hx | 2 ++ 1 file changed, 2 insertions(+)