[PATCH] kvm/ia64: Qemu : Fix Guest boot issue with >3G memory.

[PATCH] kvm/ia64: Qemu : Fix Guest boot issue with >3G memory.

[Zhang, Xiantao]

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

Hi, Avi
	Seems this patch is missing after merging with Qemu upstream,
please help to apply it again. 
Xiantao

>From a6703684b67518ca614bbd2c23060d8f502136ce Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 18 Sep 2008 14:07:00 +0800
Subject: [PATCH] kvm/ia64: Qemu : Fix Guest boot issue with >3G memory.

I have fixed it before, but the patch was removed by 77c9148ba4a8
accidently,
when deal with merge conflicts.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/exec.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/qemu/exec.c b/qemu/exec.c
index bf037f0..7cb811b 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -82,6 +82,8 @@
 #define TARGET_PHYS_ADDR_SPACE_BITS 42
 #elif defined(TARGET_I386) && !defined(USE_KQEMU)
 #define TARGET_PHYS_ADDR_SPACE_BITS 36
+#elif defined(TARGET_IA64)
+#define TARGET_PHYS_ADDR_SPACE_BITS 36
 #else
 /* Note: for compatibility with kqemu, we use 32 bits for x86_64 */
 #define TARGET_PHYS_ADDR_SPACE_BITS 32
-- 
1.5.1

[-- Attachment #2: 0001-kvm-ia64-Qemu-Fix-Guest-boot-issue-with-3G-memor.patch --]
[-- Type: application/octet-stream, Size: 920 bytes --]

From a6703684b67518ca614bbd2c23060d8f502136ce Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 18 Sep 2008 14:07:00 +0800
Subject: [PATCH] kvm/ia64: Qemu : Fix Guest boot issue with >3G memory.

I have fixed it before, but the patch was removed by 77c9148ba4a8 accidently,
when deal with merge conflicts.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/exec.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/qemu/exec.c b/qemu/exec.c
index bf037f0..7cb811b 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -82,6 +82,8 @@
 #define TARGET_PHYS_ADDR_SPACE_BITS 42
 #elif defined(TARGET_I386) && !defined(USE_KQEMU)
 #define TARGET_PHYS_ADDR_SPACE_BITS 36
+#elif defined(TARGET_IA64)
+#define TARGET_PHYS_ADDR_SPACE_BITS 36
 #else
 /* Note: for compatibility with kqemu, we use 32 bits for x86_64 */
 #define TARGET_PHYS_ADDR_SPACE_BITS 32
-- 
1.5.1

Re: [PATCH] kvm/ia64: Qemu : Fix Guest boot issue with >3G memory.

[Avi Kivity]

Zhang, Xiantao wrote:
> Hi, Avi
> 	Seems this patch is missing after merging with Qemu upstream,
> please help to apply it again. 
>   

Sure; done.

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