Skip to content

Commit

Permalink
usb-redir: convert init to realize
Browse files Browse the repository at this point in the history
In this way, all the implementations now use
error_setg instead of qerror_report for reporting error.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  • Loading branch information
gongleiarei authored and kraxel committed Sep 23, 2014
1 parent 5450eea commit 77e35b4
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions hw/usb/redirect.c
Expand Up @@ -1361,24 +1361,24 @@ static void usbredir_init_endpoints(USBRedirDevice *dev)
}
}

static int usbredir_initfn(USBDevice *udev)
static void usbredir_realize(USBDevice *udev, Error **errp)
{
USBRedirDevice *dev = DO_UPCAST(USBRedirDevice, dev, udev);
int i;

if (dev->cs == NULL) {
qerror_report(QERR_MISSING_PARAMETER, "chardev");
return -1;
error_set(errp, QERR_MISSING_PARAMETER, "chardev");
return;
}

if (dev->filter_str) {
i = usbredirfilter_string_to_rules(dev->filter_str, ":", "|",
&dev->filter_rules,
&dev->filter_rules_count);
if (i) {
qerror_report(QERR_INVALID_PARAMETER_VALUE, "filter",
"a usb device filter string");
return -1;
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "filter",
"a usb device filter string");
return;
}
}

Expand All @@ -1402,7 +1402,6 @@ static int usbredir_initfn(USBDevice *udev)

qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
add_boot_device_path(dev->bootindex, &udev->qdev, NULL);
return 0;
}

static void usbredir_cleanup_device_queues(USBRedirDevice *dev)
Expand Down Expand Up @@ -2481,7 +2480,7 @@ static void usbredir_class_initfn(ObjectClass *klass, void *data)
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);

uc->init = usbredir_initfn;
uc->realize = usbredir_realize;
uc->product_desc = "USB Redirection Device";
uc->handle_destroy = usbredir_handle_destroy;
uc->cancel_packet = usbredir_cancel_packet;
Expand Down

0 comments on commit 77e35b4

Please sign in to comment.