The netdev_add and netdev_del commands should be used nowadays instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hmp-commands.hx | 8 ++++----
net/net.c | 13 +++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 0aca984..baeac47 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1296,7 +1296,7 @@ ETEXI
.name = "host_net_add",
.args_type = "device:s,opts:s?",
.params = "tap|user|socket|vde|netmap|bridge|vhost-user|dump [options]",
- .help = "add host VLAN client",
+ .help = "add host VLAN client (deprecated, use netdev_add instead)",
.cmd = hmp_host_net_add,
.command_completion = host_net_add_completion,
},
@@ -1304,14 +1304,14 @@ ETEXI
STEXI
@item host_net_add
@findex host_net_add
-Add host VLAN client.
+Add host VLAN client. Deprecated, please use @code{netdev_add} instead.
ETEXI
{
.name = "host_net_remove",
.args_type = "vlan_id:i,device:s",
.params = "vlan_id name",
- .help = "remove host VLAN client",
+ .help = "remove host VLAN client (deprecated, use netdev_del instead)",
.cmd = hmp_host_net_remove,
.command_completion = host_net_remove_completion,
},
@@ -1319,7 +1319,7 @@ ETEXI
STEXI
@item host_net_remove
@findex host_net_remove
-Remove host VLAN client.
+Remove host VLAN client. Deprecated, please use @code{netdev_del} instead.
ETEXI
{
diff --git a/net/net.c b/net/net.c
index 0ac3b9e..6235aab 100644
--- a/net/net.c
+++ b/net/net.c
@@ -45,6 +45,7 @@
#include "qapi-visit.h"
#include "qapi/opts-visitor.h"
#include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
#include "net/filter.h"
#include "qapi/string-output-visitor.h"
@@ -1149,6 +1150,12 @@ void hmp_host_net_add(Monitor *mon, const QDict *qdict)
const char *opts_str = qdict_get_try_str(qdict, "opts");
Error *local_err = NULL;
QemuOpts *opts;
+ static bool warned;
+
+ if (!warned && !qtest_enabled()) {
+ error_report("host_net_add is deprecated, use netdev_add instead");
+ warned = true;
+ }
if (!net_host_check_device(device)) {
monitor_printf(mon, "invalid host network device %s\n", device);
@@ -1175,6 +1182,12 @@ void hmp_host_net_remove(Monitor *mon, const QDict *qdict)
NetClientState *nc;
int vlan_id = qdict_get_int(qdict, "vlan_id");
const char *device = qdict_get_str(qdict, "device");
+ static bool warned;
+
+ if (!warned && !qtest_enabled()) {
+ error_report("host_net_remove is deprecated, use netdev_del instead");
+ warned = true;
+ }
nc = net_hub_find_client_by_name(vlan_id, device);
if (!nc) {
--
1.8.3.1
On 2017年05月15日 21:32, Thomas Huth wrote: > The netdev_add and netdev_del commands should be used nowadays instead. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > hmp-commands.hx | 8 ++++---- > net/net.c | 13 +++++++++++++ > 2 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 0aca984..baeac47 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1296,7 +1296,7 @@ ETEXI > .name = "host_net_add", > .args_type = "device:s,opts:s?", > .params = "tap|user|socket|vde|netmap|bridge|vhost-user|dump [options]", > - .help = "add host VLAN client", > + .help = "add host VLAN client (deprecated, use netdev_add instead)", > .cmd = hmp_host_net_add, > .command_completion = host_net_add_completion, > }, > @@ -1304,14 +1304,14 @@ ETEXI > STEXI > @item host_net_add > @findex host_net_add > -Add host VLAN client. > +Add host VLAN client. Deprecated, please use @code{netdev_add} instead. > ETEXI > > { > .name = "host_net_remove", > .args_type = "vlan_id:i,device:s", > .params = "vlan_id name", > - .help = "remove host VLAN client", > + .help = "remove host VLAN client (deprecated, use netdev_del instead)", > .cmd = hmp_host_net_remove, > .command_completion = host_net_remove_completion, > }, > @@ -1319,7 +1319,7 @@ ETEXI > STEXI > @item host_net_remove > @findex host_net_remove > -Remove host VLAN client. > +Remove host VLAN client. Deprecated, please use @code{netdev_del} instead. > ETEXI > > { > diff --git a/net/net.c b/net/net.c > index 0ac3b9e..6235aab 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -45,6 +45,7 @@ > #include "qapi-visit.h" > #include "qapi/opts-visitor.h" > #include "sysemu/sysemu.h" > +#include "sysemu/qtest.h" > #include "net/filter.h" > #include "qapi/string-output-visitor.h" > > @@ -1149,6 +1150,12 @@ void hmp_host_net_add(Monitor *mon, const QDict *qdict) > const char *opts_str = qdict_get_try_str(qdict, "opts"); > Error *local_err = NULL; > QemuOpts *opts; > + static bool warned; > + > + if (!warned && !qtest_enabled()) { > + error_report("host_net_add is deprecated, use netdev_add instead"); > + warned = true; > + } > > if (!net_host_check_device(device)) { > monitor_printf(mon, "invalid host network device %s\n", device); > @@ -1175,6 +1182,12 @@ void hmp_host_net_remove(Monitor *mon, const QDict *qdict) > NetClientState *nc; > int vlan_id = qdict_get_int(qdict, "vlan_id"); > const char *device = qdict_get_str(qdict, "device"); > + static bool warned; > + > + if (!warned && !qtest_enabled()) { > + error_report("host_net_remove is deprecated, use netdev_del instead"); > + warned = true; > + } > > nc = net_hub_find_client_by_name(vlan_id, device); > if (!nc) { Applied, thanks.
© 2016 - 2024 Red Hat, Inc.