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

[patchbot@xxxxxxx]

commit d84e4524e30413b2a1d724754e76a7d2480466f3
Merge: e381ccab5afe6b5e808aa550d8bd22b1d0757fde 
62ecc3a0e3c77a4944c92a02dd7fae2ab1f2290d
Author:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
AuthorDate: Thu Oct 10 11:02:48 2013 +0000
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
CommitDate: Thu Oct 10 11:02:48 2013 +0000

    Merge remote branch 'origin/stable-1.6' into xen-staging-master-9
    
    Conflicts:
        xen-all.c

 VERSION                        |    2 +-
 block.c                        |   11 ++++++---
 block/cow.c                    |    6 ++++-
 block/qcow2.c                  |    4 +--
 block/raw-win32.c              |   36 ++++++++++++++++++++++++------
 block/rbd.c                    |    3 +-
 block/stream.c                 |    2 +-
 block/vmdk.c                   |    6 ++--
 blockdev.c                     |    2 +-
 configure                      |   24 ++++++++++++++++++++
 exec.c                         |    9 ++++++-
 gdbstub.c                      |    6 +++-
 hw/acpi/core.c                 |    3 +-
 hw/acpi/piix4.c                |    1 +
 hw/audio/adlib.c               |    2 +-
 hw/block/virtio-blk.c          |   24 ++++++++++++++++++-
 hw/char/spapr_vty.c            |    2 +
 hw/display/qxl-render.c        |   15 ++++++++----
 hw/i386/kvmvapic.c             |   17 ++++++++++----
 hw/net/ne2000.c                |    2 +-
 hw/net/pcnet-pci.c             |    4 +-
 hw/pci-host/piix.c             |    9 +++++--
 hw/pci-host/q35.c              |    8 ++++--
 hw/scsi/scsi-bus.c             |   46 ++++++++++++++++++++++++++++----------
 hw/usb/core.c                  |    7 +++--
 hw/usb/dev-hid.c               |    2 +-
 hw/usb/dev-hub.c               |    6 +----
 hw/usb/hcd-ehci.c              |    7 ++---
 hw/usb/hcd-ehci.h              |    1 +
 hw/usb/hcd-xhci.c              |   47 +++++++++++++++++++++++++++++++++------
 hw/virtio/virtio-pci.c         |    3 +-
 hw/virtio/virtio.c             |    2 +-
 include/exec/ioport.h          |    4 +++
 include/hw/i386/pc.h           |   11 ++++++++-
 include/hw/scsi/scsi.h         |    2 +
 include/hw/virtio/virtio-blk.h |    1 +
 include/qom/cpu.h              |    2 +
 include/sysemu/sysemu.h        |    4 ++-
 ioport.c                       |   16 +++++++++++++
 memory.c                       |    2 +-
 migration-rdma.c               |    8 ++++--
 net/tap-bsd.c                  |   11 ---------
 qemu-char.c                    |   12 +++------
 qemu-coroutine.c               |   32 +++++++++++++++------------
 qemu-img.c                     |   16 ++++++++++++-
 qemu-io-cmds.c                 |    4 +++
 qom/cpu.c                      |    2 +-
 scripts/qapi-types.py          |    5 +++-
 scripts/qapi.py                |    2 +-
 target-i386/helper.c           |   34 +++++++++++++---------------
 target-ppc/translate.c         |    4 +-
 tci.c                          |   12 ----------
 util/iov.c                     |   10 +++-----
 vl.c                           |   15 ++++++------
 xen-all.c                      |    9 +++++++
 55 files changed, 362 insertions(+), 175 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