From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFi8B-0000M7-6D for qemu-devel@nongnu.org; Mon, 26 Jan 2015 06:47:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFi86-0004wB-68 for qemu-devel@nongnu.org; Mon, 26 Jan 2015 06:46:59 -0500 Received: from mail-we0-x229.google.com ([2a00:1450:400c:c03::229]:57941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFi85-0004vf-Ps for qemu-devel@nongnu.org; Mon, 26 Jan 2015 06:46:54 -0500 Received: by mail-we0-f169.google.com with SMTP id u56so8572708wes.0 for ; Mon, 26 Jan 2015 03:46:53 -0800 (PST) Received: from playground.station (net-2-35-193-154.cust.vodafonedsl.it. [2.35.193.154]) by mx.google.com with ESMTPSA id x18sm6786258wia.12.2015.01.26.03.46.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jan 2015 03:46:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 26 Jan 2015 12:46:43 +0100 Message-Id: <1422272804-25947-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL v2 00/19] i386, KVM, misc changes for 2015-01-26 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The following changes since commit a46b3aaf6bb038d4f6f192a84df204f10929e75c: Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150123' into staging (2015-01-23 13:24:17 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to fc116efad0aadb2f8a49d51240bddbfe21b631a0: kvm_stat: Add RESET support for perf event ioctl (2015-01-26 12:27:05 +0100) ---------------------------------------------------------------- - Many fixes from the floor as usual - New "edu" device (v1->v2: fix 32-bit compilation) - Disabling HLE and RTM on Haswell & Broadwell - kvm_stat updates - Added --enable-modules to Travis, in preparation for switching the default ---------------------------------------------------------------- v1->v2 diff: diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 8b68d76..f601069 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -110,7 +110,7 @@ static dma_addr_t edu_clamp_addr(const EduState *edu, dma_addr_t addr) dma_addr_t res = addr & edu->dma_mask; if (addr != res) { - printf("EDU: clamping DMA 0x%.16lx to 0x%.16lx!\n", addr, res); + printf("EDU: clamping DMA %#.16"PRIx64" to %#.16"PRIx64"!\n", addr, res); } return res; 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