1.1 --- a/xen/include/public/arch-ia64/hvm/save.h	Tue Nov 20 09:21:27 2007 -0700
     1.2 +++ b/xen/include/public/arch-ia64/hvm/save.h	Tue Nov 20 09:28:15 2007 -0700
     1.3 @@ -74,13 +74,15 @@ struct hvm_hw_ia64_vlsapic {
     1.4      uint8_t pad[2];
     1.5  };
     1.6  DECLARE_HVM_SAVE_TYPE(VLSAPIC, 4, struct hvm_hw_ia64_vlsapic);
     1.7 -// unconditionaly set v->arch.irq_new_peding = 1 
     1.8 -// unconditionaly set v->arch.irq_new_condition = 0
     1.9 +/* set
    1.10 + * unconditionaly set v->arch.irq_new_peding = 1 
    1.11 + * unconditionaly set v->arch.irq_new_condition = 0
    1.12 + */
    1.13  
    1.14  /*
    1.15   * vtime
    1.16   */
    1.17 -// itc, itm, itv are saved by arch vcpu context
    1.18 +/* itc, itm, itv are saved by arch vcpu context */
    1.19  struct hvm_hw_ia64_vtime {
    1.20      uint64_t itc;
    1.21      uint64_t itm;
    1.22 @@ -89,13 +91,15 @@ struct hvm_hw_ia64_vtime {
    1.23      uint64_t pending;
    1.24  };
    1.25  DECLARE_HVM_SAVE_TYPE(VTIME, 5, struct hvm_hw_ia64_vtime);
    1.26 -// calculate v->vtm.vtm_offset
    1.27 -// ??? Or should vtm_offset be set by leave_hypervisor_tail()?
    1.28 -// start vtm_timer if necessary by vtm_set_itm().
    1.29 -// ??? Or should vtm_timer be set by leave_hypervisor_tail()?
    1.30 -//
    1.31 -// ??? or should be done by schedule_tail()
    1.32 -//        => schedule_tail() should do.
    1.33 +/*
    1.34 + * calculate v->vtm.vtm_offset
    1.35 + * ??? Or should vtm_offset be set by leave_hypervisor_tail()?
    1.36 + * start vtm_timer if necessary by vtm_set_itm().
    1.37 + * ??? Or should vtm_timer be set by leave_hypervisor_tail()?
    1.38 + *
    1.39 + * ??? or should be done by schedule_tail()
    1.40 + *        => schedule_tail() should do.
    1.41 + */
    1.42  
    1.43  /*
    1.44   * viosapic
    1.45 @@ -138,30 +142,22 @@ DECLARE_HVM_SAVE_TYPE(VIOSAPIC, 6, struc
    1.46   * vacpi
    1.47   * PM timer
    1.48   */
    1.49 -#if 0
    1.50 -struct hvm_hw_ia64_pmtimer {
    1.51 +struct vacpi_regs {
    1.52 +    union {
    1.53 +        struct {
    1.54 +            uint32_t pm1a_sts:16;/* PM1a_EVT_BLK.PM1a_STS: status register */
    1.55 +            uint32_t pm1a_en:16; /* PM1a_EVT_BLK.PM1a_EN: enable register */
    1.56 +        };
    1.57 +        uint32_t evt_blk;
    1.58 +    };
    1.59      uint32_t tmr_val;   /* PM_TMR_BLK.TMR_VAL: 32bit free-running counter */
    1.60 -    uint16_t pm1a_sts;  /* PM1a_EVT_BLK.PM1a_STS: status register */
    1.61 -    uint16_t pm1a_en;   /* PM1a_EVT_BLK.PM1a_EN: enable register */
    1.62 -};
    1.63 -DECLARE_HVM_SAVE_TYPE(PMTIMER, 7, struct hvm_hw_ia64_pmtimer);
    1.64 -#else
    1.65 -struct vacpi_regs {
    1.66 -	union {
    1.67 -		struct {
    1.68 -			uint32_t pm1a_sts:16;
    1.69 -			uint32_t pm1a_en:16;
    1.70 -		};
    1.71 -		uint32_t evt_blk;
    1.72 -	};
    1.73 -	uint32_t tmr_val;
    1.74  };
    1.75  
    1.76  struct hvm_hw_ia64_vacpi {
    1.77      struct vacpi_regs   regs;
    1.78  };
    1.79  DECLARE_HVM_SAVE_TYPE(VACPI, 7, struct hvm_hw_ia64_vacpi);
    1.80 -// update last_gtime and setup timer of struct vacpi
    1.81 +/* update last_gtime and setup timer of struct vacpi */
    1.82  
    1.83  /*
    1.84   * opt_feature: identity mapping of region 4, 5 and 7.