From patchwork Fri Nov 29 10:17:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 295254 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 0714D2C0085 for ; Fri, 29 Nov 2013 21:56:55 +1100 (EST) Received: from localhost ([::1]:46602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmLH9-0001rY-46 for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 05:26:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9N-0005w6-Cf for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmL9H-0004DL-H6 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:17 -0500 Received: from mail-ea0-x22c.google.com ([2a00:1450:4013:c01::22c]:54972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9H-0004Cu-5Q; Fri, 29 Nov 2013 05:18:11 -0500 Received: by mail-ea0-f172.google.com with SMTP id q10so6681470ead.3 for ; Fri, 29 Nov 2013 02:18:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=IGZabGxHKo3rR21X7bw8Lfq85repW8cuL0pn2oN2vwY=; b=wPiNdefh5iKsPZajSBWL8AD8Uuxu7a5+KLxzBd7yv9EeLaStWe16Nr6Y2ckcLzZQnK Bl7tVDj69pd/XOTSvUtqPXRstHQ2pTaL0Io4TS8o1nQpJCOEgx6gSTJyoaVXpz+GmL1A niu7gZyIK4fGN5Y1+oBtZQgBApVO/vObmcr4R+GblvUWJopnX3xyBTUHH2rR4QYw15bt 8+gc5X///yvqQet200BRWjD6IZg/41jqjmVYBnozRvVD2qsiiT2tsJ1l/SuQS/zR/Dz6 warR5X7Om7PaQIwD0hwhXmKIOoW0VsA/SeZzBAUVtSprc/LGrz1S7MpJ7uywq5Wj75WW /m5g== X-Received: by 10.15.42.134 with SMTP id u6mr347805eev.141.1385720290269; Fri, 29 Nov 2013 02:18:10 -0800 (PST) Received: from playground.lan (net-37-117-137-113.cust.dsl.vodafone.it. [37.117.137.113]) by mx.google.com with ESMTPSA id b42sm39055362eem.9.2013.11.29.02.18.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Nov 2013 02:18:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 11:17:21 +0100 Message-Id: <1385720262-14107-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> References: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22c Cc: qemu-stable@nongnu.org, afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH 09/30] virtio-scsi: switch exit callback to VirtioDeviceClass 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 This ensures hot-unplug is handled properly by the proxy. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/scsi/vhost-scsi.c | 11 +++++------ hw/scsi/virtio-scsi.c | 15 +++++++-------- include/hw/virtio/virtio-scsi.h | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 9e770fb..5e3cc61 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -240,11 +240,10 @@ static int vhost_scsi_init(VirtIODevice *vdev) return 0; } -static int vhost_scsi_exit(DeviceState *qdev) +static void vhost_scsi_exit(VirtIODevice *vdev) { - VirtIODevice *vdev = VIRTIO_DEVICE(qdev); - VHostSCSI *s = VHOST_SCSI(qdev); - VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(qdev); + VHostSCSI *s = VHOST_SCSI(vdev); + VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); migrate_del_blocker(s->migration_blocker); error_free(s->migration_blocker); @@ -253,7 +252,7 @@ static int vhost_scsi_exit(DeviceState *qdev) vhost_scsi_set_status(vdev, 0); g_free(s->dev.vqs); - return virtio_scsi_common_exit(vs); + virtio_scsi_common_exit(vs); } static Property vhost_scsi_properties[] = { @@ -265,10 +264,10 @@ static void vhost_scsi_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); - dc->exit = vhost_scsi_exit; dc->props = vhost_scsi_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); vdc->init = vhost_scsi_init; + vdc->exit = vhost_scsi_exit; vdc->get_features = vhost_scsi_get_features; vdc->set_config = vhost_scsi_set_config; vdc->set_status = vhost_scsi_set_status; diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 26d95a1..83344ea 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -644,22 +644,21 @@ static int virtio_scsi_device_init(VirtIODevice *vdev) return 0; } -int virtio_scsi_common_exit(VirtIOSCSICommon *vs) +void virtio_scsi_common_exit(VirtIOSCSICommon *vs) { VirtIODevice *vdev = VIRTIO_DEVICE(vs); g_free(vs->cmd_vqs); virtio_cleanup(vdev); - return 0; } -static int virtio_scsi_device_exit(DeviceState *qdev) +static void virtio_scsi_device_exit(VirtIODevice *vdev) { - VirtIOSCSI *s = VIRTIO_SCSI(qdev); - VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(qdev); + VirtIOSCSI *s = VIRTIO_SCSI(vdev); + VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); - unregister_savevm(qdev, "virtio-scsi", s); - return virtio_scsi_common_exit(vs); + unregister_savevm(DEVICE(vdev), "virtio-scsi", s); + virtio_scsi_common_exit(vs); } static Property virtio_scsi_properties[] = { @@ -680,10 +679,10 @@ static void virtio_scsi_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); - dc->exit = virtio_scsi_device_exit; dc->props = virtio_scsi_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); vdc->init = virtio_scsi_device_init; + vdc->exit = virtio_scsi_device_exit; vdc->set_config = virtio_scsi_set_config; vdc->get_features = virtio_scsi_get_features; vdc->reset = virtio_scsi_reset; diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index 9a98540..206c61d 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -187,6 +187,6 @@ typedef struct { VIRTIO_SCSI_F_CHANGE, true) int virtio_scsi_common_init(VirtIOSCSICommon *vs); -int virtio_scsi_common_exit(VirtIOSCSICommon *vs); +void virtio_scsi_common_exit(VirtIOSCSICommon *vs); #endif /* _QEMU_VIRTIO_SCSI_H */