The following changes since commit 699eae17b841e6784dc3864bf357e26bff1e9dfe:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-misc-20150120' into
staging (2015-01-20 16:19:58 +0000)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 9fc2ecf4e8266dcb01961851c595d09485d26bc1:
kvm_stat: Add RESET support for perf event ioctl (2015-01-26 10:03:09 +0100)
----------------------------------------------------------------
- Many fixes from the floor as usual
- New "edu" device
- Disabling HLE and RTM on Haswell & Broadwell
- kvm_stat updates
- Added --enable-modules to Travis, in preparation for switching
the default
----------------------------------------------------------------
Christian Borntraeger (1):
sparse: Fix build with sparse on .S files
Eduardo Habkost (1):
target-i386: Disable HLE and RTM on Haswell & Broadwell
Jiri Slaby (1):
hw: misc, add educational driver
Kevin Wolf (3):
tests/multiboot: Update reference output
multiboot: Fix offset of bootloader name
tests/multiboot: Add test for modules
Paolo Bonzini (9):
pc: fix KVM features in pc-1.3 and earlier machine types
target-i386: use vmstate_offset_sub_array for AVX registers
target-i386: make xmm_regs 512-bit wide
qemu-timer: add timer_init and timer_init_ns/us/ms
qemu-timer: introduce timer_deinit
vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*
apic: do not dereference pointer before it is checked for NULL
.travis.yml: Add "--enable-modules"
exec: fix madvise of NULL pointer
Wei Huang (4):
kvm_stat: Add aarch64 support
kvm_stat: Update exit reasons to the latest defintion
kvm_stat: Print errno when syscall to perf_event_open() fails
kvm_stat: Add RESET support for perf event ioctl
.travis.yml | 3 +
MAINTAINERS | 5 +
configure | 1 +
default-configs/pci.mak | 1 +
docs/specs/edu.txt | 110 ++++++++++++
exec.c | 13 +-
hw/acpi/ich9.c | 2 +-
hw/acpi/piix4.c | 2 +-
hw/arm/stellaris.c | 2 +-
hw/block/fdc.c | 2 +-
hw/char/cadence_uart.c | 2 +-
hw/char/serial.c | 4 +-
hw/core/ptimer.c | 2 +-
hw/dma/pl330.c | 2 +-
hw/i386/multiboot.c | 16 +-
hw/i386/pc_piix.c | 8 +-
hw/i386/pc_q35.c | 4 +
hw/input/lm832x.c | 2 +-
hw/intc/apic_common.c | 8 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/isa/vt82c686.c | 2 +-
hw/misc/Makefile.objs | 1 +
hw/misc/edu.c | 408 ++++++++++++++++++++++++++++++++++++++++++++
hw/misc/macio/cuda.c | 2 +-
hw/net/pcnet.c | 2 +-
hw/sd/sdhci.c | 4 +-
hw/timer/a9gtimer.c | 2 +-
hw/timer/arm_mptimer.c | 2 +-
hw/timer/hpet.c | 2 +-
hw/timer/mc146818rtc.c | 4 +-
hw/usb/hcd-ehci.c | 2 +-
hw/usb/hcd-ohci.c | 2 +-
hw/usb/hcd-uhci.c | 2 +-
hw/usb/hcd-xhci.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/watchdog/wdt_i6300esb.c | 2 +-
hw/watchdog/wdt_ib700.c | 2 +-
include/migration/vmstate.h | 28 ++-
include/qemu/timer.h | 84 +++++++++
qemu-timer.c | 14 +-
scripts/kvm/kvm_stat | 24 ++-
target-arm/machine.c | 4 +-
target-i386/cpu.c | 9 +-
target-i386/cpu.h | 68 +-------
target-i386/kvm.c | 40 +++--
target-i386/machine.c | 73 ++++----
tests/multiboot/Makefile | 5 +-
tests/multiboot/libc.c | 12 ++
tests/multiboot/libc.h | 1 +
tests/multiboot/mmap.out | 37 ++--
tests/multiboot/module.txt | 1 +
tests/multiboot/modules.c | 55 ++++++
tests/multiboot/modules.out | 38 +++++
tests/multiboot/run_test.sh | 9 +-
54 files changed, 944 insertions(+), 192 deletions(-)
create mode 100644 docs/specs/edu.txt
create mode 100644 hw/misc/edu.c
create mode 100644 tests/multiboot/module.txt
create mode 100644 tests/multiboot/modules.c
create mode 100644 tests/multiboot/modules.out
--
1.8.3.1
