diff options
17 files changed, 0 insertions, 649 deletions
diff --git a/recipes/qemu/qemu-0.12.3/06_exit_segfault.patch b/recipes/qemu/qemu-0.12.3/06_exit_segfault.patch deleted file mode 100644 index bc02d31839..0000000000 --- a/recipes/qemu/qemu-0.12.3/06_exit_segfault.patch +++ /dev/null @@ -1,45 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/main.c | 8 ++++---- -# 1 file changed, 4 insertions(+), 4 deletions(-) -# -Index: linux-user/main.c -=================================================================== ---- linux-user/main.c.orig 2008-04-24 20:15:46.000000000 +0100 -+++ linux-user/main.c 2008-04-24 20:15:53.000000000 +0100 -@@ -765,7 +765,7 @@ - default: - printf ("Unhandled trap: 0x%x\n", trapnr); - cpu_dump_state(env, stderr, fprintf, 0); -- exit (1); -+ _exit (1); - } - process_pending_signals (env); - } -@@ -1697,7 +1697,7 @@ - default: - printf ("Unhandled trap: 0x%x\n", trapnr); - cpu_dump_state(env, stderr, fprintf, 0); -- exit (1); -+ _exit (1); - } - process_pending_signals (env); - } -@@ -2026,7 +2026,7 @@ - for(item = cpu_log_items; item->mask != 0; item++) { - printf("%-10s %s\n", item->name, item->help); - } -- exit(1); -+ _exit(1); - } - cpu_set_log(mask); - } else if (!strcmp(r, "s")) { -@@ -2045,7 +2045,7 @@ - if (qemu_host_page_size == 0 || - (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) { - fprintf(stderr, "page size must be a power of two\n"); -- exit(1); -+ _exit(1); - } - } else if (!strcmp(r, "g")) { - gdbstub_port = atoi(argv[optind++]); diff --git a/recipes/qemu/qemu-0.12.3/11_signal_sigaction.patch b/recipes/qemu/qemu-0.12.3/11_signal_sigaction.patch deleted file mode 100644 index cd56541b71..0000000000 --- a/recipes/qemu/qemu-0.12.3/11_signal_sigaction.patch +++ /dev/null @@ -1,21 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/signal.c | 5 +++++ -# 1 file changed, 5 insertions(+) -# -Index: linux-user/signal.c -=================================================================== ---- linux-user/signal.c.orig 2008-04-24 20:15:55.000000000 +0100 -+++ linux-user/signal.c 2008-04-24 20:15:57.000000000 +0100 -@@ -512,6 +512,11 @@ - - if (sig < 1 || sig > TARGET_NSIG || sig == SIGKILL || sig == SIGSTOP) - return -EINVAL; -+ -+ /* no point doing the stuff as those are not allowed for sigaction */ -+ if ((sig == TARGET_SIGKILL) || (sig == TARGET_SIGSTOP)) -+ return -EINVAL; -+ - k = &sigact_table[sig - 1]; - #if defined(DEBUG_SIGNAL) - fprintf(stderr, "sigaction sig=%d act=0x%08x, oact=0x%08x\n", diff --git a/recipes/qemu/qemu-0.12.3/22_net_tuntap_stall.patch b/recipes/qemu/qemu-0.12.3/22_net_tuntap_stall.patch deleted file mode 100644 index 01dc29d910..0000000000 --- a/recipes/qemu/qemu-0.12.3/22_net_tuntap_stall.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: qemu-0.12.3/net/tap-linux.c -=================================================================== ---- qemu-0.12.3.orig/net/tap-linux.c -+++ qemu-0.12.3/net/tap-linux.c -@@ -43,7 +43,7 @@ int tap_open(char *ifname, int ifname_si - return -1; - } - memset(&ifr, 0, sizeof(ifr)); -- ifr.ifr_flags = IFF_TAP | IFF_NO_PI; -+ ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE; - - if (*vnet_hdr) { - unsigned int features; -Index: qemu-0.12.3/net/tap-linux.h -=================================================================== ---- qemu-0.12.3.orig/net/tap-linux.h -+++ qemu-0.12.3/net/tap-linux.h -@@ -33,6 +33,7 @@ - /* TUNSETIFF ifr flags */ - #define IFF_TAP 0x0002 - #define IFF_NO_PI 0x1000 -+#define IFF_ONE_QUEUE 0x2000 - #define IFF_VNET_HDR 0x4000 - - /* Features for GSO (TUNSETOFFLOAD). */ diff --git a/recipes/qemu/qemu-0.12.3/31_syscalls.patch b/recipes/qemu/qemu-0.12.3/31_syscalls.patch deleted file mode 100644 index 20a1499d18..0000000000 --- a/recipes/qemu/qemu-0.12.3/31_syscalls.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: linux-user/syscall.c -=================================================================== ---- linux-user/syscall.c.orig 2008-04-24 20:15:46.000000000 +0100 -+++ linux-user/syscall.c 2008-04-24 20:15:59.000000000 +0100 -@@ -250,6 +250,7 @@ - extern int setresgid(gid_t, gid_t, gid_t); - extern int getresgid(gid_t *, gid_t *, gid_t *); - extern int setgroups(int, gid_t *); -+extern int uselib(const char*); - - #define ERRNO_TABLE_SIZE 1200 - -@@ -4041,7 +4042,8 @@ - #endif - #ifdef TARGET_NR_uselib - case TARGET_NR_uselib: -- goto unimplemented; -+ ret = get_errno(uselib(path((const char*)arg1))); -+ break; - #endif - #ifdef TARGET_NR_swapon - case TARGET_NR_swapon: diff --git a/recipes/qemu/qemu-0.12.3/32_syscall_sysctl.patch b/recipes/qemu/qemu-0.12.3/32_syscall_sysctl.patch deleted file mode 100644 index 2bd90d177d..0000000000 --- a/recipes/qemu/qemu-0.12.3/32_syscall_sysctl.patch +++ /dev/null @@ -1,55 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/syscall.c | 32 +++++++++++++++++++++++++++++--- -# 1 file changed, 29 insertions(+), 3 deletions(-) -# -Index: linux-user/syscall.c -=================================================================== ---- linux-user/syscall.c.orig -+++ linux-user/syscall.c -@@ -56,6 +56,7 @@ - #include <netinet/ip.h> - #include <netinet/tcp.h> - #include <qemu-common.h> -+#include <sys/sysctl.h> - #ifdef TARGET_GPROF - #include <sys/gmon.h> - #endif -@@ -5986,9 +5987,34 @@ abi_long do_syscall(void *cpu_env, int n - break; - #endif - case TARGET_NR__sysctl: -- /* We don't implement this, but ENOTDIR is always a safe -- return value. */ -- ret = -TARGET_ENOTDIR; -+ { -+ struct __sysctl_args *args = (struct __sysctl_args *) arg1; -+ int *name_target, *name, nlen, *oldlenp, oldlen, newlen, i; -+ void *oldval, *newval; -+ -+ name_target = (int *) tswapl((long) args->name); -+ nlen = tswapl(args->nlen); -+ oldval = (void *) tswapl((long) args->oldval); -+ oldlenp = (int *) tswapl((long) args->oldlenp); -+ oldlen = tswapl(*oldlenp); -+ newval = (void *) tswapl((long) args->newval); -+ newlen = tswapl(args->newlen); -+ -+ name = alloca(nlen * sizeof (int)); -+ for (i = 0; i < nlen; i++) -+ name[i] = tswapl(name_target[i]); -+ -+ if (nlen == 2 && name[0] == CTL_KERN && name[1] == KERN_VERSION) { -+ ret = get_errno( -+ sysctl(name, nlen, oldval, &oldlen, newval, newlen)); -+ if (!is_error(ret)) { -+ *oldlenp = tswapl(oldlen); -+ } -+ } else { -+ gemu_log("qemu: Unsupported sysctl name\n"); -+ ret = -ENOSYS; -+ } -+ } - break; - case TARGET_NR_sched_setparam: - { diff --git a/recipes/qemu/qemu-0.12.3/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch b/recipes/qemu/qemu-0.12.3/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch deleted file mode 100644 index 143b0059ae..0000000000 --- a/recipes/qemu/qemu-0.12.3/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 3f26c1227e3b08010f2a65379cecf4cb4b5933fa Mon Sep 17 00:00:00 2001 -From: Riku Voipio <riku.voipio@nokia.com> -Date: Mon, 25 Jan 2010 13:17:32 +0000 -Subject: target-arm: refactor cp15.c13 register access - -Access the cp15.c13 TLS registers directly with TCG ops instead of with -a slow helper. If the the cp15 read/write was not TLS register access, -fall back to the cp15 helper. - -This makes accessing __thread variables in linux-user when apps are compiled -with -mtp=cp15 possible. legal cp15 register to acces from linux-user are -already checked in cp15_user_ok. - -While at it, make the cp15.c13 Thread ID registers available only on -ARMv6K and newer. - -Signed-off-by: Riku Voipio <riku.voipio@nokia.com> ---- -diff --git a/target-arm/helper.c b/target-arm/helper.c -index b3aec99..27001e8 100644 ---- a/target-arm/helper.c -+++ b/target-arm/helper.c -@@ -511,7 +511,6 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val) - uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn) - { - cpu_abort(env, "cp15 insn %08x\n", insn); -- return 0; - } - - /* These should probably raise undefined insn exceptions. */ -@@ -1491,15 +1490,6 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val) - tlb_flush(env, 0); - env->cp15.c13_context = val; - break; -- case 2: -- env->cp15.c13_tls1 = val; -- break; -- case 3: -- env->cp15.c13_tls2 = val; -- break; -- case 4: -- env->cp15.c13_tls3 = val; -- break; - default: - goto bad_reg; - } -@@ -1779,12 +1769,6 @@ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn) - return env->cp15.c13_fcse; - case 1: - return env->cp15.c13_context; -- case 2: -- return env->cp15.c13_tls1; -- case 3: -- return env->cp15.c13_tls2; -- case 4: -- return env->cp15.c13_tls3; - default: - goto bad_reg; - } -diff --git a/target-arm/translate.c b/target-arm/translate.c -index 5cf3e06..786c329 100644 ---- a/target-arm/translate.c -+++ b/target-arm/translate.c -@@ -2455,6 +2455,57 @@ static int cp15_user_ok(uint32_t insn) - return 0; - } - -+static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, uint32_t rd) -+{ -+ TCGv tmp; -+ int cpn = (insn >> 16) & 0xf; -+ int cpm = insn & 0xf; -+ int op = ((insn >> 5) & 7) | ((insn >> 18) & 0x38); -+ -+ if (!arm_feature(env, ARM_FEATURE_V6K)) -+ return 0; -+ -+ if (!(cpn == 13 && cpm == 0)) -+ return 0; -+ -+ if (insn & ARM_CP_RW_BIT) { -+ tmp = new_tmp(); -+ switch (op) { -+ case 2: -+ tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1)); -+ break; -+ case 3: -+ tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2)); -+ break; -+ case 4: -+ tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3)); -+ break; -+ default: -+ dead_tmp(tmp); -+ return 0; -+ } -+ store_reg(s, rd, tmp); -+ -+ } else { -+ tmp = load_reg(s, rd); -+ switch (op) { -+ case 2: -+ tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1)); -+ break; -+ case 3: -+ tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2)); -+ break; -+ case 4: -+ tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3)); -+ break; -+ default: -+ return 0; -+ } -+ dead_tmp(tmp); -+ } -+ return 1; -+} -+ - /* Disassemble system coprocessor (cp15) instruction. Return nonzero if - instruction is not defined. */ - static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn) -@@ -2489,6 +2540,10 @@ static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn) - return 0; - } - rd = (insn >> 12) & 0xf; -+ -+ if (cp15_tls_load_store(env, s, insn, rd)) -+ return 0; -+ - tmp2 = tcg_const_i32(insn); - if (insn & ARM_CP_RW_BIT) { - tmp = new_tmp(); --- -cgit v0.8.2.1 diff --git a/recipes/qemu/qemu-0.12.3/52_ne2000_return.patch b/recipes/qemu/qemu-0.12.3/52_ne2000_return.patch deleted file mode 100644 index e364bff731..0000000000 --- a/recipes/qemu/qemu-0.12.3/52_ne2000_return.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - hw/ne2000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: trunk/hw/ne2000.c -=================================================================== ---- trunk.orig/hw/ne2000.c 2008-04-24 20:15:46.000000000 +0100 -+++ trunk/hw/ne2000.c 2008-04-24 20:16:05.000000000 +0100 -@@ -217,7 +217,7 @@ - NE2000State *s = opaque; - - if (s->cmd & E8390_STOP) -- return 1; -+ return 0; - return !ne2000_buffer_full(s); - } - diff --git a/recipes/qemu/qemu-0.12.3/63_sparc_build.patch b/recipes/qemu/qemu-0.12.3/63_sparc_build.patch deleted file mode 100644 index 097f55a09e..0000000000 --- a/recipes/qemu/qemu-0.12.3/63_sparc_build.patch +++ /dev/null @@ -1,18 +0,0 @@ -#DPATCHLEVEL=0 ---- -# sparc.ld | 2 +- -# 1 file changed, 1 insertion(+), 1 deletion(-) -# -Index: sparc.ld -=================================================================== ---- sparc.ld.orig 2008-04-24 20:15:46.000000000 +0100 -+++ sparc.ld 2008-04-24 20:16:07.000000000 +0100 -@@ -6,7 +6,7 @@ - SECTIONS - { - /* Read-only sections, merged into text segment: */ -- . = 0x60000000 + SIZEOF_HEADERS; -+ . = 0x60000000 + 0x400; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } diff --git a/recipes/qemu/qemu-0.12.3/64_ppc_asm_constraints.patch b/recipes/qemu/qemu-0.12.3/64_ppc_asm_constraints.patch deleted file mode 100644 index 7562daf77b..0000000000 --- a/recipes/qemu/qemu-0.12.3/64_ppc_asm_constraints.patch +++ /dev/null @@ -1,18 +0,0 @@ -#DPATCHLEVEL=1 ---- -# cpu-all.h | 2 +- -# 1 file changed, 1 insertion(+), 1 deletion(-) -# -Index: qemu-0.10.3/cpu-all.h -=================================================================== ---- qemu-0.10.3.orig/cpu-all.h 2009-05-01 21:02:44.000000000 +0400 -+++ qemu-0.10.3/cpu-all.h 2009-05-19 17:59:28.357103179 +0400 -@@ -288,7 +288,7 @@ - static inline void stl_le_p(void *ptr, int v) - { - #ifdef _ARCH_PPC -- __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr)); -+ __asm__ __volatile__ ("stwbrx %0,0,%1" : : "r" (v), "r" (ptr) : "memory"); - #else - uint8_t *p = ptr; - p[0] = v; diff --git a/recipes/qemu/qemu-0.12.3/66_tls_ld.patch b/recipes/qemu/qemu-0.12.3/66_tls_ld.patch deleted file mode 100644 index cbd3f873d8..0000000000 --- a/recipes/qemu/qemu-0.12.3/66_tls_ld.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- - arm.ld | 7 +++++++ - i386.ld | 7 +++++++ - 2 files changed, 14 insertions(+) - -Index: arm.ld -=================================================================== ---- arm.ld.orig 2008-04-24 20:15:45.000000000 +0100 -+++ arm.ld 2008-04-24 20:16:11.000000000 +0100 -@@ -26,6 +26,10 @@ - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } -+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } -+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } -+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } -+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } -@@ -58,6 +62,9 @@ - .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } - __exidx_end = .; - .reginfo : { *(.reginfo) } -+ /* Thread Local Storage sections */ -+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } -+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = ALIGN(0x100000) + (. & (0x100000 - 1)); -Index: i386.ld -=================================================================== ---- i386.ld.orig 2008-04-24 20:15:45.000000000 +0100 -+++ i386.ld 2008-04-24 20:16:11.000000000 +0100 -@@ -28,6 +28,10 @@ - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } -+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } -+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } -+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } -+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } -@@ -53,6 +57,9 @@ - _etext = .; - PROVIDE (etext = .); - .fini : { *(.fini) } =0x47ff041f -+ /* Thread Local Storage sections */ -+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } -+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - . = ALIGN(32 / 8); - PROVIDE (__preinit_array_start = .); - .preinit_array : { *(.preinit_array) } diff --git a/recipes/qemu/qemu-0.12.3/91-oh-sdl-cursor.patch b/recipes/qemu/qemu-0.12.3/91-oh-sdl-cursor.patch deleted file mode 100644 index b3d95a4534..0000000000 --- a/recipes/qemu/qemu-0.12.3/91-oh-sdl-cursor.patch +++ /dev/null @@ -1,18 +0,0 @@ -=== modified file 'sdl.c' ---- - sdl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: sdl.c -=================================================================== ---- sdl.c.orig 2008-04-24 20:15:45.000000000 +0100 -+++ sdl.c 2008-04-24 20:16:12.000000000 +0100 -@@ -247,7 +247,7 @@ - - if (kbd_mouse_is_absolute()) { - SDL_ShowCursor(1); -- SDL_SetCursor(sdl_cursor_hidden); -+ /* SDL_SetCursor(sdl_cursor_hidden); */ - } else { - SDL_ShowCursor(0); - } diff --git a/recipes/qemu/qemu-0.12.3/c5883be23519921254c6940873ee8db04979c20a.patch b/recipes/qemu/qemu-0.12.3/c5883be23519921254c6940873ee8db04979c20a.patch deleted file mode 100644 index bbdab11101..0000000000 --- a/recipes/qemu/qemu-0.12.3/c5883be23519921254c6940873ee8db04979c20a.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c5883be23519921254c6940873ee8db04979c20a Mon Sep 17 00:00:00 2001 -From: Paul Brook <paul@codesourcery.com> -Date: Tue, 23 Feb 2010 14:45:16 +0000 -Subject: ARM CP15 tls fix - -Fix temporary handling in cp15 tls register load/store. - -Signed-off-by: Paul Brook <paul@codesourcery.com> ---- -diff --git a/target-arm/translate.c b/target-arm/translate.c -index 8b3b12d..ac04996 100644 ---- a/target-arm/translate.c -+++ b/target-arm/translate.c -@@ -2469,19 +2469,17 @@ static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, ui - return 0; - - if (insn & ARM_CP_RW_BIT) { -- tmp = new_tmp(); - switch (op) { - case 2: -- tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1)); -+ tmp = load_cpu_field(cp15.c13_tls1); - break; - case 3: -- tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2)); -+ tmp = load_cpu_field(cp15.c13_tls2); - break; - case 4: -- tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3)); -+ tmp = load_cpu_field(cp15.c13_tls3); - break; - default: -- dead_tmp(tmp); - return 0; - } - store_reg(s, rd, tmp); -@@ -2490,18 +2488,18 @@ static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, ui - tmp = load_reg(s, rd); - switch (op) { - case 2: -- tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1)); -+ store_cpu_field(tmp, cp15.c13_tls1); - break; - case 3: -- tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2)); -+ store_cpu_field(tmp, cp15.c13_tls2); - break; - case 4: -- tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3)); -+ store_cpu_field(tmp, cp15.c13_tls3); - break; - default: -+ dead_tmp(tmp); - return 0; - } -- dead_tmp(tmp); - } - return 1; - } --- -cgit v0.8.2.1 diff --git a/recipes/qemu/qemu-0.12.3/fallback.to.safe.mmap_min_addr.patch b/recipes/qemu/qemu-0.12.3/fallback.to.safe.mmap_min_addr.patch deleted file mode 100644 index fb1080f078..0000000000 --- a/recipes/qemu/qemu-0.12.3/fallback.to.safe.mmap_min_addr.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 13 May 2010 12:23:40 +0200 -Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read - -* 65536 is default at least for ubuntu and fedora. ---- - linux-user/main.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/linux-user/main.c b/linux-user/main.c -index 18b52c0..cf2cc59 100644 ---- a/linux-user/main.c -+++ b/linux-user/main.c -@@ -2728,6 +2728,7 @@ - * When user has explicitly set the quest base, we skip this - * test. - */ -+#define MMAP_MIN_ADDR_DEFAULT 65536 - if (!have_guest_base) { - FILE *fp; - -@@ -2736,8 +2737,14 @@ - if (fscanf(fp, "%lu", &tmp) == 1) { - mmap_min_addr = tmp; - qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr); -+ } else { -+ qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT); -+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT; - } - fclose(fp); -+ } else { -+ qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT); -+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT; - } - } - #endif /* CONFIG_USE_GUEST_BASE */ diff --git a/recipes/qemu/qemu-0.12.3/fix_baum_c_compilation.patch b/recipes/qemu/qemu-0.12.3/fix_baum_c_compilation.patch deleted file mode 100644 index a2eb438ed9..0000000000 --- a/recipes/qemu/qemu-0.12.3/fix_baum_c_compilation.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: trunk/hw/baum.c -=================================================================== ---- trunk.orig/hw/baum.c 2008-11-29 05:12:40.418390606 +0300 -+++ trunk/hw/baum.c 2008-11-29 05:13:11.498378426 +0300 -@@ -569,8 +569,10 @@ CharDriverState *chr_baum_init(void) - CharDriverState *chr; - brlapi_handle_t *handle; - #ifdef CONFIG_SDL -+#ifdef SDL_VIDEO_DRIVER_X11 - SDL_SysWMinfo info; - #endif -+#endif - int tty; - - baum = qemu_mallocz(sizeof(BaumDriverState)); -@@ -605,12 +607,14 @@ CharDriverState *chr_baum_init(void) - } - - #ifdef CONFIG_SDL -+#ifdef SDL_VIDEO_DRIVER_X11 - memset(&info, 0, sizeof(info)); - SDL_VERSION(&info.version); - if (SDL_GetWMInfo(&info)) - tty = info.info.x11.wmwindow; - else - #endif -+#endif - tty = BRLAPI_TTY_DEFAULT; - - if (brlapi__enterTtyMode(handle, tty, NULL) == -1) { diff --git a/recipes/qemu/qemu-0.12.3/fix_fortify_source_compilation.patch b/recipes/qemu/qemu-0.12.3/fix_fortify_source_compilation.patch deleted file mode 100644 index db507b3b45..0000000000 --- a/recipes/qemu/qemu-0.12.3/fix_fortify_source_compilation.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: qemu-0.12.3/block/vvfat.c -=================================================================== ---- qemu-0.12.3.orig/block/vvfat.c -+++ qemu-0.12.3/block/vvfat.c -@@ -868,7 +868,9 @@ static int init_directories(BDRVVVFATSta - { - direntry_t* entry=array_get_next(&(s->directory)); - entry->attributes=0x28; /* archive | volume label */ -- snprintf((char*)entry->name,11,"QEMU VVFAT"); -+ // snprintf((char*)entry->name,11,"QEMU VVFAT"); -+ snprintf(entry->name, sizeof(entry->name), "QEMU VV"); -+ snprintf(entry->extension, sizeof(entry->extension), "FAT"); - } - - /* Now build FAT, and write back information into directory */ diff --git a/recipes/qemu/qemu-0.12.3/fix_segfault.patch b/recipes/qemu/qemu-0.12.3/fix_segfault.patch deleted file mode 100644 index 32ca3c0b6b..0000000000 --- a/recipes/qemu/qemu-0.12.3/fix_segfault.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- - linux-user/syscall.c | 22 ---------------------- - 1 file changed, 22 deletions(-) - -Index: qemu-0.10.3/linux-user/syscall.c -=================================================================== ---- qemu-0.10.3.orig/linux-user/syscall.c 2009-05-19 18:18:04.000000000 +0400 -+++ qemu-0.10.3/linux-user/syscall.c 2009-05-19 18:18:40.397103379 +0400 -@@ -6024,28 +6024,6 @@ - goto unimplemented_nowarn; - #endif - --#ifdef TARGET_NR_clock_gettime -- case TARGET_NR_clock_gettime: -- { -- struct timespec ts; -- ret = get_errno(clock_gettime(arg1, &ts)); -- if (!is_error(ret)) { -- host_to_target_timespec(arg2, &ts); -- } -- break; -- } --#endif --#ifdef TARGET_NR_clock_getres -- case TARGET_NR_clock_getres: -- { -- struct timespec ts; -- ret = get_errno(clock_getres(arg1, &ts)); -- if (!is_error(ret)) { -- host_to_target_timespec(arg2, &ts); -- } -- break; -- } --#endif - #ifdef TARGET_NR_clock_nanosleep - case TARGET_NR_clock_nanosleep: - { diff --git a/recipes/qemu/qemu_0.12.3.bb b/recipes/qemu/qemu_0.12.3.bb deleted file mode 100644 index 96415aa38f..0000000000 --- a/recipes/qemu/qemu_0.12.3.bb +++ /dev/null @@ -1,41 +0,0 @@ -LICENSE = "GPL" -DEPENDS = "zlib" - -PR = "r3" - -SRC_URI = "\ - http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz;name=qemu-${PV} \ - file://06_exit_segfault.patch;striplevel=0 \ - file://11_signal_sigaction.patch;striplevel=0 \ - file://22_net_tuntap_stall.patch \ - file://31_syscalls.patch;striplevel=0 \ - file://32_syscall_sysctl.patch;striplevel=0 \ - file://52_ne2000_return.patch \ - file://63_sparc_build.patch;striplevel=0 \ - file://64_ppc_asm_constraints.patch \ - file://66_tls_ld.patch;striplevel=0 \ - file://91-oh-sdl-cursor.patch;striplevel=0 \ - file://fix_segfault.patch \ - file://fix_baum_c_compilation.patch \ - file://fix_fortify_source_compilation.patch \ - file://3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch \ - file://c5883be23519921254c6940873ee8db04979c20a.patch \ - file://fallback.to.safe.mmap_min_addr.patch \ - " - -SRC_URI[qemu-0.12.3.sha256sum] = "3ce26f8fb0a59418b2064a26bac4b40ea4e493acbc3df7ad5932635477fade4b" -SRC_URI[qemu-0.12.3.md5sum] = "d215e4568650e8019816397174c090e1" - -BBCLASSEXTEND="native" - -S = "${WORKDIR}/qemu-${PV}" - -EXTRA_OECONF += " --disable-curl --disable-sdl --disable-strip" - -EXTRA_OECONF_append_virtclass-native = " --extra-cflags="-I${STAGING_INCDIR_NATIVE}"" - -inherit autotools - -do_configure() { - ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} -} |