[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 7/9] scsi-disk: bdrv_attach_dev() for empty CD-RO
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v2 7/9] scsi-disk: bdrv_attach_dev() for empty CD-ROM |
Date: |
Thu, 13 Jul 2017 13:41:33 +0200 |
If no drive=... option is passed (for an empty drive), we don't only
lack the BlockBackend normally created by parse_drive(), but we also
need to manually call blk_attach_dev().
This fixes at least a segfault when unplugging such devices, the bug
that they didn't show up in query-block, and probably some more
problems.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/scsi/scsi-disk.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index a53f058..5f1e5e8 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2384,9 +2384,14 @@ static void scsi_hd_realize(SCSIDevice *dev, Error
**errp)
static void scsi_cd_realize(SCSIDevice *dev, Error **errp)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev);
+ int ret;
if (!dev->conf.blk) {
+ /* Anonymous BlockBackend for an empty drive. As we put it into
+ * dev->conf, qdev takes care of detaching on unplug. */
dev->conf.blk = blk_new(0, BLK_PERM_ALL);
+ ret = blk_attach_dev(dev->conf.blk, &dev->qdev);
+ assert(ret == 0);
}
s->qdev.blocksize = 2048;
--
1.8.3.1
- [Qemu-block] [PATCH v2 0/9] block: -device drive=<node-name> fixes, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 1/9] block: Make blk_get_attached_dev_id() public, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 2/9] block/qapi: Add qdev device name to query-block, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 3/9] block: Make blk_all_next() public, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 5/9] block: List anonymous device BBs in query-block, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 4/9] block/qapi: Use blk_all_next() for query-block, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 6/9] ide: bdrv_attach_dev() for empty CD-ROM, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 7/9] scsi-disk: bdrv_attach_dev() for empty CD-ROM,
Kevin Wolf <=
- [Qemu-block] [PATCH v2 9/9] qemu-iotests: Test unplug of -device without drive, Kevin Wolf, 2017/07/13
- [Qemu-block] [PATCH v2 8/9] qemu-iotests: Test 'info block', Kevin Wolf, 2017/07/13
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 0/9] block: -device drive=<node-name> fixes, John Snow, 2017/07/13
- Re: [Qemu-block] [PATCH v2 0/9] block: -device drive=<node-name> fixes, Kevin Wolf, 2017/07/17