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
..
acpi	memhp: don't generate memory hotplug AML if it's not enabled/supported	2017-01-10 07:03:24 +02:00
adc	STM32F2xx: Add the ADC device	2016-10-04 13:28:07 +01:00
arm	hw/arm/virt: Add board property to enable EL2	2017-01-20 11:15:11 +00:00
audio	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
block	block/qdev: Allow configuring rerror/werror with qdev properties	2016-07-13 13:32:27 +02:00
char	char: use qemu_chr_fe* functions with CharBackend argument	2016-10-24 15:27:21 +02:00
core	generic-loader: Add a generic loader	2016-10-04 13:28:09 +01:00
cpu	qapi: keep names in 'CpuInstanceProperties' in sync with struct CPUCore	2016-06-27 13:15:06 +10:00
cris	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
display	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
dma	dma: xlnx-zynq-devcfg: Fix up XLNX_ZYNQ_DEVCFG_R_MAX	2016-09-22 18:13:08 +01:00
gpio	Clean up ill-advised or unusual header guards	2016-07-12 16:20:46 +02:00
i2c	i2c: Allow I2C devices to NAK start events	2017-01-09 11:40:20 +00:00
i386	pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8	2017-01-20 13:22:57 +01:00
ide	ide: Fix memory leak in ide_register_restart_cb()	2016-09-29 15:50:29 -04:00
input	adb-keys.h: initial commit	2016-09-23 10:29:40 +10:00
intc	hw/intc/arm_gicv3: Implement gicv3_cpuif_virt_update()	2017-01-20 11:15:10 +00:00
ipack	ipack: Update e-mail address	2016-05-18 15:04:27 +03:00
ipmi	ipmi: rework the fwinfo to be fetched from the interface	2016-06-07 15:36:54 +03:00
isa	portio: keep references on portio	2016-09-08 18:05:21 +04:00
kvm	hw: move headers to include/	2013-04-08 18:13:10 +02:00
lm32	intc: make HMP 'info irq' and 'info pic' commands use InterruptStatsProvider interface	2016-10-04 10:00:25 +02:00
m68k	m68k: QOMify the MCF Fast Ethernet Controller device	2017-01-20 10:36:38 +08:00
mem	nvdimm acpi: rename nvdimm_acpi_hotplug	2016-11-15 17:20:37 +02:00
mips	Move target-* CPU file into a target/ folder	2016-12-20 21:52:12 +01:00
misc	aspeed: add the definitions for the AST2400 A1 SoC	2016-12-27 14:59:28 +00:00
net	cadence_gem: Add support for screening	2016-09-22 18:13:07 +01:00
nvram	fw-cfg: turn FW_CFG_FILE_SLOTS into a device property	2017-01-18 22:59:53 +02:00
pci	pcie_aer: support configurable AER capa version	2017-01-10 07:02:52 +02:00
pci-host	spapr: Fix 2.7<->2.8 migration of PCI host bridge	2016-11-23 12:00:48 +11:00
ppc	Move target-* CPU file into a target/ folder	2016-12-20 21:52:12 +01:00
s390x	s390x/kvm: disable cpu model for the 2.7 machine	2016-09-19 11:05:51 +02:00
scsi	Remove unused function declarations	2016-09-15 15:32:22 +03:00
sd	Clean up ill-advised or unusual header guards	2016-07-12 16:20:46 +02:00
sh4	Move target-* CPU file into a target/ folder	2016-12-20 21:52:12 +01:00
smbios	smbios: filter based on CONFIG_SMBIOS rather than TARGET	2017-01-16 17:52:34 +01:00
sparc	target-sparc: move common cpu initialisation routines to sparc64.c	2017-01-18 22:03:44 +01:00
ssi	aspeed/smc: handle SPI flash Command mode	2017-01-20 11:15:08 +00:00
timer	target-sparc: implement sun4v RTC	2017-01-18 22:03:44 +01:00
tricore	Clean up header guards that don't match their file name	2016-07-12 16:19:16 +02:00
unicore32	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
usb	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
vfio	vfio: Pass an error object to vfio_get_device	2016-10-17 10:58:00 -06:00
virtio	First set of s390x patches for 2.9:	2017-01-20 15:53:58 +00:00
watchdog	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
xen	xen: create qdev for each backend device	2016-11-22 10:29:39 -08:00
boards.h	cpu: Support a target CPU having a variable page size	2016-10-24 16:26:49 +01:00
bt.h	bt-hci-csr: drop unused argument	2016-10-08 09:02:19 +03:00
compat.h	fw-cfg: bump "x-file-slots" to 0x20 for 2.9+ machine types	2017-01-18 22:59:53 +02:00
devices.h	arm: fix location of some include files	2013-04-15 15:16:01 +02:00
elf_ops.h	loader: Add AddressSpace loading support to ELFs	2016-09-22 18:13:08 +01:00
empty_slot.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
fw-path-provider.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
hotplug.h	qdev: hotplug: drop HotplugHandler.post_plug callback	2016-11-15 17:20:37 +02:00
hw.h	hw: move reset handlers from vl.c to hw/core	2017-01-16 17:52:35 +01:00
ide.h	Call pci_piix3_xen_ide_unplug from unplug_disks	2014-02-20 17:28:08 +00:00
irq.h	irq: Remove qemu_irq_intercept_out	2014-10-23 16:41:25 +02:00
loader.h	fw-cfg: support writeable blobs	2017-01-18 22:59:53 +02:00
nmi.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
or-irq.h	irq: Add a new irq device that allows the ORing of lines	2016-10-04 13:28:07 +01:00
pcmcia.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
platform-bus.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
ptimer.h	hw/ptimer: Add "no counter round down" policy	2016-10-24 16:26:52 +01:00
qdev-core.h	bus: simplify name handling	2016-09-08 18:05:22 +04:00
qdev-dma.h	qdev: Remove hex8/32/64 property types	2014-02-14 21:12:04 +01:00
qdev-properties.h	char: replace PROP_CHR with CharBackend	2016-10-24 15:27:20 +02:00
qdev.h	hw: move headers to include/	2013-04-08 18:13:10 +02:00
register.h	register: Add block initialise helper	2016-07-04 13:15:22 +01:00
stream.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
sysbus.h	sysbus: Remove ignored return value of FindSysbusDeviceFunc	2016-09-27 17:03:34 -03:00
usb.h	usb: Add QOM property "attached".	2016-06-22 12:53:26 +02:00