Merge tag 'v2.7.0' into develop_qemu_2.7

[sdk/emulator/qemu.git] / hw / i386 / pc.c

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 022dd1b..0daa4d1 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -69,6 +69,8 @@
 #include "qom/cpu.h"
 #include "hw/nmi.h"
 
+#include "sysemu/hax.h"
+
 /* debug PC/ISA interrupts */
 //#define DEBUG_IRQ
 
@@ -850,8 +852,12 @@ static void load_linux(PCMachineState *pcms,
     if (!f || !(kernel_size = get_file_size(f)) ||
         fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) !=
         MIN(ARRAY_SIZE(header), kernel_size)) {
-        fprintf(stderr, "qemu: could not load kernel '%s': %s\n",
+// CONFIG_MARU MODIFICATION
+//      fprintf(stderr, "qemu: could not load kernel '%s': %s\n",
+//              kernel_filename, strerror(errno));
+        error_report("qemu: could not load kernel '%s': %s\n",
                 kernel_filename, strerror(errno));
+
         exit(1);
     }
 
@@ -2085,6 +2091,8 @@ bool pc_machine_is_smm_enabled(PCMachineState *pcms)
         smm_available = true;
     } else if (kvm_enabled()) {
         smm_available = kvm_has_smm();
+    } else if (hax_enabled()) {
+        smm_available = false;
     }
 
     if (smm_available) {