From: Alex Williamson <alex.williamson@redhat.com>
Date: Fri, 30 Apr 2010 21:21:11 +0000 (-0600)
Subject: Fix boot once option
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=37905d6ae53d8a9f0744867a8cf2dad6e7ae3674;p=qemu.git

Fix boot once option

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>
--
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index 5e03b72f74..53ea69888d 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);