[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/5] usb-storage: qcow2 encryption support is fin
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 1/5] usb-storage: qcow2 encryption support is finally gone, zap dead code |
Date: |
Wed, 15 Jun 2016 11:46:55 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-storage.c | 34 ----------------------------------
1 file changed, 34 deletions(-)
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 248a580..f67c090 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -556,21 +556,6 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket
*p)
}
}
-static void usb_msd_password_cb(void *opaque, int err)
-{
- MSDState *s = opaque;
- Error *local_err = NULL;
-
- if (!err) {
- usb_device_attach(&s->dev, &local_err);
- }
-
- if (local_err) {
- error_report_err(local_err);
- qdev_unplug(&s->dev.qdev, NULL);
- }
-}
-
static void *usb_msd_load_request(QEMUFile *f, SCSIRequest *req)
{
MSDState *s = DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent);
@@ -616,25 +601,6 @@ static void usb_msd_realize_storage(USBDevice *dev, Error
**errp)
return;
}
- if (blk_bs(blk)) {
- bdrv_add_key(blk_bs(blk), NULL, &err);
- if (err) {
- if (monitor_cur_is_qmp()) {
- error_propagate(errp, err);
- return;
- }
- error_free(err);
- err = NULL;
- if (cur_mon) {
- monitor_read_bdrv_key_start(cur_mon, blk_bs(blk),
- usb_msd_password_cb, s);
- s->dev.auto_attach = 0;
- } else {
- autostart = 0;
- }
- }
- }
-
blkconf_serial(&s->conf, &dev->serial);
blkconf_blocksizes(&s->conf);
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/5] usb: hotplug support for usb-bot and usb-uas, Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 4/5] usb-bot: hotplug support, Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 5/5] usb-uas: hotplug support, Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 3/5] usb: Add QOM property "attached "., Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 1/5] usb-storage: qcow2 encryption support is finally gone, zap dead code,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 2/5] usb: make USBDevice->attached bool, Gerd Hoffmann, 2016/06/15