From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTAyh-0004Bl-C0 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 11:17:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTAye-0006a4-Bt for qemu-devel@nongnu.org; Tue, 09 Feb 2016 11:17:23 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:43785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTAye-0006Zu-7u for qemu-devel@nongnu.org; Tue, 09 Feb 2016 11:17:20 -0500 From: Ian Campbell Date: Tue, 9 Feb 2016 16:17:13 +0000 Message-ID: <1455034636-27829-2-git-send-email-ian.campbell@citrix.com> In-Reply-To: <1455034615.19857.96.camel@citrix.com> References: <1455034615.19857.96.camel@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 2/5] xen: drop xen_xc_hvm_inject_msi wrapper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefano.stabellini@eu.citrix.com, qemu-devel@nongnu.org Cc: Ian Campbell , xen-devel@lists.xen.org The xc version is now always present. Signed-off-by: Ian Campbell --- include/hw/xen/xen_common.h | 6 ------ xen-hvm.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 3a5b537..ec3ca56 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -83,12 +83,6 @@ static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger, } #endif -static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom, - uint64_t addr, uint32_t data) -{ - return xc_hvm_inject_msi(xen_xc, dom, addr, data); -} - void destroy_hvm_domain(bool reboot); /* shutdown/destroy current domain because of an error */ diff --git a/xen-hvm.c b/xen-hvm.c index 8350ca2..918cabc 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -169,7 +169,7 @@ int xen_is_pirq_msi(uint32_t msi_data) void xen_hvm_inject_msi(uint64_t addr, uint32_t data) { - xen_xc_hvm_inject_msi(xen_xc, xen_domid, addr, data); + xc_hvm_inject_msi(xen_xc, xen_domid, addr, data); } static void xen_suspend_notifier(Notifier *notifier, void *data) -- 2.1.4