[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/14] usb: usb-net QOMify
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PATCH 08/14] usb: usb-net QOMify |
Date: |
Wed, 6 May 2015 20:55:30 +0800 |
From: Gonglei <address@hidden>
Signed-off-by: Gonglei <address@hidden>
---
hw/usb/dev-network.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 1866991..5f2ffd0 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -648,6 +648,9 @@ typedef struct USBNetState {
QTAILQ_HEAD(rndis_resp_head, rndis_response) rndis_resp;
} USBNetState;
+#define TYPE_USB_NET "usb-net"
+#define USB_NET(obj) OBJECT_CHECK(USBNetState, (obj), TYPE_USB_NET)
+
static int is_rndis(USBNetState *s)
{
return s->dev.config->bConfigurationValue == DEV_RNDIS_CONFIG_VALUE;
@@ -1343,7 +1346,7 @@ static NetClientInfo net_usbnet_info = {
static void usb_net_realize(USBDevice *dev, Error **errrp)
{
- USBNetState *s = DO_UPCAST(USBNetState, dev, dev);
+ USBNetState *s = USB_NET(dev);
usb_desc_create_serial(dev);
usb_desc_init(dev);
@@ -1376,7 +1379,7 @@ static void usb_net_realize(USBDevice *dev, Error **errrp)
static void usb_net_instance_init(Object *obj)
{
USBDevice *dev = USB_DEVICE(obj);
- USBNetState *s = DO_UPCAST(USBNetState, dev, dev);
+ USBNetState *s = USB_NET(dev);
device_add_bootindex_property(obj, &s->conf.bootindex,
"bootindex", "/address@hidden",
@@ -1437,7 +1440,7 @@ static void usb_net_class_initfn(ObjectClass *klass, void
*data)
}
static const TypeInfo net_info = {
- .name = "usb-net",
+ .name = TYPE_USB_NET,
.parent = TYPE_USB_DEVICE,
.instance_size = sizeof(USBNetState),
.class_init = usb_net_class_initfn,
@@ -1447,7 +1450,7 @@ static const TypeInfo net_info = {
static void usb_net_register_types(void)
{
type_register_static(&net_info);
- usb_legacy_register("usb-net", "net", usb_net_init);
+ usb_legacy_register(TYPE_USB_NET, "net", usb_net_init);
}
type_init(usb_net_register_types)
--
1.7.12.4
- [Qemu-devel] [PATCH 00/14] usb: QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 01/14] uhci: QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 12/14] usb: usb-wacom-tablet QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 06/14] usb: usb-mtp QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 09/14] usb: usb-ccid QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 03/14] usb: usb-bt QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 04/14] usb: usb-hid QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 11/14] usb: usb-uas QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 08/14] usb: usb-net QOMify,
arei.gonglei <=
- [Qemu-devel] [PATCH 05/14] usb: usb-hub QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 02/14] usb: usb-audio QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 10/14] usb: usb-storage QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 13/14] usb: usb-redir QOMify, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 07/14] usb-mtp: fix segmentation fault, arei.gonglei, 2015/05/06
- [Qemu-devel] [PATCH 14/14] usb: usb-serial QOMify, arei.gonglei, 2015/05/06