The following changes since commit e081c24d30c1e7b29eb4450aa16d6a0da5782797:
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging (2016-05-23 10:30:41 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 1453e6627d19a8d6d54480c6980f5cef5dfc6833: cpus: call the core nmi injection function (2016-05-23 16:53:47 +0200) ---------------------------------------------------------------- * NMI cleanups (Bandan) * RAMBlock/Memory cleanups and fixes (Dominik, Gonglei, Fam, me) * first part of linuxboot support for fw_cfg DMA (Richard) * IOAPIC fix (Peter Xu) * iSCSI SG_IO fix (Vadim) * Various infrastructure bug fixes (Zhijian, Peter M., Stefan) * CVE fixes (Prasad) ---------------------------------------------------------------- Bandan Das (3): target-i386: add a generic x86 nmi handler nmi: remove x86 specific nmi handling cpus: call the core nmi injection function Dominik Dingel (1): exec.c: Ensure right alignment also for file backed ram Fam Zheng (2): memory: Remove code for mr->may_overlap memory: Drop FlatRange.romd_mode Gonglei (2): memory: drop find_ram_block() exec: adjust rcu_read_lock requirement Li Zhijian (1): vl: change runstate only if new state is different from current state Paolo Bonzini (3): target-i386: key sfence availability on CPUID_SSE, not CPUID_SSE2 memory: remove unnecessary masking of MemoryRegion ram_addr coccinelle: add g_assert_cmp* to macro file Peter Maydell (2): cpus.c: Use pthread_sigmask() rather than sigprocmask() Remove config-devices.mak on 'make clean' Peter Xu (2): ioapic: keep RO bits for IOAPIC entry ioapic: clear remote irr bit for edge-triggered interrupts Pranith Kumar (1): docs/atomics.txt: Update pointer to linux macro Prasad J Pandit (3): i386: kvmvapic: initialise imm32 variable esp: check command buffer length before write(CVE-2016-4439) esp: check dma length before reading scsi command(CVE-2016-4441) Richard W.M. Jones (2): scripts/signrom.py: Allow option ROM checksum script to write the size header. scripts/signrom.py: Check for magic in option ROMs. Stefan Weil (1): configure: Allow builds with extra warnings Vadim Rozenfeld (1): iscsi: pass SCSI status back for SG_IO Makefile | 1 + block/iscsi.c | 1 + configure | 2 +- cpus.c | 16 +--------- docs/atomics.txt | 4 +-- exec.c | 64 +++++++++++---------------------------- hw/core/nmi.c | 24 --------------- hw/i386/kvmvapic.c | 2 +- hw/i386/pc.c | 20 ++++++++++++ hw/intc/ioapic.c | 33 ++++++++++++++++++++ hw/scsi/esp.c | 17 ++++++++--- hw/watchdog/watchdog.c | 2 +- include/exec/cpu-common.h | 4 +-- include/exec/memory.h | 1 - include/exec/ram_addr.h | 2 +- include/hw/i386/ioapic_internal.h | 5 +++ include/hw/nmi.h | 1 - include/qemu/osdep.h | 13 ++++++++ memory.c | 46 ++-------------------------- migration/ram.c | 2 +- migration/savevm.c | 4 +-- scripts/cocci-macro-file.h | 6 ++++ scripts/signrom.py | 28 +++++++++++++++-- target-i386/translate.c | 5 +++ translate-all.c | 3 +- util/oslib-posix.c | 13 -------- vl.c | 4 +++ 27 files changed, 158 insertions(+), 165 deletions(-) -- 1.8.3.1