From 42dcc547e1982f31d0f678e02f0aae5be570384a Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Thu, 12 Apr 2012 13:20:40 -0300 Subject: net: purge the monitor object from all init functions The only backend that really uses it is the socket one, which calls monitor_get_fd(). But it can use 'cur_mon' instead. Signed-off-by: Luiz Capitulino Reviewed-By: Laszlo Ersek --- hw/pci-hotplug.c | 2 +- hw/usb/dev-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index c55d8b9..785eb3d 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -60,7 +60,7 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, qemu_opt_set(opts, "type", "nic"); - ret = net_client_init(mon, opts, 0); + ret = net_client_init(opts, 0); if (ret < 0) return NULL; if (nd_table[ret].devaddr) { diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index b238a09..4e26e64 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1367,7 +1367,7 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) qemu_opt_set(opts, "type", "nic"); qemu_opt_set(opts, "model", "usb"); - idx = net_client_init(NULL, opts, 0); + idx = net_client_init(opts, 0); if (idx == -1) { return NULL; } -- cgit v1.1