1.1 --- a/xen/arch/x86/hvm/vioapic.c	Wed Mar 08 15:02:43 2006 +0100
     1.2 +++ b/xen/arch/x86/hvm/vioapic.c	Wed Mar 08 15:35:14 2006 +0100
     1.3 @@ -52,7 +52,7 @@ static void ioapic_enable(hvm_vioapic_t 
     1.4          s->flags &= ~IOAPIC_ENABLE_FLAG;
     1.5  }
     1.6  
     1.7 -#ifdef hvm_guest_SAVE_RESTORE
     1.8 +#ifdef HVM_DOMAIN_SAVE_RESTORE
     1.9  void ioapic_save(QEMUFile* f, void* opaque)
    1.10  {
    1.11      printk("no implementation for ioapic_save\n");

     2.1 --- a/xen/include/asm-x86/hvm/domain.h	Wed Mar 08 15:02:43 2006 +0100
     2.2 +++ b/xen/include/asm-x86/hvm/domain.h	Wed Mar 08 15:35:14 2006 +0100
     2.3 @@ -19,8 +19,8 @@
     2.4   *
     2.5   */
     2.6  
     2.7 -#ifndef __ASM_X86_hvm_guest_H__
     2.8 -#define __ASM_X86_hvm_guest_H__
     2.9 +#ifndef __ASM_X86_HVM_DOMAIN_H__
    2.10 +#define __ASM_X86_HVM_DOMAIN_H__
    2.11  
    2.12  #include <asm/e820.h>
    2.13  #include <asm/hvm/vpic.h>
    2.14 @@ -49,5 +49,5 @@ struct hvm_domain {
    2.15      char                   pbuf[HVM_PBUF_SIZE];
    2.16  };
    2.17  
    2.18 -#endif /* __ASM_X86_hvm_guest_H__ */
    2.19 +#endif /* __ASM_X86_HVM_DOMAIN_H__ */
    2.20  

     3.1 --- a/xen/include/asm-x86/hvm/vioapic.h	Wed Mar 08 15:02:43 2006 +0100
     3.2 +++ b/xen/include/asm-x86/hvm/vioapic.h	Wed Mar 08 15:35:14 2006 +0100
     3.3 @@ -116,7 +116,7 @@ int hvm_vioapic_add_lapic(struct vlapic 
     3.4  
     3.5  void ioapic_update_EOI(struct domain *d, int vector);
     3.6  
     3.7 -#ifdef hvm_guest_SAVE_RESTORE
     3.8 +#ifdef HVM_DOMAIN_SAVE_RESTORE
     3.9  void ioapic_save(QEMUFile* f, void* opaque);
    3.10  int ioapic_load(QEMUFile* f, void* opaque, int version_id);
    3.11  #endif