projects
/
sdk
/
emulator
/
qemu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-1.7' into tizen_qemu_1.7
[sdk/emulator/qemu.git]
/
hw
/
i386
/
pc_sysfw.c
diff --git
a/hw/i386/pc_sysfw.c
b/hw/i386/pc_sysfw.c
index
e917c83
..
7dc3f71
100644
(file)
--- a/
hw/i386/pc_sysfw.c
+++ b/
hw/i386/pc_sysfw.c
@@
-34,6
+34,10
@@
#include "hw/block/flash.h"
#include "sysemu/kvm.h"
#include "hw/block/flash.h"
#include "sysemu/kvm.h"
+#ifdef CONFIG_MARU
+#include "../../tizen/src/maru_err_table.h"
+#endif
+
#define BIOS_FILENAME "bios.bin"
typedef struct PcSysFwDevice {
#define BIOS_FILENAME "bios.bin"
typedef struct PcSysFwDevice {
@@
-134,6
+138,9
@@
static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw)
if (ret != 0) {
bios_error:
fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
if (ret != 0) {
bios_error:
fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
+#ifdef CONFIG_MARU
+ maru_register_exit_msg(MARU_EXIT_BIOS_FILE_EXCEPTION, bios_name);
+#endif
exit(1);
}
if (filename) {
exit(1);
}
if (filename) {