aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-12-21 11:37:57 +0100
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2012-01-06 15:07:00 +0000
commit6a84cb1f2822e494839b93dd8c7f7f8fa6c261a9 (patch)
tree4cac89f6dfa794568f2d30abedb9e78d8d029da9
parentbe62a2ebab29eef7dc66c112d60271890ebbbee2 (diff)
scsi virtio-blk usb-msd: Clean up device init error messages
Replace error_report("DEVICE-NAME: MESSAGE"); by just error_report("MESSAGE"); in block device init functions. DEVICE-NAME is bogus in some cases: it's "scsi-disk" for device scsi-hd and scsi-cd, "virtio-blk-pci" for virtio-blk-s390, and "usb-msd" for usb-storage. There is no real need to put a device name in the message, because error_report() points to the offending command line option already: $ qemu-system-x86_64 --nodefaults --enable-kvm -vnc :0 -S -monitor stdio -usb -device virtio-blk-pci upstream-qemu: -device virtio-blk-pci: virtio-blk-pci: drive property not set upstream-qemu: -device virtio-blk-pci: Device 'virtio-blk-pci' could not be initialized And for a monitor command, it's obvious anyway: $ qemu-system-x86_64 --nodefaults --enable-kvm -vnc :0 -S -monitor stdio -usb (qemu) device_add virtio-blk-pci virtio-blk-pci: drive property not set Device 'virtio-blk-pci' could not be initialized Reported-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
-rw-r--r--hw/scsi-disk.c4
-rw-r--r--hw/scsi-generic.c8
-rw-r--r--hw/usb-msd.c2
-rw-r--r--hw/virtio-blk.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 505accdde5..5d8bf53586 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1515,7 +1515,7 @@ static int scsi_initfn(SCSIDevice *dev)
DriveInfo *dinfo;
if (!s->qdev.conf.bs) {
- error_report("scsi-disk: drive property not set");
+ error_report("drive property not set");
return -1;
}
@@ -1537,7 +1537,7 @@ static int scsi_initfn(SCSIDevice *dev)
}
if (bdrv_is_sg(s->qdev.conf.bs)) {
- error_report("scsi-disk: unwanted /dev/sg*");
+ error_report("unwanted /dev/sg*");
return -1;
}
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 6f7d3db775..0aebcddf6e 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -374,13 +374,13 @@ static int scsi_generic_initfn(SCSIDevice *s)
struct sg_scsi_id scsiid;
if (!s->conf.bs) {
- error_report("scsi-generic: drive property not set");
+ error_report("drive property not set");
return -1;
}
/* check we are really using a /dev/sg* file */
if (!bdrv_is_sg(s->conf.bs)) {
- error_report("scsi-generic: not /dev/sg*");
+ error_report("not /dev/sg*");
return -1;
}
@@ -396,13 +396,13 @@ static int scsi_generic_initfn(SCSIDevice *s)
/* check we are using a driver managing SG_IO (version 3 and after */
if (bdrv_ioctl(s->conf.bs, SG_GET_VERSION_NUM, &sg_version) < 0 ||
sg_version < 30000) {
- error_report("scsi-generic: scsi generic interface too old");
+ error_report("scsi generic interface too old");
return -1;
}
/* get LUN of the /dev/sg? */
if (bdrv_ioctl(s->conf.bs, SG_GET_SCSI_ID, &scsiid)) {
- error_report("scsi-generic: SG_GET_SCSI_ID ioctl failed");
+ error_report("SG_GET_SCSI_ID ioctl failed");
return -1;
}
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 4c06950125..b87b9290be 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -517,7 +517,7 @@ static int usb_msd_initfn(USBDevice *dev)
DriveInfo *dinfo;
if (!bs) {
- error_report("usb-msd: drive property not set");
+ error_report("drive property not set");
return -1;
}
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index ef27421d46..5e81f53e14 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -569,7 +569,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf,
DriveInfo *dinfo;
if (!conf->bs) {
- error_report("virtio-blk-pci: drive property not set");
+ error_report("drive property not set");
return NULL;
}
if (!bdrv_is_inserted(conf->bs)) {