From patchwork Fri Jul 27 15:02:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 173709 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8E58C2C0095 for ; Sat, 28 Jul 2012 01:43:03 +1000 (EST) Received: from localhost ([::1]:48855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum5c-0007wB-KL for incoming@patchwork.ozlabs.org; Fri, 27 Jul 2012 11:04:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum4u-0006nW-Rw for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:03:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sum4m-0007JY-Os for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:03:44 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:42319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum4m-0007JU-KX for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:03:36 -0400 Received: by ghrr14 with SMTP id r14so3231906ghr.4 for ; Fri, 27 Jul 2012 08:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=1DZzVXBWTIxj62RvQyjE8fr3xjv6mZ2f/5pBjk1tS1g=; b=LhrFft4hElB7pt2cjIeOcO2d9711Kx9PQP6bm+uM+KbdQXOLYpiZJntP0Y2RYFyxYb NNM9cc+BgmNtsoGaIXV+NFefxlBn8CDx/C1wi4GwQo+IWZYZUqTgii8f0IanbhSHyrJj iYcld5J8rnIX2NUrGNRc/FlidNw8Iw2TaIHMpcaI7nhwqwVI8rTQXdnmx7J5kwDzTKgB ILqGkKK8iwiNI/kj3uNybyzUN5X6Y6joUd47KpypXiehtufdhBsknaT6RsQxvlSyFB4a K9AmoZVxkQYIwqPdYtzzGIxlM/Al27RcA/g7t8tg3JguKlNd5CJ5IZMApV8mKWrNe2F9 sE1Q== Received: by 10.68.219.135 with SMTP id po7mr14386900pbc.149.1343401415900; Fri, 27 Jul 2012 08:03:35 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id nk3sm2062530pbc.27.2012.07.27.08.03.32 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 08:03:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 27 Jul 2012 17:02:35 +0200 Message-Id: <1343401379-19495-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343401379-19495-1-git-send-email-pbonzini@redhat.com> References: <1343401379-19495-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.173 Cc: Yan Vugenfirer , Dmitry Fleytman Subject: [Qemu-devel] [PATCH 08/32] scsi-disk: let the user customize vendor and product name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Dmitry Fleytman This patch adds two new properties vendor and product to SCSI disks. These options let the user customize the inquiry data returned by the disk. Signed-off-by: Yan Vugenfirer Signed-off-by: Dmitry Fleytman [ Use vendor and product property names, avoid "if" statements. - PB ] Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 8907197..788fe86 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -72,6 +72,8 @@ struct SCSIDiskState QEMUBH *bh; char *version; char *serial; + char *vendor; + char *product; bool tray_open; bool tray_locked; }; @@ -669,12 +671,10 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) outbuf[0] = s->qdev.type & 0x1f; outbuf[1] = (s->features & (1 << SCSI_DISK_F_REMOVABLE)) ? 0x80 : 0; - if (s->qdev.type == TYPE_ROM) { - memcpy(&outbuf[16], "QEMU CD-ROM ", 16); - } else { - memcpy(&outbuf[16], "QEMU HARDDISK ", 16); - } - memcpy(&outbuf[8], "QEMU ", 8); + + strpadcpy((char *) &outbuf[16], 16, s->product, ' '); + strpadcpy((char *) &outbuf[8], 8, s->vendor, ' '); + memset(&outbuf[32], 0, 4); memcpy(&outbuf[32], s->version, MIN(4, strlen(s->version))); /* @@ -1757,6 +1757,9 @@ static int scsi_initfn(SCSIDevice *dev) if (!s->version) { s->version = g_strdup(qemu_get_version()); } + if (!s->vendor) { + s->vendor = g_strdup("QEMU"); + } if (bdrv_is_sg(s->qdev.conf.bs)) { error_report("unwanted /dev/sg*"); @@ -1778,6 +1781,9 @@ static int scsi_hd_initfn(SCSIDevice *dev) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); s->qdev.blocksize = s->qdev.conf.logical_block_size; s->qdev.type = TYPE_DISK; + if (!s->product) { + s->product = g_strdup("QEMU HARDDISK"); + } return scsi_initfn(&s->qdev); } @@ -1787,6 +1793,9 @@ static int scsi_cd_initfn(SCSIDevice *dev) s->qdev.blocksize = 2048; s->qdev.type = TYPE_ROM; s->features |= 1 << SCSI_DISK_F_REMOVABLE; + if (!s->product) { + s->product = g_strdup("QEMU CD-ROM"); + } return scsi_initfn(&s->qdev); } @@ -1954,10 +1963,12 @@ static SCSIRequest *scsi_block_new_request(SCSIDevice *d, uint32_t tag, } #endif -#define DEFINE_SCSI_DISK_PROPERTIES() \ - DEFINE_BLOCK_PROPERTIES(SCSIDiskState, qdev.conf), \ - DEFINE_PROP_STRING("ver", SCSIDiskState, version), \ - DEFINE_PROP_STRING("serial", SCSIDiskState, serial) +#define DEFINE_SCSI_DISK_PROPERTIES() \ + DEFINE_BLOCK_PROPERTIES(SCSIDiskState, qdev.conf), \ + DEFINE_PROP_STRING("ver", SCSIDiskState, version), \ + DEFINE_PROP_STRING("serial", SCSIDiskState, serial), \ + DEFINE_PROP_STRING("vendor", SCSIDiskState, vendor), \ + DEFINE_PROP_STRING("product", SCSIDiskState, product) static Property scsi_hd_properties[] = { DEFINE_SCSI_DISK_PROPERTIES(),