From 1ecda02b24a13f501e747b8442934829d82698ae Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 18 Feb 2010 17:25:24 +0100 Subject: error: Replace qemu_error() by error_report() error_report() terminates the message with a newline. Strip it it from its arguments. This fixes a few error messages lacking a newline: net_handle_fd_param()'s "No file descriptor named %s found", and tap_open()'s "vnet_hdr=1 requested, but no kernel support for IFF_VNET_HDR available" (all three versions). There's one place that passes arguments without newlines intentionally: load_vmstate(). Fix it up. --- hw/scsi-disk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/scsi-disk.c') diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 9cc35f8..da56d2b 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1025,13 +1025,13 @@ static int scsi_disk_initfn(SCSIDevice *dev) uint64_t nb_sectors; if (!s->qdev.conf.dinfo || !s->qdev.conf.dinfo->bdrv) { - qemu_error("scsi-disk: drive property not set\n"); + error_report("scsi-disk: drive property not set"); return -1; } s->bs = s->qdev.conf.dinfo->bdrv; if (bdrv_is_sg(s->bs)) { - qemu_error("scsi-disk: unwanted /dev/sg*\n"); + error_report("scsi-disk: unwanted /dev/sg*"); return -1; } -- cgit v1.1