qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] bd2be1: arm: fix location of some include fil


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] bd2be1: arm: fix location of some include files
Date: Mon, 15 Apr 2013 16:00:14 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bd2be1500337f0349f70802e4d8d43f5aca61477
      
https://github.com/qemu/qemu/commit/bd2be1500337f0349f70802e4d8d43f5aca61477
  Author: Peter Maydell <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M hw/alpha/typhoon.c
    M hw/arm/armv7m.c
    M hw/arm/boot.c
    M hw/arm/collie.c
    M hw/arm/exynos4210.c
    M hw/arm/exynos4_boards.c
    M hw/arm/gumstix.c
    M hw/arm/highbank.c
    M hw/arm/integratorcp.c
    M hw/arm/kzm.c
    M hw/arm/mainstone.c
    M hw/arm/musicpal.c
    M hw/arm/nseries.c
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/arm/omap_sx1.c
    M hw/arm/palm.c
    M hw/arm/pic_cpu.c
    M hw/arm/realview.c
    M hw/arm/spitz.c
    M hw/arm/stellaris.c
    M hw/arm/strongarm.c
    M hw/arm/tosa.c
    M hw/arm/versatilepb.c
    M hw/arm/vexpress.c
    M hw/arm/xilinx_zynq.c
    M hw/arm/z2.c
    M hw/block/m25p80.c
    M hw/display/blizzard.c
    M hw/display/sm501.c
    M hw/display/tc6393xb.c
    M hw/input/stellaris_input.c
    M hw/input/tsc2005.c
    M hw/input/tsc210x.c
    M hw/intc/armv7m_nvic.c
    M hw/lm32/lm32_boards.c
    M hw/lm32/milkymist.c
    M hw/microblaze/petalogix_ml605_mmu.c
    M hw/microblaze/petalogix_s3adsp1800_mmu.c
    M hw/misc/cbus.c
    M hw/net/lan9118.c
    M hw/net/smc91c111.c
    M hw/ppc/virtex_ml507.c
    M hw/sh4/r2d.c
    M hw/timer/tusb6010.c
    R include/hw/arm.h
    A include/hw/arm/arm.h
    R include/hw/arm/devices.h
    A include/hw/devices.h
    M target-arm/arm-semi.c
    M target-arm/kvm.c

  Log Message:
  -----------
  arm: fix location of some include files

The recent rearrangement of include files had some minor errors:
 devices.h is not ARM specific and should not be in arm/
 arm.h should be in arm/

Move these two headers to correct this.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: fd123245b98fd6e13d829878f25b30a9417f4bfc
      
https://github.com/qemu/qemu/commit/fd123245b98fd6e13d829878f25b30a9417f4bfc
  Author: Jan Kiszka <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  Add linux-headers to QEMU_INCLUDES

virtio/dataplane/vring.c requires the Linux headers and is built for all
targets. So we need to add the corresponding include to QEMU_INCLUDES to
avoid that outdated distribution headers are used.

Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 35b2028f47eef4e20752f94f7cff650d828bfaee
      
https://github.com/qemu/qemu/commit/35b2028f47eef4e20752f94f7cff650d828bfaee
  Author: Hu Tao <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M default-configs/i386-softmmu.mak
    M default-configs/x86_64-softmmu.mak

  Log Message:
  -----------
  Fix failure to create q35 machine

This is a regression introduced by c0907c9e6417c. How to reproduce:

$ qemu-system-x86_64 -nodefaults -vnc :0 -M q35
qemu-system-x86_64: Unknown device 'q35-pcihost' for default sysbus
Aborted (core dumped)

Tested-by: Markus Armbruster <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 174d5d990c7b08e75677402a71c834b000171c94
      
https://github.com/qemu/qemu/commit/174d5d990c7b08e75677402a71c834b000171c94
  Author: Stefan Weil <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M default-configs/arm-softmmu.mak

  Log Message:
  -----------
  hw: Add lost ARM core again

