mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: add -netdev option

Browse Source 
Patchworks-ID: 35506
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-10-08 19:58:26 +01:00 committed by Anthony Liguori
parent 7f161aaea6
commit a1ea458fdf
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-config.c
View File

@ -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 = { QemuOptsList qemu_net_opts = {
.name = "net", .name = "net",
.head = QTAILQ_HEAD_INITIALIZER(qemu_net_opts.head), .head = QTAILQ_HEAD_INITIALIZER(qemu_net_opts.head),
@ -188,6 +200,7 @@ static QemuOptsList *lists[] = {
&qemu_drive_opts, &qemu_drive_opts,
&qemu_chardev_opts, &qemu_chardev_opts,
&qemu_device_opts, &qemu_device_opts,
&qemu_netdev_opts,
&qemu_net_opts, &qemu_net_opts,
&qemu_rtc_opts, &qemu_rtc_opts,
NULL, NULL,

1
qemu-config.h
View File

@ -4,6 +4,7 @@
extern QemuOptsList qemu_drive_opts; extern QemuOptsList qemu_drive_opts;
extern QemuOptsList qemu_chardev_opts; extern QemuOptsList qemu_chardev_opts;
extern QemuOptsList qemu_device_opts; extern QemuOptsList qemu_device_opts;
extern QemuOptsList qemu_netdev_opts;
extern QemuOptsList qemu_net_opts; extern QemuOptsList qemu_net_opts;
extern QemuOptsList qemu_rtc_opts; extern QemuOptsList qemu_rtc_opts;

10
qemu-options.hx
View File

@ -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" " 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" "-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") " 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 STEXI
@item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}][,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}] @item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}][,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]
Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n} Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}

5
vl.c
View File

@ -5087,6 +5087,11 @@ int main(int argc, char **argv, char **envp)
fd_bootchk = 0; fd_bootchk = 0;
break; break;
#endif #endif
case QEMU_OPTION_netdev:
if (net_client_parse(&qemu_netdev_opts, optarg) == -1) {
exit(1);
}
break;
case QEMU_OPTION_net: case QEMU_OPTION_net:
if (net_client_parse(&qemu_net_opts, optarg) == -1) { if (net_client_parse(&qemu_net_opts, optarg) == -1) {
exit(1); exit(1);