[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/24] Port usb net to QemuOpts
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 22/24] Port usb net to QemuOpts |
Date: |
Wed, 23 Sep 2009 11:24:21 +0100 |
We need net_client_init_from_opts() exported for this
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 2 +-
net.h | 2 ++
vl.c | 19 +++++++++++++++----
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/net.c b/net.c
index f66df04..a192761 100644
--- a/net.c
+++ b/net.c
@@ -2995,7 +2995,7 @@ static struct {
{ /* end of list */ }
};
-static int net_client_init_from_opts(Monitor *mon, QemuOpts *opts)
+int net_client_init_from_opts(Monitor *mon, QemuOpts *opts)
{
const char *type;
int i;
diff --git a/net.h b/net.h
index d48c9b8..1b849b4 100644
--- a/net.h
+++ b/net.h
@@ -4,6 +4,7 @@
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qdict.h"
+#include "qemu-option.h"
/* VLANs support */
@@ -135,6 +136,7 @@ extern const char *legacy_tftp_prefix;
extern const char *legacy_bootp_filename;
int net_client_init(Monitor *mon, const char *device, const char *p);
+int net_client_init_from_opts(Monitor *mon, QemuOpts *opts);
void net_client_uninit(NICInfo *nd);
int net_client_parse(const char *str);
void net_slirp_smb(const char *exported_dir);
diff --git a/vl.c b/vl.c
index 0f2e2f6..f9e60ed 100644
--- a/vl.c
+++ b/vl.c
@@ -2495,12 +2495,23 @@ static int usb_device_add(const char *devname, int
is_hotplug)
dev = usb_baum_init();
#endif
} else if (strstart(devname, "net:", &p)) {
- int nic = nb_nics;
+ QemuOpts *opts;
+ int idx;
- if (net_client_init(NULL, "nic", p) < 0)
+ opts = qemu_opts_parse(&qemu_net_opts, p, NULL);
+ if (!opts) {
return -1;
- nd_table[nic].model = qemu_strdup("usb");
- dev = usb_net_init(&nd_table[nic]);
+ }
+
+ qemu_opt_set(opts, "type", "nic");
+ qemu_opt_set(opts, "model", "usb");
+
+ idx = net_client_init_from_opts(NULL, opts);
+ if (idx == -1) {
+ return -1;
+ }
+
+ dev = usb_net_init(&nd_table[idx]);
} else if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
dev = usb_bt_init(devname[2] ? hci_init(p) :
bt_new_hci(qemu_find_bt_vlan(0)));
--
1.6.2.5
- [Qemu-devel] [PATCH 20/24] Clean up legacy code in net_client_init(), (continued)
- [Qemu-devel] [PATCH 20/24] Clean up legacy code in net_client_init(), Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 11/24] Add qemu_opts_validate() for post parsing validation, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 02/24] Don't assign a static string to NICInfo::model, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 03/24] Make NICInfo string fields non-const, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 10/24] Make qemu_opts_parse() handle empty strings, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 09/24] Remove double error message for -device option parsing, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 13/24] Add qemu_net_opts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 23/24] Port PCI NIC hotplug to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 06/24] Fix coding style issue, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 08/24] Remove double error message in qemu_option_set(), Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 22/24] Port usb net to QemuOpts,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 05/24] Use qemu_strdup() for VLANClientState string fields, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 17/24] Port -net socket to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 15/24] Port -net user to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 07/24] Remove bogus error message from qemu_opts_set(), Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 16/24] Port -net tap to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 21/24] Port host_net_add monitor command to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 14/24] Port -net none and -net nic to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 24/24] Final net cleanup after conversion to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 18/24] Port -net vde to QemuOpts, Mark McLoughlin, 2009/09/23