Commit 0434e30afb6175212389811e0b28b948eb3c1e40 accidentally removed
the compilation of arm11mpcore.c.

Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0445259ba686f9ddf395f700c7d5b1ac400a451c
      
https://github.com/qemu/qemu/commit/0445259ba686f9ddf395f700c7d5b1ac400a451c
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M arch_init.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M include/hw/acpi/acpi.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  acpi: move declarations from pc.h to acpi.h

Functions defined in acpi/ should be declared in
acpi.h

Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e53339cf7cf90cf5c7a6bca64d0e7c0956f53a66
      
https://github.com/qemu/qemu/commit/e53339cf7cf90cf5c7a6bca64d0e7c0956f53a66
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M include/hw/acpi/acpi.h

  Log Message:
  -----------
  acpi.h: make it self contained

Headers shouldn't assume another header is included,
pull in everything necessary.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3b8acc11d3f60792f9f716f2a93c258e729af980
      
https://github.com/qemu/qemu/commit/3b8acc11d3f60792f9f716f2a93c258e729af980
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M configure
    M default-configs/i386-softmmu.mak
    M default-configs/x86_64-softmmu.mak
    M tpm/Makefile.objs

  Log Message:
  -----------
  configure: fix TPM logic

A non-native i386 or x86_64 emulator should not have TPM passthrough
support, since the TPM is only present for those hosts.

Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: bdee56f5466a724f043e6cfcfcf69866cc48cc94
      
https://github.com/qemu/qemu/commit/bdee56f5466a724f043e6cfcfcf69866cc48cc94
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M Makefile.objs
    M backends/tpm.c
    M hw/Makefile.objs
    A hw/tpm/Makefile.objs
    A hw/tpm/tpm_int.h
    A hw/tpm/tpm_passthrough.c
    A hw/tpm/tpm_tis.c
    A hw/tpm/tpm_tis.h
    M include/backends/tpm.h
    A include/sysemu/tpm.h
    A include/sysemu/tpm_backend_int.h
    R include/tpm/tpm.h
    M monitor.c
    A tpm.c
    R tpm/Makefile.objs
    R tpm/tpm.c
    R tpm/tpm_backend.c
    R tpm/tpm_backend.h
    R tpm/tpm_int.h
    R tpm/tpm_passthrough.c
    R tpm/tpm_tis.c
    R tpm/tpm_tis.h
    M vl.c

  Log Message:
  -----------
  tpm: reorganize headers and split hardware part

The TPM subsystem does not have a full front-end/back-end separation.
The sole available backend, tpm_passthrough, depends on the data
structures of the sole available frontend, tpm_tis.

However, we can at least try to split the user interface (tpm.c) from the
implementation (hw/tpm).  The patches makes tpm.c not include tpm_int.h,
which is shared between tpm_tis.c and tpm_passthrough.c; instead it
moves more stuff to tpm_backend.h.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: dccfcd0e5f8f37360ebda11ccc4dab164c04d5a3
      
