diff options
Diffstat (limited to 'hw/usb-msd.c')
| -rw-r--r-- | hw/usb-msd.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index f7ad25e..3a3eb4a 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -11,14 +11,15 @@ #include "usb.h" #include "block.h" #include "scsi-disk.h" +#include "console.h" //#define DEBUG_MSD #ifdef DEBUG_MSD -#define DPRINTF(fmt, args...) \ -do { printf("usb-msd: " fmt , ##args); } while (0) +#define DPRINTF(fmt, ...) \ +do { printf("usb-msd: " fmt , ## __VA_ARGS__); } while (0) #else -#define DPRINTF(fmt, args...) do {} while(0) +#define DPRINTF(fmt, ...) do {} while(0) #endif /* USB requests. */ @@ -548,14 +549,10 @@ USBDevice *usb_msd_init(const char *filename) } s = qemu_mallocz(sizeof(MSDState)); - if (!s) - return NULL; bdrv = bdrv_new("usb"); if (bdrv_open2(bdrv, filename, 0, drv) < 0) goto fail; - if (qemu_key_check(bdrv, filename)) - goto fail; s->bs = bdrv; s->dev.speed = USB_SPEED_FULL; @@ -576,3 +573,10 @@ USBDevice *usb_msd_init(const char *filename) qemu_free(s); return NULL; } + +BlockDriverState *usb_msd_get_bdrv(USBDevice *dev) +{ + MSDState *s = (MSDState *)dev; + + return s->bs; +} |