From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 5 Jan 2010 19:36:50 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=ec01e0d8a7a3debd92ce2787a9d8bfd15d38df04;hp=4fd66bc72087ed45755500d5f2965d8afc30acc3

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

diff --git a/palacios/include/palacios/vmcs.h b/palacios/include/palacios/vmcs.h
index 2a7e42e..11309bf 100644
--- a/palacios/include/palacios/vmcs.h
+++ b/palacios/include/palacios/vmcs.h
@@ -265,15 +265,21 @@ struct vmcs_segment {
 
 
 struct vmcs_interrupt_state {
-    uint32_t    sti_blocking    : 1;
-    uint32_t    mov_ss_blocking : 1;
-    uint32_t    smi_blocking    : 1;
-    uint32_t    nmi_blocking    : 1;
-    uint32_t    rsvd1           : 28;
+    union {
+	uint32_t val;
+	struct {
+	    uint32_t    sti_blocking    : 1;
+	    uint32_t    mov_ss_blocking : 1;
+	    uint32_t    smi_blocking    : 1;
+	    uint32_t    nmi_blocking    : 1;
+	    uint32_t    rsvd1           : 28;
+	} __attribute__((packed));
+    } __attribute__((packed));
 } __attribute__((packed));
 
 
 
+
 struct vmcs_data {
     uint32_t revision ;
     uint32_t abort    ;