https://github.com/qemu/qemu/commit/dccfcd0e5f8f37360ebda11ccc4dab164c04d5a3
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M backends/baum.c
    M backends/msmouse.c
    M backends/rng-egd.c
    M backends/rng-random.c
    M backends/rng.c
    M backends/tpm.c
    M bt-host.c
    M bt-vhci.c
    M gdbstub.c
    M hmp.c
    M hw/arm/omap2.c
    M hw/arm/pxa2xx.c
    M hw/arm/strongarm.c
    M hw/bt/core.c
    M hw/bt/hci-csr.c
    M hw/bt/hci.c
    M hw/char/cadence_uart.c
    M hw/char/debugcon.c
    M hw/char/escc.c
    M hw/char/etraxfs_ser.c
    M hw/char/exynos4210_uart.c
    M hw/char/grlib_apbuart.c
    M hw/char/imx_serial.c
    M hw/char/ipoctal232.c
    M hw/char/lm32_juart.c
    M hw/char/lm32_uart.c
    M hw/char/mcf_uart.c
    M hw/char/milkymist-uart.c
    M hw/char/omap_uart.c
    M hw/char/parallel.c
    M hw/char/pl011.c
    M hw/char/sclpconsole.c
    M hw/char/serial.c
    M hw/char/sh_serial.c
    M hw/char/spapr_vty.c
    M hw/char/virtio-console.c
    M hw/char/xen_console.c
    M hw/char/xilinx_uartlite.c
    M hw/core/qdev-properties-system.c
    M hw/core/qdev-properties.c
    M hw/display/xenfb.c
    M hw/isa/pc87312.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_malta.c
    M hw/misc/ivshmem.c
    M hw/net/xgmac.c
    M hw/ppc/spapr_events.c
    M hw/ppc/spapr_rtas.c
    M hw/sparc/leon3.c
    M hw/tpm/tpm_passthrough.c
    M hw/tpm/tpm_tis.c
    M hw/usb/ccid-card-emulated.c
    M hw/usb/ccid-card-passthru.c
    M hw/usb/dev-bluetooth.c
    M hw/usb/dev-serial.c
    M hw/usb/redirect.c
    M hw/virtio/virtio-rng.c
    M hw/xen/xen_backend.c
    M hw/xtensa/xtensa_lx60.c
    R include/backends/tpm.h
    R include/bt/bt.h
    R include/char/char.h
    M include/hw/virtio/virtio-rng.h
    R include/qemu/rng-random.h
    R include/qemu/rng.h
    A include/sysemu/bt.h
    A include/sysemu/char.h
    A include/sysemu/rng-random.h
    A include/sysemu/rng.h
    A include/sysemu/tpm_backend.h
    M monitor.c
    M net/slirp.c
    M qemu-char.c
    M qmp.c
    M qtest.c
    M slirp/slirp.c
    M spice-qemu-char.c
    M tpm.c
    M ui/console.c
    M ui/gtk.c
    M util/event_notifier-posix.c
    M vl.c
    M xen-all.c

  Log Message:
  -----------
  sysemu: avoid proliferation of include/ subdirectories

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0bc3cd624f1d59456cad769bb07e84066a2ddaf9
      
https://github.com/qemu/qemu/commit/0bc3cd624f1d59456cad769bb07e84066a2ddaf9
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M arch_init.c
    M dump.c
    M hw/alpha/typhoon.c
    M hw/ide/ahci.c
    M hw/ide/internal.h
    M hw/net/vmxnet_tx_pkt.c
    M hw/usb/libhw.c
    M kvm-stub.c
    M translate-all.c

  Log Message:
  -----------
  include: avoid useless includes of exec/ headers

Headers in include/exec/ are for the deepest innards of QEMU,
they should almost never be included directly.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: b421d9c6aba0ba3338c00b56cf45edbc150c42f3
      
https://github.com/qemu/qemu/commit/b421d9c6aba0ba3338c00b56cf45edbc150c42f3
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M include/exec/memory.h
    M include/qemu/typedefs.h
    M target-ppc/kvm_ppc.h

  Log Message:
  -----------
  memory: move core typedefs to qemu/typedefs.h

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c72dd2d04bd28f7ec6b073316270258684ba5fc3
      
https://github.com/qemu/qemu/commit/c72dd2d04bd28f7ec6b073316270258684ba5fc3
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M include/exec/memory-internal.h

  Log Message:
  -----------
  exec: remove useless declarations from memory-internal.h

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: fe6c211781f80ef4fc246269cecbbc21981089f0
      
https://github.com/qemu/qemu/commit/fe6c211781f80ef4fc246269cecbbc21981089f0
  Author: Andreas Färber <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M hw/core/qdev.c
    M include/hw/qdev-core.h

  Log Message:
  -----------
  qdev: Fix QOM unrealize behavior

