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/tests/acpi-test-data/q35/DSDT | Bin 7666 -> 8357 bytes qemu/tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8374 bytes qemu/tests/acpi-test-data/q35/SSDT | Bin 691 -> 0 bytes qemu/tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 qemu/tests/acpi-test-data/q35/DSDT.bridge delete mode 100644 qemu/tests/acpi-test-data/q35/SSDT delete mode 100644 qemu/tests/acpi-test-data/q35/SSDT.bridge (limited to 'qemu/tests/acpi-test-data/q35') diff --git a/qemu/tests/acpi-test-data/q35/DSDT b/qemu/tests/acpi-test-data/q35/DSDT index 4723e5954..1c089c34b 100644 Binary files a/qemu/tests/acpi-test-data/q35/DSDT and b/qemu/tests/acpi-test-data/q35/DSDT differ diff --git a/qemu/tests/acpi-test-data/q35/DSDT.bridge b/qemu/tests/acpi-test-data/q35/DSDT.bridge new file mode 100644 index 000000000..b29fcda0b Binary files /dev/null and b/qemu/tests/acpi-test-data/q35/DSDT.bridge differ diff --git a/qemu/tests/acpi-test-data/q35/SSDT b/qemu/tests/acpi-test-data/q35/SSDT deleted file mode 100644 index 0970c67dd..000000000 Binary files a/qemu/tests/acpi-test-data/q35/SSDT and /dev/null differ diff --git a/qemu/tests/acpi-test-data/q35/SSDT.bridge b/qemu/tests/acpi-test-data/q35/SSDT.bridge deleted file mode 100644 index a77868861..000000000 Binary files a/qemu/tests/acpi-test-data/q35/SSDT.bridge and /dev/null differ -- cgit 1.2.3-korg