Jack's changes to split up stucts for multi-core.

Merge branch 'devel' of ssh://ktpedre@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel

Conflicts:
	palacios/src/devices/keyboard.c

diff --cc palacios/include/palacios/vmm.h
Simple merge

diff --cc palacios/src/devices/apic.c
index 6a65d37,3ea76cb..c8ec4c7
--- 1/palacios/src/devices/apic.c
--- 2/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@@ -182,9 -181,9 +182,10 @@@ struct apic_state 
      uint32_t eoi;
  
  
+     struct guest_info * core;
  };
  
 +static void apic_incoming_ipi(void *val);
  static int apic_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data);
  static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_data);
  

diff --cc palacios/src/palacios/svm.c
Simple merge