From patchwork Mon Dec 12 20:18:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 130886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4DA3C1007D4 for ; Tue, 13 Dec 2011 08:57:31 +1100 (EST) Received: from localhost ([::1]:44082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaDsG-0002Vu-KP for incoming@patchwork.ozlabs.org; Mon, 12 Dec 2011 16:57:28 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCRi-0000s6-O9 for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:26:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaCRh-0001UA-DY for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:58 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:55989 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCRh-0001U1-50 for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:57 -0500 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id pBCKPoPb000348; Mon, 12 Dec 2011 14:25:50 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id pBCKPmvM000347; Mon, 12 Dec 2011 14:25:48 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 12 Dec 2011 14:18:49 -0600 Message-Id: <1323721273-32404-54-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> References: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH v3 053/197] kill off SCSIDeviceInfo 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 --- hw/scsi-bus.c | 12 +++++----- hw/scsi-disk.c | 64 ++++++++++++++++++++++++++-------------------------- hw/scsi-generic.c | 16 ++++++------ hw/scsi.h | 7 +----- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index cabdb3c..d017ece 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -183,13 +183,13 @@ static int scsi_qdev_exit(DeviceState *qdev) return 0; } -void scsi_qdev_register(SCSIDeviceInfo *info) +void scsi_qdev_register(DeviceInfo *info) { - info->qdev.bus_info = &scsi_bus_info; - info->qdev.init = scsi_qdev_init; - info->qdev.unplug = qdev_simple_unplug_cb; - info->qdev.exit = scsi_qdev_exit; - qdev_register_subclass(&info->qdev, TYPE_SCSI_DEVICE); + info->bus_info = &scsi_bus_info; + info->init = scsi_qdev_init; + info->unplug = qdev_simple_unplug_cb; + info->exit = scsi_qdev_exit; + qdev_register_subclass(info, TYPE_SCSI_DEVICE); } /* handle legacy '-drive if=scsi,...' cmd line args */ diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 9944d69..4c4cc75 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1739,14 +1739,14 @@ static void scsi_hd_class_initfn(ObjectClass *klass, void *data) sc->unit_attention_reported = scsi_disk_unit_attention_reported; } -static SCSIDeviceInfo scsi_hd_info = { - .qdev.name = "scsi-hd", - .qdev.fw_name = "disk", - .qdev.desc = "virtual SCSI disk", - .qdev.size = sizeof(SCSIDiskState), - .qdev.reset = scsi_disk_reset, - .qdev.class_init = scsi_hd_class_initfn, - .qdev.props = (Property[]) { +static DeviceInfo scsi_hd_info = { + .name = "scsi-hd", + .fw_name = "disk", + .desc = "virtual SCSI disk", + .size = sizeof(SCSIDiskState), + .reset = scsi_disk_reset, + .class_init = scsi_hd_class_initfn, + .props = (Property[]) { DEFINE_SCSI_DISK_PROPERTIES(), DEFINE_PROP_BIT("removable", SCSIDiskState, removable, 0, false), DEFINE_PROP_END_OF_LIST(), @@ -1763,14 +1763,14 @@ static void scsi_cd_class_initfn(ObjectClass *klass, void *data) sc->unit_attention_reported = scsi_disk_unit_attention_reported; } -static SCSIDeviceInfo scsi_cd_info = { - .qdev.name = "scsi-cd", - .qdev.fw_name = "disk", - .qdev.desc = "virtual SCSI CD-ROM", - .qdev.size = sizeof(SCSIDiskState), - .qdev.reset = scsi_disk_reset, - .qdev.class_init = scsi_cd_class_initfn, - .qdev.props = (Property[]) { +static DeviceInfo scsi_cd_info = { + .name = "scsi-cd", + .fw_name = "disk", + .desc = "virtual SCSI CD-ROM", + .size = sizeof(SCSIDiskState), + .reset = scsi_disk_reset, + .class_init = scsi_cd_class_initfn, + .props = (Property[]) { DEFINE_SCSI_DISK_PROPERTIES(), DEFINE_PROP_END_OF_LIST(), }, @@ -1786,14 +1786,14 @@ static void scsi_block_class_initfn(ObjectClass *klass, void *data) sc->alloc_req = scsi_block_new_request; } -static SCSIDeviceInfo scsi_block_info = { - .qdev.name = "scsi-block", - .qdev.fw_name = "disk", - .qdev.desc = "SCSI block device passthrough", - .qdev.size = sizeof(SCSIDiskState), - .qdev.reset = scsi_disk_reset, - .qdev.class_init = scsi_block_class_initfn, - .qdev.props = (Property[]) { +static DeviceInfo scsi_block_info = { + .name = "scsi-block", + .fw_name = "disk", + .desc = "SCSI block device passthrough", + .size = sizeof(SCSIDiskState), + .reset = scsi_disk_reset, + .class_init = scsi_block_class_initfn, + .props = (Property[]) { DEFINE_SCSI_DISK_PROPERTIES(), DEFINE_PROP_END_OF_LIST(), }, @@ -1810,14 +1810,14 @@ static void scsi_disk_class_initfn(ObjectClass *klass, void *data) sc->unit_attention_reported = scsi_disk_unit_attention_reported; } -static SCSIDeviceInfo scsi_disk_info = { - .qdev.name = "scsi-disk", /* legacy -device scsi-disk */ - .qdev.fw_name = "disk", - .qdev.desc = "virtual SCSI disk or CD-ROM (legacy)", - .qdev.size = sizeof(SCSIDiskState), - .qdev.reset = scsi_disk_reset, - .qdev.class_init = scsi_disk_class_initfn, - .qdev.props = (Property[]) { +static DeviceInfo scsi_disk_info = { + .name = "scsi-disk", /* legacy -device scsi-disk */ + .fw_name = "disk", + .desc = "virtual SCSI disk or CD-ROM (legacy)", + .size = sizeof(SCSIDiskState), + .reset = scsi_disk_reset, + .class_init = scsi_disk_class_initfn, + .props = (Property[]) { DEFINE_SCSI_DISK_PROPERTIES(), DEFINE_PROP_BIT("removable", SCSIDiskState, removable, 0, false), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 9fb2a09..8d7a8f3 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -470,14 +470,14 @@ static void scsi_generic_class_initfn(ObjectClass *klass, void *data) sc->alloc_req = scsi_new_request; } -static SCSIDeviceInfo scsi_generic_info = { - .qdev.name = "scsi-generic", - .qdev.fw_name = "disk", - .qdev.desc = "pass through generic scsi device (/dev/sg*)", - .qdev.size = sizeof(SCSIDevice), - .qdev.reset = scsi_generic_reset, - .qdev.class_init = scsi_generic_class_initfn, - .qdev.props = (Property[]) { +static DeviceInfo scsi_generic_info = { + .name = "scsi-generic", + .fw_name = "disk", + .desc = "pass through generic scsi device (/dev/sg*)", + .size = sizeof(SCSIDevice), + .reset = scsi_generic_reset, + .class_init = scsi_generic_class_initfn, + .props = (Property[]) { DEFINE_BLOCK_PROPERTIES(SCSIDevice, conf), DEFINE_PROP_END_OF_LIST(), }, diff --git a/hw/scsi.h b/hw/scsi.h index 41501f2..4290b20 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -13,7 +13,6 @@ typedef struct SCSIBus SCSIBus; typedef struct SCSIBusInfo SCSIBusInfo; typedef struct SCSICommand SCSICommand; typedef struct SCSIDevice SCSIDevice; -typedef struct SCSIDeviceInfo SCSIDeviceInfo; typedef struct SCSIRequest SCSIRequest; typedef struct SCSIReqOps SCSIReqOps; @@ -109,10 +108,6 @@ struct SCSIReqOps { uint8_t *(*get_buf)(SCSIRequest *req); }; -struct SCSIDeviceInfo { - DeviceInfo qdev; -}; - struct SCSIBusInfo { int tcq; int max_channel, max_target, max_lun; @@ -130,7 +125,7 @@ struct SCSIBus { }; void scsi_bus_new(SCSIBus *bus, DeviceState *host, const SCSIBusInfo *info); -void scsi_qdev_register(SCSIDeviceInfo *info); +void scsi_qdev_register(DeviceInfo *info); static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d) {