Merge remote-tracking branch 'remotes/xtensa/tags/20170124-xtensa' into staging

[qemu.git] / target / s390x / kvm.c

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 3ac29f92b30290f51614e19e9c9ae3b0acf98382..6ed387671e255f4c0519e775bab1827561db84bf 100644 (file)
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -32,7 +32,7 @@
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "sysemu/kvm.h"
+#include "sysemu/hw_accel.h"
 #include "hw/hw.h"
 #include "sysemu/device_tree.h"
 #include "qapi/qmp/qjson.h"
@@ -197,7 +197,7 @@ void kvm_s390_cmma_reset(void)
         .attr = KVM_S390_VM_MEM_CLR_CMMA,
     };
 
-    if (!mem_path || !kvm_s390_cmma_available()) {
+    if (mem_path || !kvm_s390_cmma_available()) {
         return;
     }