From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlCdz-0005ll-Pt for qemu-devel@nongnu.org; Fri, 16 May 2014 03:33:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WlCdp-0001JI-Rj for qemu-devel@nongnu.org; Fri, 16 May 2014 03:33:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlCdp-0001It-Ko for qemu-devel@nongnu.org; Fri, 16 May 2014 03:33:17 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4G7XGlv000683 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 16 May 2014 03:33:16 -0400 Date: Fri, 16 May 2014 15:33:26 +0800 From: Fam Zheng Message-ID: <20140516073326.GC1941@T430.nay.redhat.com> References: <1398685153-15146-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1398685153-15146-1-git-send-email-pbonzini@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2] scsi: Improve error messages more List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, armbru@redhat.com On Mon, 04/28 13:39, Paolo Bonzini wrote: > Remove the "scsi-block:" prefix for error messages as suggested > by Markus. > > Improve the previous patch by making the message the same for both > scsi-block and scsi-generic, including the strerror() output in both > and making an explicit reference to SG_IO. Also s/can not/cannot/. > > Signed-off-by: Paolo Bonzini Paolo, I think there are a small number of scsi-next patches queued now, are you going to send a PULL request? Thanks, Fam > --- > hw/scsi/scsi-disk.c | 11 ++++++----- > hw/scsi/scsi-generic.c | 8 ++++++-- > 2 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index d2e532e..4bcef55 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -2458,26 +2458,27 @@ static int scsi_block_initfn(SCSIDevice *dev) > int rc; > > if (!s->qdev.conf.bs) { > - error_report("scsi-block: drive property not set"); > + error_report("drive property not set"); > return -1; > } > > /* check we are using a driver managing SG_IO (version 3 and after) */ > - rc = bdrv_ioctl(s->qdev.conf.bs, SG_GET_VERSION_NUM, &sg_version); > + rc = bdrv_ioctl(s->qdev.conf.bs, SG_GET_VERSION_NUM, &sg_version); > if (rc < 0) { > - error_report("scsi-block: can not get version number: %s", > + error_report("cannot get SG_IO version number: %s. " > + "Is this a SCSI device?", > strerror(-rc)); > return -1; > } > if (sg_version < 30000) { > - error_report("scsi-block: scsi generic interface too old"); > + error_report("scsi generic interface too old"); > return -1; > } > > /* get device type from INQUIRY data */ > rc = get_device_type(s); > if (rc < 0) { > - error_report("scsi-block: INQUIRY failed"); > + error_report("INQUIRY failed"); > return -1; > } > > diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c > index 8d92e0d..3733d2c 100644 > --- a/hw/scsi/scsi-generic.c > +++ b/hw/scsi/scsi-generic.c > @@ -394,6 +394,7 @@ static void scsi_destroy(SCSIDevice *s) > > static int scsi_generic_initfn(SCSIDevice *s) > { > + int rc; > int sg_version; > struct sg_scsi_id scsiid; > > @@ -412,8 +413,11 @@ 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) { > - error_report("scsi generic interface not supported"); > + rc = bdrv_ioctl(s->conf.bs, SG_GET_VERSION_NUM, &sg_version); > + if (rc < 0) { > + error_report("cannot get SG_IO version number: %s. " > + "Is this a SCSI device?", > + strerror(-rc)); > return -1; > } > if (sg_version < 30000) { > -- > 1.8.3.1 > >