Rename inj_msi -> inject_msi

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index a99aebb8ad3d362bc901f1142a554348547b74d2..a029d791ba3d310e58878bedd247c9274a4490ab 100644 (file)
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -421,18 +421,18 @@ int xc_hvm_inject_msi(
     xc_interface *xch, domid_t dom, uint64_t addr, uint32_t data)
 {
     DECLARE_HYPERCALL;
-    DECLARE_HYPERCALL_BUFFER(struct xen_hvm_inj_msi, arg);
+    DECLARE_HYPERCALL_BUFFER(struct xen_hvm_inject_msi, arg);
     int rc;
 
     arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg));
     if ( arg == NULL )
     {
-        PERROR("Could not allocate memory for xc_hvm_inj_msi hypercall");
+        PERROR("Could not allocate memory for xc_hvm_inject_msi hypercall");
         return -1;
     }
 
     hypercall.op     = __HYPERVISOR_hvm_op;
-    hypercall.arg[0] = HVMOP_inj_msi;
+    hypercall.arg[0] = HVMOP_inject_msi;
     hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg);
 
     arg->domid = dom;

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 9b92fc01863af2ef8e3a697019d73615640339be..210a6dfe4c7089ff436acbc3e2359c5b655e064a 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -3285,10 +3285,10 @@ static int hvmop_set_pci_link_route(
     return rc;
 }
 
-static int hvmop_inj_msi(
-    XEN_GUEST_HANDLE(xen_hvm_inj_msi_t) uop)
+static int hvmop_inject_msi(
+    XEN_GUEST_HANDLE(xen_hvm_inject_msi_t) uop)
 {
-    struct xen_hvm_inj_msi op;
+    struct xen_hvm_inject_msi op;
     struct domain *d;
     int rc;
 
@@ -3303,12 +3303,11 @@ static int hvmop_inj_msi(
     if ( !is_hvm_domain(d) )
         goto out;
 
-    rc = xsm_hvm_inj_msi(d);
+    rc = xsm_hvm_inject_msi(d);
     if ( rc )
         goto out;
 
-    rc = 0;
-    hvm_inj_msi(d, op.addr, op.data);
+    hvm_inject_msi(d, op.addr, op.data);
 
  out:
     rcu_unlock_domain(d);
@@ -3593,9 +3592,9 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
             guest_handle_cast(arg, xen_hvm_set_isa_irq_level_t));
         break;
 
-    case HVMOP_inj_msi:
-        rc = hvmop_inj_msi(
-            guest_handle_cast(arg, xen_hvm_inj_msi_t));
+    case HVMOP_inject_msi:
+        rc = hvmop_inject_msi(
+            guest_handle_cast(arg, xen_hvm_inject_msi_t));
         break;
 
     case HVMOP_set_pci_link_route:

diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index f6f2613e218fcc46d00c9d5aa01903e842ded3d3..67ecbeaafb1114577a412aaf53cdbb89c2eaeb98 100644 (file)
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -260,7 +260,7 @@ void hvm_set_pci_link_route(struct domain *d, u8 link, u8 isa_irq)
             d->domain_id, link, old_isa_irq, isa_irq);
 }
 
-void hvm_inj_msi(struct domain *d, uint64_t addr, uint32_t data)
+void hvm_inject_msi(struct domain *d, uint64_t addr, uint32_t data)
 {
     uint32_t tmp = (uint32_t) addr;
     uint8_t  dest = (tmp & MSI_ADDR_DEST_ID_MASK) >> MSI_ADDR_DEST_ID_SHIFT;

diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h
index afe82789f6187a04ae666a66b690a7acff08e3dd..1689cd22d69ed62a5e1d5542592b59afd0855e63 100644 (file)
--- a/xen/include/public/hvm/hvm_op.h
+++ b/xen/include/public/hvm/hvm_op.h
@@ -244,8 +244,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_get_mem_type_t);
 #if defined(__XEN__) || defined(__XEN_TOOLS__)
 
 /* MSI injection for emulated devices */
-#define HVMOP_inj_msi         16
-struct xen_hvm_inj_msi {
+#define HVMOP_inject_msi         16
+struct xen_hvm_inject_msi {
     /* Domain to be injected */
     domid_t   domid;
     /* Data -- lower 32 bits */
@@ -253,8 +253,8 @@ struct xen_hvm_inj_msi {
     /* Address (0xfeexxxxx) */
     uint64_t  addr;
 };
-typedef struct xen_hvm_inj_msi xen_hvm_inj_msi_t;
-DEFINE_XEN_GUEST_HANDLE(xen_hvm_inj_msi_t);
+typedef struct xen_hvm_inject_msi xen_hvm_inject_msi_t;
+DEFINE_XEN_GUEST_HANDLE(xen_hvm_inject_msi_t);
 
 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
 

diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h
index 3ef46b03cc1a4d073010f2b5bec704cb141bbb85..e20cdcf1a8471c35478e4000b4917f617e1123ae 100644 (file)
--- a/xen/include/xen/hvm/irq.h
+++ b/xen/include/xen/hvm/irq.h
@@ -116,7 +116,7 @@ void hvm_isa_irq_deassert(
 
 void hvm_set_pci_link_route(struct domain *d, u8 link, u8 isa_irq);
 
-void hvm_inj_msi(struct domain *d, uint64_t addr, uint32_t data);
+void hvm_inject_msi(struct domain *d, uint64_t addr, uint32_t data);
 
 void hvm_maybe_deassert_evtchn_irq(void);
 void hvm_assert_evtchn_irq(struct vcpu *v);

diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index e6587574c616f1707f23d4d97e9c84379439656b..b0b798f388067e56f16190196f3d7c39d45171c9 100644 (file)
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -123,7 +123,7 @@ struct xsm_operations {
     int (*hvm_set_pci_intx_level) (struct domain *d);
     int (*hvm_set_isa_irq_level) (struct domain *d);
     int (*hvm_set_pci_link_route) (struct domain *d);
-    int (*hvm_inj_msi) (struct domain *d);
+    int (*hvm_inject_msi) (struct domain *d);
     int (*apic) (struct domain *d, int cmd);
     int (*assign_vector) (struct domain *d, uint32_t pirq);
     int (*xen_settime) (void);
@@ -508,9 +508,9 @@ static inline int xsm_hvm_set_pci_link_route (struct domain *d)
     return xsm_call(hvm_set_pci_link_route(d));
 }
 
-static inline int xsm_hvm_inj_msi (struct domain *d)
+static inline int xsm_hvm_inject_msi (struct domain *d)
 {
-    return xsm_call(hvm_inj_msi(d));
+    return xsm_call(hvm_inject_msi(d));
 }
 
 static inline int xsm_apic (struct domain *d, int cmd)