Peter Maydell 598cf1c805 * QOM interface fix (Eduardo) ... * RTC fixes (Gaohuai, Igor) * Memory leak fixes (Li Qiang, me) * Ctrl-a b regression (Marc-André) * Stubs cleanups and fixes (Leif, me) * hxtool tweak (me) * HAX support (Vincent) * QemuThread, exec.c and SCSI fixes (Roman, Xinhua, me) * PC_COMPAT_2_8 fix (Marcelo) * stronger bitmap assertions (Peter) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQExBAABCAAbBQJYggc9FBxwYm9uemluaUByZWRoYXQuY29tAAoJEL/70l94x66D 5pMH/092iVHw1la8VmphQd8W7hkCHckvVbwaEJ+n4BP8MjeUNmYFJX+op9Qlpqfe ekYqQgK69v2UwuofVK2gqS+Y2EyFHivTESk5pS3SM3lTewV1fzCM/HVG3pTxV/ol V+eBnp+shrfNG3Eg7YThTqx4LkDUp24Pd3HJVblQZMVpqGzL2xUuUQzSf8F/eeQJ xO61pm0ovpCY5MCg3kPLx8GIkPAmcXo5jhMCTz5aLnQW6TO/mwx271a4UE2RTLZ7 cFjNhxdGSzlnn2RwId4HVYWGU42taW6mpa8NX1hVVUXa1A2qlAfi5N/WLaH0aGYR J5ZTIaXdPUBx2SrUmd8udj4a818= =H5BQ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * QOM interface fix (Eduardo) * RTC fixes (Gaohuai, Igor) * Memory leak fixes (Li Qiang, me) * Ctrl-a b regression (Marc-André) * Stubs cleanups and fixes (Leif, me) * hxtool tweak (me) * HAX support (Vincent) * QemuThread, exec.c and SCSI fixes (Roman, Xinhua, me) * PC_COMPAT_2_8 fix (Marcelo) * stronger bitmap assertions (Peter) # gpg: Signature made Fri 20 Jan 2017 12:49:01 GMT # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: (35 commits) pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8 bitmap: assert that start and nr are non negative Revert "win32: don't run subprocess tests on Mingw32 platform" hax: add Darwin support Plumb the HAXM-based hardware acceleration support target/i386: Add Intel HAX files kvm: move cpu synchronization code KVM: PPC: eliminate unnecessary duplicate constants ramblock-notifier: new char: fix ctrl-a b not working exec: Add missing rcu_read_unlock x86: ioapic: fix fail migration when irqchip=split x86: ioapic: dump version for "info ioapic" x86: ioapic: add traces for ioapic hxtool: emit Texinfo headings as @subsection qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create() serial: fix memory leak in serial exit scsi-block: fix direction of BYTCHK test for VERIFY commands pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged acpi: filter based on CONFIG_ACPI_X86 rather than TARGET ... # Conflicts: # include/hw/i386/pc.h		2017-01-20 16:42:07 +00:00
..
ccw-device.c	s390x/css: Unplug handler of virtual css bridge	2016-07-11 09:48:05 +02:00
ccw-device.h	s390x/css: Unplug handler of virtual css bridge	2016-07-11 09:48:05 +02:00
css-bridge.c	s390x/css: provide a dev_path for css devices	2016-07-20 15:47:25 +02:00
css.c	s390x/css: {c,h,t,r,x}sch: require enable AND device number valid	2016-09-28 13:24:51 +02:00
event-facility.c	include/qemu/osdep.h: Don't include qapi/error.h	2016-03-22 22:20:15 +01:00
ipl.c	s390x/css: Unplug handler of virtual css bridge	2016-07-11 09:48:05 +02:00
ipl.h	s390x/ipl: fix reboots for migration from different bios	2016-07-11 09:48:05 +02:00
Makefile.objs	s390x/css: Unplug handler of virtual css bridge	2016-07-11 09:48:05 +02:00
s390-pci-bus.c	s390x/pci: merge msix init functions	2017-01-20 10:02:02 +01:00
s390-pci-bus.h	s390x/pci: handle PCIBridge bus number	2017-01-20 10:02:02 +01:00
s390-pci-inst.c	* QOM interface fix (Eduardo)	2017-01-20 16:42:07 +00:00
s390-pci-inst.h	s390x/pci: make S390PCIIOMMU inherit Object	2017-01-20 09:48:09 +01:00
s390-skeys-kvm.c	s390: Clean up includes	2016-01-29 15:07:22 +00:00
s390-skeys.c	s390: use FILE instead of QEMUFile for creating text file	2016-05-26 11:31:05 +05:30
s390-virtio-ccw.c	s390x: add compat machine for 2.9	2017-01-20 09:48:09 +01:00
s390-virtio-hcall.c	s390: Clean up includes	2016-01-29 15:07:22 +00:00
s390-virtio.c	s390x/cpumodel: "host" and "qemu" as CPU subclasses	2016-09-06 17:06:49 +02:00
s390-virtio.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
sclp.c	s390x: remove useless cast	2016-09-15 15:32:22 +03:00
sclpcpu.c	s390: Clean up includes	2016-01-29 15:07:22 +00:00
sclpquiesce.c	Use #include "..." for our own headers, <...> for others	2016-07-12 16:19:16 +02:00
trace-events	trace-events: fix first line comment in trace-events	2016-08-12 10:36:01 +01:00
virtio-ccw.c	virtio-ccw: fix ring sizing	2017-01-20 10:02:02 +01:00
virtio-ccw.h	virtio: move ioeventfd_started flag to VirtioBusState	2016-10-30 19:51:32 +02:00