The following changes since commit 2d591ce2aeebf9620ff527c7946844a3122afeec:
Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-08-08' into staging (2014-08-08 14:16:05 +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 260cb1c409f6b41fc284ece95462e458d7fda6c4: pc: Get rid of pci-info leftovers (2014-08-14 13:22:25 +0200) ---------------------------------------------------------------- post-2.1 bugfixes A bunch of fixes that missed 2.1 by a small margin. If we do 2.1.1, some of these would be good candidates, added Cc qemu-stable as appropriate. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> ---------------------------------------------------------------- Gabriel L. Somlo (2): e1000: correctly handle phy_ctrl reserved & self-clearing bits e1000: use symbolic constants to init phy ctrl & status registers Hu Tao (3): hw:i386: typo fix: MEMORY_HOPTLUG_DEVICE -> MEMORY_HOTPLUG_DEVICE pc-dimm: validate node property numa: show hex number in error message for consistency and prefix them with 0x Jan Kiszka (3): pci: Use bus master address space for delivering MSI/MSI-X messages pc: Create 2.2 machine type hw/audio/intel-hda: Fix MSI capability address Levente Kurusa (1): ivshmem: fix building when debug mode is enabled Markus Armbruster (1): pc: Get rid of pci-info leftovers Michael S. Tsirkin (2): pc-dimm: fix up error message acpi: align RSDP include/hw/acpi/pc-hotplug.h | 2 +- include/hw/i386/pc.h | 9 ++++++- hw/audio/intel-hda.c | 4 ++- hw/i386/acpi-build.c | 2 +- hw/i386/pc.c | 30 --------------------- hw/i386/pc_piix.c | 23 +++++++++++----- hw/i386/pc_q35.c | 20 ++++++++++---- hw/mem/pc-dimm.c | 6 +++++ hw/misc/ivshmem.c | 4 +-- hw/net/e1000.c | 60 +++++++++++++++++++++++++++-------------- hw/pci/msi.c | 2 +- hw/pci/msix.c | 2 +- numa.c | 4 +-- hw/i386/acpi-dsdt.dsl | 4 +-- hw/i386/acpi-dsdt.hex.generated | 8 +++--- hw/i386/q35-acpi-dsdt.dsl | 4 +-- hw/i386/ssdt-mem.dsl | 16 +++++------ hw/i386/ssdt-misc.dsl | 2 +- 18 files changed, 113 insertions(+), 89 deletions(-)