From ebbefaabc2fbf3d9a54abfd9c7233f92ff7a8c25 Mon Sep 17 00:00:00 2001
From: Rafal Wojtczuk <rafal@invisiblethingslab.com>
Date: Mon, 30 Aug 2010 11:43:30 +0200
Subject: [PATCH] Fix restore completion detection in appvm/qubes_core

---
 appvm/qubes_core | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/appvm/qubes_core b/appvm/qubes_core
index c291ec7..1b7aa3f 100755
--- a/appvm/qubes_core
+++ b/appvm/qubes_core
@@ -35,13 +35,8 @@ start()
 			(read a b c d ; xenstore-write device/qubes_used_mem $c)
 		# we're still running in DispVM template
 		echo "Waiting for save/restore..."
-		# WARNING: Nergalism!
-		# Apparently it has been determined that DomU kernel
-		# dmesg's "using vcpu" after restore
-		while ! dmesg -c | grep "using vcpu" ; do usleep 10 ; done
-		# we're now after restore in a new instance of a DispVM
 		# ... wait until qubes_restore.c (in Dom0) recreates VM-specific keys
-		while ! xenstore-read qubes_vm_type 2>/dev/null ; do 
+		while ! xenstore-read qubes_restore_complete 2>/dev/null ; do 
 			usleep 10
 		done
 		echo Back to life.