diff options
| -rw-r--r-- | hw/usb/dev-hid.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 7fef1ea41d..b580825606 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -49,6 +49,7 @@ typedef struct USBHIDState { HIDState hid; uint32_t usb_version; UsbDumpState *usb_dump_state; + char *usbdump_filename; } USBHIDState; enum { @@ -589,8 +590,9 @@ static int usb_hid_initfn(USBDevice *dev, int kind) usb_desc_init(dev); us->intr = usb_ep_get(dev, USB_TOKEN_IN, 1); hid_init(&us->hid, kind, usb_hid_changed); - // TODO: API sucks... - us->usb_dump_state = usb_dump_init_alloc("/tmp/usbdump.pcap"); + if (us->usbdump_filename != NULL) { + us->usb_dump_state = usb_dump_init_alloc(us->usbdump_filename); + } return 0; } @@ -670,6 +672,7 @@ static void usb_hid_class_initfn(ObjectClass *klass, void *data) static Property usb_tablet_properties[] = { DEFINE_PROP_UINT32("usb_version", USBHIDState, usb_version, 2), + DEFINE_PROP_STRING("usbdump", USBHIDState, usbdump_filename), DEFINE_PROP_END_OF_LIST(), }; @@ -693,6 +696,11 @@ static const TypeInfo usb_tablet_info = { .class_init = usb_tablet_class_initfn, }; +static Property usb_hid_properties[] = { + DEFINE_PROP_STRING("usbdump", USBHIDState, usbdump_filename), + DEFINE_PROP_END_OF_LIST(), +}; + static void usb_mouse_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -703,6 +711,7 @@ static void usb_mouse_class_initfn(ObjectClass *klass, void *data) uc->product_desc = "QEMU USB Mouse"; uc->usb_desc = &desc_mouse; dc->vmsd = &vmstate_usb_ptr; + dc->props = usb_hid_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } @@ -723,6 +732,7 @@ static void usb_keyboard_class_initfn(ObjectClass *klass, void *data) uc->product_desc = "QEMU USB Keyboard"; uc->usb_desc = &desc_keyboard; dc->vmsd = &vmstate_usb_kbd; + dc->props = usb_hid_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } |