projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8b4a92
)
smm: hax can not support SMM
author
SeokYeon Hwang
<syeon.hwang@samsung.com>
Mon, 24 Aug 2015 04:27:58 +0000
(13:27 +0900)
committer
SeokYeon Hwang
<syeon.hwang@samsung.com>
Mon, 24 Aug 2015 04:27:58 +0000
(13:27 +0900)
Change-Id: Iec531e74c02741f6be5a263e5ff6f241bdc40d26
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
hw/i386/pc.c
patch
|
blob
|
history
diff --git
a/hw/i386/pc.c
b/hw/i386/pc.c
index
1b09cab
..
646ad4b
100644
(file)
--- a/
hw/i386/pc.c
+++ b/
hw/i386/pc.c
@@
-66,6
+66,7
@@
#include "hw/mem/pc-dimm.h"
#include "qapi/visitor.h"
#include "qapi-visit.h"
+#include "sysemu/hax.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
@@
-1848,6
+1849,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) {