net: ne2000: fix bounds check in ioport operations

[qemu.git] / bootdevice.c

diff --git a/bootdevice.c b/bootdevice.c
index eacd8c88c27d50659ccd67f2acd09d27011447cf..3cdc0d7b2249f73804055a767906462b6980532b 100644 (file)
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -1,7 +1,7 @@
 /*
  * QEMU Boot Device Implement
  *
 /*
  * QEMU Boot Device Implement
  *

- * Copyright (c) 2014 HUAWEI TECHNOLOGIES CO.,LTD.
+ * Copyright (c) 2014 HUAWEI TECHNOLOGIES CO., LTD.

  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal


@@ -105,7 +105,9 @@ void restore_boot_order(void *opaque)
         return;
     }
 
         return;
     }
 

-    qemu_boot_set(normal_boot_order, NULL);
+    if (boot_set_handler) {
+        qemu_boot_set(normal_boot_order, &error_abort);
+    }

 
     qemu_unregister_reset(restore_boot_order, normal_boot_order);
     g_free(normal_boot_order);
 
     qemu_unregister_reset(restore_boot_order, normal_boot_order);
     g_free(normal_boot_order);