WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Rename inj_msi -> inject_msi

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Rename inj_msi -> inject_msi
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Thu, 16 Jun 2011 11:11:55 +0100
Delivery-date: Thu, 16 Jun 2011 03:18:37 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1306418669 -3600
# Node ID 9672195337ae7248353aaaeadd0e8d4304c2fd8e
# Parent  a7383a7a00006a6983fc3b9587363ffc7c53e156
Rename inj_msi -> inject_msi

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r a7383a7a0000 -r 9672195337ae tools/libxc/xc_misc.c
--- a/tools/libxc/xc_misc.c     Thu May 26 15:01:17 2011 +0100
+++ b/tools/libxc/xc_misc.c     Thu May 26 15:04:29 2011 +0100
@@ -421,18 +421,18 @@
     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 -r a7383a7a0000 -r 9672195337ae xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Thu May 26 15:01:17 2011 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Thu May 26 15:04:29 2011 +0100
@@ -3285,10 +3285,10 @@
     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 @@
     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 @@
             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 -r a7383a7a0000 -r 9672195337ae xen/arch/x86/hvm/irq.c
--- a/xen/arch/x86/hvm/irq.c    Thu May 26 15:01:17 2011 +0100
+++ b/xen/arch/x86/hvm/irq.c    Thu May 26 15:04:29 2011 +0100
@@ -260,7 +260,7 @@
             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 -r a7383a7a0000 -r 9672195337ae xen/include/public/hvm/hvm_op.h
--- a/xen/include/public/hvm/hvm_op.h   Thu May 26 15:01:17 2011 +0100
+++ b/xen/include/public/hvm/hvm_op.h   Thu May 26 15:04:29 2011 +0100
@@ -244,8 +244,8 @@
 #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 @@
     /* 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 -r a7383a7a0000 -r 9672195337ae xen/include/xen/hvm/irq.h
--- a/xen/include/xen/hvm/irq.h Thu May 26 15:01:17 2011 +0100
+++ b/xen/include/xen/hvm/irq.h Thu May 26 15:04:29 2011 +0100
@@ -116,7 +116,7 @@
 
 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 -r a7383a7a0000 -r 9672195337ae xen/include/xsm/xsm.h
--- a/xen/include/xsm/xsm.h     Thu May 26 15:01:17 2011 +0100
+++ b/xen/include/xsm/xsm.h     Thu May 26 15:04:29 2011 +0100
@@ -123,7 +123,7 @@
     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 @@
     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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Rename inj_msi -> inject_msi, Xen patchbot-unstable <=