sysemu: avoid proliferation of include/ subdirectories

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/backends/baum.c b/backends/baum.c
index ea9ffe88fbbea8407d24dce6d7944801ab0f1ce8..4cba79fc7d159444421f11e7cccadca6fd668170 100644 (file)
--- a/backends/baum.c
+++ b/backends/baum.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include <brlapi.h>

diff --git a/backends/msmouse.c b/backends/msmouse.c
index 61052fe78314dca0bdf3e8fb05f02b9cd96fb8e1..0ac05a0d10d463fb492130a4a6947549e3a52637 100644 (file)
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -23,7 +23,7 @@
  */
 #include <stdlib.h>
 #include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "ui/console.h"
 
 #define MSMOUSE_LO6(n) ((n) & 0x3f)

diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index cc6f5ee28ebeaea6f29902a487144b8c3eabeff6..9e5a5366f7f69399f76dbf612905b0c98b963d30 100644 (file)
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -10,8 +10,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "qemu/rng.h"
-#include "char/char.h"
+#include "sysemu/rng.h"
+#include "sysemu/char.h"
 #include "qapi/qmp/qerror.h"
 #include "hw/qdev.h" /* just for DEFINE_PROP_CHR */
 

diff --git a/backends/rng-random.c b/backends/rng-random.c
index acd20afad2d4b7cfc492ca5e13daa746c742c432..d5761f2ccea7a436b6b6b8dea864d66d0a644ad6 100644 (file)
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -10,8 +10,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "qemu/rng-random.h"
-#include "qemu/rng.h"
+#include "sysemu/rng-random.h"
+#include "sysemu/rng.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/main-loop.h"
 

