diff -r 20204db0891b tools/libxc/xc_hvm_build.c
--- a/tools/libxc/xc_hvm_build.c	Thu Nov 02 18:52:04 2006 +0000
+++ b/tools/libxc/xc_hvm_build.c	Fri Nov 03 11:55:20 2006 +0800
@@ -337,7 +337,6 @@ static int xc_hvm_build_internal(int xc_
     }
 
     memset(ctxt, 0, sizeof(*ctxt));
-    ctxt->flags = VGCF_HVM_GUEST;
 
     if ( setup_guest(xc_handle, domid, memsize, image, image_size,
                      ctxt, domctl.u.getdomaininfo.shared_info_frame,
diff -r 20204db0891b xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c	Thu Nov 02 18:52:04 2006 +0000
+++ b/xen/arch/x86/domain.c	Fri Nov 03 11:55:20 2006 +0800
@@ -284,10 +284,6 @@ int arch_set_info_guest(
     unsigned long cr3_pfn = INVALID_MFN;
     int i, rc;
 
-    if ( !!(c->flags & VGCF_hvm_guest) != is_hvm_vcpu(v) )
-        return -EINVAL;
-    c->flags &= ~VGCF_hvm_guest;
-
     if ( !is_hvm_vcpu(v) )
     {
         fixup_guest_stack_selector(c->user_regs.ss);
diff -r 20204db0891b xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c	Thu Nov 02 18:52:04 2006 +0000
+++ b/xen/arch/x86/hvm/hvm.c	Fri Nov 03 11:55:20 2006 +0800
@@ -510,7 +510,7 @@ int hvm_bringup_ap(int vcpuid, int tramp
 
     if ( (ctxt = xmalloc(struct vcpu_guest_context)) == NULL )
     {
-        gdprintk(XENLOG_INFO,
+        gdprintk(XENLOG_ERR,
                 "Failed to allocate memory in hvm_bringup_ap.\n");
         return -ENOMEM;
     }
@@ -525,7 +525,7 @@ int hvm_bringup_ap(int vcpuid, int tramp
 
     if ( rc != 0 )
     {
-        gdprintk(XENLOG_INFO,
+        gdprintk(XENLOG_ERR,
                "AP %d bringup failed in boot_vcpu %x.\n", vcpuid, rc);
         goto out;
     }