From: Kevin Pedretti <ktpedre@x300.(none)>
Date: Fri, 15 Jan 2010 00:27:40 +0000 (-0700)
Subject: Jack's changes to split up stucts for multi-core.
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=2af24dee6386a5fc694d74fa4281dff8b8e2f148

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
---

2af24dee6386a5fc694d74fa4281dff8b8e2f148
diff --cc palacios/src/devices/apic.c
index 6a65d37,3ea76cb..c8ec4c7
--- a/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);