Merge remote-tracking branch 'bonzini/hw-dirs' into staging

* bonzini/hw-dirs:
  exec: remove useless declarations from memory-internal.h
  memory: move core typedefs to qemu/typedefs.h
  include: avoid useless includes of exec/ headers
  sysemu: avoid proliferation of include/ subdirectories
  tpm: reorganize headers and split hardware part
  configure: fix TPM logic
  acpi.h: make it self contained
  acpi: move declarations from pc.h to acpi.h
  hw: Add lost ARM core again
  Fix failure to create q35 machine
  Add linux-headers to QEMU_INCLUDES
  arm: fix location of some include files

Conflicts:
	configure

aliguori: trivial conflict in configure output

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-04-15 17:06:04 -05:00
commit 4ceb193d30
153 changed files with 290 additions and 319 deletions

View File

@ -65,7 +65,7 @@ common-obj-y += bt-host.o bt-vhci.o
common-obj-y += dma-helpers.o
common-obj-y += vl.o
common-obj-y += tpm/
common-obj-y += tpm.o
common-obj-$(CONFIG_SLIRP) += slirp/

View File

@ -40,7 +40,6 @@
#include "hw/audio/audio.h"
#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "exec/gdbstub.h"
#include "hw/i386/smbios.h"
#include "exec/address-spaces.h"
#include "hw/audio/pcspk.h"
@ -49,6 +48,7 @@
#include "qmp-commands.h"
#include "trace.h"
#include "exec/cpu-all.h"
#include "hw/acpi/acpi.h"
#ifdef DEBUG_ARCH_INIT
#define DPRINTF(fmt, ...) \

View File

@ -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>

View File

@ -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)

View File

@ -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 */

View File

@ -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"

View File

@ -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,

View File

@ -12,9 +12,11 @@
* Based on backends/rng.c by Anthony Liguori
*/
#include "backends/tpm.h"
#include "tpm/tpm_int.h"
#include "sysemu/tpm_backend.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/tpm.h"
#include "qemu/thread.h"
#include "sysemu/tpm_backend_int.h"
enum TpmType tpm_backend_get_type(TPMBackend *s)
{
@ -137,6 +139,40 @@ static void tpm_backend_instance_init(Object *obj)
NULL);
}
void tpm_backend_thread_deliver_request(TPMBackendThread *tbt)
{
g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_PROCESS_CMD, NULL);
}
void tpm_backend_thread_create(TPMBackendThread *tbt,
GFunc func, gpointer user_data)
{
if (!tbt->pool) {
tbt->pool = g_thread_pool_new(func, user_data, 1, TRUE, NULL);
g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_INIT, NULL);
}
}
void tpm_backend_thread_end(TPMBackendThread *tbt)
{
if (tbt->pool) {
g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_END, NULL);
g_thread_pool_free(tbt->pool, FALSE, TRUE);
tbt->pool = NULL;
}
}
void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt,
GFunc func, gpointer user_data)
{
if (!tbt->pool) {
tpm_backend_thread_create(tbt, func, user_data);
} else {
g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_TPM_RESET,
NULL);
}
}
static const TypeInfo tpm_backend_info = {
.name = TYPE_TPM_BACKEND,
.parent = TYPE_OBJECT,

View File

@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
#include "bt/bt.h"
#include "sysemu/bt.h"
#include "qemu/main-loop.h"
#ifndef _WIN32

View File

@ -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"

29
configure vendored
View File

@ -545,6 +545,7 @@ Haiku)
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
audio_possible_drivers="$audio_possible_drivers fmod"
fi
QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
;;
esac
@ -2403,6 +2404,15 @@ EOF
fi
fi
##########################################
# TPM passthrough is only on x86 Linux
if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
tpm_passthrough=$tpm
else
tpm_passthrough=no
fi
##########################################
# adjust virtio-blk-data-plane based on linux-aio
@ -3518,6 +3528,7 @@ echo "gcov $gcov_tool"
echo "gcov enabled $gcov"
echo "TPM support $tpm"
echo "libssh2 support $libssh2"
echo "TPM passthrough $tpm_passthrough"
if test "$sdl_too_old" = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@ -3901,6 +3912,14 @@ bsd)
;;
esac
# TPM passthrough support?
if test "$tpm" = "yes"; then
echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
if test "$tpm_passthrough" = "yes"; then
echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_host_mak
fi
fi
# use default implementation for tracing backend-specific routines
trace_default=yes
echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
@ -4318,10 +4337,6 @@ else
fi
includes="-I\$(SRC_PATH)/tcg $includes"
if test "$linux" = "yes" ; then
includes="-I\$(SRC_PATH)/linux-headers $includes"
fi
for i in $ARCH $TARGET_BASE_ARCH ; do
case "$i" in
alpha)
@ -4432,12 +4447,6 @@ if test "$gprof" = "yes" ; then
fi
fi
if test "$tpm" = "yes"; then
if test "$target_softmmu" = "yes" ; then
echo "CONFIG_TPM=y" >> $config_host_mak
fi
fi
if test "$ARCH" = "tci"; then
linker_script=""
else

