ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb-net: convert init to realize 

meanwhile, qerror_report_err() is a transitional interface to
help with converting existing HMP commands to QMP. It should
not be used elsewhere.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gonglei 2014-09-19 14:48:25 +08:00 committed by Gerd Hoffmann
parent 7d553f27fc
commit d73ad35990
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb/dev-network.c
View File

@ -27,7 +27,7 @@
#include "hw/usb.h" #include "hw/usb.h"
#include "hw/usb/desc.h" #include "hw/usb/desc.h"
#include "net/net.h" #include "net/net.h"
#include "qapi/qmp/qerror.h" #include "qemu/error-report.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
@ -1341,7 +1341,7 @@ static NetClientInfo net_usbnet_info = {
.cleanup = usbnet_cleanup, .cleanup = usbnet_cleanup,
}; };
static int usb_net_initfn(USBDevice *dev) static void usb_net_realize(USBDevice *dev, Error **errrp)
{ {
USBNetState *s = DO_UPCAST(USBNetState, dev, dev); USBNetState *s = DO_UPCAST(USBNetState, dev, dev);
@ -1373,7 +1373,6 @@ static int usb_net_initfn(USBDevice *dev)
usb_desc_set_string(dev, STRING_ETHADDR, s->usbstring_mac); usb_desc_set_string(dev, STRING_ETHADDR, s->usbstring_mac);
add_boot_device_path(s->conf.bootindex, &dev->qdev, "/ethernet@0"); add_boot_device_path(s->conf.bootindex, &dev->qdev, "/ethernet@0");
return 0;
} }
static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) static USBDevice *usb_net_init(USBBus *bus, const char *cmdline)
@ -1392,7 +1391,7 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline)
idx = net_client_init(opts, 0, &local_err); idx = net_client_init(opts, 0, &local_err);
if (local_err) { if (local_err) {
qerror_report_err(local_err); error_report("%s", error_get_pretty(local_err));
error_free(local_err); error_free(local_err);
return NULL; return NULL;
} }
@ -1421,7 +1420,7 @@ static void usb_net_class_initfn(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
USBDeviceClass *uc = USB_DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
uc->init = usb_net_initfn; uc->realize = usb_net_realize;
uc->product_desc = "QEMU USB Network Interface"; uc->product_desc = "QEMU USB Network Interface";
uc->usb_desc = &desc_net; uc->usb_desc = &desc_net;
uc->handle_reset = usb_net_handle_reset; uc->handle_reset = usb_net_handle_reset;