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/
Home Products Support Community News


[Xen-ia64-devel] [PATCH] vmx_vioapic gcc-3.4 build fix

To: "Magenheimer, Dan (HP Labs Fort Collins)" <dan.magenheimer@xxxxxx>
Subject: [Xen-ia64-devel] [PATCH] vmx_vioapic gcc-3.4 build fix
From: Alex Williamson <alex.williamson@xxxxxx>
Date: Thu, 17 Nov 2005 16:58:26 -0700
Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
Delivery-date: Thu, 17 Nov 2005 23:56:43 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-ia64-devel-request@lists.xensource.com?subject=help>
List-id: Discussion of the ia64 port of Xen <xen-ia64-devel.lists.xensource.com>
List-post: <mailto:xen-ia64-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx
   I need either one (not both) of the patch below to make current
xen-ia64-unstable.hg build w/ gcc-3.4.  Option 1 is cleaner, but mucks
with code we're not otherwise touching for ia64.  Option 2 is the
compact but uglier fix.  Take your pick ;^)  Thanks,  


Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>

##### Option 1

diff -r ec2ab25dacee xen/arch/x86/vmx_vlapic.c
--- a/xen/arch/x86/vmx_vlapic.c Thu Nov 17 16:32:22 2005
+++ b/xen/arch/x86/vmx_vlapic.c Thu Nov 17 16:51:08 2005
@@ -309,7 +309,6 @@
     if (test_and_clear_bit(vector, &vlapic->tmr[0])) {
-        extern void ioapic_update_EOI(struct domain *d, int vector);
         ioapic_update_EOI(vlapic->domain, vector);
diff -r ec2ab25dacee xen/include/asm-x86/vmx_vioapic.h
--- a/xen/include/asm-x86/vmx_vioapic.h Thu Nov 17 16:32:22 2005
+++ b/xen/include/asm-x86/vmx_vioapic.h Thu Nov 17 16:51:08 2005
@@ -112,6 +112,7 @@
 void vmx_vioapic_set_irq(struct domain *d, int irq, int level);
 int vmx_vioapic_add_lapic(struct vlapic *vlapic, struct vcpu *v);
+void ioapic_update_EOI(struct domain *d, int vector);
 void ioapic_save(QEMUFile* f, void* opaque);

#### Option 2

diff -r ec2ab25dacee xen/arch/x86/dm/vmx_vioapic.c
--- a/xen/arch/x86/dm/vmx_vioapic.c     Thu Nov 17 16:32:22 2005
+++ b/xen/arch/x86/dm/vmx_vioapic.c     Thu Nov 17 16:34:00 2005
@@ -209,6 +209,10 @@
     } /* switch */
+#ifdef __ia64__
+void ioapic_update_EOI(struct domain *d, int vector);
 static void vmx_vioapic_write(struct vcpu *v,
                              unsigned long addr,
                              unsigned long length,

Xen-ia64-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>