[Xen-changelog] Undo misapplied search replace.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 3627061dcc9af8622bd7f63086d9d673cd3d8624
# Parent  94b10faa7577ed73cea698a3cc723e9e75404172
Undo misapplied search replace.

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

diff -r 94b10faa7577 -r 3627061dcc9a xen/arch/x86/hvm/vioapic.c
--- a/xen/arch/x86/hvm/vioapic.c        Wed Mar  8 14:02:43 2006
+++ b/xen/arch/x86/hvm/vioapic.c        Wed Mar  8 14:35:14 2006
@@ -52,7 +52,7 @@
         s->flags &= ~IOAPIC_ENABLE_FLAG;
 }
 
-#ifdef hvm_guest_SAVE_RESTORE
+#ifdef HVM_DOMAIN_SAVE_RESTORE
 void ioapic_save(QEMUFile* f, void* opaque)
 {
     printk("no implementation for ioapic_save\n");
diff -r 94b10faa7577 -r 3627061dcc9a xen/include/asm-x86/hvm/domain.h
--- a/xen/include/asm-x86/hvm/domain.h  Wed Mar  8 14:02:43 2006
+++ b/xen/include/asm-x86/hvm/domain.h  Wed Mar  8 14:35:14 2006
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __ASM_X86_hvm_guest_H__
-#define __ASM_X86_hvm_guest_H__
+#ifndef __ASM_X86_HVM_DOMAIN_H__
+#define __ASM_X86_HVM_DOMAIN_H__
 
 #include <asm/e820.h>
 #include <asm/hvm/vpic.h>
@@ -49,5 +49,5 @@
     char                   pbuf[HVM_PBUF_SIZE];
 };
 
-#endif /* __ASM_X86_hvm_guest_H__ */
+#endif /* __ASM_X86_HVM_DOMAIN_H__ */
 
diff -r 94b10faa7577 -r 3627061dcc9a xen/include/asm-x86/hvm/vioapic.h
--- a/xen/include/asm-x86/hvm/vioapic.h Wed Mar  8 14:02:43 2006
+++ b/xen/include/asm-x86/hvm/vioapic.h Wed Mar  8 14:35:14 2006
@@ -116,7 +116,7 @@
 
 void ioapic_update_EOI(struct domain *d, int vector);
 
-#ifdef hvm_guest_SAVE_RESTORE
+#ifdef HVM_DOMAIN_SAVE_RESTORE
 void ioapic_save(QEMUFile* f, void* opaque);
 int ioapic_load(QEMUFile* f, void* opaque, int version_id);
 #endif

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