[Xen-changelog] [qemu-upstream-unstable] Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master

[patchbot@xxxxxxx]

commit 42ffdf360dd9df66b0a4a7ada059c02a3cf3a8de
Merge: be11dc1e9172f91e798a8f831b30c14b479e08e8 
2001e197cf68a4f262a5a06e0ffe6dce3c2e2a7b
Author:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
AuthorDate: Wed Mar 11 11:16:38 2015 +0000
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
CommitDate: Wed Mar 11 11:16:38 2015 +0000

    Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master

 VERSION                             |    2 +-
 audio/audio_template.h              |    2 +-
 block-migration.c                   |   14 +++-
 block.c                             |   36 ++++++-----
 block/iscsi.c                       |    2 +-
 block/nfs.c                         |   15 +++++
 block/qcow2-cluster.c               |    2 +-
 block/qcow2.c                       |   33 +++++++---
 block/raw-posix.c                   |    3 +-
 block/raw-win32.c                   |    2 +-
 block/raw_bsd.c                     |    2 +-
 block/vpc.c                         |   10 +--
 block/vvfat.c                       |    6 ++
 cpus.c                              |    4 +
 exec.c                              |    4 +-
 hw/audio/sb16.c                     |    4 +-
 hw/char/serial.c                    |   31 ++++++++-
 hw/core/qdev.c                      |    7 ++-
 hw/i386/acpi-dsdt-cpu-hotplug.dsl   |    1 +
 hw/i386/acpi-dsdt.hex.generated     |   43 +++++++++++--
 hw/i386/kvm/apic.c                  |   10 ++-
 hw/i386/q35-acpi-dsdt.hex.generated |   45 +++++++++++---
 hw/input/hid.c                      |    2 +-
 hw/input/pckbd.c                    |   10 +++-
 hw/intc/apic_common.c               |    5 ++
 hw/isa/vt82c686.c                   |    2 +-
 hw/misc/vfio.c                      |    1 +
 hw/ppc/spapr_iommu.c                |    6 +-
 hw/scsi/scsi-bus.c                  |    2 +
 hw/scsi/virtio-scsi.c               |    2 +-
 hw/timer/mc146818rtc.c              |    2 +-
 hw/virtio/dataplane/vring.c         |    4 +-
 include/block/block_int.h           |    8 +++
 include/hw/i386/apic_internal.h     |    1 +
 include/qemu/atomic.h               |    4 +-
 libcacard/Makefile                  |    2 +
 linux-user/main.c                   |    9 +++-
 linux-user/signal.c                 |    6 +-
 pc-bios/efi-e1000.rom               |  Bin 194560 -> 197120 bytes
 pc-bios/efi-eepro100.rom            |  Bin 196096 -> 197632 bytes
 pc-bios/efi-ne2k_pci.rom            |  Bin 194560 -> 195584 bytes
 pc-bios/efi-pcnet.rom               |  Bin 194560 -> 195584 bytes
 pc-bios/efi-rtl8139.rom             |  Bin 198144 -> 200192 bytes
 pc-bios/efi-virtio.rom              |  Bin 192000 -> 194048 bytes
 pc-bios/linuxboot.bin               |  Bin 1024 -> 1024 bytes
 pc-bios/optionrom/linuxboot.S       |   37 ++++++++---
 qemu-coroutine.c                    |    2 +-
 qemu-img.c                          |   21 ++++++
 roms/ipxe                           |    2 +-
 target-arm/translate-a64.c          |    2 +-
 target-i386/translate.c             |    3 +-
 target-mips/machine.c               |    6 +-
 target-xtensa/translate.c           |   27 +++++++-
 tests/acpi-test-data/pc/DSDT        |  Bin 3592 -> 3621 bytes
 tests/acpi-test-data/q35/DSDT       |  Bin 8182 -> 8211 bytes
 tests/qemu-iotests/026.out          |  120 +++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/071.out          |    8 +++
 tests/qemu-iotests/080              |    2 +
 tests/qemu-iotests/080.out          |    2 +
 tests/qemu-iotests/089.out          |    2 +
 tests/qemu-iotests/113              |   76 ++++++++++++++++++++++
 tests/qemu-iotests/113.out          |   15 +++++
 tests/qemu-iotests/114              |   61 ++++++++++++++++++
 tests/qemu-iotests/114.out          |   13 ++++
 tests/qemu-iotests/common.rc        |    4 +-
 tests/qemu-iotests/group            |    2 +
 tests/qemu-iotests/qcow2.py         |    4 +
 tests/tcg/xtensa/test_mmu.S         |   26 ++++----
 util/qemu-thread-posix.c            |    2 +
 vl.c                                |   15 +++--
 70 files changed, 667 insertions(+), 129 deletions(-)

--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog