Commit fe47db72 authored by Gonglei's avatar Gonglei Committed by Gerd Hoffmann
Browse files

usb: usb-net QOMify 



Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent e60baebd

hw/usb/dev-network.c

+7 −4
Original line number Diff line number Diff line
@@ -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;
@@ -1347,7 +1350,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);
@@ -1380,7 +1383,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", "/ethernet-phy@0",
@@ -1441,7 +1444,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,
@@ -1451,7 +1454,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)