From patchwork Wed Apr 26 12:53:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zihan Yang X-Patchwork-Id: 9701333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4C59A603F6 for ; Wed, 26 Apr 2017 12:55:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D7832015F for ; Wed, 26 Apr 2017 12:55:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30FB028606; Wed, 26 Apr 2017 12:55:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DE3572015F for ; Wed, 26 Apr 2017 12:55:57 +0000 (UTC) Received: from localhost ([::1]:55077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3MU9-00076P-4H for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Apr 2017 08:55:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3MS1-0006Hg-1Z for qemu-devel@nongnu.org; Wed, 26 Apr 2017 08:53:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3MRx-0005US-UZ for qemu-devel@nongnu.org; Wed, 26 Apr 2017 08:53:45 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:35896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d3MRx-0005UK-PN for qemu-devel@nongnu.org; Wed, 26 Apr 2017 08:53:41 -0400 Received: by mail-pg0-x242.google.com with SMTP id v1so10773003pgv.3 for ; Wed, 26 Apr 2017 05:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RkanD4MIH4erybPj7Kt+gz9lDJKr0kal1eK+vmhJ5ig=; b=o9Mau4TANQ5HS87RNrGY0OpdrJgmCzoyH7oP/iwBYcO4v778gfFoWN30ESK2NuFncm pciJK8EBIbXvQZnoY2q49oT4724DdFYaa7HkAmMcueqssxISgGdlbFjiQPRFZigY7Ur+ VDDfK7PCEatpg1ERt2B7dg9vpxIt8yXaps25GYly6YF2DphkypTuCsMLMoc3gtK8QegI 4Wu9OegE689JJ61pK0EZA5DXJ9UFNrN2jBo6moCrMTmNvZO5TRKtCfj72G0pCxaItoES kP/PYNUbKbR8hQN8i4xWNDVJnb+Adn6P7fhZFV8rhDneSq+ZQl6nObtIpXylACJwb/OK WTew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RkanD4MIH4erybPj7Kt+gz9lDJKr0kal1eK+vmhJ5ig=; b=f+n5/JcT6MdHiJXvEDHQax8RGiOkXPPp4aQRTxb2TmqkBZW9QAkZ3AKocS+oraBu9/ nS3rP54p9OksU6UUkAruwNCHmo+75H4pqhooCNsksEYrKuy4e4WrX0ns3uT4DWavDQTK /1UWDn0A7asEUUh5gh7sm7FwPJi0dJZyQp9xJJXkMsjEoN1/ipGPDb4+jfplB+a4Myul i32odFn+DKfCu9x00OTaNe1sTgp1ll6Wf9z7kNwPV23h8CGVnUMCsNpoYkux+qWRHXWW f+RYrJ520IKQMVf5Jy5MCIn67Tbo1N42WVl2pAx/XDiOqGKHj46OqtX/+FnffPOqwUkM PI3w== X-Gm-Message-State: AN3rC/4eqepqJAW6lZXHQSoFbpIdFTWaqNS5bRfIDYt9NqDcaclQd6Dh 8736PDgQc0+biQ== X-Received: by 10.98.10.25 with SMTP id s25mr32586575pfi.78.1493211220898; Wed, 26 Apr 2017 05:53:40 -0700 (PDT) Received: from fma-dfsg.ipads-lab.se.sjtu.edu.cn ([69.85.85.101]) by smtp.gmail.com with ESMTPSA id 3sm369324pge.12.2017.04.26.05.53.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Apr 2017 05:53:40 -0700 (PDT) From: Zihan Yang To: qemu-devel@nongnu.org Date: Wed, 26 Apr 2017 20:53:06 +0800 Message-Id: <1493211188-24086-3-git-send-email-tgnyang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493211188-24086-1-git-send-email-tgnyang@gmail.com> References: <1493211188-24086-1-git-send-email-tgnyang@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH 3/5] hw/s390: convert exit to unrealize in virtio_ccw_device_class_init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Alexander Graf , Christian Borntraeger , Cornelia Huck , Zihan Yang , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently the virtio_ccw_device_class_init function sets dc->exit, the exit callback of DeviceClass. It should be converted to dc->unrealize since exit callback of DeviceClass will be removed in the future. Signed-off-by: Zihan Yang --- hw/s390x/virtio-ccw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 91b43ac..5c193a8 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1621,13 +1621,12 @@ static void virtio_ccw_busdev_realize(DeviceState *dev, Error **errp) virtio_ccw_device_realize(_dev, errp); } -static int virtio_ccw_busdev_exit(DeviceState *dev) +static void virtio_ccw_busdev_unrealize(DeviceState *dev, Error **errp) { VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev; VirtIOCCWDeviceClass *_info = VIRTIO_CCW_DEVICE_GET_CLASS(dev); _info->exit(_dev); - return 0; } static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, @@ -1645,7 +1644,7 @@ static void virtio_ccw_device_class_init(ObjectClass *klass, void *data) k->unplug = virtio_ccw_busdev_unplug; dc->realize = virtio_ccw_busdev_realize; - dc->exit = virtio_ccw_busdev_exit; + dc->unrealize = virtio_ccw_busdev_unrealize; dc->bus_type = TYPE_VIRTUAL_CSS_BUS; }