ia64/xen-unstable

changeset 6749:4508c22dc458

Yes, that fixes the problem, our patches crossed. I saw Keir already
integrated my patch and while it is harmless, it is redundant and
here is the diff to take it out.

The patch also addresses some indent problems and aligns instructions
up with the rest of the block.

Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Sun Sep 11 16:36:24 2005 +0000 (2005-09-11)
parents 5721657e8130
children 3feb7fa331ed
files xen/arch/x86/vmx_io.c xen/arch/x86/vmx_platform.c
line diff
     1.1 --- a/xen/arch/x86/vmx_io.c	Sun Sep 11 16:34:38 2005 +0000
     1.2 +++ b/xen/arch/x86/vmx_io.c	Sun Sep 11 16:36:24 2005 +0000
     1.3 @@ -198,7 +198,6 @@ void load_cpu_user_regs(struct cpu_user_
     1.4  static inline void __set_reg_value(unsigned long *reg, int size, long value)
     1.5  {
     1.6      switch (size) {
     1.7 -        case BYTE:
     1.8          case BYTE_64:
     1.9              *reg &= ~0xFF;
    1.10              *reg |= (value & 0xFF);
     2.1 --- a/xen/arch/x86/vmx_platform.c	Sun Sep 11 16:34:38 2005 +0000
     2.2 +++ b/xen/arch/x86/vmx_platform.c	Sun Sep 11 16:36:24 2005 +0000
     2.3 @@ -55,7 +55,6 @@ void store_cpu_user_regs(struct cpu_user
     2.4  static inline long __get_reg_value(unsigned long reg, int size)
     2.5  {
     2.6      switch(size) {
     2.7 -        case BYTE:
     2.8          case BYTE_64:
     2.9              return (char)(reg & 0xFF);
    2.10          case WORD:
    2.11 @@ -90,10 +89,11 @@ long get_reg_value(int size, int index, 
    2.12                  return (char)((regs->rdx & 0xFF00) >> 8);
    2.13  	case 7: /* %bh */
    2.14                  return (char)((regs->rbx & 0xFF00) >> 8);
    2.15 -            default:
    2.16 +	default:
    2.17  	    printf("Error: (get_reg_value) Invalid index value\n"); 
    2.18 -                domain_crash_synchronous();
    2.19 +	    domain_crash_synchronous();
    2.20          }
    2.21 +    	/* NOTREACHED */
    2.22      }
    2.23  
    2.24      switch (index) {
    2.25 @@ -114,8 +114,8 @@ long get_reg_value(int size, int index, 
    2.26          case 14: return __get_reg_value(regs->r14, size);
    2.27          case 15: return __get_reg_value(regs->r15, size);
    2.28          default:
    2.29 -	printf("Error: (get_reg_value) Invalid index value\n"); 
    2.30 -            domain_crash_synchronous();
    2.31 +	    printf("Error: (get_reg_value) Invalid index value\n"); 
    2.32 +	    domain_crash_synchronous();
    2.33      }
    2.34  }
    2.35  #elif defined (__i386__)