lm32_juart: Relocate and tidy header

Signed-off-by: Andreas Färber <afaerber@suse.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 93ad19d90efc3612b78cb1028d54a02426f2bd3b..82ca5fb60a4121d0082b670ea9938479ad290a01 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -80,6 +80,7 @@ M: Michael Walle <michael@walle.cc>
 S: Maintained
 F: target-lm32/
 F: hw/lm32/
+F: hw/char/lm32_*
 
 M68K
 M: Paul Brook <paul@codesourcery.com>

diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 839f3ebfe746070368a51a2ef8417526240c6f47..154511e633a6250fdecfeb8b72e244ea74cb261a 100644 (file)
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -22,7 +22,7 @@
 #include "trace.h"
 #include "sysemu/char.h"
 
-#include "hw/lm32/lm32_juart.h"
+#include "hw/char/lm32_juart.h"
 
 enum {
     LM32_JUART_MIN_SAVE_VERSION = 0,

diff --git a/include/hw/lm32/lm32_juart.h b/include/hw/char/lm32_juart.h
similarity index 72%
rename from include/hw/lm32/lm32_juart.h
rename to include/hw/char/lm32_juart.h
index 67fc5866ea734f06f12600bc205db2e0399f69bb..1cd3148e62ddce9106b300ff16dcec011c1a2cc6 100644 (file)
--- a/include/hw/lm32/lm32_juart.h
+++ b/include/hw/char/lm32_juart.h
@@ -1,7 +1,7 @@
-#ifndef QEMU_HW_LM32_JUART_H
-#define QEMU_HW_LM32_JUART_H
+#ifndef QEMU_HW_CHAR_LM32_JUART_H
+#define QEMU_HW_CHAR_LM32_JUART_H
 
-#include "qemu-common.h"
+#include "hw/qdev.h"
 
 uint32_t lm32_juart_get_jtx(DeviceState *d);
 uint32_t lm32_juart_get_jrx(DeviceState *d);

diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index f106873ad828660c4db47176f109e250cf8c4360..2dab9f27b4d77d885ab3c733c8460bd1d7045089 100644 (file)
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -4,7 +4,7 @@
 #include "qemu/host-utils.h"
 
 #include "hw/lm32/lm32_pic.h"
-#include "hw/lm32/lm32_juart.h"
+#include "hw/char/lm32_juart.h"
 
 #if !defined(CONFIG_USER_ONLY)
 #define MMUSUFFIX _mmu