diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-07-06 14:37:43 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-07-13 17:48:17 +0200 |
| commit | d75d25e34e4b4eb6a18122b5fa3baac70cea0f2b (patch) | |
| tree | b6eb17dbae520add98cfa49267f3ba2c7aac4040 | |
| parent | ac0c14d71b68ac18f03a876028e332534e1e6a3e (diff) | |
| download | focaccia-qemu-d75d25e34e4b4eb6a18122b5fa3baac70cea0f2b.tar.gz focaccia-qemu-d75d25e34e4b4eb6a18122b5fa3baac70cea0f2b.zip | |
virtio-blk: Fix virtio-blk-s390 to require drive
Move the check from virtio_blk_init_pci(), where it protects only virtio-blk-pci, to virtio_blk_init(). Without that, virtio-blk-s390 initializes without a drive. I figure that can lead to null pointer dereferences. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/virtio-blk.c | 6 | ||||
| -rw-r--r-- | hw/virtio-pci.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 8747634fbe..99e9dd294b 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -12,6 +12,7 @@ */ #include <qemu-common.h> +#include "qemu-error.h" #include "virtio-blk.h" #ifdef __linux__ # include <scsi/sg.h> @@ -490,6 +491,11 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) static int virtio_blk_id; DriveInfo *dinfo; + if (!conf->bs) { + error_report("virtio-blk-pci: drive property not set"); + return NULL; + } + s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, sizeof(struct virtio_blk_config), sizeof(VirtIOBlock)); diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 55831665f6..31a711ef41 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -546,10 +546,6 @@ static int virtio_blk_init_pci(PCIDevice *pci_dev) proxy->class_code != PCI_CLASS_STORAGE_OTHER) proxy->class_code = PCI_CLASS_STORAGE_SCSI; - if (!proxy->block.bs) { - error_report("virtio-blk-pci: drive property not set"); - return -1; - } vdev = virtio_blk_init(&pci_dev->qdev, &proxy->block); if (!vdev) { return -1; |