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/bsd-user/sparc64/syscall.h | 10 ---------- qemu/bsd-user/sparc64/target_syscall.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 qemu/bsd-user/sparc64/syscall.h create mode 100644 qemu/bsd-user/sparc64/target_syscall.h (limited to 'qemu/bsd-user/sparc64') diff --git a/qemu/bsd-user/sparc64/syscall.h b/qemu/bsd-user/sparc64/syscall.h deleted file mode 100644 index 81a816de9..000000000 --- a/qemu/bsd-user/sparc64/syscall.h +++ /dev/null @@ -1,10 +0,0 @@ -struct target_pt_regs { - abi_ulong u_regs[16]; - abi_ulong tstate; - abi_ulong pc; - abi_ulong npc; - abi_ulong y; - abi_ulong fprs; -}; - -#define UNAME_MACHINE "sun4u" diff --git a/qemu/bsd-user/sparc64/target_syscall.h b/qemu/bsd-user/sparc64/target_syscall.h new file mode 100644 index 000000000..2f06100ae --- /dev/null +++ b/qemu/bsd-user/sparc64/target_syscall.h @@ -0,0 +1,15 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + +struct target_pt_regs { + abi_ulong u_regs[16]; + abi_ulong tstate; + abi_ulong pc; + abi_ulong npc; + abi_ulong y; + abi_ulong fprs; +}; + +#define UNAME_MACHINE "sun4u" + +#endif /* TARGET_SYSCALL_H */ -- cgit 1.2.3-korg