# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1186153981 21600
# Node ID 0cf0feba58fb0edcc68eb4bbc97d41a67031bede
# Parent d83c9d87ede41918c1d17d67560aed9852bc41d3
[IA64] Remove more useless code
Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>
---
xen/arch/ia64/vmx/mmio.c | 2 --
xen/arch/ia64/vmx/vmx_vcpu.c | 6 ------
xen/include/asm-ia64/vmx_mm_def.h | 16 ----------------
xen/include/asm-ia64/vmx_platform.h | 2 --
xen/include/asm-ia64/vmx_vcpu.h | 1 -
5 files changed, 27 deletions(-)
diff -r d83c9d87ede4 -r 0cf0feba58fb xen/arch/ia64/vmx/mmio.c
--- a/xen/arch/ia64/vmx/mmio.c Wed Aug 01 16:40:30 2007 -0600
+++ b/xen/arch/ia64/vmx/mmio.c Fri Aug 03 09:13:01 2007 -0600
@@ -270,11 +270,9 @@ static void legacy_io_access(VCPU *vcpu,
static void mmio_access(VCPU *vcpu, u64 src_pa, u64 *dest, size_t s, int ma,
int dir)
{
- struct virtual_platform_def *v_plat;
//mmio_type_t iot;
unsigned long iot;
iot=__gpfn_is_io(vcpu->domain, src_pa>>PAGE_SHIFT);
- v_plat = vmx_vcpu_get_plat(vcpu);
perfc_incra(vmx_mmio_access, iot >> 56);
switch (iot) {
diff -r d83c9d87ede4 -r 0cf0feba58fb xen/arch/ia64/vmx/vmx_vcpu.c
--- a/xen/arch/ia64/vmx/vmx_vcpu.c Wed Aug 01 16:40:30 2007 -0600
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c Fri Aug 03 09:13:01 2007 -0600
@@ -151,12 +151,6 @@ IA64FAULT vmx_vcpu_cover(VCPU *vcpu)
return (IA64_NO_FAULT);
}
-struct virtual_platform_def *
-vmx_vcpu_get_plat(VCPU *vcpu)
-{
- return &(vcpu->domain->arch.vmx_platform);
-}
-
IA64FAULT vmx_vcpu_set_rr(VCPU *vcpu, u64 reg, u64 val)
{
ia64_rr oldrr,newrr;
diff -r d83c9d87ede4 -r 0cf0feba58fb xen/include/asm-ia64/vmx_mm_def.h
--- a/xen/include/asm-ia64/vmx_mm_def.h Wed Aug 01 16:40:30 2007 -0600
+++ b/xen/include/asm-ia64/vmx_mm_def.h Fri Aug 03 09:13:01 2007 -0600
@@ -120,22 +120,6 @@ typedef enum { INSTRUCTION, DATA, REGIST
//typedef enum { MVHPT, STLB } vtlb_loc_type_t;
typedef enum { DATA_REF, NA_REF, INST_REF, RSE_REF } vhpt_ref_t;
-typedef enum {
- PIB_MMIO=0,
- VGA_BUFF,
- CHIPSET_IO,
- LOW_MMIO,
- LEGACY_IO,
- IO_SAPIC,
- NOT_IO
-} mmio_type_t;
-
-typedef struct mmio_list {
- mmio_type_t iot;
- u64 start; // start address of this memory IO block
- u64 end; // end address (include this one)
-} mmio_list_t;
-
static __inline__ uint64_t
bits_v(uint64_t v, uint32_t bs, uint32_t be)
{
diff -r d83c9d87ede4 -r 0cf0feba58fb xen/include/asm-ia64/vmx_platform.h
--- a/xen/include/asm-ia64/vmx_platform.h Wed Aug 01 16:40:30 2007 -0600
+++ b/xen/include/asm-ia64/vmx_platform.h Fri Aug 03 09:13:01 2007 -0600
@@ -43,7 +43,6 @@
* it is not used on ia64 */
#define OS_TYPE_PORT 0xB2
-struct mmio_list;
typedef struct virtual_platform_def {
unsigned long gos_type;
unsigned long buffered_io_va;
@@ -52,7 +51,6 @@ typedef struct virtual_platform_def {
unsigned long shared_page_va;
unsigned long pib_base;
unsigned long params[HVM_NR_PARAMS];
- struct mmio_list *mmio;
/* One IOSAPIC now... */
struct viosapic viosapic;
struct vacpi vacpi;
diff -r d83c9d87ede4 -r 0cf0feba58fb xen/include/asm-ia64/vmx_vcpu.h
--- a/xen/include/asm-ia64/vmx_vcpu.h Wed Aug 01 16:40:30 2007 -0600
+++ b/xen/include/asm-ia64/vmx_vcpu.h Fri Aug 03 09:13:01 2007 -0600
@@ -107,7 +107,6 @@ extern uint64_t guest_read_vivr(VCPU * v
extern uint64_t guest_read_vivr(VCPU * vcpu);
extern void vmx_inject_vhpi(VCPU * vcpu, u8 vec);
extern int vmx_vcpu_pend_interrupt(VCPU * vcpu, uint8_t vector);
-extern struct virtual_platform_def *vmx_vcpu_get_plat(VCPU * vcpu);
extern void memread_p(VCPU * vcpu, u64 * src, u64 * dest, size_t s);
extern void memread_v(VCPU * vcpu, thash_data_t * vtlb, u64 * src, u64 * dest,
size_t s);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home