Attachment 310689 Details for Bug 453631 – patch for kvm code to build on ia64

[patch] patch for kvm code to build on ia64

kvm-70-ia64.patch (text/plain), 4.89 KB, created by Doug Chapman on 2008-07-01 16:27:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Chapman

Created: 2008-07-01 16:27:24 UTC

Size: 4.89 KB

patch

obsolete

>diff -up kvm-70/configure.ia64 kvm-70/configure
>--- kvm-70/configure.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/configure	2008-06-27 17:30:44.000000000 -0400
>@@ -23,7 +23,7 @@ usage() {
> 	    --prefix=PREFIX        where to install things ($prefix)
> 	    --with-patched-kernel  don't use external module
> 	    --kerneldir=DIR        kernel build directory ($kerneldir)
>-	    --qemu-cflags=CFLAGS   CFLAGS to add to qemu configuration
>+	    --qemu-cc=CC           specify compiler for qemu (must be gcc-3.x)
> 	    --qemu-ldflags=LDFLAGS LDFLAGS to add to qemu configuration
> 
> 	Any additional option is given to qemu's configure verbatim; including:
>@@ -56,6 +56,9 @@ while [[ "$1" = -* ]]; do
> 	--with-patched-kernel)
> 	    want_module=
> 	    ;;
>+	--qemu-cc)
>+	    qemu_cc="$arg"
>+	    ;;
> 	--qemu-cflags)
> 	    qemu_cflags="$arg"
> 	    ;;
>@@ -110,11 +113,11 @@ fi
> #configure qemu
> (cd qemu; ./configure --target-list=$target_exec \
>     --disable-kqemu \
>-    --disable-gcc-check \
>     --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \
>     --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \
>     --kernel-path="$libkvm_kerneldir" \
>     --prefix="$prefix" \
>+    ${qemu_cc:+"--cc=$qemu_cc"} \
>     ${cross_prefix:+"--cross-prefix=$cross_prefix"} \
>     ${cross_prefix:+"--cpu=$arch"} $qemu_opts
> ) || usage
>diff -up kvm-70/Makefile.ia64 kvm-70/Makefile
>--- kvm-70/Makefile.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/Makefile	2008-06-27 17:30:44.000000000 -0400
>@@ -10,7 +10,7 @@ sane-arch = $(subst i386,x86,$(subst x86
> .PHONY: kernel user libkvm qemu bios vgabios extboot clean libfdt
> 
> all: libkvm qemu
>-ifneq '$(filter $(ARCH), x86_64 i386 ia64)' ''
>+ifneq '$(filter $(ARCH), x86_64 i386)' ''
>     all: $(if $(WANT_MODULE), kernel) user
> endif
> 
>diff -up kvm-70/qemu/cpu-exec.c.ia64 kvm-70/qemu/cpu-exec.c
>--- kvm-70/qemu/cpu-exec.c.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/qemu/cpu-exec.c	2008-06-27 17:30:44.000000000 -0400
>@@ -21,7 +21,9 @@
> #define CPU_NO_GLOBAL_REGS
> #include "exec.h"
> #include "disas.h"
>+#if !defined(TARGET_IA64)
> #include "tcg.h"
>+#endif
> 
> #if !defined(CONFIG_SOFTMMU)
> #undef EAX
>diff -up kvm-70/qemu/exec.c.ia64 kvm-70/qemu/exec.c
>--- kvm-70/qemu/exec.c.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/qemu/exec.c	2008-06-27 17:30:44.000000000 -0400
>@@ -37,7 +37,9 @@
> #include "exec-all.h"
> #include "qemu-common.h"
> 
>+#if !defined(TARGET_IA64)
> #include "tcg.h"
>+#endif
> #include "qemu-kvm.h"
> 
> #if defined(CONFIG_USER_ONLY)
>diff -up kvm-70/qemu/Makefile.target.ia64 kvm-70/qemu/Makefile.target
>--- kvm-70/qemu/Makefile.target.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/qemu/Makefile.target	2008-06-27 17:30:44.000000000 -0400
>@@ -201,8 +201,10 @@ ifdef CONFIG_DYNGEN_OP
> LIBOBJS+=op.o
> endif
> # TCG code generator
>+ifneq ($(TARGET_ARCH), ia64)
> LIBOBJS+= tcg/tcg.o tcg/tcg-dyngen.o tcg/tcg-runtime.o
> CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
>+endif
> ifeq ($(ARCH),sparc64)
> CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc
> endif
>@@ -239,7 +241,11 @@ LIBOBJS+= qemu-kvm-powerpc.o
> endif
> endif
> 
>-LIBOBJS+= op_helper.o helper.o
>+LIBOBJS+= op_helper.o
>+
>+ifneq ($(TARGET_ARCH), ia64)
>+LIBOBJS+= helper.o
>+endif
> 
> ifeq ($(TARGET_BASE_ARCH), arm)
> LIBOBJS+= neon_helper.o iwmmxt_helper.o
>diff -up kvm-70/qemu/target-ia64/cpu.h.ia64 kvm-70/qemu/target-ia64/cpu.h
>--- kvm-70/qemu/target-ia64/cpu.h.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/qemu/target-ia64/cpu.h	2008-06-27 17:46:14.000000000 -0400
>@@ -30,7 +30,7 @@
> 
> #define TARGET_LONG_BITS 64
> 
>-#define TARGET_PAGE_BITS 16
>+#define TARGET_PAGE_BITS 14
> 
> #define ELF_MACHINE	EM_IA_64
> 
>@@ -43,9 +43,6 @@
> #include "softfloat.h"
> typedef struct CPUIA64State {
>     CPU_COMMON;
>-    /* exception/interrupt handling */
>-   jmp_buf jmp_env;
>-   int exception_index;
> 
>    int interrupt_request;
>    int user_mode_only;
>diff -up kvm-70/qemu/target-ia64/exec.h.ia64 kvm-70/qemu/target-ia64/exec.h
>--- kvm-70/qemu/target-ia64/exec.h.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/qemu/target-ia64/exec.h	2008-06-27 17:30:44.000000000 -0400
>@@ -26,6 +26,8 @@ uint32_t T0;
> uint32_t T1;
> uint32_t T2;
> 
>+#define tcg_qemu_tb_exec(tb_ptr) 0
>+
> static inline void env_to_regs(void)
> {
> }
>@@ -34,6 +36,9 @@ static inline void regs_to_env(void)
> {
> }
> 
>+void tcg_dump_info(FILE *f,
>+                   int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
>+
> void cpu_lock(void);
> void cpu_unlock(void);
> void cpu_loop_exit(void);
>diff -up kvm-70/qemu/target-ia64/fake-exec.c.ia64 kvm-70/qemu/target-ia64/fake-exec.c
>--- kvm-70/qemu/target-ia64/fake-exec.c.ia64	2008-06-16 14:25:16.000000000 -0400
>+++ kvm-70/qemu/target-ia64/fake-exec.c	2008-06-27 17:30:44.000000000 -0400
>@@ -33,6 +33,12 @@ int cpu_ia64_gen_code(CPUState *env, Tra
>     return 0;
> }
> 
>+void tcg_dump_info(FILE *f,
>+                   int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
>+{
>+    return;
>+}
>+
> void flush_icache_range(unsigned long start, unsigned long stop)
> {
>     while (start < stop) {

Actions: View | Diff

Attachments on bug 453631: 310688 | 310689 | 310690