From patchwork Sun Jul 10 11:47:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Condrea X-Patchwork-Id: 9222599 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 AC72B60572 for ; Sun, 10 Jul 2016 12:01:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9516326E8A for ; Sun, 10 Jul 2016 12:01:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 892C42711E; Sun, 10 Jul 2016 12:01:46 +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 131A626E8A for ; Sun, 10 Jul 2016 12:01:45 +0000 (UTC) Received: from localhost ([::1]:54309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMDQe-0005CE-De for patchwork-qemu-devel@patchwork.kernel.org; Sun, 10 Jul 2016 08:01:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMDDk-00065S-LD for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMDDh-0001h7-EL for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:24 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMDDh-0001gS-5u for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:21 -0400 Received: by mail-wm0-x241.google.com with SMTP id k123so13138508wme.2 for ; Sun, 10 Jul 2016 04:48:21 -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=+TlD3/kU0BQWDHVKOPWDDA2ODzrWNlL86+Ntvvi4hi4=; b=bncHRosCsEqWe0qzuE5POZTrOJE6s9xWoDvJTtudVh5TuqRgvJ6qI1mGq2jDkFY8Ey AzYHTLNOiuijd5D8B8z2B8SEKuJVX7WUOfQ2ekyj/PVlBf73vzIEWMtCh/xlFkC02Gcu H5dRKWbQ1d5O6sAX17VkRnIOa3pf1L49Ly4Vq/UjaZiz+RjNIbQPiEWizd060qWtTiDe dQfk8WOlNc4+XLi03/jQNHKw58xWgKhs7Nn2FTYcPBnMtacJjIbQ8e87a/2HeDURMwIZ YzwBWHzG4GL1p2Lb2byKPajPWQismbsYCXG9BMjkzaKcwy7WQDf6RUxgfYbeGyedQJIZ XPBw== 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=+TlD3/kU0BQWDHVKOPWDDA2ODzrWNlL86+Ntvvi4hi4=; b=eK5GJYYhthc4fKABbRKuT4duh1EtiK7huAgr3+6T6bPUkMFnbuS/Dlam9iA6JA2O5L YfQ7IqPIHY0D+r7mM+GE2nf/1GeamRRPTX1BU+VUPmuhdT6dihikJ3iozu6ii7kCKOjS m41dkSEzgFJwiaMSjZa2XfmUf6XvnJeD+9r03NW1Dt67p1MRUvQ5BCZx8X6bCEYzqY75 t/wBptzLGeWn+qtzb8F3zuHCNvQkgV+XtqTXmdGw9F7MJZjF7PqyDWyp6W/8Cbr8UuIO VgglyrhjZQSkBQv+sj7yH+N53T6mCnQZC7p+wHCdV+ZxwcTcwj600MoQ7W2W9rIwFk/o 369w== X-Gm-Message-State: ALyK8tLF5eW4ULQoD4RB+tl1Km9z0bSqTNWWzlSMG5hYTa2wid189w0BnBtFfaop3OoLIg== X-Received: by 10.28.146.9 with SMTP id u9mr7413760wmd.52.1468151300604; Sun, 10 Jul 2016 04:48:20 -0700 (PDT) Received: from localhost.localdomain ([79.112.8.37]) by smtp.gmail.com with ESMTPSA id d137sm6888378wmd.12.2016.07.10.04.48.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Jul 2016 04:48:19 -0700 (PDT) From: Emil Condrea To: qemu-devel@nongnu.org Date: Sun, 10 Jul 2016 14:47:38 +0300 Message-Id: <1468151270-12984-8-git-send-email-emilcondrea@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468151270-12984-1-git-send-email-emilcondrea@gmail.com> References: <1468151270-12984-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::241 Subject: [Qemu-devel] [PATCH 07/19] 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: wei.liu2@citrix.com, stefanb@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, xen-devel@lists.xen.org, quan.xu@intel.com, dgdegra@tycho.nsa.gov, emilcondrea@gmail.com 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 --- hw/block/xen_disk.c | 2 +- hw/char/xen_console.c | 2 +- hw/display/xenfb.c | 2 +- hw/net/xen_nic.c | 2 +- hw/xen/xen_pvdev.c | 2 +- include/hw/xen/xen_pvdev.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index ad3f519..0716ca2 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -1048,7 +1048,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 e6bae67..889f7b2 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -263,7 +263,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 b1e8b3b..250dbc2 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -112,7 +112,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 91126b5..1fc6a22 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -367,7 +367,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/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 7375b43..6bf1ae4 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -193,7 +193,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 3e2dfd8..5c27184 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -71,7 +71,7 @@ void xen_pv_insert_xendev(struct XenDevice *xendev); struct XenDevice *xen_be_del_xendev(int dom, int dev); 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, const char *fmt, ...)