summaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-08 19:58:25 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-15 09:32:01 -0500
commit7f161aaea6e1f566a017f87513924d1c8bbfdc6c (patch)
tree023f251dfbf3c9ce8bb8f7bea78bf82e8b73878f /net.c
parentd80b9fc628501aefef949e6085bdecf1432d1b9b (diff)
downloadqemu-7f161aaea6e1f566a017f87513924d1c8bbfdc6c.tar.gz
net: add QemuOptsList arg to net_client_parse()
Patchworks-ID: 35505 Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net.c b/net.c
index 6cd63aa733..2cfdd308d3 100644
--- a/net.c
+++ b/net.c
@@ -3231,11 +3231,12 @@ int net_init_clients(void)
return 0;
}
-int net_client_parse(const char *optarg)
+int net_client_parse(QemuOptsList *opts_list, const char *optarg)
{
#if defined(CONFIG_SLIRP)
/* handle legacy -net channel,port:chr */
- if (!strncmp(optarg, "channel,", strlen("channel,"))) {
+ if (!strcmp(opts_list->name, "net") &&
+ !strncmp(optarg, "channel,", strlen("channel,"))) {
int ret;
optarg += strlen("channel,");
@@ -3256,7 +3257,7 @@ int net_client_parse(const char *optarg)
return ret;
}
#endif
- if (!qemu_opts_parse(&qemu_net_opts, optarg, "type")) {
+ if (!qemu_opts_parse(opts_list, optarg, "type")) {
return -1;
}