diff --git a/backends/rng.c b/backends/rng.c
index 3d3389802e58b3d07b1a834ddf073f801395c162..85cb83f5e1ea9025b23b1596a5c05d4451e89218 100644 (file)
--- a/backends/rng.c
+++ b/backends/rng.c
@@ -10,7 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "qemu/rng.h"
+#include "sysemu/rng.h"
 #include "qapi/qmp/qerror.h"
 
 void rng_backend_request_entropy(RngBackend *s, size_t size,

diff --git a/backends/tpm.c b/backends/tpm.c
index 0580108c5f8acb0b96d2c37dd22a2babc44d9178..b73580134c4b0a453ebb9504b5e069ed234affb6 100644 (file)
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -12,7 +12,7 @@
  * Based on backends/rng.c by Anthony Liguori
  */
 
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm.h"
 #include "qemu/thread.h"

diff --git a/bt-host.c b/bt-host.c
index 2da3c32204b0262a89b21b27847ed87d56aab2a0..49205bf288cf2441b1a78486c1593c8c576c1967 100644 (file)
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
 #include "qemu/main-loop.h"
 
 #ifndef _WIN32

diff --git a/bt-vhci.c b/bt-vhci.c
index a6a7ab032955a9c926f3a3ca6153847dcf81042f..e267c8ad15a2140c6962f417ca0be6fb7d514dfe 100644 (file)
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
 #include "hw/bt.h"
 #include "qemu/main-loop.h"
 

diff --git a/gdbstub.c b/gdbstub.c
index 22ab12c68cea3d6015a7d65da8fc7c2dc6f3b64c..e80e1d32b10b15aefac006e398ee7101f3642c66 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -30,7 +30,7 @@
 #include "qemu.h"
 #else
 #include "monitor/monitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "sysemu/sysemu.h"
 #include "exec/gdbstub.h"
 #endif

diff --git a/hmp.c b/hmp.c
index dbe9b9043e8c8dbd994682a0063bf9150a45c4da..1675e77cf0f9020454057f9f1b781a0b2a609dc1 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -15,7 +15,7 @@
 
 #include "hmp.h"
 #include "net/net.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/option.h"
 #include "qemu/timer.h"
 #include "qmp-commands.h"

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index a4b414621dc5e52f67f20caad5c20452fb78f889..2ff43710e4e3ef861beb6f13e315fce955d66b5b 100644 (file)
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -24,7 +24,7 @@
 #include "hw/arm/omap.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/block/flash.h"
 #include "hw/arm/soc_dma.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index bbecc770ed8f7bcefadd4b1d4f8eb624a6f34fd0..24b03a0d29026c125f4c0eccfb5d6554016b4985 100644 (file)
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -13,7 +13,7 @@
 #include "hw/char/serial.h"
 #include "hw/i2c/i2c.h"
 #include "hw/ssi.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "sysemu/blockdev.h"
 
 static struct {

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 75a813e6184e4102ec1ac0230071de1480ef7138..4d49306dd00d06debb49d99dce113b00e3ff7c24 100644 (file)
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -30,7 +30,7 @@
 #include "strongarm.h"
 #include "qemu/error-report.h"
 #include "hw/arm/arm.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "sysemu/sysemu.h"
 #include "hw/ssi.h"
 

diff --git a/hw/bt/core.c b/hw/bt/core.c
index 24ef4de49d15adc460f1f916b29cd694324e2e41..49012e028cb109eaafeb349c07f8bb7b71c64b55 100644 (file)
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
 #include "hw/bt.h"
 
 /* Slave implementations can ignore this */

diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index 55c819b08562880956533d7be8f85060751aaba5..16a25cb3490fdf724ff24bd2a2170d6e9e82fd7e 100644 (file)
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -19,10 +19,10 @@
  */
 
 #include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/timer.h"
 #include "hw/irq.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
 #include "hw/bt.h"
 
 struct csrhci_s {

diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index a76edea2c910ebedc692bbae515206774140d455..b53cd5dea2d0ad2aaccad69cd4c7160beb9d67f8 100644 (file)
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -21,7 +21,7 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
 #include "hw/bt.h"
 
 struct bt_hci_s {

diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 421ec998d69962c5ab9218f57c2f2965237f4f72..c2a783430b5c62c70493c41488324d3100ccd3ca 100644 (file)
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -17,7 +17,7 @@
  */
 
 #include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/timer.h"
 
 #ifdef CADENCE_UART_ERR_DEBUG

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 0588eebb773a1aed85ab79d79c80df2019cc81b6..02c9577024d9d8373190e43379fcbb506bf9ee07 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -25,7 +25,7 @@
  */
 
 #include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/isa/isa.h"
 #include "hw/i386/pc.h"
 

diff --git a/hw/char/escc.c b/hw/char/escc.c
index 067b055fee0b49050b25b4b65b542240155c7981..c2cb07f3bd282829bf16c078a86b5ccea94b1a2b 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -25,7 +25,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/char/escc.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "ui/console.h"
 #include "trace.h"
 

diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index b7499d775bf4cf23e31d452fd69cf0be26bb87cd..11820f5864b24c387e43cff18ac1f481be6dd312 100644 (file)
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -23,7 +23,7 @@
  */
 
 #include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/log.h"
 
 #define D(x)

diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 8b4e72ca11efe4c1ec94d569e4d8883c491dc5fd..5751816c62dea95e90e69907e88abc5f254e01fd 100644 (file)
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -21,7 +21,7 @@
 
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 #include "hw/arm/exynos4210.h"
 

diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 62f799083c8ad0874cc8e0d1342b8a70b0370155..a64453fb18c1ef8d4a252fbfb01b7a043bd5697b 100644 (file)
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -23,7 +23,7 @@
  */
 
 #include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 #include "trace.h"
 

diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index d7ec2090fd85ed28e9523326c0854cfdfe16c2a6..2a2c230c557d3293cf17c3d14de7dc3760db1001 100644 (file)
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -20,7 +20,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/arm/imx.h"
 
 //#define DEBUG_SERIAL 1

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index fcd0af31b4d8475e14baa5317a14074610403dff..c9698a6bc4f54a91f851d2d780f60050631b1236 100644 (file)
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -10,7 +10,7 @@
 
 #include "ipack.h"
 #include "qemu/bitops.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 /* #define DEBUG_IPOCTAL */
 

diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 93f0d1534e0c54a8959d46101e75567c14f9a98c..839f3ebfe746070368a51a2ef8417526240c6f47 100644 (file)
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -20,7 +20,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 #include "hw/lm32/lm32_juart.h"
 

diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 32bc37ac963844e3e21da6af05c8a017c432448d..99721ab78dbbdd317cd698733c2386baef179afd 100644 (file)
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -25,7 +25,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/error-report.h"
 
 enum {

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 6724b1b7188262631cd35b3d8824ffd83f50e2e5..3ec47058672ca349ac2d7017e60eedc6ad38750d 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -7,7 +7,7 @@
  */
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "exec/address-spaces.h"
 
 typedef struct {

diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index f3bdf6991a4edcf5093b077cedcf2ce5e33f882c..cbc7d73a6e8832c74924a75aa5070d364ee292db 100644 (file)
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -24,7 +24,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/error-report.h"
 
 enum {

diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 26c14266fc48be09d1d4bc80502eaf43777f1aec..5bb36ed2c1d6b176630d034daa99b2d9ccc70917 100644 (file)
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/hw.h"
 #include "hw/arm/omap.h"
 #include "hw/char/serial.h"

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 863a6fb4a9ecf901eec69f3d628cfdc71c748f5b..b5e867f21cd05ad0d46bef18206688e6b4d5586a 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/isa/isa.h"
 #include "hw/i386/pc.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 332d5b970c4de01a955f5fccec654e1dc4b3609b..7079ef6be1b2827f308e638dbbb59493eb34360e 100644 (file)
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -8,7 +8,7 @@
  */
 
 #include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index 42ed54c9abbdf8d2edc982f7368d8cae27f4fbc4..bcc7893230f484abc35038bda93703d646e94702 100644 (file)
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -18,7 +18,7 @@
 
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/event-facility.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 typedef struct ASCIIConsoleData {
     EventBufferHeader ebh;

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 1151bf1babda58ec500d6d8a43cad0d7648343f7..66b6348867589e692276af3fbcdd0910778b575d 100644 (file)
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -24,7 +24,7 @@
  */
 
 #include "hw/char/serial.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 450c7d8551b9a38c9230d79d73c683b86ee10d3d..b3286438ca3f7746e3d9e022f9bfb54d58e6859d 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -26,7 +26,7 @@
  */
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "exec/address-spaces.h"
 
 //#define DEBUG_SERIAL

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 9df018a230d893cdf1b5fdc78a62cad3e0b84f8c..afcec1f182e85f674a7dcd60b757beaa82b365f0 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -1,5 +1,5 @@
 #include "hw/qdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
 

diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 31f672c9a31e1f8129601301495ca47e14383f5a..50350303cd5cf9ed45b9d9598098f33120945213 100644 (file)
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -10,7 +10,7 @@
  * the COPYING file in the top-level directory.
  */
 
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "hw/virtio/virtio-serial.h"

diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index efc32320faa0eee15c61c43da000d413063f3496..eb7f450abaf689d8ea873b3f12bdb9ac3cba7d5b 100644 (file)
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -30,7 +30,7 @@
 #include <sys/mman.h>
 
 #include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/xen/xen_backend.h"
 
 #include <xen/io/console.h>

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 079f4d4e1a86102f1fa2a00af73af09a99018498..3f7e989f35c7dc6110c919c1701c1e6513713a0e 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -23,7 +23,7 @@
  */
 
 #include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 #define DUART(x)
 

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 8c2e15205cffd3f6fbbc9bfe5ac839edeee5972a..0eada32dcf33efe41c8e5a21d727e2f606e14abe 100644 (file)
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -17,7 +17,7 @@
 #include "hw/block/block.h"
 #include "net/hub.h"
 #include "qapi/visitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 static void get_pointer(Object *obj, Visitor *v, Property *prop,
                         const char *(*print)(void *ptr),

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 9a0872d3b9c71da0db06ae1627ff42324fdb1426..ddde18e6b43b4af77059d340290e7cd37fb4e538 100644 (file)
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -5,7 +5,7 @@
 #include "hw/block/block.h"
 #include "net/hub.h"
 #include "qapi/visitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
                                   Error **errp)

diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 8e4266142debf0b675c33feeba7646b34c776499..e3715695853b96a783b685b62b90f7b4d66edca9 100644 (file)
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -37,7 +37,7 @@
 
 #include "hw/hw.h"
 #include "ui/console.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/xen/xen_backend.h"
 
 #include <xen/event_channel.h>

diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 9f5e18568555292719e50798f6c1bf4c567e49f4..82f7c80f9ca5a1e037536132023c3a5fa6aa7810 100644 (file)
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "trace.h"
 
 

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 3cf27fa822fb6301309fb6660c5fe6c6544548cb..1aac93a414bc99d557aa6635b3a488417f523f23 100644 (file)
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -30,7 +30,7 @@
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/pci/pci.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "sysemu/sysemu.h"
 #include "audio/audio.h"
 #include "qemu/log.h"

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index a3e936b77fa3d6517e49f8447c466fda0ad03ad3..86f42b2ede36d1d1be884ad8eeff445b00f61cd9 100644 (file)
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -34,7 +34,7 @@
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/pci/pci.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
 #include "hw/boards.h"

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index f92ce19dde84ff336b58a097439767ccf776ead8..a19a6d6d8ca843639e4f4555f89de5101730c150 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -24,7 +24,7 @@
 #include "migration/migration.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/event_notifier.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 #include <sys/mman.h>
 #include <sys/types.h>

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 5275f4810dc001a1fa29301ae0f519f4a75f4b87..1d9074a1d0caec596e223c0b86fea7af91fd8f10 100644 (file)
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -25,7 +25,7 @@
  */
 
 #include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/log.h"
 #include "net/net.h"
 #include "net/checksum.h"

diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index ff87ac31d1302226bfd54ae5c62fa9028eedf8b7..c0d7e62f3280f55da9665278a40d94f5f56f6402 100644 (file)
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -26,7 +26,7 @@
  */
 #include "cpu.h"
 #include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/qdev.h"
 #include "sysemu/device_tree.h"
 

diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index b71b59c5cf9163bfdbba417808e4b80f933174ce..8ecaa5f8ec96a1ae7630aade7c9b418597113f01 100644 (file)
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -26,7 +26,7 @@
  */
 #include "cpu.h"
 #include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/qdev.h"
 #include "sysemu/device_tree.h"
 

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 3b27d4019a7b0652e989c0d75b592afaf21b8e56..78c77eff4667047ef79cef73546fa52cb20c3a92 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -24,7 +24,7 @@
 #include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 578127723f5943d2990c9f29bee9fb0d7fc3fd99..416b9b65c780294e9c3f6842c271ca49829921c6 100644 (file)
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -27,7 +27,7 @@
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "qemu/sockets.h"
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
 #include "tpm_int.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index faa3cecafedf0e46754bb3b0579ca5e3158797a1..d4d81528752084197ed3a9a588cbe7920b34be93 100644 (file)
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -19,7 +19,7 @@
  * specification.
  */
 
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
 #include "tpm_int.h"
 #include "block/block.h"
 #include "exec/address-spaces.h"

diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 29dcd7acbff59355f0a107dbe2330ab99d1d8ff4..d534c94c1af4015a8e5ac0e628bdf3cd29018e22 100644 (file)
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -32,7 +32,7 @@
 #include <vcard_emul.h>
 
 #include "qemu/thread.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "monitor/monitor.h"
 #include "ccid.h"
 

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 5e017ae0ca29d79c756cdf9aaf2252b8a55d0a73..71a45f674f40e2314608442ca12707ee2eb35132 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -8,7 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/sockets.h"
 #include "monitor/monitor.h"
 #include "ccid.h"

diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 0f8aa48c85a8d411c3fa1553eb4e1feb8cf38441..68cc1d4fab26538371a2ac4d5a02b2947d7bd078 100644 (file)
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -21,7 +21,7 @@
 #include "qemu-common.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
 #include "hw/bt.h"
 
 struct USBBtState {

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 7c314dc59dc4e8ded42edbbc37e7c0f65a014866..dd0a608bff82947f4a0c0eee4c72cac7e10f04e2 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -12,7 +12,7 @@
 #include "qemu/error-report.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 //#define DEBUG_Serial
 

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 0ddb0818d8ed6434f75161bf322bfd798e8f782f..a594e954e49b32117ee303a5cfe7b2fd8b9bcc47 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -30,7 +30,7 @@
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
 #include "qemu/iov.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 #include <dirent.h>
 #include <sys/ioctl.h>

diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 6079b2a3a951f946d5182fbd1b210417912866e6..fcc223af06be51033d12f56fb6a2d44ff2b2194b 100644 (file)
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -14,7 +14,7 @@
 #include "qapi/qmp/qerror.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-rng.h"
-#include "qemu/rng.h"
+#include "sysemu/rng.h"
 
 static bool is_guest_ready(VirtIORNG *vrng)
 {

diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index 2a8c9f5d1a7d6dacaf7c7dd02dbd82789e362965..d82ce5d8a6831c297b61f110c8193792fd446f6e 100644 (file)
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -35,7 +35,7 @@
 #include <sys/signal.h>
 
 #include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/log.h"
 #include "hw/xen/xen_backend.h"
 

diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c
index 2682eda2ad8728b17de9c24f367d8b95afd8e37e..650dd31c98859bd51c7c6f134636a221abfc367e 100644 (file)
--- a/hw/xtensa/xtensa_lx60.c
+++ b/hw/xtensa/xtensa_lx60.c
@@ -36,7 +36,7 @@
 #include "hw/sysbus.h"
 #include "hw/block/flash.h"
 #include "sysemu/blockdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "xtensa_bootparam.h"
 
 typedef struct LxBoardDesc {

diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h
index 3711c97a7050d26e87f01fb6c1efe902d1667f55..c9cadc24b6db3c8db57569bea58d7da0025349cd 100644 (file)
--- a/include/hw/virtio/virtio-rng.h
+++ b/include/hw/virtio/virtio-rng.h
@@ -12,8 +12,8 @@
 #ifndef _QEMU_VIRTIO_RNG_H
 #define _QEMU_VIRTIO_RNG_H
 
-#include "qemu/rng.h"
-#include "qemu/rng-random.h"
+#include "sysemu/rng.h"
+#include "sysemu/rng-random.h"
 
 /* The Virtio ID for the virtio rng device */
 #define VIRTIO_ID_RNG    4

diff --git a/include/bt/bt.h b/include/sysemu/bt.h
similarity index 100%
rename from include/bt/bt.h
rename to include/sysemu/bt.h

diff --git a/include/char/char.h b/include/sysemu/char.h
similarity index 100%
rename from include/char/char.h
rename to include/sysemu/char.h

diff --git a/include/qemu/rng-random.h b/include/sysemu/rng-random.h
similarity index 100%
rename from include/qemu/rng-random.h
rename to include/sysemu/rng-random.h

diff --git a/include/qemu/rng.h b/include/sysemu/rng.h
similarity index 100%
rename from include/qemu/rng.h
rename to include/sysemu/rng.h

diff --git a/include/backends/tpm.h b/include/sysemu/tpm_backend.h
similarity index 100%
rename from include/backends/tpm.h
rename to include/sysemu/tpm_backend.h

diff --git a/monitor.c b/monitor.c
index e605822445cfcfccce08fd5bf42c9c24e3012d4d..2909ca1985cebcc3cd514bc5c18f47129ef4a8ef 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -33,7 +33,7 @@
 #include "exec/gdbstub.h"
 #include "net/net.h"
 #include "net/slirp.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "ui/qemu-spice.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"

diff --git a/net/slirp.c b/net/slirp.c
index eabfee6d4fdfef7068a8eb9eed3ab96d542e520f..b3f35d58612ce823c29298fad7b1e29487e7638e 100644 (file)
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -35,7 +35,7 @@
 #include "monitor/monitor.h"
 #include "qemu/sockets.h"
 #include "slirp/libslirp.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
 {

diff --git a/qemu-char.c b/qemu-char.c
index eae17fc61cc6c8080c810a0f8e4ffc2e2dd7b436..14707eac6881ae98b1b194991d833cffeb6a7dc6 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -26,7 +26,7 @@
 #include "ui/console.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "hw/usb.h"
 #include "qmp-commands.h"
 

diff --git a/qmp.c b/qmp.c
index 55b056b558bd44117df7e7301b3cde31e7c0a608..ed6c7ef3aeb2a307e47ea5d7a6e9f08ce0f3ee81 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -16,7 +16,7 @@
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 #include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "ui/qemu-spice.h"
 #include "ui/vnc.h"
 #include "sysemu/kvm.h"

diff --git a/qtest.c b/qtest.c
index b03b68adb3f78461f318782438ab039135dcaa63..3bba3e5751d4b8ece1a25b7043d6919b93dfe8ed 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -13,7 +13,7 @@
 
 #include "sysemu/qtest.h"
 #include "hw/qdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "exec/ioport.h"
 #include "exec/memory.h"
 #include "hw/irq.h"

diff --git a/slirp/slirp.c b/slirp/slirp.c
index bd9b7cb64436f612083d467899057ede29a25a87..80b28ea89e445d2735cc5e458e571bed70bbe48b 100644 (file)
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -23,7 +23,7 @@
  */
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "slirp.h"
 #include "hw/hw.h"
 

diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 535f955ca88abd2021697b4c7ff7645fd72f5524..c9403de8af5343f78d4fa9364b2e8b836a64a2b9 100644 (file)
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,7 +1,7 @@
 #include "config-host.h"
 #include "trace.h"
 #include "ui/qemu-spice.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include <spice.h>
 #include <spice-experimental.h>
 #include <spice/protocol.h>

diff --git a/tpm.c b/tpm.c
index 1e943148d2fced228b2e3a3e1afa287c002d0526..c91da43cf1b4ac2e5176fcdc3dd238389fb5d9b8 100644 (file)
--- a/tpm.c
+++ b/tpm.c
@@ -15,7 +15,7 @@
 
 #include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
 #include "sysemu/tpm.h"
 #include "qemu/config-file.h"
 #include "qmp-commands.h"

diff --git a/ui/console.c b/ui/console.c
index e84ba8b40a5c4932d99dfa483ce704c994ac4b40..0ed4211986147d08ab2958101247410c9c1e0849 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -25,7 +25,7 @@
 #include "ui/console.h"
 #include "qemu/timer.h"
 #include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 //#define DEBUG_CONSOLE
 #define DEFAULT_BACKSCROLL 512

diff --git a/ui/gtk.c b/ui/gtk.c
index 1a6bee616a251c4e3455e498f22fc2dd3c941a28..1e105e2fc7b25c4b73bc6c74e5559dbf238f68dc 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -62,7 +62,7 @@
 #include "qmp-commands.h"
 #include "x_keymap.h"
 #include "keymaps.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 
 //#define DEBUG_GTK
 

diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 713d7560d0abd8f349b6a86ebc5def1bd6f49cdf..8442c6e63c517d1e0a36201cde009e5bed142a48 100644 (file)
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -12,7 +12,7 @@
 
 #include "qemu-common.h"
 #include "qemu/event_notifier.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/main-loop.h"
 
 #ifdef CONFIG_EVENTFD

diff --git a/vl.c b/vl.c
index ce7bed7141e4a8f082f1b8c620bf7ec9bc165a99..cdadad09ecef443c43c63be578ffb24a14101606 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
 #include "hw/qdev.h"
 #include "hw/loader.h"
 #include "monitor/qdev.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
 #include "net/net.h"
 #include "net/slirp.h"
 #include "monitor/monitor.h"
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
 #include "sysemu/sysemu.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/cache-utils.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"

diff --git a/xen-all.c b/xen-all.c
index 31f28fc1ae7f84ed2ca4d6ed6656b73bc23eb793..539a1549a5cee3b313dbb67dad636735a194e8a5 100644 (file)
--- a/xen-all.c
+++ b/xen-all.c
@@ -16,7 +16,7 @@
 #include "hw/xen/xen_backend.h"
 #include "qmp-commands.h"
 
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/range.h"
 #include "sysemu/xen-mapcache.h"
 #include "trace.h"