diff options
78 files changed, 78 insertions, 78 deletions
diff --git a/backends/baum.c b/backends/baum.c index ea9ffe88fb..4cba79fc7d 100644 --- 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 61052fe783..0ac05a0d10 100644 --- 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 cc6f5ee28e..9e5a5366f7 100644 --- 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 acd20afad2..d5761f2cce 100644 --- 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 3d3389802e..85cb83f5e1 100644 --- 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 0580108c5f..b73580134c 100644 --- 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" @@ -18,7 +18,7 @@ */ #include "qemu-common.h" -#include "bt/bt.h" +#include "sysemu/bt.h" #include "qemu/main-loop.h" #ifndef _WIN32 @@ -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" @@ -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 @@ -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 a4b414621d..2ff43710e4 100644 --- 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 bbecc770ed..24b03a0d29 100644 --- 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 75a813e618..4d49306dd0 100644 --- 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 24ef4de49d..49012e028c 100644 --- 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 55c819b085..16a25cb349 100644 --- 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 a76edea2c9..b53cd5dea2 100644 --- 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 421ec998d6..c2a783430b 100644 --- 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 0588eebb77..02c9577024 100644 --- 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 067b055fee..c2cb07f3bd 100644 --- 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 b7499d775b..11820f5864 100644 --- 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 8b4e72ca11..5751816c62 100644 --- 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 62f799083c..a64453fb18 100644 --- 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 d7ec2090fd..2a2c230c55 100644 --- 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 fcd0af31b4..c9698a6bc4 100644 --- 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 93f0d1534e..839f3ebfe7 100644 --- 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 32bc37ac96..99721ab78d 100644 --- 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 6724b1b718..3ec4705867 100644 --- 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 f3bdf6991a..cbc7d73a6e 100644 --- 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 26c14266fc..5bb36ed2c1 100644 --- 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 863a6fb4a9..b5e867f21c 100644 --- 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 332d5b970c..7079ef6be1 100644 --- 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 42ed54c9ab..bcc7893230 100644 --- 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 1151bf1bab..66b6348867 100644 --- 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 450c7d8551..b3286438ca 100644 --- 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 9df018a230..afcec1f182 100644 --- 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 31f672c9a3..50350303cd 100644 --- 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 efc32320fa..eb7f450aba 100644 --- 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 079f4d4e1a..3f7e989f35 100644 --- 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 8c2e15205c..0eada32dcf 100644 --- 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 9a0872d3b9..ddde18e6b4 100644 --- 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 8e4266142d..e371569585 100644 --- 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 9f5e185685..82f7c80f9c 100644 --- 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 3cf27fa822..1aac93a414 100644 --- 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 a3e936b77f..86f42b2ede 100644 --- 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 f92ce19dde..a19a6d6d8c 100644 --- 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 5275f4810d..1d9074a1d0 100644 --- 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 ff87ac31d1..c0d7e62f32 100644 --- 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 b71b59c5cf..8ecaa5f8ec 100644 --- 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 3b27d4019a..78c77eff46 100644 --- 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 578127723f..416b9b65c7 100644 --- 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 faa3cecafe..d4d8152875 100644 --- 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 29dcd7acbf..d534c94c1a 100644 --- 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 5e017ae0ca..71a45f674f 100644 --- 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 0f8aa48c85..68cc1d4fab 100644 --- 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 7c314dc59d..dd0a608bff 100644 --- 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 0ddb0818d8..a594e954e4 100644 --- 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 6079b2a3a9..fcc223af06 100644 --- 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 2a8c9f5d1a..d82ce5d8a6 100644 --- 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 2682eda2ad..650dd31c98 100644 --- 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 3711c97a70..c9cadc24b6 100644 --- 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 index 2bc6d53cca..2bc6d53cca 100644 --- a/include/bt/bt.h +++ b/include/sysemu/bt.h diff --git a/include/char/char.h b/include/sysemu/char.h index 9d1ea46117..9d1ea46117 100644 --- a/include/char/char.h +++ b/include/sysemu/char.h diff --git a/include/qemu/rng-random.h b/include/sysemu/rng-random.h index 4332772a24..4332772a24 100644 --- a/include/qemu/rng-random.h +++ b/include/sysemu/rng-random.h diff --git a/include/qemu/rng.h b/include/sysemu/rng.h index 509abd023d..509abd023d 100644 --- a/include/qemu/rng.h +++ b/include/sysemu/rng.h diff --git a/include/backends/tpm.h b/include/sysemu/tpm_backend.h index 466787453d..466787453d 100644 --- a/include/backends/tpm.h +++ b/include/sysemu/tpm_backend.h @@ -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 eabfee6d4f..b3f35d5861 100644 --- 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 eae17fc61c..14707eac68 100644 --- 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" @@ -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" @@ -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 bd9b7cb644..80b28ea89e 100644 --- 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 535f955ca8..c9403de8af 100644 --- 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> @@ -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 e84ba8b40a..0ed4211986 100644 --- 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 @@ -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 713d7560d0..8442c6e63c 100644 --- 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 @@ -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" @@ -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" |