diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-07-01 13:12:37 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-07-01 00:42:54 -0700 |
| commit | c593d8f518eef40609e0a01ba662032715fdf522 (patch) | |
| tree | bfc1d4bd8e79ed36b2481fd9a94c4cfc98fa80cd /hw | |
| parent | b708d4b284472512a6059b69446e264ddea3296a (diff) | |
| download | qemu-c593d8f518eef40609e0a01ba662032715fdf522.tar.gz qemu-c593d8f518eef40609e0a01ba662032715fdf522.tar.bz2 qemu-c593d8f518eef40609e0a01ba662032715fdf522.zip | |
usb: remove legacy usb storage support
Change-Id: I1ca6572ce2b2ba75329451f1274e4eb60e111c69
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/dev-storage.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 6a331040e9..2852669d57 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -18,10 +18,6 @@ #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" -#ifdef CONFIG_MARU -#include "../tizen/src/mloop_event.h" -#endif - //#define DEBUG_MSD #ifdef DEBUG_MSD @@ -550,13 +546,6 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p) } } -#ifdef CONFIG_MARU -static void usb_msd_handle_destroy(USBDevice *dev) -{ - mloop_evcmd_set_usbdisk(NULL); -} -#endif - static void usb_msd_password_cb(void *opaque, int err) { MSDState *s = opaque; @@ -673,15 +662,13 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename) QemuOpts *opts; DriveInfo *dinfo; USBDevice *dev; -#ifndef CONFIG_MARU const char *p1; char fmt[32]; -#endif /* parse -usbdevice disk: syntax into drive opts */ snprintf(id, sizeof(id), "usb%d", nr++); opts = qemu_opts_create(qemu_find_opts("drive"), id, 0, NULL); -#ifndef CONFIG_MARU + p1 = strchr(filename, ':'); if (p1++) { const char *p2; @@ -696,7 +683,6 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename) } filename = p1; } -#endif if (!*filename) { printf("block device specification needed\n"); return NULL; @@ -723,10 +709,6 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename) if (qdev_init(&dev->qdev) < 0) return NULL; -#ifdef CONFIG_MARU - mloop_evcmd_set_usbdisk(dev); -#endif - return dev; } @@ -766,9 +748,6 @@ static void usb_msd_class_initfn_common(ObjectClass *klass) uc->handle_reset = usb_msd_handle_reset; uc->handle_control = usb_msd_handle_control; uc->handle_data = usb_msd_handle_data; -#ifdef CONFIG_MARU - uc->handle_destroy = usb_msd_handle_destroy; -#endif set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->fw_name = "storage"; dc->vmsd = &vmstate_usb_msd; |