xilinx_ethlite: use qdev properties for configuration.

[qemu.git] / hw / usb-hid.c

diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 0837ec1587d97f17846e8371ec1f8a3b7bbc5fd8..d1cc45e02c69dae30726f10d9682473b6415ff9c 100644 (file)
--- a/hw/usb-hid.c
+++ b/hw/usb-hid.c
@@ -843,7 +843,6 @@ static void usb_hid_handle_destroy(USBDevice *dev)
     if (s->kind != USB_KEYBOARD)
         qemu_remove_mouse_event_handler(s->ptr.eh_entry);
     /* TODO: else */
-    qemu_free(s);
 }
 
 static int usb_hid_initfn(USBDevice *dev, int kind)
@@ -882,6 +881,7 @@ void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *))
 static struct USBDeviceInfo hid_info[] = {
     {
         .qdev.name      = "QEMU USB Tablet",
+        .qdev.alias     = "usb-tablet",
         .qdev.size      = sizeof(USBHIDState),
         .init           = usb_tablet_initfn,
         .handle_packet  = usb_generic_handle_packet,
@@ -891,6 +891,7 @@ static struct USBDeviceInfo hid_info[] = {
         .handle_destroy = usb_hid_handle_destroy,
     },{
         .qdev.name      = "QEMU USB Mouse",
+        .qdev.alias     = "usb-mouse",
         .qdev.size      = sizeof(USBHIDState),
         .init           = usb_mouse_initfn,
         .handle_packet  = usb_generic_handle_packet,
@@ -900,6 +901,7 @@ static struct USBDeviceInfo hid_info[] = {
         .handle_destroy = usb_hid_handle_destroy,
     },{
         .qdev.name      = "QEMU USB Keyboard",
+        .qdev.alias     = "usb-kbd",
         .qdev.size      = sizeof(USBHIDState),
         .init           = usb_keyboard_initfn,
         .handle_packet  = usb_generic_handle_packet,