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>
*/
#include <qemu-common.h>
*/
#include <qemu-common.h>
#include "virtio-blk.h"
#ifdef __linux__
# include <scsi/sg.h>
#include "virtio-blk.h"
#ifdef __linux__
# include <scsi/sg.h>
static int virtio_blk_id;
DriveInfo *dinfo;
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));
s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK,
sizeof(struct virtio_blk_config),
sizeof(VirtIOBlock));
proxy->class_code != PCI_CLASS_STORAGE_OTHER)
proxy->class_code = PCI_CLASS_STORAGE_SCSI;
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;
vdev = virtio_blk_init(&pci_dev->qdev, &proxy->block);
if (!vdev) {
return -1;