From 437fd90c0250dee670290f9b714253671a990160 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Wed, 18 May 2016 13:18:31 +0300 Subject: These changes are the raw update to qemu-2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen --- .../qemu-iotests/sample_images/d2v-zerofilled.vhd.bz2 | Bin 0 -> 1021 bytes .../sample_images/hyperv2012r2-dynamic.vhd.bz2 | Bin 0 -> 214 bytes .../qemu-iotests/sample_images/virtualpc-dynamic.vhd.bz2 | Bin 0 -> 212 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 qemu/tests/qemu-iotests/sample_images/d2v-zerofilled.vhd.bz2 create mode 100644 qemu/tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 create mode 100644 qemu/tests/qemu-iotests/sample_images/virtualpc-dynamic.vhd.bz2 (limited to 'qemu/tests/qemu-iotests/sample_images') diff --git a/qemu/tests/qemu-iotests/sample_images/d2v-zerofilled.vhd.bz2 b/qemu/tests/qemu-iotests/sample_images/d2v-zerofilled.vhd.bz2 new file mode 100644 index 000000000..f12cb9203 Binary files /dev/null and b/qemu/tests/qemu-iotests/sample_images/d2v-zerofilled.vhd.bz2 differ diff --git a/qemu/tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 b/qemu/tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 new file mode 100644 index 000000000..bfeccf7b9 Binary files /dev/null and b/qemu/tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 differ diff --git a/qemu/tests/qemu-iotests/sample_images/virtualpc-dynamic.vhd.bz2 b/qemu/tests/qemu-iotests/sample_images/virtualpc-dynamic.vhd.bz2 new file mode 100644 index 000000000..783be3c8f Binary files /dev/null and b/qemu/tests/qemu-iotests/sample_images/virtualpc-dynamic.vhd.bz2 differ -- cgit 1.2.3-korg