[PATCH] Fix ia64/Qemu build issue.

[PATCH] Fix ia64/Qemu build issue.

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1542 bytes --]

>From 28058e18bd74c23c9b7444fbd831311798a53592 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Fri, 11 Jul 2008 09:14:23 +0800
Subject: [PATCH] KVM: Qemu: Fix ia64 build issue.

Fix ia64 build issue due to latest merge with upstream.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/target-ia64/cpu.h       |    5 +----
 qemu/target-ia64/fake-exec.c |    9 ++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/qemu/target-ia64/cpu.h b/qemu/target-ia64/cpu.h
index 12718f5..a3ff7a8 100644
--- a/qemu/target-ia64/cpu.h
+++ b/qemu/target-ia64/cpu.h
@@ -42,10 +42,7 @@
 
 #include "softfloat.h"
 typedef struct CPUIA64State {
-    CPU_COMMON;
-
-   int interrupt_request;
-   int user_mode_only;
+   CPU_COMMON;
    uint32_t hflags;
 
 } CPUIA64State;
diff --git a/qemu/target-ia64/fake-exec.c b/qemu/target-ia64/fake-exec.c
index b6bd2cf..de81381 100644
--- a/qemu/target-ia64/fake-exec.c
+++ b/qemu/target-ia64/fake-exec.c
@@ -14,8 +14,8 @@
  * This work is licensed under the GNU GPL licence version 2 or later.
  *
  */
-#include "exec.h"
 #include "cpu.h"
+#include "exec-all.h"
 
 int code_copy_enabled = 0;
 
@@ -48,3 +48,10 @@ void flush_icache_range(unsigned long start, unsigned
long stop)
     asm volatile (";;sync.i;;srlz.i;;");
 }
 
+int cpu_restore_state(TranslationBlock *tb,
+                      CPUState *env, unsigned long searched_pc,
+                      void *puc)
+
+{
+    return 0;
+}
-- 
1.5.2

[-- Attachment #2: 0001-KVM-Qemu-Fix-ia64-build-issue.patch --]
[-- Type: application/octet-stream, Size: 1486 bytes --]

From 28058e18bd74c23c9b7444fbd831311798a53592 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Fri, 11 Jul 2008 09:14:23 +0800
Subject: [PATCH] KVM: Qemu: Fix ia64 build issue.

Fix ia64 build issue due to latest merge with upstream.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/target-ia64/cpu.h       |    5 +----
 qemu/target-ia64/fake-exec.c |    9 ++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/qemu/target-ia64/cpu.h b/qemu/target-ia64/cpu.h
index 12718f5..a3ff7a8 100644
--- a/qemu/target-ia64/cpu.h
+++ b/qemu/target-ia64/cpu.h
@@ -42,10 +42,7 @@
 
 #include "softfloat.h"
 typedef struct CPUIA64State {
-    CPU_COMMON;
-
-   int interrupt_request;
-   int user_mode_only;
+   CPU_COMMON;
    uint32_t hflags;
 
 } CPUIA64State;
diff --git a/qemu/target-ia64/fake-exec.c b/qemu/target-ia64/fake-exec.c
index b6bd2cf..de81381 100644
--- a/qemu/target-ia64/fake-exec.c
+++ b/qemu/target-ia64/fake-exec.c
@@ -14,8 +14,8 @@
  * This work is licensed under the GNU GPL licence version 2 or later.
  *
  */
-#include "exec.h"
 #include "cpu.h"
+#include "exec-all.h"
 
 int code_copy_enabled = 0;
 
@@ -48,3 +48,10 @@ void flush_icache_range(unsigned long start, unsigned long stop)
     asm volatile (";;sync.i;;srlz.i;;");
 }
 
+int cpu_restore_state(TranslationBlock *tb,
+                      CPUState *env, unsigned long searched_pc,
+                      void *puc)
+
+{
+    return 0;
+}
-- 
1.5.2

Re: [PATCH] Fix ia64/Qemu build issue.

[Avi Kivity]

Zhang, Xiantao wrote:
> From 28058e18bd74c23c9b7444fbd831311798a53592 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Fri, 11 Jul 2008 09:14:23 +0800
> Subject: [PATCH] KVM: Qemu: Fix ia64 build issue.
>
> Fix ia64 build issue due to latest merge with upstream.
>   


Applied, thanks.

-- 
error compiling committee.c: too many arguments to function