From patchwork Wed Mar 20 05:56:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asias He X-Patchwork-Id: 2305331 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A24D73FC54 for ; Wed, 20 Mar 2013 05:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757874Ab3CTF4g (ORCPT ); Wed, 20 Mar 2013 01:56:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47680 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755161Ab3CTF4f (ORCPT ); Wed, 20 Mar 2013 01:56:35 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2K5uXH5019081 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 20 Mar 2013 01:56:33 -0400 Received: from hj.localdomain.com ([10.66.4.126]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2K5uUD1006051; Wed, 20 Mar 2013 01:56:31 -0400 From: Asias He To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , kvm@vger.kernel.org, Asias He Subject: [PATCH] virtio-blk: Set default serial id Date: Wed, 20 Mar 2013 13:56:08 +0800 Message-Id: <1363758968-28549-1-git-send-email-asias@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org If user does not specify a serial id, e.g. -device virtio-blk-pci,serial="serial_id" or -drive serial="serial_id" no serial id will be assigned. Add a default serial id in this case to help identifying the disk in guest. Signed-off-by: Asias He --- hw/virtio-blk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index f2143fd..c016817 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -642,6 +642,13 @@ static int virtio_blk_device_init(VirtIODevice *vdev) } blkconf_serial(&blk->conf, &blk->serial); + + if (!blk->serial) { + char serial[VIRTIO_BLK_ID_BYTES]; + snprintf(serial, VIRTIO_BLK_ID_BYTES, "ID%05d", virtio_blk_id); + blk->serial = g_strdup(serial); + } + if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) { return -1; }