View File

@ -34,8 +34,8 @@ CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
CONFIG_USB_MUSB=y
CONFIG_ARM5MPCORE=y
CONFIG_ARM9MPCORE=y
CONFIG_ARM11MPCORE=y
CONFIG_ARM15MPCORE=y
CONFIG_ARM_GIC=y

View File

@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
CONFIG_TPM_TIS=y
CONFIG_TPM_PASSTHROUGH=y
CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
@ -42,6 +41,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
CONFIG_Q35=y
CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y

View File

@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
CONFIG_TPM_TIS=y
CONFIG_TPM_PASSTHROUGH=y
CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
@ -42,6 +41,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
CONFIG_Q35=y
CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y

6
dump.c
View File

@ -23,7 +23,6 @@
#include "sysemu/memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
#include "exec/gdbstub.h"
static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
{
@ -268,6 +267,11 @@ static int write_elf64_note(DumpState *s)
return 0;
}
static inline int cpu_index(CPUState *cpu)
{
return cpu->cpu_index + 1;
}
static int write_elf64_notes(DumpState *s)
{
CPUArchState *env;

View File

@ -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

2
hmp.c
View File

@ -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"

View File

@ -22,6 +22,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += scsi/
devices-dirs-$(CONFIG_SOFTMMU) += sd/
devices-dirs-$(CONFIG_SOFTMMU) += ssi/
devices-dirs-$(CONFIG_SOFTMMU) += timer/
devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-$(CONFIG_SOFTMMU) += usb/
devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/

View File

@ -7,9 +7,8 @@
*/
#include "cpu.h"
#include "exec/exec-all.h"
#include "hw/hw.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"

View File

@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "elf.h"

View File

@ -9,7 +9,7 @@
#include "config.h"
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"

View File

@ -11,9 +11,9 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "strongarm.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

View File

@ -24,7 +24,7 @@
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "hw/arm/exynos4210.h"
#include "hw/usb/hcd-ehci.h"

View File

@ -24,7 +24,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"

View File

@ -38,7 +38,7 @@
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

View File

@ -18,8 +18,8 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/sysemu.h"

View File

@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"

View File

@ -16,8 +16,8 @@
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"

View File

@ -13,9 +13,9 @@
*/
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "net/net.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"

View File

@ -10,8 +10,8 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"

View File

@ -21,12 +21,12 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "hw/arm/omap.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"

View File

@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "hw/arm/soc_dma.h"

View File

@ -20,11 +20,11 @@
#include "sysemu/blockdev.h"
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#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"

View File

@ -29,7 +29,7 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

View File

@ -22,8 +22,8 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"

View File

@ -8,7 +8,7 @@
*/
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "sysemu/kvm.h"
/* Input 0 is IRQ and input 1 is FIQ. */

View File

@ -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 {

View File

@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"

View File

@ -12,14 +12,14 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/pcmcia.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/block/flash.h"
#include "qemu/timer.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "ui/console.h"
#include "block/block.h"

View File

@ -9,8 +9,8 @@
#include "hw/sysbus.h"
#include "hw/ssi.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
#include "net/net.h"

View File

@ -29,8 +29,8 @@
#include "hw/sysbus.h"
#include "strongarm.h"
#include "qemu/error-report.h"
#include "hw/arm.h"
#include "char/char.h"
#include "hw/arm/arm.h"
#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "hw/ssi.h"

View File

@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "hw/pcmcia.h"
#include "block/block.h"

View File

@ -8,8 +8,8 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"

View File

@ -22,9 +22,9 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"

View File

@ -16,7 +16,7 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"

View File

@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/boards.h"

View File

@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "sysemu/blockdev.h"
#include "hw/ssi.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#ifdef M25P80_ERR_DEBUG
#define DB_PRINT(...) do { \

View File

@ -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 */

View File

@ -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 {

View File

@ -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 {

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
#include "qemu/log.h"
#define D(x)

View File

@ -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"

View File

@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
#include "trace.h"

View File

@ -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

View File

@ -10,7 +10,7 @@
#include "ipack.h"
#include "qemu/bitops.h"
#include "char/char.h"
#include "sysemu/char.h"
/* #define DEBUG_IPOCTAL */

View File

@ -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"

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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"

View File

@ -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"

View File

@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
typedef struct {
SysBusDevice busdev;

View File

@ -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;

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
#include "char/char.h"
#include "sysemu/char.h"
#define DUART(x)

View File

@ -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),

View File

@ -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)

View File

@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"

View File

@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/sysbus.h"
#include "hw/qdev-addr.h"
#include "qemu/range.h"

View File

@ -11,7 +11,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"

View File

@ -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>

View File

@ -52,6 +52,7 @@
#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
#include "qemu/config-file.h"
#include "hw/acpi/acpi.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ

View File

@ -43,6 +43,7 @@
#include "hw/xen/xen.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "hw/acpi/acpi.h"
#include "cpu.h"
#ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h>

View File

@ -29,7 +29,6 @@
#include "monitor/monitor.h"
#include "sysemu/dma.h"
#include "exec/cpu-common.h"
#include "internal.h"
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>

View File

@ -8,7 +8,6 @@
*/
#include <hw/ide.h>
#include <hw/isa/isa.h>
#include "exec/iorange.h"
#include "sysemu/dma.h"
#include "sysemu/sysemu.h"
#include "hw/block/block.h"

View File

@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
#include "hw/hw.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "ui/console.h"
typedef struct {

View File

@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "ui/console.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))

View File

@ -24,7 +24,7 @@
#include "qemu/timer.h"
#include "ui/console.h"
#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */
#include "hw/arm/devices.h"
#include "hw/devices.h"
#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1

View File

@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "gic_internal.h"

View File

@ -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"

View File

@ -20,7 +20,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"

View File

@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"

View File

@ -30,7 +30,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"

View File

@ -28,7 +28,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"

View File

@ -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"

View File

@ -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"

View File

@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
//#define DEBUG

View File

@ -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>

View File

@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
/* For crc32 */

View File

@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
/* For crc32 */
#include <zlib.h>

View File

@ -15,6 +15,7 @@
*
*/
#include "hw/hw.h"
#include "vmxnet_tx_pkt.h"
#include "net/eth.h"
#include "qemu-common.h"
@ -22,7 +23,6 @@
#include "net/checksum.h"
#include "net/tap.h"
#include "net/net.h"
#include "exec/cpu-common.h"
enum {
VMXNET_TX_PKT_VHDR_FRAG = 0,

View File

@ -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"

View File

@ -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"

Some files were not shown because too many files have changed in this diff Show More