diff options
Diffstat (limited to 'hw/usb-msd.c')
| -rw-r--r-- | hw/usb-msd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 1fb62ad13..36991f883 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -47,7 +47,7 @@ typedef struct { uint32_t residue; uint32_t tag; SCSIBus bus; - DriveInfo *dinfo; + BlockConf conf; SCSIDevice *scsi_dev; int result; /* For async completion. */ @@ -523,20 +523,20 @@ static int usb_msd_initfn(USBDevice *dev) { MSDState *s = DO_UPCAST(MSDState, dev, dev); - if (!s->dinfo || !s->dinfo->bdrv) { + if (!s->conf.dinfo || !s->conf.dinfo->bdrv) { qemu_error("usb-msd: drive property not set\n"); return -1; } s->dev.speed = USB_SPEED_FULL; scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, usb_msd_command_complete); - s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, s->dinfo, 0); + s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, s->conf.dinfo, 0); s->bus.qbus.allow_hotplug = 0; usb_msd_handle_reset(dev); - if (bdrv_key_required(s->dinfo->bdrv)) { + if (bdrv_key_required(s->conf.dinfo->bdrv)) { if (s->dev.qdev.hotplugged) { - monitor_read_bdrv_key_start(cur_mon, s->dinfo->bdrv, + monitor_read_bdrv_key_start(cur_mon, s->conf.dinfo->bdrv, usb_msd_password_cb, s); s->dev.auto_attach = 0; } else { @@ -611,7 +611,7 @@ static struct USBDeviceInfo msd_info = { .usbdevice_name = "disk", .usbdevice_init = usb_msd_init, .qdev.props = (Property[]) { - DEFINE_PROP_DRIVE("drive", MSDState, dinfo), + DEFINE_BLOCK_PROPERTIES(MSDState, conf), DEFINE_PROP_END_OF_LIST(), }, }; |