Commit 4ceb193d authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents a907cf59 c72dd2d0

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -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/

arch_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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, ...) \

backends/baum.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

backends/msmouse.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

backends/rng-egd.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */