From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 19 May 2010 16:19:03 +0000 (-0500)
Subject: Merge branch 'Release-1.2' of ssh://palacios@newskysaw.cs.northwestern.edu//home... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=refs%2Fheads%2FRelease-1.2;hp=ddd9fd13627552b915753b06be997921cc904466

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

diff --git a/manual/network_boot/Network_Booting_Kitten_using_PXE.pdf b/manual/network_boot/Network_Booting_Kitten_using_PXE.pdf
index 59a984d..7155b41 100644
Binary files a/manual/network_boot/Network_Booting_Kitten_using_PXE.pdf and b/manual/network_boot/Network_Booting_Kitten_using_PXE.pdf differ
diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 4b01c8b..ca8fc18 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -425,6 +425,8 @@ int v3_svm_enter(struct guest_info * info) {
     // disable global interrupts for vm state transition
     v3_clgi();
 
+    /// checkpoint 
+
     // Synchronize the guest state to the VMCB
     guest_state->cr0 = info->ctrl_regs.cr0;
     guest_state->cr2 = info->ctrl_regs.cr2;