From patchwork Fri Apr 30 21:21:11 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Fix boot once option
Date: Fri, 30 Apr 2010 11:21:11 -0000
From: Alex Williamson <alex.williamson@redhat.com>
X-Patchwork-Id: 51393
Message-Id: <1272662471.2822.9.camel@localhost>
To: qemu-devel@nongnu.org
Cc: jan.kiszka@siemens.com

The boot once options seems to have gotten broken since it originally
went in.  We need to wait until the second time restore_boot_devices()
gets called before restoring the standard boot order and removing itself
from the reset list.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

---


diff --git a/vl.c b/vl.c
index a485c58..2fabc7e 100644
--- a/vl.c
+++ b/vl.c
@@ -1193,6 +1193,13 @@ static void validate_bootdevices(char *devices)
 static void restore_boot_devices(void *opaque)
 {
     char *standard_boot_devices = opaque;
+    static int first = 1;
+
+    /* Restore boot order and remove ourselves after the first boot */
+    if (first) {
+        first = 0;
+        return;
+    }
 
     qemu_boot_set(standard_boot_devices);