OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Port usb net to QemuOpts 

We need net_client_init_from_opts() exported for this

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-06 12:17:14 +01:00 committed by Anthony Liguori
parent 7f1c9d20ea
commit 13cf8f2129
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net.c
View File

@ -3001,7 +3001,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;

2
net.h
View File

@ -4,6 +4,7 @@
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qdict.h"
#include "qemu-option.h"
/* VLANs support */
@ -136,6 +137,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);
int net_slirp_smb(const char *exported_dir);

19
vl.c
View File

@ -2595,12 +2595,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)));