From patchwork Thu Aug 1 02:17:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 263875 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 84AA92C00C4 for ; Thu, 1 Aug 2013 12:25:42 +1000 (EST) Received: from localhost ([::1]:52397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iaC-0006v0-CM for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 22:25:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iT0-0003en-JS for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4iSo-0006PV-G1 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32782 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iSo-0006PC-65 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:02 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BD37EA51CB; Thu, 1 Aug 2013 04:18:01 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 1 Aug 2013 04:17:43 +0200 Message-Id: <1375323463-32747-23-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1375323463-32747-1-git-send-email-afaerber@suse.de> References: <1375323463-32747-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Paolo Bonzini , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH RFC for-next v2 22/22] virtio-scsi: Convert virtio_scsi_common_[un]realize to QOM realize 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 VirtIOSCSI and VHostSCSI now perform some initializations after VirtIOSCSICommon's realize calls virtio_bus_plug_device(), namely creating the SCSIBus and initializing /dev/vhost-scsi respectively. Signed-off-by: Andreas Färber --- hw/scsi/vhost-scsi.c | 6 +----- hw/scsi/virtio-scsi.c | 20 +++++++++++++------- include/hw/virtio/virtio-scsi.h | 5 ++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index ad7cc9b..f4546da 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -219,7 +219,7 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp) } } - virtio_scsi_common_realize(dev, &err); + parent_dc->realize(dev, &err); if (err != NULL) { error_propagate(errp, err); return; @@ -240,8 +240,6 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp) error_setg(&s->migration_blocker, "vhost-scsi does not support migration"); migrate_add_blocker(s->migration_blocker); - - parent_dc->realize(dev, errp); } static void vhost_scsi_unrealize(DeviceState *dev, Error **errp) @@ -259,8 +257,6 @@ static void vhost_scsi_unrealize(DeviceState *dev, Error **errp) g_free(s->dev.vqs); - virtio_scsi_common_unrealize(dev, errp); - parent_dc->unrealize(dev, errp); } diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index ac0ecdf..3a4ec97 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -589,10 +589,12 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { .load_request = virtio_scsi_load_request, }; -void virtio_scsi_common_realize(DeviceState *dev, Error **errp) +static void virtio_scsi_common_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOSCSICommon *s = VIRTIO_SCSI_COMMON(dev); + ObjectClass *parent_oc = VIRTIO_SCSI_COMMON_GET_PARENT_CLASS(dev); + DeviceClass *parent_dc = DEVICE_CLASS(parent_oc); int i; virtio_init(vdev, "virtio-scsi", VIRTIO_ID_SCSI, @@ -610,6 +612,8 @@ void virtio_scsi_common_realize(DeviceState *dev, Error **errp) s->cmd_vqs[i] = virtio_add_queue(vdev, VIRTIO_SCSI_VQ_SIZE, virtio_scsi_handle_cmd); } + + parent_dc->realize(dev, errp); } static void virtio_scsi_device_realize(DeviceState *dev, Error **errp) @@ -621,7 +625,7 @@ static void virtio_scsi_device_realize(DeviceState *dev, Error **errp) static int virtio_scsi_id; Error *err = NULL; - virtio_scsi_common_realize(dev, &err); + parent_dc->realize(dev, &err); if (err != NULL) { error_propagate(errp, err); return; @@ -639,17 +643,19 @@ static void virtio_scsi_device_realize(DeviceState *dev, Error **errp) register_savevm(dev, "virtio-scsi", virtio_scsi_id++, 1, virtio_scsi_save, virtio_scsi_load, s); - - parent_dc->realize(dev, errp); } -void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp) +static void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev); + ObjectClass *parent_oc = VIRTIO_SCSI_COMMON_GET_PARENT_CLASS(dev); + DeviceClass *parent_dc = DEVICE_CLASS(parent_oc); g_free(vs->cmd_vqs); virtio_cleanup(vdev); + + parent_dc->unrealize(dev, errp); } static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp) @@ -660,8 +666,6 @@ static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp) unregister_savevm(dev, "virtio-scsi", s); - virtio_scsi_common_unrealize(dev, errp); - parent_dc->unrealize(dev, errp); } @@ -675,6 +679,8 @@ static void virtio_scsi_common_class_init(ObjectClass *klass, void *data) VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); + dc->realize = virtio_scsi_common_realize; + dc->unrealize = virtio_scsi_common_unrealize; vdc->get_config = virtio_scsi_get_config; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index c56292b..a9fac74 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -21,6 +21,8 @@ #define TYPE_VIRTIO_SCSI_COMMON "virtio-scsi-common" #define VIRTIO_SCSI_COMMON(obj) \ OBJECT_CHECK(VirtIOSCSICommon, (obj), TYPE_VIRTIO_SCSI_COMMON) +#define VIRTIO_SCSI_COMMON_GET_PARENT_CLASS(obj) \ + OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_SCSI_COMMON) #define TYPE_VIRTIO_SCSI "virtio-scsi-device" #define VIRTIO_SCSI(obj) \ @@ -188,7 +190,4 @@ typedef struct { DEFINE_PROP_BIT("param_change", _state, _feature_field, \ VIRTIO_SCSI_F_CHANGE, true) -void virtio_scsi_common_realize(DeviceState *dev, Error **errp); -void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp); - #endif /* _QEMU_VIRTIO_SCSI_H */