| Message ID | 1324463877-1281-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Dec 21, 2011 at 11:37:57AM +0100, Markus Armbruster wrote: > 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> > --- > hw/scsi-disk.c | 4 ++-- > hw/scsi-generic.c | 8 ++++---- > hw/usb-msd.c | 2 +- > hw/virtio-blk.c | 2 +- > 4 files changed, 8 insertions(+), 8 deletions(-) Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
On (Wed) 21 Dec 2011 [11:37:57], Markus Armbruster wrote: > 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> Acked-by: Amit Shah <amit.shah@redhat.com> Amit
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 505accd..5d8bf53 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 6f7d3db..0aebcdd 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 4c06950..b87b929 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 ef27421..5e81f53 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)) {
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> --- hw/scsi-disk.c | 4 ++-- hw/scsi-generic.c | 8 ++++---- hw/usb-msd.c | 2 +- hw/virtio-blk.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)