On 16/10/2015 10:49, Paolo Bonzini wrote: > The following changes since commit 5451316ed07b758a187dedf21047bed8f843f7f1: > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' > into staging (2015-10-12 15:52:54 +0100) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 353a0e34e66d4640c04937e6b04eaabc6245231e: > > kvm: Allow the Hyper-V vendor ID to be specified (2015-10-16 10:48:19 +0200) > > ---------------------------------------------------------------- > * KVM page size fix for PPC > * Support for Linux 4.4's new Hyper-V features > * Eliminate g_slice from areas I maintain > * checkpatch fix > * Peter's cpu_reload_memory_map() cleanups > * More changes to MAINTAINERS > * Require Python 2.6 > * kvm: Allow the Hyper-V vendor ID to be specified > * chardev creation fixes > * PCI requester id for ARM KVM > * cleanups and doc fixes > > ---------------------------------------------------------------- > Alex Williamson (1): > kvm: Allow the Hyper-V vendor ID to be specified > > Alexey Kardashevskiy (1): > kvm-all: Align to qemu_real_host_page_size in kvm_set_phys_mem > > Andrey Smetanin (3): > target-i386/kvm: Hyper-V HV_X64_MSR_RESET support > target-i386/kvm: set Hyper-V features cpuid bit > HV_X64_MSR_VP_INDEX_AVAILABLE > target-i386/kvm: Hyper-V HV_X64_MSR_VP_RUNTIME support > > Andy Whitcroft (1): > checkpatch: port fix from kernel "## is not a valid modifier" > > Daniel P. Berrange (1): > README: fill out some useful quickstart information > > Markus Armbruster (1): > configure: Require Python 2.6 > > Paolo Bonzini (33): > nbd: switch from g_slice allocator to malloc > scsi: switch from g_slice allocator to malloc > megasas: fix megasas_get_sata_addr > checkpatch: allow open braces on typedef lines > linux-headers: update from kvm/next > exec: remove non-TCG stuff from exec-all.h header. > MAINTAINERS: add two devices to the e500 section > MAINTAINERS: Add more Xen files > MAINTAINERS: Add more pxa2xx files and boards > MAINTAINERS: Add maintainer for ARM PrimeCell and integrated devices > MAINTAINERS: Add more devices to realview board > qemu-sockets: fix conversion of ipv4/ipv6 JSON to QemuOpts > qemu-char: cleanup qmp_chardev_add > qemu-char: cleanup HAVE_CHARDEV_* > qemu-char: add create to register_char_driver > qemu-char: convert file backend to data-driven creation > qemu-char: convert serial backend to data-driven creation > qemu-char: convert parallel backend to data-driven creation > qemu-char: convert pipe backend to data-driven creation > qemu-char: convert socket backend to data-driven creation > qemu-char: convert UDP backend to data-driven creation > qemu-char: convert pty backend to data-driven creation > qemu-char: convert null backend to data-driven creation > qemu-char: convert mux backend to data-driven creation > qemu-char: convert msmouse backend to data-driven creation > qemu-char: convert braille backend to data-driven creation > qemu-char: convert testdev backend to data-driven creation > qemu-char: convert stdio backend to data-driven creation > qemu-char: convert console backend to data-driven creation > qemu-char: convert spice backend to data-driven creation > qemu-char: convert vc backend to data-driven creation > qemu-char: convert ringbuf backend to data-driven creation > qemu-char: cleanup after completed conversion to cd->create > > Pavel Fedin (3): > kvm: Make KVM_CAP_SIGNAL_MSI globally available > hw/pci: Introduce pci_requester_id() > kvm: Pass PCI device pointer to MSI routing functions > > Peter Maydell (3): > exec.c: Don't call cpu_reload_memory_map() from cpu_exec_init() > cpu-exec-common.c: Clarify comment about cpu_reload_memory_map()'s RCU > operations > exec.c: Collect AddressSpace related fields into a CPUAddressSpace > struct > > Sergey Fedorov (1): > doc/rcu: fix g_free_rcu() usage example > > Thomas Huth (1): > kvm: Move x86-specific functions into target-i386/kvm.c > > MAINTAINERS | 51 +++- > README | 108 +++++++- > backends/baum.c | 17 +- > backends/msmouse.c | 8 +- > backends/testdev.c | 8 +- > configure | 12 +- > cpu-exec-common.c | 33 +-- > docs/rcu.txt | 2 +- > exec.c | 57 +++-- > hw/i386/kvm/pci-assign.c | 11 +- > hw/pci/msi.c | 2 +- > hw/pci/pcie_aer.c | 2 +- > hw/scsi/megasas.c | 2 +- > hw/scsi/scsi-bus.c | 4 +- > hw/scsi/virtio-scsi-dataplane.c | 10 +- > hw/scsi/virtio-scsi.c | 12 +- > hw/vfio/pci.c | 11 +- > hw/virtio/virtio-pci.c | 5 +- > include/exec/exec-all.h | 8 +- > include/exec/memattrs.h | 4 +- > include/exec/ram_addr.h | 1 + > include/hw/pci/pci.h | 5 + > include/qemu/typedefs.h | 1 + > include/qom/cpu.h | 7 +- > include/standard-headers/asm-x86/hyperv.h | 6 + > include/sysemu/char.h | 18 +- > include/sysemu/cpus.h | 1 + > include/sysemu/kvm.h | 22 +- > include/ui/qemu-spice.h | 2 - > kvm-all.c | 56 ++--- > kvm-stub.c | 10 +- > linux-headers/asm-arm64/kvm.h | 37 ++- > linux-headers/linux/kvm.h | 12 + > nbd.c | 4 +- > qemu-char.c | 392 > ++++++++++++++++-------------- > scripts/checkpatch.pl | 9 +- > spice-qemu-char.c | 21 +- > stubs/Makefile.objs | 5 - > stubs/chr-baum-init.c | 7 - > stubs/chr-msmouse.c | 7 - > stubs/chr-testdev.c | 7 - > stubs/qemu-chr-open-spice.c | 14 -- > stubs/vc-init.c | 7 - > target-arm/kvm.c | 2 +- > target-i386/cpu-qom.h | 4 + > target-i386/cpu.c | 4 + > target-i386/cpu.h | 1 + > target-i386/kvm.c | 86 ++++++- > target-i386/machine.c | 20 ++ > target-mips/kvm.c | 2 +- > target-ppc/kvm.c | 2 +- > target-s390x/kvm.c | 2 +- > ui/console.c | 11 +- > ui/gtk.c | 2 +- > util/qemu-sockets.c | 9 +- > 55 files changed, 725 insertions(+), 438 deletions(-) > delete mode 100644 stubs/chr-baum-init.c > delete mode 100644 stubs/chr-msmouse.c > delete mode 100644 stubs/chr-testdev.c > delete mode 100644 stubs/qemu-chr-open-spice.c > delete mode 100644 stubs/vc-init.c >
I've dropped patch 49, but everything else is still good. Paolo
