The following changes since commit 97af820f539efe80b87615a04f9de11ea585f725:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150529'
into staging (2015-05-29 17:10:57 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
for you to fetch changes up to 903b97864621d2fe702d623747611e1bc9bfc313:
virtio-mmio: ioeventfd support (2015-05-31 20:29:03 +0200)
----------------------------------------------------------------
pc, pci, tpm, virtio enhancements and fixes
A bunch of cleanups and fixes all over the place,
enhancements in TPM and virtio.
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
----------------------------------------------------------------
Cornelia Huck (3):
virtio: move host_features
virtio-ccw: Don't advertise VIRTIO_F_BAD_FEATURE
virtio: move VIRTIO_F_NOTIFY_ON_EMPTY into core
Eduardo Habkost (23):
pc: Replace tab with spaces
hw: Move commas inside HW_COMPAT_2_1 macro
pc: Move commas inside PC_COMPAT_* macros
spapr: Move commas inside SPAPR_COMPAT_* macros
hw: Define empty HW_COMPAT_2_[23] macros
pc: Define PC_COMPAT_2_[123] macros
spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros
spapr: define SPAPR_COMPAT_2_3
piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14
piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11
piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13
piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13
piix: Define PC_COMPAT_0_10
pc: Define MACHINE_OPTIONS macros consistently for all machines
pc: Define machines using a DEFINE_PC_MACHINE macro
pc: Convert *_MACHINE_OPTIONS macros into functions
pc: Move compat_props setting inside *_machine_options() functions
pc: Don't use QEMUMachine anymore
pc: Remove qemu_register_pc_machine() function
machine: Remove unused fields from QEMUMachine
piix: Add kvmclock_enabled, pci_enabled globals
piix: Eliminate pc_init_pci()
pc: Generate init functions with a macro
Jason Wang (9):
virtio-net: adding all queues in .realize()
virtio: device_plugged() can fail
virtio: introduce virtio_get_num_queues()
virtio-ccw: introduce ccw specific queue limit
virtio-ccw: validate the number of queues against bus limitation
virtio-s390: introduce virito s390 queue limit
virtio-s390: introduce virtio_s390_device_plugged()
virtio: rename VIRTIO_PCI_QUEUE_MAX to VIRTIO_QUEUE_MAX
virtio: increase the queue limit to 1024
Laszlo Ersek (4):
i386/pc: pc_basic_device_init(): delegate FDC creation request
i386/pc: '-drive if=floppy' should imply a board-default FDC
i386/pc_q35: don't insist on board FDC if there's no default floppy
i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted
Marcel Apfelbaum (7):
acpi: add aml_add() term
acpi: add aml_lless() term
acpi: add aml_index() term
acpi: add aml_shiftleft() term
acpi: add aml_shiftright() term
acpi: add aml_increment() term
acpi: add aml_while() term
Markus Armbruster (1):
acpi: Simplify printing to dynamic string
Pavel Fedin (1):
Add stream ID to MSI write
Radim Krčmář (1):
pc: acpi: fix pvpanic for buggy guests
Shannon Zhao (4):
hw/virtio/virtio-balloon: move adding property to
virtio_balloon_instance_init
hw/virtio/virtio-pci: use alias property for virtio-balloon-pci
hw/s390x/virtio-ccw: use alias property for virtio-balloon-ccw
hw/acpi/aml-build: Fix memory leak
Stefan Berger (3):
Extend TPM TIS interface to support TPM 2
tpm: Probe for connected TPM 1.2 or TPM 2
TPM2 ACPI table support
Ying-Shiuan Pan (1):
virtio-mmio: ioeventfd support
hw/s390x/s390-virtio-bus.h | 1 -
hw/s390x/virtio-ccw.h | 4 -
hw/tpm/tpm_int.h | 7 +
hw/tpm/tpm_tis.h | 1 +
hw/tpm/tpm_util.h | 28 ++
hw/virtio/virtio-pci.h | 1 -
include/exec/memattrs.h | 2 +
include/hw/acpi/acpi-defs.h | 18 ++
include/hw/acpi/aml-build.h | 7 +
include/hw/acpi/tpm.h | 5 +
include/hw/boards.h | 15 +-
include/hw/compat.h | 8 +-
include/hw/i386/pc.h | 89 ++++--
include/hw/pci/msi.h | 1 +
include/hw/s390x/s390_flic.h | 5 +-
include/hw/virtio/virtio-bus.h | 5 +-
include/hw/virtio/virtio.h | 14 +-
include/sysemu/tpm.h | 17 +-
include/sysemu/tpm_backend.h | 23 ++
backends/tpm.c | 14 +
hw/acpi/aml-build.c | 85 +++--
hw/char/virtio-serial-bus.c | 2 +-
hw/i386/acpi-build.c | 43 ++-
hw/i386/pc.c | 49 +--
hw/i386/pc_piix.c | 697 ++++++++++++++++++-----------------------
hw/i386/pc_q35.c | 237 ++++++--------
hw/net/virtio-net.c | 63 ++--
hw/pci/msi.c | 10 +-
hw/pci/msix.c | 3 +-
hw/ppc/spapr.c | 15 +-
hw/s390x/s390-virtio-bus.c | 30 +-
hw/s390x/s390-virtio-ccw.c | 2 +-
hw/s390x/virtio-ccw.c | 89 ++----
hw/scsi/virtio-scsi.c | 4 +-
hw/tpm/tpm_passthrough.c | 65 +---
hw/tpm/tpm_tis.c | 119 ++++++-
hw/tpm/tpm_util.c | 126 ++++++++
hw/virtio/virtio-balloon.c | 22 +-
hw/virtio/virtio-bus.c | 23 +-
hw/virtio/virtio-mmio.c | 205 ++++++++++--
hw/virtio/virtio-pci.c | 68 +---
hw/virtio/virtio.c | 63 ++--
vl.c | 15 -
hw/i386/Makefile.objs | 2 +-
hw/i386/ssdt-tpm.dsl | 16 +-
hw/i386/ssdt-tpm.hex.generated | 26 +-
hw/tpm/Makefile.objs | 2 +-
47 files changed, 1323 insertions(+), 1023 deletions(-)
create mode 100644 hw/tpm/tpm_util.h
create mode 100644 hw/tpm/tpm_util.c
