Peter Maydell d6688ba17b pc, acpi, virtio, tpm ... This includes pxb support by Marcel, as well as multiple enhancements all over the place. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVcC2WAAoJECgfDbjSjVRpwgcH/3mvFP3UmvmXyzf8mYtQ/1fR ikvdTGHl2DR7TMQszNeCJn/p6NgH3oXRbXh39xM1xl9D2/dsZH9o1cUyFE04K9LK am0cTmlty1OEyFN8BX1TtpngUxa5mpRA/+NYuWbh1FoTp6RoEPM6P+L1zLqtXYn1 REF++ehrsQI2Az2pibf4nul8bwuTWJLJeMS6TcCVCRGoaHsCESiVMu2sQrzEbWEW E8ZWaXaiycLxLkW0/oU8BmZyrAk1PHdHwgbMUINV0kV5E2u+ZU+3KY79ezC2FyHW NV7G9Rhh/5H828/cB6UP4CPZ4AYIYmg02iz5XBGKbd8WS9oPrJVK7EoqfU3oZfc= =5AmP -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pc, acpi, virtio, tpm This includes pxb support by Marcel, as well as multiple enhancements all over the place. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu Jun 4 11:51:02 2015 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: (28 commits) vhost: logs sharing hw/acpi: piix4_pm_init(): take fw_cfg object no more hw/acpi: move "etc/system-states" fw_cfg file from PIIX4 to core hw/acpi: acpi_pm1_cnt_init(): take "disable_s3" and "disable_s4" pc-dimm: don't assert if pc-dimm alignment != hotpluggable mem range size docs: Add PXB documentation apci: fix PXB behaviour if used with unsupported BIOS hw/pxb: add numa_node parameter hw/pci: add support for NUMA nodes hw/pxb: add map_irq func hw/pci: inform bios if the system has extra pci root buses hw/pci: introduce PCI Expander Bridge (PXB) hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query hw/acpi: remove from root bus 0 the crs resources used by other buses. hw/acpi: add _CRS method for extra root busses hw/apci: add _PRT method for extra PCI root busses hw/acpi: add support for i440fx 'snooping' root busses hw/pci: extend PCI config access to support devices behind PXB hw/i386: query only for q35/pc when looking for pci host bridge hw/pci: made pci_bus_num a PCIBusClass method ... Conflicts: hw/i386/pc_piix.c Signed-off-by: Peter Maydell <peter.maydell@linaro.org>		2015-06-04 18:33:24 +01:00
..
block	qapi: add dirty bitmap status	2015-05-29 12:53:12 +02:00
disas	disas: Implement disassembly output for A64	2014-02-08 14:50:48 +00:00
exec	softmmu: support up to 12 MMU modes	2015-06-03 23:56:56 +02:00
fpu	softfloat: expand out STATUS macro	2015-02-06 16:11:38 +00:00
hw	pc, acpi, virtio, tpm	2015-06-04 18:33:24 +01:00
libdecnumber	Fix new typos in comments (found by codespell)	2014-07-18 17:45:36 +04:00
migration	migration: Use an array instead of 3 parameters	2015-05-07 18:31:53 +02:00
monitor	monitor: Change return type of monitor_cur_is_qmp() to bool	2015-06-02 10:07:16 +02:00
net	net: add MAC address string printer	2015-05-11 14:49:03 +01:00
qapi	qobject: Add a special null QObject	2015-05-11 08:59:07 -04:00
qemu	util: move read_password method out of qemu-img into osdep/oslib	2015-05-22 17:08:01 +02:00
qom	exec.c: Capture the memory attributes for a watchpoint hit	2015-04-26 16:49:24 +01:00
standard-headers	virtio-input: add linux/input.h	2015-05-29 10:30:06 +02:00
sysemu	pc, acpi, virtio, tpm	2015-06-04 18:33:24 +01:00
ui	gtk: add opengl support, using egl	2015-05-29 11:43:29 +02:00
config.h
elf.h	linux/elf.h update	2015-05-27 17:52:03 +02:00
glib-compat.h	glib: remove stale compat functions	2015-05-22 15:58:06 -04:00
qemu-common.h	machine: add default_ram_size to machine class	2015-06-03 23:56:55 +02:00
qemu-io.h	qemu-io: Use BlockBackend	2015-02-16 15:07:19 +00:00
qjson.h	QJSON: Add JSON writer	2015-02-05 17:16:14 +01:00
trace-tcg.h	trace: [tcg] Generate TCG tracing routines	2014-08-12 14:26:12 +01:00
trace.h	trace: [tcg] Include event definitions in "trace.h"	2014-08-12 14:26:12 +01:00