From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 11 Jul 2017 12:04:08 +0000 (+0200)
Subject: scsi-disk: bdrv_attach_dev() for empty CD-ROM
X-Git-Tag: v2.10.0-rc0~38^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83b4fe0ed5c27dfe181c7c746456ba33e4f7ef2b;p=thirdparty%2Fqemu.git

scsi-disk: bdrv_attach_dev() for empty CD-ROM

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 <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index a53f0586219..5f1e5e80703 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;