Since commit 249d41720b7dfbb5951b430b9eefdbee7464f515 (qdev: Prepare
"realized" property) setting realized = true would register the device's
VMStateDescription, but realized = false would not unregister it. Fix that.

Moving the code from unparenting also revealed that we were calling
DeviceClass::init through DeviceClass::realize as interim solution but
DeviceClass::exit still at unparenting time with a realized check.
Make this symmetrical by implementing DeviceClass::unrealize to call it,
while we're setting realized = false in the unparenting path.
The only other unrealize user is mac_nvram, which can safely override it.

Thus, mark DeviceClass::exit as obsolete, new devices should implement
DeviceClass::unrealize instead.

Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: a907cf59d8a41ecb909ad4367cd016c7d71f8546
      
https://github.com/qemu/qemu/commit/a907cf59d8a41ecb909ad4367cd016c7d71f8546
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  Allow qtest to be used together with a virtual CPU

Signed-off-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 4ceb193d30fe9b1cda0dc73bddb8051659926fb9
      
https://github.com/qemu/qemu/commit/4ceb193d30fe9b1cda0dc73bddb8051659926fb9
  Author: Anthony Liguori <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M Makefile.objs
    M arch_init.c
    M backends/baum.c
    M backends/msmouse.c
    M backends/rng-egd.c
    M backends/rng-random.c
    M backends/rng.c
    M backends/tpm.c
    M bt-host.c
    M bt-vhci.c
    M configure
    M default-configs/arm-softmmu.mak
    M default-configs/i386-softmmu.mak
    M default-configs/x86_64-softmmu.mak
    M dump.c
    M gdbstub.c
    M hmp.c
    M hw/Makefile.objs
    M hw/alpha/typhoon.c
    M hw/arm/armv7m.c
    M hw/arm/boot.c
    M hw/arm/collie.c
    M hw/arm/exynos4210.c
    M hw/arm/exynos4_boards.c
    M hw/arm/gumstix.c
    M hw/arm/highbank.c
    M hw/arm/integratorcp.c
    M hw/arm/kzm.c
    M hw/arm/mainstone.c
    M hw/arm/musicpal.c
    M hw/arm/nseries.c
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/arm/omap_sx1.c
    M hw/arm/palm.c
    M hw/arm/pic_cpu.c
    M hw/arm/pxa2xx.c
    M hw/arm/realview.c
    M hw/arm/spitz.c
    M hw/arm/stellaris.c
    M hw/arm/strongarm.c
    M hw/arm/tosa.c
    M hw/arm/versatilepb.c
    M hw/arm/vexpress.c
    M hw/arm/xilinx_zynq.c
    M hw/arm/z2.c
    M hw/block/m25p80.c
    M hw/bt/core.c
    M hw/bt/hci-csr.c
    M hw/bt/hci.c
    M hw/char/cadence_uart.c
    M hw/char/debugcon.c
    M hw/char/escc.c
    M hw/char/etraxfs_ser.c
    M hw/char/exynos4210_uart.c
    M hw/char/grlib_apbuart.c
    M hw/char/imx_serial.c
    M hw/char/ipoctal232.c
    M hw/char/lm32_juart.c
    M hw/char/lm32_uart.c
    M hw/char/mcf_uart.c
    M hw/char/milkymist-uart.c
    M hw/char/omap_uart.c
    M hw/char/parallel.c
    M hw/char/pl011.c
    M hw/char/sclpconsole.c
    M hw/char/serial.c
    M hw/char/sh_serial.c
    M hw/char/spapr_vty.c
    M hw/char/virtio-console.c
    M hw/char/xen_console.c
    M hw/char/xilinx_uartlite.c
    M hw/core/qdev-properties-system.c
    M hw/core/qdev-properties.c
    M hw/display/blizzard.c
    M hw/display/sm501.c
    M hw/display/tc6393xb.c
    M hw/display/xenfb.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/ide/ahci.c
    M hw/ide/internal.h
    M hw/input/stellaris_input.c
    M hw/input/tsc2005.c
    M hw/input/tsc210x.c
    M hw/intc/armv7m_nvic.c
    M hw/isa/pc87312.c
    M hw/lm32/lm32_boards.c
    M hw/lm32/milkymist.c
    M hw/microblaze/petalogix_ml605_mmu.c
    M hw/microblaze/petalogix_s3adsp1800_mmu.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_malta.c
    M hw/misc/cbus.c
    M hw/misc/ivshmem.c
    M hw/net/lan9118.c
    M hw/net/smc91c111.c
    M hw/net/vmxnet_tx_pkt.c
    M hw/net/xgmac.c
    M hw/ppc/spapr_events.c
    M hw/ppc/spapr_rtas.c
    M hw/ppc/virtex_ml507.c
    M hw/sh4/r2d.c
    M hw/sparc/leon3.c
    M hw/timer/tusb6010.c
    A hw/tpm/Makefile.objs
    A hw/tpm/tpm_int.h
    A hw/tpm/tpm_passthrough.c
    A hw/tpm/tpm_tis.c
    A hw/tpm/tpm_tis.h
    M hw/usb/ccid-card-emulated.c
    M hw/usb/ccid-card-passthru.c
    M hw/usb/dev-bluetooth.c
    M hw/usb/dev-serial.c
    M hw/usb/libhw.c
    M hw/usb/redirect.c
    M hw/virtio/virtio-rng.c
    M hw/xen/xen_backend.c
    M hw/xtensa/xtensa_lx60.c
    R include/backends/tpm.h
    R include/bt/bt.h
    R include/char/char.h
    M include/exec/memory-internal.h
    M include/exec/memory.h
    M include/hw/acpi/acpi.h
    R include/hw/arm.h
    A include/hw/arm/arm.h
    R include/hw/arm/devices.h
    A include/hw/devices.h
    M include/hw/i386/pc.h
    M include/hw/virtio/virtio-rng.h
    R include/qemu/rng-random.h
    R include/qemu/rng.h
    M include/qemu/typedefs.h
    A include/sysemu/bt.h
    A include/sysemu/char.h
    A include/sysemu/rng-random.h
    A include/sysemu/rng.h
    A include/sysemu/tpm.h
    A include/sysemu/tpm_backend.h
    A include/sysemu/tpm_backend_int.h
    R include/tpm/tpm.h
    M kvm-stub.c
    M monitor.c
    M net/slirp.c
    M qemu-char.c
    M qmp.c
    M qtest.c
    M slirp/slirp.c
    M spice-qemu-char.c
    M target-arm/arm-semi.c
    M target-arm/kvm.c
    M target-ppc/kvm_ppc.h
    A tpm.c
    R tpm/Makefile.objs
    R tpm/tpm.c
    R tpm/tpm_backend.c
    R tpm/tpm_backend.h
    R tpm/tpm_int.h
    R tpm/tpm_passthrough.c
    R tpm/tpm_tis.c
    R tpm/tpm_tis.h
    M translate-all.c
    M ui/console.c
    M ui/gtk.c
    M util/event_notifier-posix.c
    M vl.c
    M xen-all.c

  Log Message:
  -----------
  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 <address@hidden>


  Commit: 24a6e7f4d91e9ed5f8117ecb083431a23f8609a0
      
https://github.com/qemu/qemu/commit/24a6e7f4d91e9ed5f8117ecb083431a23f8609a0
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-pci.c

  Log Message:
  -----------
  virtio-balloon: fix dynamic properties.

To keep compatibility with the old virtio-balloon-x, add the dynamic properties
to virtio-balloon-pci and virtio-balloon-ccw.

Cc: Luiz Capitulino <address@hidden>
Signed-off-by: KONRAD Frederic <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e0e367bad717...24a6e7f4d91e

reply via email to

[Prev in Thread] Current Thread [Next in Thread]