Merge remote-tracking branch 'luiz/queue/qmp' into staging

[qemu.git] / hw / lm32_sys.c

diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c
index e3a9db9748f47877e643578c66ab7384fecbb20a..33a3b80ce779410a323dd33b8effa5c50e7e5a9d 100644 (file)
--- a/hw/lm32_sys.c
+++ b/hw/lm32_sys.c
@@ -28,8 +28,8 @@
  * the test is passed or any non-zero value to it if the test is failed.
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
@@ -157,7 +157,7 @@ static void lm32_sys_class_init(ObjectClass *klass, void *data)
     dc->props = lm32_sys_properties;
 }
 
-static TypeInfo lm32_sys_info = {
+static const TypeInfo lm32_sys_info = {
     .name          = "lm32-sys",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(LM32SysState),