From patchwork Tue Oct 4 06:43:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Condrea X-Patchwork-Id: 9361245 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 9CF12600C8 for ; Tue, 4 Oct 2016 07:02:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EDEE28ADC for ; Tue, 4 Oct 2016 07:02:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71BC928AE0; Tue, 4 Oct 2016 07:02:38 +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 DD62E28ADC for ; Tue, 4 Oct 2016 07:02:37 +0000 (UTC) Received: from localhost ([::1]:40524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJkI-0007T5-E4 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 04 Oct 2016 03:02:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJT4-0001q6-Up for qemu-devel@nongnu.org; Tue, 04 Oct 2016 02:44:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brJT3-0005ry-2d for qemu-devel@nongnu.org; Tue, 04 Oct 2016 02:44:46 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:34174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJT2-0005r2-OB for qemu-devel@nongnu.org; Tue, 04 Oct 2016 02:44:44 -0400 Received: by mail-wm0-x243.google.com with SMTP id b201so12871247wmb.1 for ; Mon, 03 Oct 2016 23:44:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5sr2yr/xcQTnj5eN75FmeX2A1ljkUtu1aKs4aNrl7Uw=; b=s1XrBoG1PjVYbvT06024Vf2sKvtfTjjsRSapPMSs3N7WMGRjXZGiOPXQaRqqIHtbAT weNxFJv7I1OLxvA4yFXADUEr1VNN5lMy9t4RZqFyr/3f1pvkVh5BhHgPbzjo5QOLzhLX BeBYCVvLyBHzThr9ldQaBhMmT4CKTHj1cJuEugCX/aKJbi9FKernyyK/1Hm4krdzlmAt 3fmL2FVr/9DgxH977nZcV3iawcCreyT4QvOUpT6+5n25BMl7Q1vhM4nU0doHVzGV9XDo vgtrkjjolddnv7RIdoSl/XEz7RIva1kbQemBLOho5+YFBdPJh3gQTCvEQprceOHsNtmm XY5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5sr2yr/xcQTnj5eN75FmeX2A1ljkUtu1aKs4aNrl7Uw=; b=hBkbCRN+QvWsnLV54zqEKsdtEmtMaWuch4l/ygtWRHolTJiiaAM2yhMVHNTn00d/Hn tTWz8KzDWDRTKsV31u1zn1smNEBmf8ID03K2Q3R2S0n7tgOKt1P4Of+/DhjM3xpxJO8g KU+JJ3GGI8VtgTrtDaGhqa7i4DLgPinMyc8KYt16vCqHO0BhfXf1Dg01CL3zaCCAW7PA B4HpfCM72Jju1lpmprKyvJVSLZ/a6xea4NZRKDPrpnPMw3hcHhHA846n4v9BsMtU4TcF Nevk4wvzY511znihf3EIkjM33ESecvzVqkzsaQOZKnSx7oCdD7R9D7g1uM2YtMNCZH4Z hZJQ== X-Gm-Message-State: AA6/9RlLGFje7F87kepIdKIB6yKrAalgozfxDM3Om0W/I0RaTNoyoqSa+LkDlFsUgolH9g== X-Received: by 10.194.200.162 with SMTP id jt2mr1426352wjc.172.1475563484004; Mon, 03 Oct 2016 23:44:44 -0700 (PDT) Received: from localhost.localdomain ([79.112.35.35]) by smtp.gmail.com with ESMTPSA id f142sm2341423wmf.19.2016.10.03.23.44.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Oct 2016 23:44:42 -0700 (PDT) From: Emil Condrea To: qemu-devel@nongnu.org Date: Tue, 4 Oct 2016 09:43:39 +0300 Message-Id: <1475563424-6604-11-git-send-email-emilcondrea@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475563424-6604-1-git-send-email-emilcondrea@gmail.com> References: <1475563424-6604-1-git-send-email-emilcondrea@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH 10/15] xen: Rename xen_be_unbind_evtchn 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: xuquan8@huawei.com, sstabellini@kernel.org, wei.liu2@citrix.com, stefanb@linux.vnet.ibm.com, xen-devel@lists.xen.org, anthony.perard@citrix.com, dgdegra@tycho.nsa.gov, Emil Condrea Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Prepare xen_be_unbind_evtchn to be shared with frontends: * xen_be_unbind_evtchn -> xen_pv_unbind_evtchn Signed-off-by: Emil Condrea Acked-by: Anthony PERARD Reviewed-by: Quan Xu --- hw/block/xen_disk.c | 2 +- hw/char/xen_console.c | 2 +- hw/display/xenfb.c | 2 +- hw/net/xen_nic.c | 2 +- hw/usb/xen-usb.c | 2 +- hw/xen/xen_pvdev.c | 2 +- include/hw/xen/xen_pvdev.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 425efba..3688a4b 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -1195,7 +1195,7 @@ static void blk_disconnect(struct XenDevice *xendev) blk_unref(blkdev->blk); blkdev->blk = NULL; } - xen_be_unbind_evtchn(&blkdev->xendev); + xen_pv_unbind_evtchn(&blkdev->xendev); if (blkdev->sring) { xengnttab_unmap(blkdev->xendev.gnttabdev, blkdev->sring, 1); diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index b705a06..6dc2d81 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -265,7 +265,7 @@ static void con_disconnect(struct XenDevice *xendev) qemu_chr_add_handlers(con->chr, NULL, NULL, NULL, NULL); qemu_chr_fe_release(con->chr); } - xen_be_unbind_evtchn(&con->xendev); + xen_pv_unbind_evtchn(&con->xendev); if (con->sring) { if (!xendev->dev) { diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 55aca85..a86d990 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -113,7 +113,7 @@ static int common_bind(struct common *c) static void common_unbind(struct common *c) { - xen_be_unbind_evtchn(&c->xendev); + xen_pv_unbind_evtchn(&c->xendev); if (c->page) { xenforeignmemory_unmap(xen_fmem, c->page, 1); c->page = NULL; diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 7418a7b..c6af5dc 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -373,7 +373,7 @@ static void net_disconnect(struct XenDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); - xen_be_unbind_evtchn(&netdev->xendev); + xen_pv_unbind_evtchn(&netdev->xendev); if (netdev->txs) { xengnttab_unmap(netdev->xendev.gnttabdev, netdev->txs, 1); diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index a245355..f93c73d 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -835,7 +835,7 @@ static void usbback_disconnect(struct XenDevice *xendev) usbif = container_of(xendev, struct usbback_info, xendev); - xen_be_unbind_evtchn(xendev); + xen_pv_unbind_evtchn(xendev); if (usbif->urb_sring) { xengnttab_unmap(xendev->gnttabdev, usbif->urb_sring, 1); diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 15bf95c..85f7430 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -247,7 +247,7 @@ void xen_be_evtchn_event(void *opaque) } } -void xen_be_unbind_evtchn(struct XenDevice *xendev) +void xen_pv_unbind_evtchn(struct XenDevice *xendev) { if (xendev->local_port == -1) { return; diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h index cf26ce5..bc8a3ea 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -69,7 +69,7 @@ void xen_pv_insert_xendev(struct XenDevice *xendev); void xen_be_del_xendev(struct XenDevice *xendev); struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev); -void xen_be_unbind_evtchn(struct XenDevice *xendev); +void xen_pv_unbind_evtchn(struct XenDevice *xendev); int xen_be_send_notify(struct XenDevice *xendev); void xen_pv_printf(struct XenDevice *xendev, int msg_level,