[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/16] net: add -netdev option
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 10/16] net: add -netdev option |
Date: |
Thu, 8 Oct 2009 19:58:26 +0100 |
Signed-off-by: Mark McLoughlin <address@hidden>
---
qemu-config.c | 13 +++++++++++++
qemu-config.h | 1 +
qemu-options.hx | 10 ++++++++++
vl.c | 5 +++++
4 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/qemu-config.c b/qemu-config.c
index bafaea2..cae92f7 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -152,6 +152,18 @@ QemuOptsList qemu_device_opts = {
},
};
+QemuOptsList qemu_netdev_opts = {
+ .name = "netdev",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_netdev_opts.head),
+ .desc = {
+ /*
+ * no elements => accept any params
+ * validation will happen later
+ */
+ { /* end of list */ }
+ },
+};
+
QemuOptsList qemu_net_opts = {
.name = "net",
.head = QTAILQ_HEAD_INITIALIZER(qemu_net_opts.head),
@@ -188,6 +200,7 @@ static QemuOptsList *lists[] = {
&qemu_drive_opts,
&qemu_chardev_opts,
&qemu_device_opts,
+ &qemu_netdev_opts,
&qemu_net_opts,
&qemu_rtc_opts,
NULL,
diff --git a/qemu-config.h b/qemu-config.h
index cdad5ac..3cc8864 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -4,6 +4,7 @@
extern QemuOptsList qemu_drive_opts;
extern QemuOptsList qemu_chardev_opts;
extern QemuOptsList qemu_device_opts;
+extern QemuOptsList qemu_netdev_opts;
extern QemuOptsList qemu_net_opts;
extern QemuOptsList qemu_rtc_opts;
diff --git a/qemu-options.hx b/qemu-options.hx
index 3dd76b3..d4cac04 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -839,6 +839,16 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
" dump traffic on vlan 'n' to file 'f' (max n bytes per
packet)\n"
"-net none use it alone to have zero network devices; if no -net
option\n"
" is provided, the default is '-net nic -net user'\n")
+DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
+ "-netdev ["
+#ifdef CONFIG_SLIRP
+ "user|"
+#endif
+ "tap|"
+#ifdef CONFIG_VDE
+ "vde|"
+#endif
+ "socket],id=str[,option][,option][,...]\n")
STEXI
@item -net
nic[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}
diff --git a/vl.c b/vl.c
index 13e56bc..49fea66 100644
--- a/vl.c
+++ b/vl.c
@@ -5087,6 +5087,11 @@ int main(int argc, char **argv, char **envp)
fd_bootchk = 0;
break;
#endif
+ case QEMU_OPTION_netdev:
+ if (net_client_parse(&qemu_netdev_opts, optarg) == -1) {
+ exit(1);
+ }
+ break;
case QEMU_OPTION_net:
if (net_client_parse(&qemu_net_opts, optarg) == -1) {
exit(1);
--
1.6.2.5
- [Qemu-devel] [PATCH 00/16] Add a -netdev option, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 04/16] net: remove unused qemu_handler_true(), Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 09/16] net: add QemuOptsList arg to net_client_parse(), Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 10/16] net: add -netdev option,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 07/16] net: use qtailq for vlan and client lists, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 01/16] slirp: fix !CONFIG_SLIRP compilation, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 03/16] net: pass monitor handle to client init functions, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 15/16] net: refactor packet queueing code, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 06/16] net: remove id field from NICInfo, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 05/16] net: handle id= parameter for -net, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 08/16] net: allow clients not associated with a vlan, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 13/16] net: add -net nic,netdev= option, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 14/16] net: allow NICs to be connected to netdevs, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 11/16] net: handle -netdevice options, Mark McLoughlin, 2009/10/08