Commit 8d3830ef authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

usb-storage: qcow2 encryption support is finally gone, zap dead code 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 1465984019-28963-2-git-send-email-kraxel@redhat.com
parent 6f1d2d1c

hw/usb/dev-storage.c

+0 −34
Original line number Diff line number Diff line
@@ -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);