hvm: Clean out save/restore debug tracing.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

1 files changed, 4 insertions, 52 deletions

diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c
index 01c78f7799..3cfd9dd47e 100644
--- a/xen/arch/x86/hvm/i8254.c
+++ b/xen/arch/x86/hvm/i8254.c
@@ -401,50 +401,6 @@ void pit_stop_channel0_irq(PITState *pit)
     spin_unlock(&pit->lock);
 }
 
-#ifdef HVM_DEBUG_SUSPEND
-static void pit_info(PITState *pit)
-{
-    struct hvm_hw_pit_channel *s;
-    struct periodic_time *pt;
-    int i;
-
-    for ( i = 0; i < 3; i++ )
-    {
-        printk("*****pit channel %d's state:*****\n", i);
-        s = &pit->hw.channels[i];
-        printk("pit 0x%x.\n", s->count);
-        printk("pit 0x%x.\n", s->latched_count);
-        printk("pit 0x%x.\n", s->count_latched);
-        printk("pit 0x%x.\n", s->status_latched);
-        printk("pit 0x%x.\n", s->status);
-        printk("pit 0x%x.\n", s->read_state);
-        printk("pit 0x%x.\n", s->write_state);
-        printk("pit 0x%x.\n", s->write_latch);
-        printk("pit 0x%x.\n", s->rw_mode);
-        printk("pit 0x%x.\n", s->mode);
-        printk("pit 0x%x.\n", s->bcd);
-        printk("pit 0x%x.\n", s->gate);
-        printk("pit %"PRId64"\n", pit->count_load_time[i]);
-
-    }
-
-    pt = &pit->pt0;
-    printk("pit channel 0 periodic timer:\n", i);
-    printk("pt %d.\n", pt->enabled);
-    printk("pt %d.\n", pt->one_shot);
-    printk("pt %d.\n", pt->irq);
-    printk("pt %d.\n", pt->first_injected);
-    printk("pt %d.\n", pt->pending_intr_nr);
-    printk("pt %d.\n", pt->period);
-    printk("pt %"PRId64"\n", pt->period_cycles);
-    printk("pt %"PRId64"\n", pt->last_plt_gtime);
-}
-#else
-static void pit_info(PITState *pit)
-{
-}
-#endif
-
 static int pit_save(struct domain *d, hvm_domain_context_t *h)
 {
     PITState *pit = domain_vpit(d);
@@ -452,9 +408,6 @@ static int pit_save(struct domain *d, hvm_domain_context_t *h)
 
     spin_lock(&pit->lock);
     
-    pit_info(pit);
-
-    /* Save the PIT hardware state */
     rc = hvm_save_entry(PIT, 0, h, &pit->hw);
 
     spin_unlock(&pit->lock);
@@ -469,22 +422,21 @@ static int pit_load(struct domain *d, hvm_domain_context_t *h)
 
     spin_lock(&pit->lock);
 
-    /* Restore the PIT hardware state */
     if ( hvm_load_entry(PIT, h, &pit->hw) )
     {
         spin_unlock(&pit->lock);
         return 1;
     }
     
-    /* Recreate platform timers from hardware state.  There will be some 
+    /*
+     * Recreate platform timers from hardware state.  There will be some 
      * time jitter here, but the wall-clock will have jumped massively, so 
-     * we hope the guest can handle it. */
+     * we hope the guest can handle it.
+     */
     pit->pt0.last_plt_gtime = hvm_get_guest_time(d->vcpu[0]);
     for ( i = 0; i < 3; i++ )
         pit_load_count(pit, i, pit->hw.channels[i].count);
 
-    pit_info(pit);
-
     spin_unlock(&pit->lock);
 
     return 0;