Commit dccfcd0e authored by Paolo Bonzini's avatar Paolo Bonzini

sysemu: avoid proliferation of include/ subdirectories

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bdee56f5
......@@ -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>
......
......@@ -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)
......
......@@ -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 */
......
......@@ -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"
......
......@@ -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,
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 {
......
......@@ -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"
......
......@@ -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 */
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
#include "qemu/log.h"
#define D(x)
......
......@@ -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"
......
......@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
#include "trace.h"
......
......@@ -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
......
......@@ -10,7 +10,7 @@
#include "ipack.h"
#include "qemu/bitops.h"
#include "char/char.h"
#include "sysemu/char.h"
/* #define DEBUG_IPOCTAL */
......
......@@ -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"
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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"
......
......@@ -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"
......
......@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
typedef struct {
SysBusDevice busdev;
......
......@@ -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;
......
......@@ -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"
......
......@@ -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
......
#include "hw/qdev.h"
#include "char/char.h"
#include "sysemu/char.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
......
......@@ -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"
......
......@@ -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>
......
......@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
#define DUART(x)
......
......@@ -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),
......
......@@ -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)
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 {
......
......@@ -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
......
......@@ -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>
......
......@@ -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)
{
......
......@@ -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"
......
......@@ -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 {
......
......@@ -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
......
......@@ -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"
......
......@@ -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)
{
......
......@@ -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"
......
......@@ -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"
......
#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"
......
......@@ -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
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment