ia64/xen-unstable

changeset 15690:0cf0feba58fb

[IA64] Remove more useless code

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
author Alex Williamson <alex.williamson@hp.com>
date Fri Aug 03 09:13:01 2007 -0600 (2007-08-03)
parents d83c9d87ede4
children 90c830835ec1
files xen/arch/ia64/vmx/mmio.c xen/arch/ia64/vmx/vmx_vcpu.c xen/include/asm-ia64/vmx_mm_def.h xen/include/asm-ia64/vmx_platform.h xen/include/asm-ia64/vmx_vcpu.h
line diff
     1.1 --- a/xen/arch/ia64/vmx/mmio.c	Wed Aug 01 16:40:30 2007 -0600
     1.2 +++ b/xen/arch/ia64/vmx/mmio.c	Fri Aug 03 09:13:01 2007 -0600
     1.3 @@ -270,11 +270,9 @@ static void legacy_io_access(VCPU *vcpu,
     1.4  
     1.5  static void mmio_access(VCPU *vcpu, u64 src_pa, u64 *dest, size_t s, int ma, int dir)
     1.6  {
     1.7 -    struct virtual_platform_def *v_plat;
     1.8      //mmio_type_t iot;
     1.9      unsigned long iot;
    1.10      iot=__gpfn_is_io(vcpu->domain, src_pa>>PAGE_SHIFT);
    1.11 -    v_plat = vmx_vcpu_get_plat(vcpu);
    1.12  
    1.13      perfc_incra(vmx_mmio_access, iot >> 56);
    1.14      switch (iot) {
     2.1 --- a/xen/arch/ia64/vmx/vmx_vcpu.c	Wed Aug 01 16:40:30 2007 -0600
     2.2 +++ b/xen/arch/ia64/vmx/vmx_vcpu.c	Fri Aug 03 09:13:01 2007 -0600
     2.3 @@ -151,12 +151,6 @@ IA64FAULT vmx_vcpu_cover(VCPU *vcpu)
     2.4      return (IA64_NO_FAULT);
     2.5  }
     2.6  
     2.7 -struct virtual_platform_def *
     2.8 -vmx_vcpu_get_plat(VCPU *vcpu)
     2.9 -{
    2.10 -    return &(vcpu->domain->arch.vmx_platform);
    2.11 -}
    2.12 -
    2.13  IA64FAULT vmx_vcpu_set_rr(VCPU *vcpu, u64 reg, u64 val)
    2.14  {
    2.15      ia64_rr oldrr,newrr;
     3.1 --- a/xen/include/asm-ia64/vmx_mm_def.h	Wed Aug 01 16:40:30 2007 -0600
     3.2 +++ b/xen/include/asm-ia64/vmx_mm_def.h	Fri Aug 03 09:13:01 2007 -0600
     3.3 @@ -120,22 +120,6 @@ typedef enum { INSTRUCTION, DATA, REGIST
     3.4  //typedef enum { MVHPT, STLB } vtlb_loc_type_t;
     3.5  typedef enum { DATA_REF, NA_REF, INST_REF, RSE_REF } vhpt_ref_t;
     3.6  
     3.7 -typedef enum {
     3.8 -	PIB_MMIO=0,
     3.9 -	VGA_BUFF,
    3.10 -	CHIPSET_IO,
    3.11 -	LOW_MMIO,
    3.12 -	LEGACY_IO,
    3.13 -	IO_SAPIC,
    3.14 -	NOT_IO
    3.15 -} mmio_type_t;
    3.16 -
    3.17 -typedef struct mmio_list {
    3.18 -	mmio_type_t  iot;
    3.19 -	u64		start;	// start address of this memory IO block
    3.20 -	u64		end;	// end address (include this one)
    3.21 -} mmio_list_t;
    3.22 -
    3.23  static __inline__ uint64_t
    3.24  bits_v(uint64_t v, uint32_t bs, uint32_t be)
    3.25  {
     4.1 --- a/xen/include/asm-ia64/vmx_platform.h	Wed Aug 01 16:40:30 2007 -0600
     4.2 +++ b/xen/include/asm-ia64/vmx_platform.h	Fri Aug 03 09:13:01 2007 -0600
     4.3 @@ -43,7 +43,6 @@
     4.4   * it is not used on ia64 */
     4.5  #define OS_TYPE_PORT    0xB2
     4.6  
     4.7 -struct mmio_list;
     4.8  typedef struct virtual_platform_def {
     4.9      unsigned long       gos_type;
    4.10      unsigned long       buffered_io_va;
    4.11 @@ -52,7 +51,6 @@ typedef struct virtual_platform_def {
    4.12      unsigned long       shared_page_va;
    4.13      unsigned long       pib_base;
    4.14      unsigned long       params[HVM_NR_PARAMS];
    4.15 -    struct mmio_list    *mmio;
    4.16      /* One IOSAPIC now... */
    4.17      struct viosapic     viosapic;
    4.18      struct vacpi        vacpi;
     5.1 --- a/xen/include/asm-ia64/vmx_vcpu.h	Wed Aug 01 16:40:30 2007 -0600
     5.2 +++ b/xen/include/asm-ia64/vmx_vcpu.h	Fri Aug 03 09:13:01 2007 -0600
     5.3 @@ -107,7 +107,6 @@ extern int is_unmasked_irq(VCPU * vcpu);
     5.4  extern uint64_t guest_read_vivr(VCPU * vcpu);
     5.5  extern void vmx_inject_vhpi(VCPU * vcpu, u8 vec);
     5.6  extern int vmx_vcpu_pend_interrupt(VCPU * vcpu, uint8_t vector);
     5.7 -extern struct virtual_platform_def *vmx_vcpu_get_plat(VCPU * vcpu);
     5.8  extern void memread_p(VCPU * vcpu, u64 * src, u64 * dest, size_t s);
     5.9  extern void memread_v(VCPU * vcpu, thash_data_t * vtlb, u64 * src, u64 * dest,
    5.10                        size_t s);