[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH] x86: rename MSI option



.. and at once rename the variable and move its declaration to a header.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: 2008-07-21/xen/arch/x86/io_apic.c
===================================================================
--- 2008-07-21.orig/xen/arch/x86/io_apic.c      2008-05-07 12:21:36.000000000 
+0200
+++ 2008-07-21/xen/arch/x86/io_apic.c   2008-07-24 09:41:38.000000000 +0200
@@ -45,12 +45,12 @@
 int (*ioapic_renumber_irq)(int ioapic, int irq);
 atomic_t irq_mis_count;
 
-int msi_irq_enable = 0;
-boolean_param("msi_irq_enable", msi_irq_enable);
+int msi_enable = 0;
+boolean_param("msi", msi_enable);
 
 int domain_irq_to_vector(struct domain *d, int irq)
 {
-    if ( !msi_irq_enable )
+    if ( !msi_enable )
         return irq_to_vector(irq);
     else
         return d->arch.pirq_vector[irq];
@@ -58,7 +58,7 @@ int domain_irq_to_vector(struct domain *
 
 int domain_vector_to_irq(struct domain *d, int vector)
 {
-    if ( !msi_irq_enable )
+    if ( !msi_enable )
         return vector_to_irq(vector);
     else
         return d->arch.vector_pirq[vector];
Index: 2008-07-21/xen/arch/x86/msi.c
===================================================================
--- 2008-07-21.orig/xen/arch/x86/msi.c  2008-07-18 16:19:34.000000000 +0200
+++ 2008-07-21/xen/arch/x86/msi.c       2008-07-24 09:40:00.000000000 +0200
@@ -27,8 +27,6 @@
 #include <public/physdev.h>
 #include <xen/iommu.h>
 
-extern int msi_irq_enable;
-
 /* bitmap indicate which fixed map is free */
 DEFINE_SPINLOCK(msix_fixmap_lock);
 DECLARE_BITMAP(msix_fixmap_pages, MAX_MSIX_PAGES);
Index: 2008-07-21/xen/arch/x86/physdev.c
===================================================================
--- 2008-07-21.orig/xen/arch/x86/physdev.c      2008-07-18 16:19:34.000000000 
+0200
+++ 2008-07-21/xen/arch/x86/physdev.c   2008-07-24 09:41:15.000000000 +0200
@@ -184,15 +184,14 @@ static int unmap_domain_pirq(struct doma
     return ret;
 }
 
-extern int msi_irq_enable;
 static int physdev_map_pirq(struct physdev_map_pirq *map)
 {
     struct domain *d;
     int vector, pirq, ret = 0;
     unsigned long flags;
 
-    /* if msi_irq_enable is not enabled,map always success */
-    if ( !msi_irq_enable )
+    /* if msi_enable is not enabled, map always succeeds */
+    if ( !msi_enable )
         return 0;
 
     if ( !IS_PRIV(current->domain) )
@@ -304,7 +303,7 @@ static int physdev_unmap_pirq(struct phy
     unsigned long flags;
     int ret;
 
-    if ( !msi_irq_enable )
+    if ( !msi_enable )
         return 0;
 
     if ( !IS_PRIV(current->domain) )
@@ -455,7 +454,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_H
 
         ret = 0;
 
-        if ( msi_irq_enable )
+        if ( msi_enable )
         {
             spin_lock_irqsave(&dom0->arch.irq_lock, flags);
             if ( irq != AUTO_ASSIGN )
Index: 2008-07-21/xen/include/asm-x86/io_apic.h
===================================================================
--- 2008-07-21.orig/xen/include/asm-x86/io_apic.h       2008-07-18 
16:19:34.000000000 +0200
+++ 2008-07-21/xen/include/asm-x86/io_apic.h    2008-07-24 09:40:43.000000000 
+0200
@@ -160,6 +160,8 @@ static inline void io_apic_modify(unsign
 /* 1 if "noapic" boot option passed */
 extern int skip_ioapic_setup;
 
+extern int msi_enable;
+
 /*
  * If we use the IO-APIC for IRQ routing, disable automatic
  * assignment of PCI IRQ's.




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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.