ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-21 10:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemu-usb: catch exception on already gone devices

Browse Source 
Fixes #3893
This commit is contained in:
Alexander Boettcher 2020-09-17 11:24:46 +02:00 committed by Christian Helmuth
parent 04821b1abc
commit e5fe9c6fc7
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
repos/libports/src/lib/qemu-usb/qemu_emul.cc
View File

@ -369,20 +369,26 @@ USBHostDevice *create_usbdevice(void *data)
void remove_usbdevice(USBHostDevice *device) void remove_usbdevice(USBHostDevice *device)
{ {
DeviceClass *usb_device_class = &Object_pool::p()->obj[Object_pool::USB_DEVICE]._device_class; try {
DeviceState *usb_device_state = cast_DeviceState(device); DeviceClass *usb_device_class = &Object_pool::p()->obj[Object_pool::USB_DEVICE]._device_class;
DeviceState *usb_device_state = cast_DeviceState(device);
if (usb_device_class == nullptr) if (usb_device_class == nullptr)
Genode::error("usb_device_class null"); Genode::error("usb_device_class null");
if (usb_device_state == nullptr) if (usb_device_state == nullptr)
Genode::error("usb_device_class null"); Genode::error("usb_device_state null");
Error *e = nullptr; Error *e = nullptr;
usb_device_class->unrealize(usb_device_state, &e); usb_device_class->unrealize(usb_device_state, &e);
Wrapper *obj = Object_pool::p()->find_object(device); Wrapper *obj = Object_pool::p()->find_object(device);
Object_pool::p()->free_object(obj); if (obj)
Object_pool::p()->free_object(obj);
} catch (int) {
/* thrown by find_object */
Genode::warning("usb device unknown");
}
} }