diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-07-14 15:49:42 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-09-05 19:06:47 +0200 |
| commit | 67c75f3dff7fa7776781d93250e1d52f1b009a74 (patch) | |
| tree | e5a20204c8362837693d3ea2e009a1b296d170f7 | |
| parent | e87d397e5ef66276ccc49b829527d605ca07d0ad (diff) | |
| download | qemu-67c75f3dff7fa7776781d93250e1d52f1b009a74.zip | |
ide: ide-cd without drive property for empty drive
This allows the creation of an empty ide-cd device without manually
creating a BlockBackend.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | hw/ide/qdev.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 67c76bfcd6..2eb055ae70 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -75,10 +75,6 @@ static int ide_qdev_init(DeviceState *qdev) IDEDeviceClass *dc = IDE_DEVICE_GET_CLASS(dev); IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev->parent_bus); - if (!dev->conf.blk) { - error_report("No drive specified"); - goto err; - } if (dev->unit == -1) { dev->unit = bus->master ? 1 : 0; } @@ -158,6 +154,16 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) IDEState *s = bus->ifs + dev->unit; Error *err = NULL; + if (!dev->conf.blk) { + if (kind != IDE_CD) { + error_report("No drive specified"); + return -1; + } else { + /* Anonymous BlockBackend for an empty drive */ + dev->conf.blk = blk_new(); + } + } + if (dev->conf.discard_granularity == -1) { dev->conf.discard_granularity = 512; } else if (dev->conf.discard_granularity && @@ -257,7 +263,11 @@ static int ide_cd_initfn(IDEDevice *dev) static int ide_drive_initfn(IDEDevice *dev) { - DriveInfo *dinfo = blk_legacy_dinfo(dev->conf.blk); + DriveInfo *dinfo = NULL; + + if (dev->conf.blk) { + dinfo = blk_legacy_dinfo(dev->conf.blk); + } return ide_dev_initfn(dev, dinfo && dinfo->media_cd ? IDE_CD : IDE_HD); } |