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

["Magenheimer, Dan (HP Labs Fort Collins)" <dan.magenheimer@xxxxxx>]

I think this patch was previously submitted by Akio Takebe
and accepted by Keir into xen-unstable, but has not yet
been merged into xen-ia64-unstable. 

> -----Original Message-----
> From: Nakajima, Jun [mailto:jun.nakajima@xxxxxxxxx] 
> Sent: Thursday, November 17, 2005 5:12 PM
> To: Williamson, Alex (Linux Kernel Dev); Magenheimer, Dan (HP 
> Labs Fort Collins)
> Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> Subject: RE: [Xen-ia64-devel] [PATCH] vmx_vioapic gcc-3.4 build fix
> 
> Alex Williamson wrote:
> >    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,
> > 
> >     Alex
> 
> Option 1 looks good to me, and we want to fix it. Please send it to
> xen-devel@xxxxxxxxxxxxxxxxxxxx
> 
> > 
> > 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 @@
> >      vlapic_update_ppr(vlapic);
> > 
> >      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);
> > 
> >  #ifdef VMX_DOMAIN_SAVE_RESTORE
> >  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);
> > +#endif
> > +
> >  static void vmx_vioapic_write(struct vcpu *v,
> >                               unsigned long addr,
> >                               unsigned long length,
> > 
> > 
> > 
> > _______________________________________________
> > Xen-ia64-devel mailing list
> > Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> > http://lists.xensource.com/xen-ia64-devel
> 
> 
> Jun
> ---
> Intel Open Source Technology Center
> 

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