From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47573 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJd4m-0001dB-5x for qemu-devel@nongnu.org; Tue, 01 Jun 2010 21:49:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJd4l-0003Kx-1L for qemu-devel@nongnu.org; Tue, 01 Jun 2010 21:48:59 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:59808) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJd4k-0003Kt-Qe for qemu-devel@nongnu.org; Tue, 01 Jun 2010 21:48:59 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e32.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o521faTS008486 for ; Tue, 1 Jun 2010 19:41:36 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o521mv7x124590 for ; Tue, 1 Jun 2010 19:48:57 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o521muhs023901 for ; Tue, 1 Jun 2010 19:48:56 -0600 Date: Tue, 1 Jun 2010 20:48:54 -0500 From: Ryan Harper Message-ID: <20100602014854.GB16406@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] virtio-blk: assign a default serial number if none provided List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: john cooper This patch applies on-top of John's virtio-blk serial patches. Generate default serial numbers for virtio drives based on DriveInfo.unit which is incremented for each additional virtio-blk device. This provides a per-virtio-blk number to use in the default string: QM%05d that is used in hw/ide/core.c. The resulting serial number looks like: QM00001, etc. Signed-off-by: Ryan Harper --- hw/virtio-blk.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 98c62f2..e5c6e7c 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -518,6 +518,9 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); strncpy(s->sn, drive_get_serial(s->bs), sizeof (s->sn)); + if (strlen(s->sn) == 0) { + snprintf(s->sn, sizeof(s->sn), "QM%05d", conf->dinfo->unit); + } s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output); -- 1.6.3.3 -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh@us.ibm.com