Skip to contentSkip to conversation

Update the qemu svn revision to svnr6477.

PATCH In review Rafael Campos Las Heras 3 participants 4 messages Mar 2, 2009 – Mar 3, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Update the qemu svn revision to svnr6477.

The update is coming from Poky linux. Fixes bug 4814: " qemu fails to build on ubuntu 8.10 "
http://bugs.openembedded.net/show_bug.cgi?id=4814

---
 conf/distro/include/sane-srcrevs.inc               |    2 +-
 packages/libsdl/libsdl-native_1.2.11.bb            |    2 +-
 .../qemu-0.9.1+svnr6477/06_exit_segfault.patch     |   45 +
 .../qemu-0.9.1+svnr6477/11_signal_sigaction.patch  |   21 +
 .../qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch  |   18 +
 .../qemu/qemu-0.9.1+svnr6477/31_syscalls.patch     |   27 +
 .../qemu-0.9.1+svnr6477/52_ne2000_return.patch     |   17 +
 .../qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch  |   18 +
 .../64_ppc_asm_constraints.patch                   |   18 +
 packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch  |   55 +
 .../qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch     |   18 +
 packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch |   12 +
 packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch   |   22 +
 .../qemu-add-gl-host-code.patch                    |33916 ++++++++++++++++++++
 .../qemu-amd64-32b-mapping-0.9.0.patch             |   37 +
 packages/qemu/qemu-0.9.1+svnr6477/series           |   13 +
 .../workaround_bad_futex_headers.patch             |   24 +
 packages/qemu/qemu_svn.bb                          |   25 +-
 18 files changed, 34268 insertions(+), 22 deletions(-)
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/series
 create mode 100644 packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch
conf/distro/include/sane-srcrevs.inc +1 -1
index eef8be6..4af1f67 100644
@@ -206,7 +206,7 @@ SRCREV_pn-python-gsmd ?= "148"
 SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
 SRCREV_pn-python-pyrtc ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-python-pyyaml ?= "344"
-QEMUSRCREV ?= "4242"
+QEMUSRCREV ?= "6477"
 SRCREV_pn-tslib ?= "53"
 SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
packages/libsdl/libsdl-native_1.2.11.bb +1 -1
index fb8e12a..4d83751 100644
@@ -16,7 +16,7 @@ PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
+                --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
                 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --disable-video-opengl --enable-input-events --enable-pthreads \
packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch new file +45 -0

45 lines not on this page · raw message

packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch new file +21 -0
new file mode 100644
index 0000000..33c5e8b
@@ -0,0 +1,21 @@
+#DPATCHLEVEL=0
+---
+# linux-user/signal.c |    5 +++++
+# 1 file changed, 5 insertions(+)
+#
+Index: linux-user/signal.c
+===================================================================
+--- linux-user/signal.c.orig	2007-12-03 23:47:44.000000000 +0000
++++ linux-user/signal.c	2007-12-03 23:47:46.000000000 +0000
+@@ -512,6 +512,11 @@ int do_sigaction(int sig, const struct t
+ 
+     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",
packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch new file +18 -0
new file mode 100644
index 0000000..f2bfbc9
@@ -0,0 +1,18 @@
+#DPATCHLEVEL=0
+---
+# vl.c |    2 +-
+# 1 file changed, 1 insertion(+), 1 deletion(-)
+#
+Index: net.c
+===================================================================
+--- net.c.orig	2009-01-05 11:27:29.000000000 +0000
++++ net.c	2009-01-05 11:27:40.000000000 +0000
+@@ -852,7 +852,7 @@
+         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 (ifname[0] != '\0')
+         pstrcpy(ifr.ifr_name, IFNAMSIZ, ifname);
+     else
packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch new file +27 -0
new file mode 100644
index 0000000..df2aa84
@@ -0,0 +1,27 @@
+#DPATCHLEVEL=0
+---
+# linux-user/syscall.c |   11 ++++++++---
+# 1 file changed, 8 insertions(+), 3 deletions(-)
+#
+Index: linux-user/syscall.c
+===================================================================
+--- linux-user/syscall.c.orig	2009-01-05 12:32:37.000000000 +0000
++++ linux-user/syscall.c	2009-01-05 12:32:37.000000000 +0000
+@@ -298,6 +298,7 @@
+ extern int setfsuid(int);
+ extern int setfsgid(int);
+ extern int setgroups(int, gid_t *);
++extern int uselib(const char*);
+ 
+ #define ERRNO_TABLE_SIZE 1200
+ 
+@@ -4397,7 +4398,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:
packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch new file +17 -0
new file mode 100644
index 0000000..e4ea33f
@@ -0,0 +1,17 @@
+---
+ hw/ne2000.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu/hw/ne2000.c
+===================================================================
+--- qemu.orig/hw/ne2000.c	2007-12-03 19:32:52.000000000 +0000
++++ qemu/hw/ne2000.c	2007-12-03 19:33:55.000000000 +0000
+@@ -217,7 +217,7 @@ static int ne2000_can_receive(void *opaq
+     NE2000State *s = opaque;
+ 
+     if (s->cmd & E8390_STOP)
+-        return 1;
++        return 0;
+     return !ne2000_buffer_full(s);
+ }
+ 
packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch new file +18 -0
new file mode 100644
index 0000000..37b38f6
@@ -0,0 +1,18 @@
+#DPATCHLEVEL=0
+---
+# sparc.ld |    2 +-
+# 1 file changed, 1 insertion(+), 1 deletion(-)
+#
+Index: sparc.ld
+===================================================================
+--- sparc.ld.orig	2007-12-03 15:40:26.000000000 +0000
++++ sparc.ld	2007-12-03 16:05:06.000000000 +0000
+@@ -6,7 +6,7 @@ ENTRY(_start)
+ SECTIONS
+ {
+   /* Read-only sections, merged into text segment: */
+-  . = 0x60000000 + SIZEOF_HEADERS;
++  . = 0x60000000 + 0x400;
+   .interp     : { *(.interp)    }
+   .hash          : { *(.hash)           }
+   .dynsym        : { *(.dynsym)         }
packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch new file +18 -0
new file mode 100644
index 0000000..e4858b7
@@ -0,0 +1,18 @@
+#DPATCHLEVEL=1
+---
+# cpu-all.h |    2 +-
+# 1 file changed, 1 insertion(+), 1 deletion(-)
+#
+Index: qemu/cpu-all.h
+===================================================================
+--- qemu.orig/cpu-all.h	2007-06-13 11:48:22.000000000 +0100
++++ qemu/cpu-all.h	2007-06-13 11:51:56.000000000 +0100
+@@ -250,7 +250,7 @@ static inline void stw_le_p(void *ptr, i
+ static inline void stl_le_p(void *ptr, int v)
+ {
+ #ifdef __powerpc__
+-    __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;
packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch new file +55 -0

55 lines not on this page · raw message

packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch new file +18 -0
new file mode 100644
index 0000000..0d60c1c
@@ -0,0 +1,18 @@
+=== modified file 'sdl.c'
+---
+ sdl.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sdl.c
+===================================================================
+--- sdl.c.orig	2007-12-03 19:32:15.000000000 +0000
++++ sdl.c	2007-12-03 19:34:04.000000000 +0000
+@@ -247,7 +247,7 @@ static void sdl_hide_cursor(void)
+ 
+     if (kbd_mouse_is_absolute()) {
+         SDL_ShowCursor(1);
+-        SDL_SetCursor(sdl_cursor_hidden);
++        /* SDL_SetCursor(sdl_cursor_hidden); */
+     } else {
+         SDL_ShowCursor(0);
+     }
packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch new file +12 -0
new file mode 100644
index 0000000..575dbfa
@@ -0,0 +1,12 @@
+Index: trunk/linux-user/syscall.c
+===================================================================
+--- trunk.orig/linux-user/syscall.c	2009-01-05 12:51:52.000000000 +0000
++++ trunk/linux-user/syscall.c	2009-01-05 12:51:52.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <dirent.h>
+ #include <time.h>
+ #include <limits.h>
+ #include <sys/types.h>
packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch new file +22 -0
new file mode 100644
index 0000000..fc69b37
@@ -0,0 +1,22 @@
+--- qemu.orig/Makefile	2008-01-29 23:16:27.000000000 -0800
++++ qemu-0.9.1/Makefile	2008-01-29 23:16:38.000000000 -0800
+@@ -174,7 +174,7 @@
+ install: all $(if $(BUILD_DOCS),install-doc)
+ 	mkdir -p "$(DESTDIR)$(bindir)"
+ ifneq ($(TOOLS),)
+-	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
++	$(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
+ endif
+ 	mkdir -p "$(DESTDIR)$(datadir)"
+ 	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+--- qemu.orig/Makefile.target	2008-01-29 23:16:27.000000000 -0800
++++ qemu-0.9.1/Makefile.target	2008-01-29 23:17:33.000000000 -0800
+@@ -632,7 +632,7 @@
+ 
+ install: all
+ ifneq ($(PROGS),)
+-	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
++	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+ endif
+ 
+ ifneq ($(wildcard .depend),)
packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch new file +33916 -0

2,713 lines not on this page · raw message

packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch new file +37 -0
new file mode 100644
index 0000000..40ab59c

Lines of this file are not shown. View the raw message.

packages/qemu/qemu-0.9.1+svnr6477/series new file +13 -0
new file mode 100644
index 0000000..57d41df

Lines of this file are not shown. View the raw message.

packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch new file +24 -0
new file mode 100644
index 0000000..b254b24

Lines of this file are not shown. View the raw message.

packages/qemu/qemu_svn.bb +5 -20
index b4acae7..5db907f 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.5.6.3

Part of the diff is not shown here. View the raw message.

#1 lore raw

Anybody brave enough to actually review the patch? :)

BTW, sorry for such a non-informative email...

Signature · 1 line
Denys
#2 lore raw
Quoted 2 lines · Denys Dmytriyenko

Anybody brave enough to actually review the patch? :)

Let's see if someone on the list is brave enough ;) The changes come from pokylinux, and works in both environments.

Quoted 10 lines

BTW, sorry for such a non-informative email...

--
Denys

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

I've more patches (smaller) related to latest qemu svn revision. I'm testing it in x86_64 and arm. If someone want's to test it in other environment different to Ubuntu 8.10 .. it could be helpful :)

Best Regards

Signature · 4 lines
___________
Rafael Campos
o0 Methril 0o
http://openblog.methril.net/
#3 lore raw
In reply to Denys Dmytriyenko

Am Montag, den 02.03.2009, 23:58 -0500 schrieb Denys Dmytriyenko:

Quoted 1 line

Anybody brave enough to actually review the patch? :)

Looks good to me, should be commited with DP=-1

Quoted 1 line

BTW, sorry for such a non-informative email...

Not your fault that there was an overwhelming majority of people in favour of substituting a bug tracker for a mailing list. *shrug*

Signature · 1 line
:M: