« Previous | Next » 

Revision 4ceb193d

ID4ceb193d30fe9b1cda0dc73bddb8051659926fb9

Added by Anthony Liguori about 11 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted