From patchwork Wed Apr 19 18:21:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zihan Yang X-Patchwork-Id: 9688613 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 CC455602DC for ; Wed, 19 Apr 2017 18:24:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3F7E28387 for ; Wed, 19 Apr 2017 18:24:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8D842843B; Wed, 19 Apr 2017 18:24:51 +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 4F43928387 for ; Wed, 19 Apr 2017 18:24:51 +0000 (UTC) Received: from localhost ([::1]:49869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0uHa-0003Iw-7A for patchwork-qemu-devel@patchwork.kernel.org; Wed, 19 Apr 2017 14:24:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0uEn-0001sC-Vk for qemu-devel@nongnu.org; Wed, 19 Apr 2017 14:22:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0uEn-0003rT-3R for qemu-devel@nongnu.org; Wed, 19 Apr 2017 14:21:57 -0400 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]:33615) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d0uEm-0003rI-V9 for qemu-devel@nongnu.org; Wed, 19 Apr 2017 14:21:57 -0400 Received: by mail-io0-x241.google.com with SMTP id k87so5889329ioi.0 for ; Wed, 19 Apr 2017 11:21:56 -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=eQb33ZTI0DFMWtr80ajrfSyZYUufrZOaZaJQh2jHKec=; b=Zpa5f9O8YtDtzDf+FXRFZdD/zWOe4UvKrtsRnwsfOxaHbiZCUo0d6WgG9JHum84eYB g/qPmgsXF3F6TywlUdKenXdluycWkHz87VCv14CwC+EA0CS0gKZK4lMrQFiY7OOMLdpN +/0QRpAB9NE6wXDmzPv5Q08OW99ofuXQuf+gslxvnJyrYzWTtc0z7nVNjRdLk/3p01hf nEKTKQwApnlO0kJ75Dr+Ijz6AL8It8fesB/mFHrUG7lGgSwh/Tw+Vtla091u4/a7UlsS Tdj+chQd8qer8iUznLltsQoVW/ABga8dsccHidkefOCvVFGi78vrHt4jtfSHbJuYl+OM VP3g== 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=eQb33ZTI0DFMWtr80ajrfSyZYUufrZOaZaJQh2jHKec=; b=WfxzY7SzcqHPItunQx2ZfYfSyd4Bha8XtbhwA+B1kz+K9DBOQVTli2TJWzSBDzwI7X L6CO2tzxW6Oyaz+lYp5TiGsVtNWUE92HcO6pAg1Lb1sjYLuIL1djR5b+OVIl39kbAo0V ndd7P8wpxKiRMduSlHqi7Iil1Bjs3pmCP0ns5oYXWsGK4wCDlefXHvswpCok9pDEM6l+ Xr7Lo1HtWDL5voEy3PgZFoleFCaAgLUgespQnL5/vYM2+ZvNa9ZITVE7f8JoWWuvrwg3 mYbvbnsBNt835Dyi2QgHC7NrMyUWJgdIYES31DA8VgdymtlU51KXwAcM2P9ns1JEuVBA 0ihw== X-Gm-Message-State: AN3rC/5htJyJYi8UF9MZSch7YJavR4Zruj3HdvrTkLoYWUUzpq4yZukV +tLNw0+fV9CHeA== X-Received: by 10.99.115.30 with SMTP id o30mr4189686pgc.155.1492626116277; Wed, 19 Apr 2017 11:21:56 -0700 (PDT) Received: from fma-dfsg.ipads-lab.se.sjtu.edu.cn ([69.85.85.101]) by smtp.gmail.com with ESMTPSA id l7sm5904575pgn.10.2017.04.19.11.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Apr 2017 11:21:55 -0700 (PDT) From: Zihan Yang To: qemu-devel@nongnu.org Date: Thu, 20 Apr 2017 02:21:30 +0800 Message-Id: <1492626091-30531-2-git-send-email-tgnyang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492626091-30531-1-git-send-email-tgnyang@gmail.com> References: <1492626091-30531-1-git-send-email-tgnyang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::241 Subject: [Qemu-devel] [PATCH 2/2] hw/s390x: make virtio_ccw_exit function in virtio-ccw return void 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 Note that only the virtio_ccw_exit, which is the exit function of VirtIOCCWDeviceClass, is modified to return void in this patch. 'virtio_ccw_busdev_exit' belongs to DeviceClass so it remains unchanged for the moment to give a split-out patch, because modifying it would involve some other folders like hw/audio. Signed-off-by: Zihan Yang --- hw/s390x/event-facility.c | 6 +----- hw/s390x/virtio-ccw.c | 6 +++--- hw/s390x/virtio-ccw.h | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 34b2faf..f7c509c 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -413,11 +413,7 @@ static void event_unrealize(DeviceState *qdev, Error **errp) SCLPEvent *event = SCLP_EVENT(qdev); SCLPEventClass *child = SCLP_EVENT_GET_CLASS(event); if (child->exit) { - int rc = child->exit(event); - if (rc < 0) { - error_setg(errp, "SCLP event exit failed."); - return; - } + child->exit(event); } } diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 00b3bde..0dbd3ee 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -722,7 +722,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp) } } -static int virtio_ccw_exit(VirtioCcwDevice *dev) +static void virtio_ccw_exit(VirtioCcwDevice *dev) { CcwDevice *ccw_dev = CCW_DEVICE(dev); SubchDev *sch = ccw_dev->sch; @@ -735,7 +735,6 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev) release_indicator(&dev->routes.adapter, dev->indicators); dev->indicators = NULL; } - return 0; } static void virtio_ccw_net_realize(VirtioCcwDevice *ccw_dev, Error **errp) @@ -1621,7 +1620,8 @@ static int virtio_ccw_busdev_exit(DeviceState *dev) VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev; VirtIOCCWDeviceClass *_info = VIRTIO_CCW_DEVICE_GET_CLASS(dev); - return _info->exit(_dev); + _info->exit(_dev); + return 0; /* TODO workaround, should remove once converted to unrealize */ } static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 41d4010..ce8baa3 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -74,7 +74,7 @@ typedef struct VirtioCcwDevice VirtioCcwDevice; typedef struct VirtIOCCWDeviceClass { CCWDeviceClass parent_class; void (*realize)(VirtioCcwDevice *dev, Error **errp); - int (*exit)(VirtioCcwDevice *dev); + void (*exit)(VirtioCcwDevice *dev); } VirtIOCCWDeviceClass; /* Performance improves when virtqueue kick processing is decoupled from the