(no commit message)

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 9cfc82666ae5aef69f0d7966360f4e5f4899c89e..a98d2fa2c41cfaf127546ad54f242eb4b5482563 100644 (file)
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -265,13 +265,18 @@ static void vlapic_init_sipi_one(struct vcpu *target, uint32_t icr)
         bool fpu_initialised;
         int rc;
 
+        printk("%pv: received INIT\n", target);
+
         /* No work on INIT de-assert for P4-type APIC. */
         if ( (icr & (APIC_INT_LEVELTRIG | APIC_INT_ASSERT)) ==
              APIC_INT_LEVELTRIG )
             break;
         /* Nothing to do if the VCPU is already reset. */
         if ( !target->is_initialised )
+        {
+            printk("%pv: INIT - nothing to do, vCPU already reset\n", target);
             break;
+        }
         hvm_vcpu_down(target);
         domain_lock(target->domain);
         /* Reset necessary VCPU state. This does not include FPU state. */
@@ -281,11 +286,14 @@ static void vlapic_init_sipi_one(struct vcpu *target, uint32_t icr)
         target->fpu_initialised = fpu_initialised;
         vlapic_do_init(vcpu_vlapic(target));
         domain_unlock(target->domain);
+        printk("%pv: INIT - vCPU reset\n", target);
         break;
     }
 
     case APIC_DM_STARTUP: {
         uint16_t reset_cs = (icr & 0xffu) << 8;
+
+        printk("%pv: STARTUP cs: %#x\n", target, reset_cs);
         hvm_vcpu_reset_state(target, reset_cs, 0);
         break;
     }

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index f16faa6a615cb32ffc2be7c6db40517686c9c715..cbe91c67980714a61d05224a0ab8c11c8a817f6e 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -4136,7 +4136,8 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs)
         break;
 
     case EXIT_REASON_INIT:
-        printk(XENLOG_ERR "Error: INIT received - ignoring\n");
+        printk(XENLOG_ERR "CPU%u %pv Error: INIT received - ignoring\n",
+               smp_processor_id(), v);
         break;
     }