VERSION | 2 1 + 1 - 0 !
backends/hostmem.c | 2 1 + 1 - 0 !
backends/rng-egd.c | 1 1 + 0 - 0 !
block/blkdebug.c | 4 4 + 0 - 0 !
block/iscsi.c | 3 2 + 1 - 0 !
block/raw-posix.c | 9 9 + 0 - 0 !
configure | 1 1 + 0 - 0 !
exec.c | 35 35 + 0 - 0 !
hw/acpi/pcihp.c | 2 1 + 1 - 0 !
hw/arm/virt.c | 31 26 + 5 - 0 !
hw/block/virtio-blk.c | 3 2 + 1 - 0 !
hw/core/machine.c | 8 8 + 0 - 0 !
hw/display/qxl-render.c | 4 3 + 1 - 0 !
hw/display/qxl.c | 1 1 + 0 - 0 !
hw/display/vga.c | 159 99 + 60 - 0 !
hw/display/vga_int.h | 1 1 + 0 - 0 !
hw/i386/acpi-build.c | 8 7 + 1 - 0 !
hw/i386/acpi-dsdt.dsl | 4 2 + 2 - 0 !
hw/i386/acpi-dsdt.hex.generated | 8 4 + 4 - 0 !
hw/i386/pc.c | 16 12 + 4 - 0 !
hw/i386/pc_piix.c | 1 1 + 0 - 0 !
hw/i386/pc_q35.c | 1 1 + 0 - 0 !
hw/i386/q35-acpi-dsdt.dsl | 4 2 + 2 - 0 !
hw/i386/ssdt-mem.dsl | 16 8 + 8 - 0 !
hw/i386/ssdt-misc.dsl | 2 1 + 1 - 0 !
hw/ide/core.c | 3 2 + 1 - 0 !
hw/mem/pc-dimm.c | 6 6 + 0 - 0 !
hw/misc/vfio.c | 38 29 + 9 - 0 !
hw/net/vhost_net.c | 42 28 + 14 - 0 !
hw/net/virtio-net.c | 31 26 + 5 - 0 !
hw/net/vmxnet3.c | 10 10 + 0 - 0 !
hw/pci/pci.c | 7 4 + 3 - 0 !
hw/scsi/vhost-scsi.c | 2 1 + 1 - 0 !
hw/virtio/vhost.c | 2 0 + 2 - 0 !
include/hw/acpi/pc-hotplug.h | 2 1 + 1 - 0 !
include/hw/i386/pc.h | 2 2 + 0 - 0 !
net/net.c | 40 39 + 1 - 0 !
net/queue.c | 3 3 + 0 - 0 !
numa.c | 4 2 + 2 - 0 !
qdev-monitor.c | 40 17 + 23 - 0 !
qemu-char.c | 4 3 + 1 - 0 !
qmp.c | 1 1 + 0 - 0 !
slirp/udp.c | 2 1 + 1 - 0 !
target-arm/cpu.h | 9 8 + 1 - 0 !
target-arm/cpu64.c | 3 2 + 1 - 0 !
target-arm/kvm-consts.h | 49 38 + 11 - 0 !
target-arm/translate-a64.c | 2 1 + 1 - 0 !
target-i386/cpu-qom.h | 1 1 + 0 - 0 !
target-i386/cpu.c | 33 25 + 8 - 0 !
target-i386/cpu.h | 4 3 + 1 - 0 !
target-i386/helper.c | 4 2 + 2 - 0 !
target-i386/kvm.c | 101 99 + 2 - 0 !
target-i386/machine.c | 2 1 + 1 - 0 !
tests/qemu-iotests/101 | 58 58 + 0 - 0 !
tests/qemu-iotests/101.out | 10 10 + 0 - 0 !
tests/qemu-iotests/group | 1 1 + 0 - 0 !
thread-pool.c | 27 14 + 13 - 0 !
ui/spice-display.c | 20 15 + 5 - 0 !
vl.c | 10 5 + 5 - 0 !
59 files changed, 691 insertions(+), 208 deletions(-)

 upstream 2.1.2 patch

configure | 12 12 + 0 - 0 !
1 file changed, 12 insertions(+)

---

os-posix.c | 2 2 + 0 - 0 !
vl.c | 8 0 + 8 - 0 !
2 files changed, 2 insertions(+), 8 deletions(-)

 use fixed data dir instead of determining it at runtime

arch_init.c | 7 7 + 0 - 0 !
vl.c | 12 8 + 4 - 0 !
2 files changed, 15 insertions(+), 4 deletions(-)

 use (arch-specific) data path, not just a single directory

hw/acpi/core.c | 5 5 + 0 - 0 !
hw/i386/acpi-build.c | 7 7 + 0 - 0 !
2 files changed, 12 insertions(+)

 copy oem acpi parameters from slic table to rsdt
    
When building RSDT table, pick OEM ID fields from uer-supplied SLIC
table instead of using hard-coded QEMU defaults.  This way, say,
OEM version of Windows7 can be run inside qemu using the same OEM
activation as on bare metal, by pointing at system firmware:

  -acpitable file=/sys/firmware/acpi/tables/SLIC

Windows7 requires that OEM ID in RSDT matches those in SLIC to
consider SLIC to be valid.

This is somewhat hackish approach, but it works fairy well in
practice.
    
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

hw/timer/imx_epit.c | 16 8 + 8 - 0 !
hw/timer/imx_gpt.c | 32 16 + 16 - 0 !
2 files changed, 24 insertions(+), 24 deletions(-)

 [patch] hw/timer/imx_*: fix itimer_max clash with system symbol

hw/9pfs/virtio-9p-local.c | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 don't return type from host in readdir on local 9p filesystem

qemu-options.hx | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 qemu-options: add missing -drive discard option to cmdline help