diff mbox

[2/5] xen: drop xen_xc_hvm_inject_msi wrapper

Message ID 1455034636-27829-2-git-send-email-ian.campbell@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Campbell Feb. 9, 2016, 4:17 p.m. UTC
The xc version is now always present.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 include/hw/xen/xen_common.h | 6 ------
 xen-hvm.c                   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

Comments

Stefano Stabellini Feb. 9, 2016, 4:54 p.m. UTC | #1
On Tue, 9 Feb 2016, Ian Campbell wrote:
> The xc version is now always present.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>


>  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
>
diff mbox

Patch

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)