From patchwork Thu Oct 13 06:01:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Condrea X-Patchwork-Id: 9374419 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 EF21F607FD for ; Thu, 13 Oct 2016 06:11:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3B512983F for ; Thu, 13 Oct 2016 06:11:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D807E2985B; Thu, 13 Oct 2016 06:11:44 +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 4B1892983F for ; Thu, 13 Oct 2016 06:11:44 +0000 (UTC) Received: from localhost ([::1]:37817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZF1-0007W6-Aj for patchwork-qemu-devel@patchwork.kernel.org; Thu, 13 Oct 2016 02:11:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZ61-00007n-Pa for qemu-devel@nongnu.org; Thu, 13 Oct 2016 02:02:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buZ5z-0000WC-By for qemu-devel@nongnu.org; Thu, 13 Oct 2016 02:02:24 -0400 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:36288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZ5z-0000Uv-0g for qemu-devel@nongnu.org; Thu, 13 Oct 2016 02:02:23 -0400 Received: by mail-lf0-x242.google.com with SMTP id b75so10630317lfg.3 for ; Wed, 12 Oct 2016 23:02:22 -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=tNlhqFA2gDCQGzpcSMcLL5i7d0w5/iXwZ4K8IvvUAao=; b=JlrmKIxEVr1tk0k3BKr4r9T4+RLUxP6KLArTG8LLJ4zlGf0MlSFF/skTAYFb09Jv6K ROel2zgCyGULpn2KsiTP9LJeGc/vOdOp53IXpFw2zY1w1vbI3uHLpLB2+am3Ug0NqZzb mWsaEwB8NXPXnQRVCbd+7XNzT5Ff2luGBdpZeDnSbAfzn2+mCgJpjX3O67ZFkKKYvK5q ue44KXihRFY7rbrEUtvwQ7lVAEuV05k9Nmq3yXsVpsGdicPCxm/h3bMm4IIYPFVRlf88 Vv7vVYtAlESAmzSl0jtM03FunYrSJX7TqnStwNfGvHm4KFisW/r1xPR/vU1hc5+W+wP3 D9bw== 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=tNlhqFA2gDCQGzpcSMcLL5i7d0w5/iXwZ4K8IvvUAao=; b=lf609wjIxFJVak69FkuVxaMmWOJaNgTBR45zz6YXncp5MmCNUy+depTp2EnCR4mbzQ qzncLVchcrEdNS1PtW2WPo+TuHdXaOcpgakDf69kIzO0bKPBtWggSDcC8Pnx5V+1MPu6 3w6p4SPkEcTMWWNPq2EQqtyLPc6OpzN5MtscZsITwlEJJaQE/VbqMJBeeowXNfGqUO6O NSOsBP6RySrFuq004dDbN/PhkoFKH+hiCDHd0n262JUFI8WuA925eEYcRKXokrZn3PbL i2IDd44qiTg1UGb+qNyqgMziHdaq/ZOGAzQuN0Ww1mvHsKFgS11Yla2mWSPiM2+CB1zM oosQ== X-Gm-Message-State: AA6/9Rkkqa4pTT/zJJIaDZD+0P7mlH8C++8eNotLQ/yqglHzZzKZicKQOQ60ohXQKEqV4Q== X-Received: by 10.28.203.5 with SMTP id b5mr819446wmg.9.1476338541538; Wed, 12 Oct 2016 23:02:21 -0700 (PDT) Received: from localhost.localdomain ([79.112.35.35]) by smtp.gmail.com with ESMTPSA id rv12sm19588230wjb.29.2016.10.12.23.02.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Oct 2016 23:02:20 -0700 (PDT) From: Emil Condrea To: qemu-devel@nongnu.org Date: Thu, 13 Oct 2016 09:01:50 +0300 Message-Id: <1476338514-14492-10-git-send-email-emilcondrea@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476338514-14492-1-git-send-email-emilcondrea@gmail.com> References: <1476338514-14492-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:4010:c07::242 Subject: [Qemu-devel] [PATCH v2 09/13] 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 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 bcfd36a..981dd0e 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -1194,7 +1194,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 34108ab..d9e5514 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 a5e57d6..9003737 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -372,7 +372,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 a43f3fa..f13bbe1 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -834,7 +834,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 6938c09..b362eb7 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -246,7 +246,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 7aedc91..1aff68c 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,