Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-08-15' into staging

[qemu.git] / target / s390x / cpu.h

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index cb103bc3e7a5c0a6f939e3ffec3e110732304942..3d9de25f7ce346e39fbe440db7887517aab00d62 100644 (file)
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -21,7 +21,6 @@
 #ifndef S390X_CPU_H
 #define S390X_CPU_H
 
-#include "qemu-common.h"
 #include "cpu-qom.h"
 #include "cpu_models.h"
 #include "exec/cpu-defs.h"
@@ -164,7 +163,7 @@ struct S390CPU {
 
 
 #ifndef CONFIG_USER_ONLY
-extern const struct VMStateDescription vmstate_s390_cpu;
+extern const VMStateDescription vmstate_s390_cpu;
 #endif
 
 /* distinguish between 24 bit and 31 bit addressing */