scsi virtio-blk usb-msd: Clean up device init error messages
commit6a84cb1f2822e494839b93dd8c7f7f8fa6c261a9
authorMarkus Armbruster <armbru@redhat.com>
Wed, 21 Dec 2011 10:37:57 +0000 (21 11:37 +0100)
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Fri, 6 Jan 2012 15:07:00 +0000 (6 15:07 +0000)
tree4cac89f6dfa794568f2d30abedb9e78d8d029da9
parentbe62a2ebab29eef7dc66c112d60271890ebbbee2
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>
hw/scsi-disk.c
hw/scsi-generic.c
hw/usb-msd.c
hw/virtio-blk.c