From patchwork Thu Oct 13 06:01:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Condrea X-Patchwork-Id: 9374421 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 56DD7607FD for ; Thu, 13 Oct 2016 06:14:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4255B2983F for ; Thu, 13 Oct 2016 06:14:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 371552985B; Thu, 13 Oct 2016 06:14:55 +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 C1E592983F for ; Thu, 13 Oct 2016 06:14:54 +0000 (UTC) Received: from localhost ([::1]:37829 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZI5-0001dB-Oh for patchwork-qemu-devel@patchwork.kernel.org; Thu, 13 Oct 2016 02:14:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZ66-0000Bz-6A for qemu-devel@nongnu.org; Thu, 13 Oct 2016 02:02:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buZ64-0000YN-3E for qemu-devel@nongnu.org; Thu, 13 Oct 2016 02:02:29 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:34872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZ63-0000YE-S1 for qemu-devel@nongnu.org; Thu, 13 Oct 2016 02:02:28 -0400 Received: by mail-lf0-x243.google.com with SMTP id x79so10791161lff.2 for ; Wed, 12 Oct 2016 23:02:27 -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=FcSHU2pWqijUdSlKN8pof+X4mA1uwUOlqygihT16GGE=; b=b5P7CLLIKEAd4dLcZz+qHXfGJvSjjdPT4O++AxSU9/H+KsiGeU0qTC6hnsqvesTBIE uaCnCyvIT6nz4J4/r2uxqf3Jq7fJgjPESiwzgmG772KqZIoEdrUuNQn6+Cha0lClTEdo cZYsFpGKp8AVO5V2TZCImMcIW86hoQVmLS9Gl6L49Adog+BEki7M40/ePkOtcdsO6Io6 NfLDVp+0hGakir+CDLs7IR34gHE+X4pkwGNDinLr6Js5eORtDWswffA/fgCTUJyiEHrS Ta2kS4de21I5O7iJvIc50bIb3vkwZtxfqP0Ek1Uklm70vG8aj8lY+Xh5OBCR8HzEgaD0 Y/BQ== 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=FcSHU2pWqijUdSlKN8pof+X4mA1uwUOlqygihT16GGE=; b=WxcB0G0wVJnS9H8ilEiW4qaysvigKqrIlbucgDlY9QcYuGrxF04FT6/J/kmopc2aj3 G1x22P3pkXAHKYkg2hozcTYJYasK9a1UwMdS9Yltl98Fc77fNvotV0w2ekz/itpofjFB RBNwblpucqVBXcuF/cf+UL6zxuuEQ0ug1JBiTd5kZlzkyUOBrbs0ohbLN+l3PIqONNa9 pVRPDlK3gQd3NDjmNX7cm4aQFwZDHA2ns2uGFWbSaTkiMHcLgXyAoWF/H8CWorreQb+R mF6wMvk3gEhEDlnr9zkHJnECiVYDWEZA713R1Lsz1EJUVgh21dQEHJp102Ny3cweF+cw 757Q== X-Gm-Message-State: AA6/9Rn7kPV1r7xZ17eHdnGVu7kE4SqZavVzwAn1q84BTnlZEgAA+AtZ18WBgYGxJYjYAA== X-Received: by 10.28.232.23 with SMTP id f23mr726930wmh.125.1476338547054; Wed, 12 Oct 2016 23:02:27 -0700 (PDT) Received: from localhost.localdomain ([79.112.35.35]) by smtp.gmail.com with ESMTPSA id rv12sm19588230wjb.29.2016.10.12.23.02.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Oct 2016 23:02:26 -0700 (PDT) From: Emil Condrea To: qemu-devel@nongnu.org Date: Thu, 13 Oct 2016 09:01:53 +0300 Message-Id: <1476338514-14492-13-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::243 Subject: [Qemu-devel] [PATCH v2 12/13] xen: Rename xen_be_find_xendev 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_find_xendev to be shared with frontends: * xen_be_find_xendev -> xen_pv_find_xendev Signed-off-by: Emil Condrea Acked-by: Anthony PERARD Reviewed-by: Quan Xu --- hw/display/xenfb.c | 4 ++-- hw/xen/xen_backend.c | 2 +- hw/xen/xen_pvdev.c | 2 +- include/hw/xen/xen_pvdev.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 7d26bdb..15aa088 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -988,8 +988,8 @@ void xen_init_display(int domid) wait_more: i++; main_loop_wait(true); - xfb = xen_be_find_xendev("vfb", domid, 0); - xin = xen_be_find_xendev("vkbd", domid, 0); + xfb = xen_pv_find_xendev("vfb", domid, 0); + xin = xen_pv_find_xendev("vkbd", domid, 0); if (!xfb || !xin) { if (i < 256) { usleep(10000); diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index f594dba..98fcb77 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -114,7 +114,7 @@ static struct XenDevice *xen_be_get_xendev(const char *type, int dom, int dev, { struct XenDevice *xendev; - xendev = xen_be_find_xendev(type, dom, dev); + xendev = xen_pv_find_xendev(type, dom, dev); if (xendev) { return xendev; } diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 28acf61..af29150 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -264,7 +264,7 @@ int xen_pv_send_notify(struct XenDevice *xendev) /* ------------------------------------------------------------- */ -struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev) +struct XenDevice *xen_pv_find_xendev(const char *type, int dom, int dev) { struct XenDevice *xendev; diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h index caf1edc..4b1cc60 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -67,7 +67,7 @@ const char *xenbus_strstate(enum xenbus_state state); void xen_pv_evtchn_event(void *opaque); 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); +struct XenDevice *xen_pv_find_xendev(const char *type, int dom, int dev); void xen_pv_unbind_evtchn(struct XenDevice *xendev); int xen_pv_send_notify(struct XenDevice *xendev);