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/libcacard/vcardt_internal.h | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 qemu/libcacard/vcardt_internal.h (limited to 'qemu/libcacard/vcardt_internal.h') diff --git a/qemu/libcacard/vcardt_internal.h b/qemu/libcacard/vcardt_internal.h deleted file mode 100644 index e5c8d2dd3..000000000 --- a/qemu/libcacard/vcardt_internal.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef VCARDT_INTERNAL_H -#define VCARDT_INTERNAL_H - -unsigned char *vcard_alloc_atr(const char *postfix, int *atr_len); - -#endif -- cgit 1.2.3-korg