[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: Re: [OE-core] [PATCH 2/3] qemu: upgrade to 2.12.0
From: Martin Jansa <martin.jansa () gmail ! com>
Date: 2018-05-31 15:41:04
Message-ID: CA+chaQfkZ6DNwvSXrZGy7ZEDEkg7znsv4Uon8qgU7EEpe77Zjw () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
I've finished the bisect today:
qemu$ git bisect log
git bisect start
# good: [9f750794985d7386f088da941c76b73880b2b6c4] sev/i386: add
sev_get_capabilities()
git bisect good 9f750794985d7386f088da941c76b73880b2b6c4
# bad: [91c60f124e682a78c9a2ef951e8e58ebab6441d0] target/ppc: fix tlbsync
to check privilege level depending on GTSE
git bisect bad 91c60f124e682a78c9a2ef951e8e58ebab6441d0
# bad: [a57946ff2acb9c0d95c9f127914540586b0b8c21] Merge remote-tracking
branch 'remotes/awilliam/tags/vfio-update-20180313.0' into staging
git bisect bad a57946ff2acb9c0d95c9f127914540586b0b8c21
# good: [5bdd374347b873ab59b356a284494a8bc1664008] Merge remote-tracking
branch 'remotes/bonzini/tags/for-upstream-sev' into staging
git bisect good 5bdd374347b873ab59b356a284494a8bc1664008
# bad: [55901900ec69d6fd6f332003d8ab81b2f8a38529] Merge remote-tracking
branch 'remotes/vivier2/tags/linux-user-for-2.12-pull-request' into staging
git bisect bad 55901900ec69d6fd6f332003d8ab81b2f8a38529
# bad: [d4090306c8079ca3df426f82c493314c3537064e] qemu-binfmt-conf.sh: add
qemu-xtensa
git bisect bad d4090306c8079ca3df426f82c493314c3537064e
# bad: [d4247ec2d79ef2477cb886fa688706b068119736] linux-user: Support
f_flags in statfs when available.
git bisect bad d4247ec2d79ef2477cb886fa688706b068119736
# good: [f8b985d65cf67004483816d5afcb7bf686e11702] linux-user: Remove the
unused "not implemented" signal handling stubs
git bisect good f8b985d65cf67004483816d5afcb7bf686e11702
# good: [3ff48453e894990ea6495574037e70ed9b91947e] linux-user: allows to
use "--systemd ALL" with qemu-binfmt-conf.sh
git bisect good 3ff48453e894990ea6495574037e70ed9b91947e
# first bad commit: [d4247ec2d79ef2477cb886fa688706b068119736] linux-user:
Support f_flags in statfs when available.
Unfortunately just revering "[d4247ec2d79ef2477cb886fa688706b068119736]
linux-user: Support f_flags in statfs when available" at the top of v2.12.0
still hangs.
I will try to dig a bit more, but any advice would be appreciated.
On Tue, May 29, 2018 at 10:40 PM Martin Jansa <martin.jansa@gmail.com>
wrote:
> After removing ld-is-gold I was able to reproduce the issue.
>
> Unfortunately removing the meta/recipes-devtools/qemu/qemu
> /linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch doesn't help
> with the hang, then I've tried to upgrade to latest SRCREV in qemu master
> (currently 5a5c383b1373aeb6c87a0d6060f6c3dc7c53082b)
>
> Will try to bisect where it started to hang between 2.11.0 and 2.12.0, but
> it might be faster if Alistair Francis can chime in as the author of this
> patch, he might have better idea why it stopped working.
>
> Cheers,
>
> On Tue, May 29, 2018 at 2:56 PM Martin Jansa <martin.jansa@gmail.com>
> wrote:
>
> > I've tried to reproduce it locally, but g-ir-scanner-qemuwrapper is
> > failing for me in various recipes and I never got as far as webkitgtk
> >
> > pango:
> > Error relocating
> > TOPDIR/tmp-musl/work/i586-oe-linux-musl/pango/1.40.14-r0/recipe-sysroot//usr/lib/libGL.so.1:
> >
> > __glX_tls_Context: symbol not found
> > http://errors.yoctoproject.org/Errors/Details/178988/
> >
> > after disabling GI for pango (GI_DATA_ENABLED_pn-pango = "False") it
> > failed in
> > librsvg:
> > Error relocating
> > TOPDIR/tmp-musl/work/i586-oe-linux-musl/librsvg/2.40.20-r0/recipe-sysroot//usr/lib/libGL.so.1:
> >
> > __glX_tls_Context: symbol not found
> > http://errors.yoctoproject.org/Errors/Details/178991/
> >
> > gstreamer1.0-plugins-base:
> > Error relocating
> > TOPDIR/tmp-musl/work/i586-oe-linux-musl/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot//usr/lib/libEGL.so.1:
> >
> > _egl_TLS: symbol not found
> > http://errors.yoctoproject.org/Errors/Details/178993/
> >
> > and gtk+3 as well, because of disabled GI for pango:
> > Couldn't find include 'Pango-1.0.gir' (search path:
> > '['TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot/usr/share/gir-1.0',
> > '../gdk',
> > 'TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot/usr/share/gir-1.0',
> > 'TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot-native/usr/share/gir-1.0',
> > '/usr/share/gir-1.0',
> > 'TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot-native/usr/share/gir-1.0']')
> > TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot/usr/share/gobject-introspection-1.0/Makefile.introspection:159:
> > recipe for target 'Gdk-3.0.gir' failed
> > http://errors.yoctoproject.org/Errors/Details/178992/
> >
> > I'm not sure how exactly AB is doing this qemux86 musl build, it might be
> > some more changes I have locally or missing/superfluous something in my
> > config.
> >
> > On Tue, May 29, 2018 at 11:10 AM Martin Jansa <martin.jansa@gmail.com>
> > wrote:
> >
> > > This hang should have been fixed by:
> > >
> > > meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
> > >
> > > which was added with previous upgrade to 2.11.0:
> > >
> > > commit d6d0d99569e0d8b62a61e27d389e7939af45bab9
> > > Author: Alistair Francis <alistair.francis@xilinx.com>
> > > Date: Wed Jan 17 13:39:06 2018 -0800
> > >
> > > qemu: Bump to version 2.11.0
> > >
> > > and my update only shifted the chunk by 2 lines in:
> > >
> > > commit a742584f253e25b97729abe19ca9e4fa2809ea2e
> > > Author: Martin Jansa <martin.jansa@gmail.com>
> > > Date: Wed May 2 14:37:33 2018 +0000
> > >
> > > qemu: refresh patches with devtool
> > >
> > > and the patch is still being applied. I was waiting for
> > > http://jenkins.nas-admin.org/view/OE/job/oe_world_qemux86/ to reproduce
> > > it, but it seems that Khem is working on some bigger overhaul of the jobs
> > > and it's not ready yet, I'll try to reproduce it locally now and if I can
> > > reproduce it, then I'll try to just remove this patch, because the upstream
> > > didn't accept it very well in:
> > > http://lists.gnu.org/archive/html/qemu-devel/2018-01/msg04185.html
> > > and the discussion there died few months ago.
> > >
> > > Regards,
> > >
> > > On Fri, May 18, 2018 at 11:59 PM Burton, Ross <ross.burton@intel.com>
> > > wrote:
> > >
> > > > This is causing the AB to hang when built for qemux86 with musl whilst
> > > > building webkitgtk during the gobject-introspection qemu-i386 calls,
> > > > qemu enters an infinite loop.
> > > >
> > > > I've not yet reproduced locally to try and get a log out of qemu, but
> > > > it has happened on the autobuilder repeatedly.
> > > >
> > > > Ross
> > > >
> > > > On 2 May 2018 at 15:37, Martin Jansa <martin.jansa@gmail.com> wrote:
> > > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > > > ---
> > > > > meta/conf/distro/include/tcmode-default.inc | 2 +-
> > > > > ...4-treat-DISAS_UPDATE-as-variant-of-D.patch | 67
> > > > -------------------
> > > > > ...-connect-socket-to-a-spawned-command.patch | 52 +++++++-------
> > > > > .../qemu/qemu/disable-grabs.patch | 43 ++++++------
> > > > > meta/recipes-devtools/qemu/qemu/memfd.patch | 57 ----------------
> > > > > .../qemu/qemu/qemu-2.5.0-cflags.patch | 15 ++++-
> > > > > .../qemu/{qemu_2.11.1.bb => qemu_2.12.0.bb} | 6 +-
> > > > > 7 files changed, 65 insertions(+), 177 deletions(-)
> > > > > delete mode 100644
> > > > meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
> > > >
> > > > > delete mode 100644 meta/recipes-devtools/qemu/qemu/memfd.patch
> > > > > rename meta/recipes-devtools/qemu/{qemu_2.11.1.bb => qemu_2.12.0.bb}
> > > > (87%)
> > > > >
> > > > > diff --git a/meta/conf/distro/include/tcmode-default.inc
> > > > b/meta/conf/distro/include/tcmode-default.inc
> > > > > index 00399ae820..8b5214ed96 100644
> > > > > --- a/meta/conf/distro/include/tcmode-default.inc
> > > > > +++ b/meta/conf/distro/include/tcmode-default.inc
> > > > > @@ -28,7 +28,7 @@ BINUVERSION ?= "2.30%"
> > > > > GDBVERSION ?= "8.0%"
> > > > > GLIBCVERSION ?= "2.27%"
> > > > > LINUXLIBCVERSION ?= "4.15%"
> > > > > -QEMUVERSION ?= "2.11%"
> > > > > +QEMUVERSION ?= "2.12%"
> > > > >
> > > > > PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
> > > > > PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
> > > > > diff --git
> > > > a/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
> > > > b/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
> > > >
> > > > > deleted file mode 100644
> > > > > index f90cae694c..0000000000
> > > > > ---
> > > > a/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
> > > >
> > > > > +++ /dev/null
> > > > > @@ -1,67 +0,0 @@
> > > > > -From a75a52d62418dafe462be4fe30485501d1010bb9 Mon Sep 17 00:00:00
> > > > 2001
> > > > > -From: Victor Kamensky <kamensky@cisco.com>
> > > > > -Date: Fri, 23 Mar 2018 18:26:45 +0000
> > > > > -Subject: [PATCH] arm/translate-a64: treat DISAS_UPDATE as variant of
> > > > > - DISAS_EXIT
> > > > > -MIME-Version: 1.0
> > > > > -Content-Type: text/plain; charset=UTF-8
> > > > > -Content-Transfer-Encoding: 8bit
> > > > > -
> > > > > -In OE project 4.15 linux kernel boot hang was observed under
> > > > > -single cpu aarch64 qemu. Kernel code was in a loop waiting for
> > > > > -vtimer arrival, spinning in TC generated blocks, while interrupt
> > > > > -was pending unprocessed. This happened because when qemu tried to
> > > > > -handle vtimer interrupt target had interrupts disabled, as
> > > > > -result flag indicating TCG exit, cpu->icount_decr.u16.high,
> > > > > -was cleared but arm_cpu_exec_interrupt function did not call
> > > > > -arm_cpu_do_interrupt to process interrupt. Later when target
> > > > > -reenabled interrupts, it happened without exit into main loop, so
> > > > > -following code that waited for result of interrupt execution
> > > > > -run in infinite loop.
> > > > > -
> > > > > -To solve the problem instructions that operate on CPU sys state
> > > > > -(i.e enable/disable interrupt), and marked as DISAS_UPDATE,
> > > > > -should be considered as DISAS_EXIT variant, and should be
> > > > > -forced to exit back to main loop so qemu will have a chance
> > > > > -processing pending CPU state updates, including pending
> > > > > -interrupts.
> > > > > -
> > > > > -This change brings consistency with how DISAS_UPDATE is treated
> > > > > -in aarch32 case.
> > > > > -
> > > > > -CC: Peter Maydell <peter.maydell@linaro.org>
> > > > > -CC: Alex Bennée <alex.bennee@linaro.org>
> > > > > -CC: qemu-stable@nongnu.org
> > > > > -Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> > > > > -Signed-off-by: Victor Kamensky <kamensky@cisco.com>
> > > > > -Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> > > > > -Message-id: 1521526368-1996-1-git-send-email-kamensky@cisco.com
> > > > > -Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> > > > > -Upstream-Status: Backport
> > > > > ----
> > > > > - target/arm/translate-a64.c | 6 +++---
> > > > > - 1 file changed, 3 insertions(+), 3 deletions(-)
> > > > > -
> > > > > -diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
> > > > > -index 31ff047..327513e 100644
> > > > > ---- a/target/arm/translate-a64.c
> > > > > -+++ b/target/arm/translate-a64.c
> > > > > -@@ -13378,12 +13378,12 @@ static void
> > > > aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
> > > > > - case DISAS_UPDATE:
> > > > > - gen_a64_set_pc_im(dc->pc);
> > > > > - /* fall through */
> > > > > -- case DISAS_JUMP:
> > > > > -- tcg_gen_lookup_and_goto_ptr();
> > > > > -- break;
> > > > > - case DISAS_EXIT:
> > > > > - tcg_gen_exit_tb(0);
> > > > > - break;
> > > > > -+ case DISAS_JUMP:
> > > > > -+ tcg_gen_lookup_and_goto_ptr();
> > > > > -+ break;
> > > > > - case DISAS_NORETURN:
> > > > > - case DISAS_SWI:
> > > > > - break;
> > > > > ---
> > > > > -2.7.4
> > > > > -
> > > > > diff --git
> > > > a/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
> > > > b/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
> > > >
> > > > > index 6e6bf95c18..f1cf53a8c5 100644
> > > > > ---
> > > > a/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
> > > >
> > > > > +++
> > > > b/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
> > > >
> > > > > @@ -1,4 +1,4 @@
> > > > > -From 3bb3100c22eb30146a69656480bdffeef8663575 Mon Sep 17 00:00:00
> > > > 2001
> > > > > +From a7690b02df70e0d3957e6eaa1e1cf92595839fbb Mon Sep 17 00:00:00
> > > > 2001
> > > > > From: Alistair Francis <alistair.francis@xilinx.com>
> > > > > Date: Thu, 21 Dec 2017 11:35:16 -0800
> > > > > Subject: [PATCH] chardev: connect socket to a spawned command
> > > > > @@ -45,16 +45,16 @@ Upstream-Status: Inappropriate [embedded specific]
> > > > >
> > > > > Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
> > > > > ---
> > > > > - chardev/char-socket.c | 86
> > > > ++++++++++++++++++++++++++++++++++++++++++++++++---
> > > > > - chardev/char.c | 3 ++
> > > > > - qapi/char.json | 5 +++
> > > > > - 3 files changed, 90 insertions(+), 4 deletions(-)
> > > > > + chardev/char-socket.c | 102
> > > > ++++++++++++++++++++++++++++++++++++++++++
> > > > > + chardev/char.c | 3 ++
> > > > > + qapi/char.json | 5 +++
> > > > > + 3 files changed, 110 insertions(+)
> > > > >
> > > > > diff --git a/chardev/char-socket.c b/chardev/char-socket.c
> > > > > -index 53eda8ef00..f566107c35 100644
> > > > > +index 159e69c3b1..84778cf31a 100644
> > > > > --- a/chardev/char-socket.c
> > > > > +++ b/chardev/char-socket.c
> > > > > -@@ -852,6 +852,68 @@ static gboolean
> > > > socket_reconnect_timeout(gpointer opaque)
> > > > > +@@ -934,6 +934,68 @@ static gboolean
> > > > socket_reconnect_timeout(gpointer opaque)
> > > > > return false;
> > > > > }
> > > > >
> > > > > @@ -123,7 +123,7 @@ index 53eda8ef00..f566107c35 100644
> > > > > static void qmp_chardev_open_socket(Chardev *chr,
> > > > > ChardevBackend *backend,
> > > > > bool *be_opened,
> > > > > -@@ -859,6 +921,9 @@
> > > > > +@@ -941,6 +1003,9 @@ static void qmp_chardev_open_socket(Chardev
> > > > *chr,
> > > > > {
> > > > > SocketChardev *s = SOCKET_CHARDEV(chr);
> > > > > ChardevSocket *sock = backend->u.socket.data;
> > > > > @@ -133,11 +133,10 @@ index 53eda8ef00..f566107c35 100644
> > > > > bool do_nodelay = sock->has_nodelay ? sock->nodelay : false;
> > > > > bool is_listen = sock->has_server ? sock->server : true;
> > > > > bool is_telnet = sock->has_telnet ? sock->telnet : false;
> > > > > -@@ -925,7 +990,14 @@
> > > > > - } else if (reconnect > 0) {
> > > > > +@@ -1008,6 +1073,14 @@ static void qmp_chardev_open_socket(Chardev
> > > > *chr,
> > > > > s->reconnect_time = reconnect;
> > > > > }
> > > > > --
> > > > > +
> > > > > +#ifndef _WIN32
> > > > > + if (cmd) {
> > > > > + chardev_open_socket_cmd(chr, cmd, errp);
> > > > > @@ -146,12 +145,12 @@ index 53eda8ef00..f566107c35 100644
> > > > > + *be_opened = true;
> > > > > + } else
> > > > > +#endif
> > > > > - if (s->reconnect_time) {
> > > > > - sioc = qio_channel_socket_new();
> > > > > - tcp_chr_set_client_ioc_name(chr, sioc);
> > > > > -@@ -985,10 +1057,26 @@
> > > > > - const char *host = qemu_opt_get(opts, "host");
> > > > > + /* If reconnect_time is set, will do that in chr_machine_done.
> > > > */
> > > > > + if (!s->reconnect_time) {
> > > > > + if (s->is_listen) {
> > > > > +@@ -1065,9 +1138,26 @@ static void qemu_chr_parse_socket(QemuOpts
> > > > *opts, ChardevBackend *backend,
> > > > > const char *port = qemu_opt_get(opts, "port");
> > > > > + const char *fd = qemu_opt_get(opts, "fd");
> > > > > const char *tls_creds = qemu_opt_get(opts, "tls-creds");
> > > > > +#ifndef _WIN32
> > > > > + const char *cmd = qemu_opt_get(opts, "cmd");
> > > > > @@ -159,7 +158,6 @@ index 53eda8ef00..f566107c35 100644
> > > > > SocketAddressLegacy *addr;
> > > > > ChardevSocket *sock;
> > > > >
> > > > > - backend->type = CHARDEV_BACKEND_KIND_SOCKET;
> > > > > +#ifndef _WIN32
> > > > > + if (cmd) {
> > > > > + /*
> > > > > @@ -173,17 +171,18 @@ index 53eda8ef00..f566107c35 100644
> > > > > + }
> > > > > + } else
> > > > > +#endif
> > > > > - if (!path) {
> > > > > - if (!host) {
> > > > > - error_setg(errp, "chardev: socket: no host given");
> > > > > -@@ -1021,13 +1109,24 @@
> > > > > - sock->has_reconnect = true;
> > > > > ++
> > > > > + if ((!!path + !!fd + !!host) != 1) {
> > > > > + error_setg(errp,
> > > > > + "Exactly one of 'path', 'fd' or 'host'
> > > > required");
> > > > > +@@ -1112,12 +1202,24 @@ static void qemu_chr_parse_socket(QemuOpts
> > > > *opts, ChardevBackend *backend,
> > > > > sock->reconnect = reconnect;
> > > > > sock->tls_creds = g_strdup(tls_creds);
> > > > > +
> > > > > +#ifndef _WIN32
> > > > > + sock->cmd = g_strdup(cmd);
> > > > > +#endif
> > > > > -
> > > > > ++
> > > > > addr = g_new0(SocketAddressLegacy, 1);
> > > > > +#ifndef _WIN32
> > > > > + if (path || cmd) {
> > > > > @@ -198,11 +197,11 @@ index 53eda8ef00..f566107c35 100644
> > > > > +#else
> > > > > q_unix->path = g_strdup(path);
> > > > > +#endif
> > > > > - } else {
> > > > > + } else if (host) {
> > > > > addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;
> > > > > addr->u.inet.data = g_new(InetSocketAddress, 1);
> > > > > diff --git a/chardev/char.c b/chardev/char.c
> > > > > -index 2ae4f465ec..5d52cd5de5 100644
> > > > > +index 76d866e6fe..9747d51d7c 100644
> > > > > --- a/chardev/char.c
> > > > > +++ b/chardev/char.c
> > > > > @@ -792,6 +792,9 @@ QemuOptsList qemu_chardev_opts = {
> > > > > @@ -239,4 +238,5 @@ index ae19dcd1ed..6de0f29bcd 100644
> > > > > '*server' : 'bool',
> > > > > '*wait' : 'bool',
> > > > > --
> > > > > -2.14.1
> > > > > +2.17.0
> > > > > +
> > > > > diff --git a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
> > > > b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
> > > > > index 77117890f4..e29c011a6f 100644
> > > > > --- a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
> > > > > +++ b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
> > > > > @@ -1,3 +1,11 @@
> > > > > +From a31c5c695cb716310257f1fc60a06b821e74fe7f Mon Sep 17 00:00:00
> > > > 2001
> > > > > +From: Ross Burton <ross.burton@intel.com>
> > > > > +Date: Wed, 18 Sep 2013 14:04:54 +0100
> > > > > +Subject: [PATCH] sdl.c: allow user to disable pointer grabs
> > > > > +MIME-Version: 1.0
> > > > > +Content-Type: text/plain; charset=UTF-8
> > > > > +Content-Transfer-Encoding: 8bit
> > > > > +
> > > > > When the pointer enters the Qemu window it calls SDL_WM_GrabInput,
> > > > which calls
> > > > > XGrabPointer in a busyloop until it returns GrabSuccess. However if
> > > > there's already
> > > > > a pointer grab (screen is locked, a menu is open) then qemu will
> > > > hang until the
> > > > > @@ -11,35 +19,30 @@ them in a conditional that can be set by the
> > > > autobuilder environment, preserving
> > > > > the current grabbing behaviour for everyone else.
> > > > >
> > > > > Upstream-Status: Pending
> > > > > -Signed-off-by: Ross Burton <ross.burton@intel.com>
> > > > > -
> > > > > -From 4b1988ecb01a178269ec0513a75f2ec620c7ef6a Mon Sep 17 00:00:00
> > > > 2001
> > > > > -From: Ross Burton <ross.burton@intel.com>
> > > > > -Date: Wed, 18 Sep 2013 14:04:54 +0100
> > > > > -Subject: [PATCH] sdl.c: allow user to disable pointer grabs
> > > > > -
> > > > > Signed-off-by: Ross Burton <ross.burton@intel.com>
> > > > > Signed-off-by: Eric Bénard <eric@eukrea.com>
> > > > > +
> > > > > ---
> > > > > - ui/sdl.c | 12 ++++++++++--
> > > > > - 1 file changed, 10 insertions(+), 2 deletions(-)
> > > > > + ui/sdl.c | 13 +++++++++++--
> > > > > + 1 file changed, 11 insertions(+), 2 deletions(-)
> > > > >
> > > > > -Index: qemu-2.11.1/ui/sdl.c
> > > > > -===================================================================
> > > > > ---- qemu-2.11.1.orig/ui/sdl.c
> > > > > -+++ qemu-2.11.1/ui/sdl.c
> > > > > -@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format;
> > > > > - static int scaling_active = 0;
> > > > > - static Notifier mouse_mode_notifier;
> > > > > - static int idle_counter;
> > > > > +diff --git a/ui/sdl.c b/ui/sdl.c
> > > > > +index a5fd503..ab8d1b1 100644
> > > > > +--- a/ui/sdl.c
> > > > > ++++ b/ui/sdl.c
> > > > > +@@ -68,6 +68,11 @@ static int idle_counter;
> > > > > + static const guint16 *keycode_map;
> > > > > + static size_t keycode_maplen;
> > > > > +
> > > > > +#ifndef True
> > > > > +#define True 1
> > > > > +#endif
> > > > > +static doing_grabs = True;
> > > > > -
> > > > > ++
> > > > > #define SDL_REFRESH_INTERVAL_BUSY 10
> > > > > #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \
> > > > > -@@ -431,14 +435,16 @@ static void sdl_grab_start(void)
> > > > > + / SDL_REFRESH_INTERVAL_BUSY + 1)
> > > > > +@@ -398,14 +403,16 @@ static void sdl_grab_start(void)
> > > > > }
> > > > > } else
> > > > > sdl_hide_cursor();
> > > > > @@ -58,7 +61,7 @@ Index: qemu-2.11.1/ui/sdl.c
> > > > > gui_grab = 0;
> > > > > sdl_show_cursor();
> > > > > sdl_update_caption();
> > > > > -@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds,
> > > > > +@@ -945,6 +952,8 @@ static void sdl1_display_init(DisplayState *ds,
> > > > DisplayOptions *o)
> > > > > * This requires SDL >= 1.2.14. */
> > > > > setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
> > > > >
> > > > > diff --git a/meta/recipes-devtools/qemu/qemu/memfd.patch
> > > > b/meta/recipes-devtools/qemu/qemu/memfd.patch
> > > > > deleted file mode 100644
> > > > > index 62e8d3800b..0000000000
> > > > > --- a/meta/recipes-devtools/qemu/qemu/memfd.patch
> > > > > +++ /dev/null
> > > > > @@ -1,57 +0,0 @@
> > > > > -Upstream-Status: Backport
> > > > > -Signed-off-by: Ross Burton <ross.burton@intel.com>
> > > > > -
> > > > > -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00
> > > > 2001
> > > > > -From: Paolo Bonzini <pbonzini@redhat.com>
> > > > > -Date: Tue, 28 Nov 2017 11:51:27 +0100
> > > > > -Subject: [PATCH] memfd: fix configure test
> > > > > -MIME-Version: 1.0
> > > > > -Content-Type: text/plain; charset=UTF-8
> > > > > -Content-Transfer-Encoding: 8bit
> > > > > -
> > > > > -Recent glibc added memfd_create in sys/mman.h. This conflicts with
> > > > > -the definition in util/memfd.c:
> > > > > -
> > > > > - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error:
> > > > static declaration of memfd_create follows non-static declaration
> > > > > -
> > > > > -Fix the configure test, and remove the sys/memfd.h inclusion since
> > > > the
> > > > > -file actually does not exist---it is a typo in the memfd_create(2)
> > > > man
> > > > > -page.
> > > > > -
> > > > > -Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> > > > > -Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > > > > ----
> > > > > - configure | 2 +-
> > > > > - util/memfd.c | 4 +---
> > > > > - 2 files changed, 2 insertions(+), 4 deletions(-)
> > > > > -
> > > > > -diff --git a/configure b/configure
> > > > > -index 9c8aa5a98b..99ccc1725a 100755
> > > > > ---- a/configure
> > > > > -+++ b/configure
> > > > > -@@ -3923,7 +3923,7 @@ fi
> > > > > - # check if memfd is supported
> > > > > - memfd=no
> > > > > - cat > $TMPC << EOF
> > > > > --#include <sys/memfd.h>
> > > > > -+#include <sys/mman.h>
> > > > > -
> > > > > - int main(void)
> > > > > - {
> > > > > -diff --git a/util/memfd.c b/util/memfd.c
> > > > > -index 4571d1aba8..412e94a405 100644
> > > > > ---- a/util/memfd.c
> > > > > -+++ b/util/memfd.c
> > > > > -@@ -31,9 +31,7 @@
> > > > > -
> > > > > - #include "qemu/memfd.h"
> > > > > -
> > > > > --#ifdef CONFIG_MEMFD
> > > > > --#include <sys/memfd.h>
> > > > > --#elif defined CONFIG_LINUX
> > > > > -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
> > > > > - #include <sys/syscall.h>
> > > > > - #include <asm/unistd.h>
> > > > > -
> > > > > ---
> > > > > -2.11.0
> > > > > diff --git a/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
> > > > b/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
> > > > > index eb99d14639..360519f1a1 100644
> > > > > --- a/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
> > > > > +++ b/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
> > > > > @@ -1,8 +1,19 @@
> > > > > +From 6702ec74a7ba90b99efedde260c9f08b75d5516d Mon Sep 17 00:00:00
> > > > 2001
> > > > > +From: Stephen Arnold <sarnold@vctlabs.com>
> > > > > +Date: Sun, 12 Jun 2016 18:09:56 -0700
> > > > > +Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some
> > > > environment
> > > > > +
> > > > > Upstream-Status: Pending
> > > > >
> > > > > +---
> > > > > + configure | 4 ----
> > > > > + 1 file changed, 4 deletions(-)
> > > > > +
> > > > > +diff --git a/configure b/configure
> > > > > +index 69e05fb..12fc3d8 100755
> > > > > --- a/configure
> > > > > +++ b/configure
> > > > > -@@ -4468,10 +4468,6 @@ fi
> > > > > +@@ -5413,10 +5413,6 @@ write_c_skeleton
> > > > > if test "$gcov" = "yes" ; then
> > > > > CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
> > > > > LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
> > > > > @@ -12,4 +23,4 @@ Upstream-Status: Pending
> > > > > - CFLAGS="-O2 $CFLAGS"
> > > > > fi
> > > > >
> > > > > - ##########################################
> > > > > + if test "$have_asan" = "yes"; then
> > > > > diff --git a/meta/recipes-devtools/qemu/qemu_2.11.1.bb
> > > > b/meta/recipes-devtools/qemu/qemu_2.12.0.bb
> > > > > similarity index 87%
> > > > > rename from meta/recipes-devtools/qemu/qemu_2.11.1.bb
> > > > > rename to meta/recipes-devtools/qemu/qemu_2.12.0.bb
> > > > > index f4b7d69fca..63590fc9eb 100644
> > > > > --- a/meta/recipes-devtools/qemu/qemu_2.11.1.bb
> > > > > +++ b/meta/recipes-devtools/qemu/qemu_2.12.0.bb
> > > > > @@ -20,8 +20,6 @@ SRC_URI = "
> > > > http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
> > > > > file://chardev-connect-socket-to-a-spawned-command.patch \
> > > > > file://apic-fixup-fallthrough-to-PIC.patch \
> > > > >
> > > > file://linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
> > > > > - file://memfd.patch \
> > > > > -
> > > > file://0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch \
> > > > > "
> > > > > UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar"
> > > > >
> > > > > @@ -31,8 +29,8 @@ SRC_URI_append_class-native = " \
> > > > > file://cpus.c-qemu_cpu_kick_thread_debugging.patch \
> > > > > "
> > > > >
> > > > > -SRC_URI[md5sum] = "61cf862b6007eba4ac98247776af2e27"
> > > > > -SRC_URI[sha256sum] =
> > > > "d9df2213ceed32e91dab7bc9dd19c1af83f91ba72c7aeef7605dfaaf81732ccb"
> > > > > +SRC_URI[md5sum] = "122fd7cdf241ff7eb1e42c0b503b5d1b"
> > > > > +SRC_URI[sha256sum] =
> > > > "c9f4a147bc915d24df9784affc611a115f42d24720a89210b479f1ba7a3f679c"
> > > > >
> > > > > COMPATIBLE_HOST_mipsarchn32 = "null"
> > > > > COMPATIBLE_HOST_mipsarchn64 = "null"
> > > > > --
> > > > > 2.17.0
> > > > >
> > > > > --
> > > > > _______________________________________________
> > > > > Openembedded-core mailing list
> > > > > Openembedded-core@lists.openembedded.org
> > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> > > >
> > >
[Attachment #5 (text/html)]
<div dir="ltr">I've finished the bisect today:<div><br></div><div><div>qemu$ git \
bisect log</div><div>git bisect start</div><div># good: \
[9f750794985d7386f088da941c76b73880b2b6c4] sev/i386: add \
sev_get_capabilities()</div><div>git bisect good \
9f750794985d7386f088da941c76b73880b2b6c4</div><div># bad: \
[91c60f124e682a78c9a2ef951e8e58ebab6441d0] target/ppc: fix tlbsync to check privilege \
level depending on GTSE</div><div>git bisect bad \
91c60f124e682a78c9a2ef951e8e58ebab6441d0</div><div># bad: \
[a57946ff2acb9c0d95c9f127914540586b0b8c21] Merge remote-tracking branch \
'remotes/awilliam/tags/vfio-update-20180313.0' into staging</div><div>git \
bisect bad a57946ff2acb9c0d95c9f127914540586b0b8c21</div><div># good: \
[5bdd374347b873ab59b356a284494a8bc1664008] Merge remote-tracking branch \
'remotes/bonzini/tags/for-upstream-sev' into staging</div><div>git bisect \
good 5bdd374347b873ab59b356a284494a8bc1664008</div><div># bad: \
[55901900ec69d6fd6f332003d8ab81b2f8a38529] Merge remote-tracking branch \
'remotes/vivier2/tags/linux-user-for-2.12-pull-request' into \
staging</div><div>git bisect bad 55901900ec69d6fd6f332003d8ab81b2f8a38529</div><div># \
bad: [d4090306c8079ca3df426f82c493314c3537064e] qemu-binfmt-conf.sh: add \
qemu-xtensa</div><div>git bisect bad \
d4090306c8079ca3df426f82c493314c3537064e</div><div># bad: \
[d4247ec2d79ef2477cb886fa688706b068119736] linux-user: Support f_flags in statfs when \
available.</div><div>git bisect bad \
d4247ec2d79ef2477cb886fa688706b068119736</div><div># good: \
[f8b985d65cf67004483816d5afcb7bf686e11702] linux-user: Remove the unused "not \
implemented" signal handling stubs</div><div>git bisect good \
f8b985d65cf67004483816d5afcb7bf686e11702</div><div># good: \
[3ff48453e894990ea6495574037e70ed9b91947e] linux-user: allows to use "--systemd \
ALL" with qemu-binfmt-conf.sh</div><div>git bisect good \
3ff48453e894990ea6495574037e70ed9b91947e</div><div># first bad commit: \
[d4247ec2d79ef2477cb886fa688706b068119736] linux-user: Support f_flags in statfs when \
available.</div></div><div><br></div><div><br></div><div>Unfortunately just revering \
"<span style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-styl \
e:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter \
-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:norma \
l;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;tex \
t-decoration-color:initial;float:none;display:inline">[d4247ec2d79ef2477cb886fa688706b068119736] \
linux-user: Support f_flags in statfs when available" at the top of v2.12.0 \
still hangs.</span></div><div><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">I \
will try to dig a bit more, but any advice would be \
appreciated.</span></div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, \
May 29, 2018 at 10:40 PM Martin Jansa <<a href="mailto:martin.jansa@gmail.com" \
target="_blank">martin.jansa@gmail.com</a>> wrote:<br></div><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr">After removing ld-is-gold I was able to \
reproduce the issue.<div><br></div><div>Unfortunately removing the <span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">meta/recipes-devtools/</span><span \
class="m_6507001071472208436m_5330040109812771397gmail-il" \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">qemu</span><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">/</span><span \
class="m_6507001071472208436m_5330040109812771397gmail-il" \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">qemu</span><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">/linux-user-Fix-webkitgtk-</span><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration \
-color:initial;float:none;display:inline">hangs-on-32-bit-x86-target.</span><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">patch \
doesn't help with the hang, then I've tried to upgrade to latest SRCREV in \
qemu master (currently \
5a5c383b1373aeb6c87a0d6060f6c3dc7c53082b)</span></div><div><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Will \
try to bisect where it started to hang between 2.11.0 and 2.12.0, but it might be \
faster if Alistair Francis can chime in as the author of this patch, he might have \
better idea why it stopped working.</span></div><div><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Cheers,</span></div></div><br><div \
class="gmail_quote"><div dir="ltr">On Tue, May 29, 2018 at 2:56 PM Martin Jansa \
<<a href="mailto:martin.jansa@gmail.com" \
target="_blank">martin.jansa@gmail.com</a>> wrote:<br></div><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr">I've tried to reproduce it locally, but \
g-ir-scanner-qemuwrapper is failing for me in various recipes and I never got as far \
as webkitgtk<div><br></div><div>pango:</div><div>Error relocating \
TOPDIR/tmp-musl/work/i586-oe-linux-musl/pango/1.40.14-r0/recipe-sysroot//usr/lib/libGL.so.1: \
__glX_tls_Context: symbol not found<br></div><div><a \
href="http://errors.yoctoproject.org/Errors/Details/178988/" \
target="_blank">http://errors.yoctoproject.org/Errors/Details/178988/</a></div><div><br></div><div>after \
disabling GI for pango (GI_DATA_ENABLED_pn-pango = "False") it failed \
in</div><div>librsvg:</div><div>Error relocating \
TOPDIR/tmp-musl/work/i586-oe-linux-musl/librsvg/2.40.20-r0/recipe-sysroot//usr/lib/libGL.so.1: \
__glX_tls_Context: symbol not found<br></div><div><a \
href="http://errors.yoctoproject.org/Errors/Details/178991/" \
target="_blank">http://errors.yoctoproject.org/Errors/Details/178991/</a><br></div><div><br></div><div><span \
style="color:rgb(34,34,34);font-family:sans-serif;font-size:13px;font-style:normal;fon \
t-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:nor \
mal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spaci \
ng:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration \
-color:initial;float:none;display:inline">gstreamer1.0-plugins-base:</span><br></div><div>Error \
relocating TOPDIR/tmp-musl/work/i586-oe-linux-musl/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot//usr/lib/libEGL.so.1: \
_egl_TLS: symbol not found<br></div><div><a \
href="http://errors.yoctoproject.org/Errors/Details/178993/" \
target="_blank">http://errors.yoctoproject.org/Errors/Details/178993/</a><br></div><div><br></div><div>and \
gtk+3 as well, because of disabled GI for pango:</div><div><div>Couldn't find \
include 'Pango-1.0.gir' (search path: \
'['TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot/usr/share/gir-1.0', \
'../gdk', 'TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot/usr/share/gir-1.0', \
'TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot-native/usr/share/gir-1.0', \
'/usr/share/gir-1.0', \
'TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3.22.29-r0/recipe-sysroot-native/us \
r/share/gir-1.0']')</div><div>TOPDIR/tmp-musl/work/i586-oe-linux-musl/gtk+3/3. \
22.29-r0/recipe-sysroot/usr/share/gobject-introspection-1.0/Makefile.introspection:159: \
recipe for target 'Gdk-3.0.gir' failed</div></div><div><a \
href="http://errors.yoctoproject.org/Errors/Details/178992/" \
target="_blank">http://errors.yoctoproject.org/Errors/Details/178992/</a><br></div><div><br></div><div>I'm \
not sure how exactly AB is doing this qemux86 musl build, it might be some more \
changes I have locally or missing/superfluous something in my \
config.</div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, May 29, 2018 \
at 11:10 AM Martin Jansa <<a href="mailto:martin.jansa@gmail.com" \
target="_blank">martin.jansa@gmail.com</a>> wrote:<br></div><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr">This hang should have been fixed \
by:<div>meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch<br></div><div><br></div><div>which \
was added with previous upgrade to 2.11.0:</div><div><br></div><div><div>commit \
d6d0d99569e0d8b62a61e27d389e7939af45bab9</div><div>Author: Alistair Francis <<a \
href="mailto:alistair.francis@xilinx.com" \
target="_blank">alistair.francis@xilinx.com</a>></div><div>Date: Wed Jan 17 \
13:39:06 2018 -0800</div><div><br></div><div> qemu: Bump to version \
2.11.0</div></div><div><br></div><div>and my update only shifted the chunk by 2 lines \
in:</div><div><br></div><div><div>commit \
a742584f253e25b97729abe19ca9e4fa2809ea2e</div><div>Author: Martin Jansa <<a \
href="mailto:martin.jansa@gmail.com" \
target="_blank">martin.jansa@gmail.com</a>></div><div>Date: Wed May 2 14:37:33 \
2018 +0000</div><div><br></div><div> qemu: refresh patches with \
devtool</div></div><div><br></div><div>and the patch is still being applied. I was \
waiting for <a href="http://jenkins.nas-admin.org/view/OE/job/oe_world_qemux86/" \
target="_blank">http://jenkins.nas-admin.org/view/OE/job/oe_world_qemux86/</a> to \
reproduce it, but it seems that Khem is working on some bigger overhaul of the jobs \
and it's not ready yet, I'll try to reproduce it locally now and if I can \
reproduce it, then I'll try to just remove this patch, because the upstream \
didn't accept it very well in:</div><div><a \
href="http://lists.gnu.org/archive/html/qemu-devel/2018-01/msg04185.html" \
target="_blank">http://lists.gnu.org/archive/html/qemu-devel/2018-01/msg04185.html</a><br></div><div>and \
the discussion there died few months \
ago.</div><div><br></div><div>Regards,</div></div><br><div class="gmail_quote"><div \
dir="ltr">On Fri, May 18, 2018 at 11:59 PM Burton, Ross <<a \
href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>> \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex">This is causing the AB to hang when \
built for qemux86 with musl whilst<br> building webkitgtk during the \
gobject-introspection qemu-i386 calls,<br> qemu enters an infinite loop.<br>
<br>
I've not yet reproduced locally to try and get a log out of qemu, but<br>
it has happened on the autobuilder repeatedly.<br>
<br>
Ross<br>
<br>
On 2 May 2018 at 15:37, Martin Jansa <<a href="mailto:martin.jansa@gmail.com" \
target="_blank">martin.jansa@gmail.com</a>> wrote:<br> > Signed-off-by: Martin \
Jansa <<a href="mailto:Martin.Jansa@gmail.com" \
target="_blank">Martin.Jansa@gmail.com</a>><br> > ---<br>
> meta/conf/distro/include/tcmode-default.inc | 2 +-<br>
> ...4-treat-DISAS_UPDATE-as-variant-of-D.patch | 67 -------------------<br>
> ...-connect-socket-to-a-spawned-command.patch | 52 +++++++-------<br>
> .../qemu/qemu/disable-grabs.patch | 43 ++++++------<br>
> meta/recipes-devtools/qemu/qemu/memfd.patch | 57 ----------------<br>
> .../qemu/qemu/qemu-2.5.0-cflags.patch | 15 ++++-<br>
> .../qemu/{<a href="http://qemu_2.11.1.bb" rel="noreferrer" \
target="_blank">qemu_2.11.1.bb</a> => <a href="http://qemu_2.12.0.bb" \
rel="noreferrer" target="_blank">qemu_2.12.0.bb</a>} | 6 +-<br> > 7 files \
changed, 65 insertions(+), 177 deletions(-)<br> > delete mode 100644 \
meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch<br>
> delete mode 100644 meta/recipes-devtools/qemu/qemu/memfd.patch<br>
> rename meta/recipes-devtools/qemu/{<a href="http://qemu_2.11.1.bb" \
rel="noreferrer" target="_blank">qemu_2.11.1.bb</a> => <a \
href="http://qemu_2.12.0.bb" rel="noreferrer" target="_blank">qemu_2.12.0.bb</a>} \
(87%)<br> ><br>
> diff --git a/meta/conf/distro/include/tcmode-default.inc \
b/meta/conf/distro/include/tcmode-default.inc<br> > index 00399ae820..8b5214ed96 \
100644<br> > --- a/meta/conf/distro/include/tcmode-default.inc<br>
> +++ b/meta/conf/distro/include/tcmode-default.inc<br>
> @@ -28,7 +28,7 @@ BINUVERSION ?= "2.30%"<br>
> GDBVERSION ?= "8.0%"<br>
> GLIBCVERSION ?= "2.27%"<br>
> LINUXLIBCVERSION ?= "4.15%"<br>
> -QEMUVERSION ?= "2.11%"<br>
> +QEMUVERSION ?= "2.12%"<br>
><br>
> PREFERRED_VERSION_gcc ?= "${GCCVERSION}"<br>
> PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"<br>
> diff --git a/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch \
b/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch<br>
> deleted file mode 100644<br>
> index f90cae694c..0000000000<br>
> --- a/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch<br>
> +++ /dev/null<br>
> @@ -1,67 +0,0 @@<br>
> -From a75a52d62418dafe462be4fe30485501d1010bb9 Mon Sep 17 00:00:00 2001<br>
> -From: Victor Kamensky <<a href="mailto:kamensky@cisco.com" \
target="_blank">kamensky@cisco.com</a>><br> > -Date: Fri, 23 Mar 2018 18:26:45 \
+0000<br> > -Subject: [PATCH] arm/translate-a64: treat DISAS_UPDATE as variant \
of<br> > - DISAS_EXIT<br>
> -MIME-Version: 1.0<br>
> -Content-Type: text/plain; charset=UTF-8<br>
> -Content-Transfer-Encoding: 8bit<br>
> -<br>
> -In OE project 4.15 linux kernel boot hang was observed under<br>
> -single cpu aarch64 qemu. Kernel code was in a loop waiting for<br>
> -vtimer arrival, spinning in TC generated blocks, while interrupt<br>
> -was pending unprocessed. This happened because when qemu tried to<br>
> -handle vtimer interrupt target had interrupts disabled, as<br>
> -result flag indicating TCG exit, cpu->icount_decr.u16.high,<br>
> -was cleared but arm_cpu_exec_interrupt function did not call<br>
> -arm_cpu_do_interrupt to process interrupt. Later when target<br>
> -reenabled interrupts, it happened without exit into main loop, so<br>
> -following code that waited for result of interrupt execution<br>
> -run in infinite loop.<br>
> -<br>
> -To solve the problem instructions that operate on CPU sys state<br>
> -(i.e enable/disable interrupt), and marked as DISAS_UPDATE,<br>
> -should be considered as DISAS_EXIT variant, and should be<br>
> -forced to exit back to main loop so qemu will have a chance<br>
> -processing pending CPU state updates, including pending<br>
> -interrupts.<br>
> -<br>
> -This change brings consistency with how DISAS_UPDATE is treated<br>
> -in aarch32 case.<br>
> -<br>
> -CC: Peter Maydell <<a href="mailto:peter.maydell@linaro.org" \
target="_blank">peter.maydell@linaro.org</a>><br> > -CC: Alex Bennée <<a \
href="mailto:alex.bennee@linaro.org" \
target="_blank">alex.bennee@linaro.org</a>><br> > -CC: <a \
href="mailto:qemu-stable@nongnu.org" target="_blank">qemu-stable@nongnu.org</a><br> \
> -Suggested-by: Peter Maydell <<a href="mailto:peter.maydell@linaro.org" \
target="_blank">peter.maydell@linaro.org</a>><br> > -Signed-off-by: Victor \
Kamensky <<a href="mailto:kamensky@cisco.com" \
target="_blank">kamensky@cisco.com</a>><br> > -Reviewed-by: Richard Henderson \
<<a href="mailto:richard.henderson@linaro.org" \
target="_blank">richard.henderson@linaro.org</a>><br> > -Message-id: <a \
href="mailto:1521526368-1996-1-git-send-email-kamensky@cisco.com" \
target="_blank">1521526368-1996-1-git-send-email-kamensky@cisco.com</a><br> > \
-Signed-off-by: Peter Maydell <<a href="mailto:peter.maydell@linaro.org" \
target="_blank">peter.maydell@linaro.org</a>><br> > -Upstream-Status: \
Backport<br> > ----<br>
> - target/arm/translate-a64.c | 6 +++---<br>
> - 1 file changed, 3 insertions(+), 3 deletions(-)<br>
> -<br>
> -diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c<br>
> -index 31ff047..327513e 100644<br>
> ---- a/target/arm/translate-a64.c<br>
> -+++ b/target/arm/translate-a64.c<br>
> -@@ -13378,12 +13378,12 @@ static void aarch64_tr_tb_stop(DisasContextBase \
*dcbase, CPUState *cpu)<br> > - case DISAS_UPDATE:<br>
> - gen_a64_set_pc_im(dc->pc);<br>
> - /* fall through */<br>
> -- case DISAS_JUMP:<br>
> -- tcg_gen_lookup_and_goto_ptr();<br>
> -- break;<br>
> - case DISAS_EXIT:<br>
> - tcg_gen_exit_tb(0);<br>
> - break;<br>
> -+ case DISAS_JUMP:<br>
> -+ tcg_gen_lookup_and_goto_ptr();<br>
> -+ break;<br>
> - case DISAS_NORETURN:<br>
> - case DISAS_SWI:<br>
> - break;<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch \
b/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch<br>
> index 6e6bf95c18..f1cf53a8c5 100644<br>
> --- a/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch<br>
> +++ b/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch<br>
> @@ -1,4 +1,4 @@<br>
> -From 3bb3100c22eb30146a69656480bdffeef8663575 Mon Sep 17 00:00:00 2001<br>
> +From a7690b02df70e0d3957e6eaa1e1cf92595839fbb Mon Sep 17 00:00:00 2001<br>
> From: Alistair Francis <<a href="mailto:alistair.francis@xilinx.com" \
target="_blank">alistair.francis@xilinx.com</a>><br> > Date: Thu, 21 Dec 2017 \
11:35:16 -0800<br> > Subject: [PATCH] chardev: connect socket to a spawned \
command<br> > @@ -45,16 +45,16 @@ Upstream-Status: Inappropriate [embedded \
specific]<br> ><br>
> Signed-off-by: Patrick Ohly <<a href="mailto:patrick.ohly@intel.com" \
target="_blank">patrick.ohly@intel.com</a>><br> > ---<br>
> - chardev/char-socket.c | 86 \
++++++++++++++++++++++++++++++++++++++++++++++++---<br> > - chardev/char.c \
| 3 ++<br> > - qapi/char.json | 5 +++<br>
> - 3 files changed, 90 insertions(+), 4 deletions(-)<br>
> + chardev/char-socket.c | 102 ++++++++++++++++++++++++++++++++++++++++++<br>
> + chardev/char.c | 3 ++<br>
> + qapi/char.json | 5 +++<br>
> + 3 files changed, 110 insertions(+)<br>
><br>
> diff --git a/chardev/char-socket.c b/chardev/char-socket.c<br>
> -index 53eda8ef00..f566107c35 100644<br>
> +index 159e69c3b1..84778cf31a 100644<br>
> --- a/chardev/char-socket.c<br>
> +++ b/chardev/char-socket.c<br>
> -@@ -852,6 +852,68 @@ static gboolean socket_reconnect_timeout(gpointer \
opaque)<br> > +@@ -934,6 +934,68 @@ static gboolean \
socket_reconnect_timeout(gpointer opaque)<br> > return false;<br>
> }<br>
><br>
> @@ -123,7 +123,7 @@ index 53eda8ef00..f566107c35 100644<br>
> static void qmp_chardev_open_socket(Chardev *chr,<br>
> ChardevBackend \
*backend,<br> > bool \
*be_opened,<br> > -@@ -859,6 +921,9 @@<br>
> +@@ -941,6 +1003,9 @@ static void qmp_chardev_open_socket(Chardev *chr,<br>
> {<br>
> SocketChardev *s = SOCKET_CHARDEV(chr);<br>
> ChardevSocket *sock = backend->u.socket.data;<br>
> @@ -133,11 +133,10 @@ index 53eda8ef00..f566107c35 100644<br>
> bool do_nodelay = sock->has_nodelay ? sock->nodelay : \
false;<br> > bool is_listen = sock->has_server ? \
sock->server : true;<br> > bool is_telnet = \
sock->has_telnet ? sock->telnet : false;<br> > -@@ -925,7 +990,14 @@<br>
> - } else if (reconnect > 0) {<br>
> +@@ -1008,6 +1073,14 @@ static void qmp_chardev_open_socket(Chardev *chr,<br>
> s->reconnect_time = reconnect;<br>
> }<br>
> --<br>
> +<br>
> +#ifndef _WIN32<br>
> + if (cmd) {<br>
> + chardev_open_socket_cmd(chr, cmd, errp);<br>
> @@ -146,12 +145,12 @@ index 53eda8ef00..f566107c35 100644<br>
> + *be_opened = true;<br>
> + } else<br>
> +#endif<br>
> - if (s->reconnect_time) {<br>
> - sioc = qio_channel_socket_new();<br>
> - tcp_chr_set_client_ioc_name(chr, sioc);<br>
> -@@ -985,10 +1057,26 @@<br>
> - const char *host = qemu_opt_get(opts, "host");<br>
> + /* If reconnect_time is set, will do that in chr_machine_done. */<br>
> + if (!s->reconnect_time) {<br>
> + if (s->is_listen) {<br>
> +@@ -1065,9 +1138,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, \
ChardevBackend *backend,<br> > const char *port = qemu_opt_get(opts, \
"port");<br> > + const char *fd = qemu_opt_get(opts, \
"fd");<br> > const char *tls_creds = qemu_opt_get(opts, \
"tls-creds");<br> > +#ifndef _WIN32<br>
> + const char *cmd = qemu_opt_get(opts, "cmd");<br>
> @@ -159,7 +158,6 @@ index 53eda8ef00..f566107c35 100644<br>
> SocketAddressLegacy *addr;<br>
> ChardevSocket *sock;<br>
><br>
> - backend->type = CHARDEV_BACKEND_KIND_SOCKET;<br>
> +#ifndef _WIN32<br>
> + if (cmd) {<br>
> + /*<br>
> @@ -173,17 +171,18 @@ index 53eda8ef00..f566107c35 100644<br>
> + }<br>
> + } else<br>
> +#endif<br>
> - if (!path) {<br>
> - if (!host) {<br>
> - error_setg(errp, "chardev: socket: no host \
given");<br> > -@@ -1021,13 +1109,24 @@<br>
> - sock->has_reconnect = true;<br>
> ++<br>
> + if ((!!path + !!fd + !!host) != 1) {<br>
> + error_setg(errp,<br>
> + "Exactly one of 'path', 'fd' \
or 'host' required");<br> > +@@ -1112,12 +1202,24 @@ static void \
qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,<br> > \
sock->reconnect = reconnect;<br> > sock->tls_creds = \
g_strdup(tls_creds);<br> > +<br>
> +#ifndef _WIN32<br>
> + sock->cmd = g_strdup(cmd);<br>
> +#endif<br>
> -<br>
> ++<br>
> addr = g_new0(SocketAddressLegacy, 1);<br>
> +#ifndef _WIN32<br>
> + if (path || cmd) {<br>
> @@ -198,11 +197,11 @@ index 53eda8ef00..f566107c35 100644<br>
> +#else<br>
> q_unix->path = g_strdup(path);<br>
> +#endif<br>
> - } else {<br>
> + } else if (host) {<br>
> addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;<br>
> addr->u.inet.data = g_new(InetSocketAddress, 1);<br>
> diff --git a/chardev/char.c b/chardev/char.c<br>
> -index 2ae4f465ec..5d52cd5de5 100644<br>
> +index 76d866e6fe..9747d51d7c 100644<br>
> --- a/chardev/char.c<br>
> +++ b/chardev/char.c<br>
> @@ -792,6 +792,9 @@ QemuOptsList qemu_chardev_opts = {<br>
> @@ -239,4 +238,5 @@ index ae19dcd1ed..6de0f29bcd 100644<br>
> '*server' \
: 'bool',<br> > \
'*wait' : 'bool',<br> > --<br>
> -2.14.1<br>
> +2.17.0<br>
> +<br>
> diff --git a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch \
b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch<br> > index \
77117890f4..e29c011a6f 100644<br> > --- \
a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch<br> > +++ \
b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch<br> > @@ -1,3 +1,11 @@<br>
> +From a31c5c695cb716310257f1fc60a06b821e74fe7f Mon Sep 17 00:00:00 2001<br>
> +From: Ross Burton <<a href="mailto:ross.burton@intel.com" \
target="_blank">ross.burton@intel.com</a>><br> > +Date: Wed, 18 Sep 2013 \
14:04:54 +0100<br> > +Subject: [PATCH] sdl.c: allow user to disable pointer \
grabs<br> > +MIME-Version: 1.0<br>
> +Content-Type: text/plain; charset=UTF-8<br>
> +Content-Transfer-Encoding: 8bit<br>
> +<br>
> When the pointer enters the Qemu window it calls SDL_WM_GrabInput, which \
calls<br> > XGrabPointer in a busyloop until it returns GrabSuccess. However if \
there's already<br> > a pointer grab (screen is locked, a menu is open) then \
qemu will hang until the<br> > @@ -11,35 +19,30 @@ them in a conditional that can \
be set by the autobuilder environment, preserving<br> > the current grabbing \
behaviour for everyone else.<br> ><br>
> Upstream-Status: Pending<br>
> -Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" \
target="_blank">ross.burton@intel.com</a>><br> > -<br>
> -From 4b1988ecb01a178269ec0513a75f2ec620c7ef6a Mon Sep 17 00:00:00 2001<br>
> -From: Ross Burton <<a href="mailto:ross.burton@intel.com" \
target="_blank">ross.burton@intel.com</a>><br> > -Date: Wed, 18 Sep 2013 \
14:04:54 +0100<br> > -Subject: [PATCH] sdl.c: allow user to disable pointer \
grabs<br> > -<br>
> Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" \
target="_blank">ross.burton@intel.com</a>><br> > Signed-off-by: Eric Bénard \
<<a href="mailto:eric@eukrea.com" target="_blank">eric@eukrea.com</a>><br> > \
+<br> > ---<br>
> - ui/sdl.c | 12 ++++++++++--<br>
> - 1 file changed, 10 insertions(+), 2 deletions(-)<br>
> + ui/sdl.c | 13 +++++++++++--<br>
> + 1 file changed, 11 insertions(+), 2 deletions(-)<br>
><br>
> -Index: qemu-2.11.1/ui/sdl.c<br>
> -===================================================================<br>
> ---- qemu-2.11.1.orig/ui/sdl.c<br>
> -+++ qemu-2.11.1/ui/sdl.c<br>
> -@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format;<br>
> - static int scaling_active = 0;<br>
> - static Notifier mouse_mode_notifier;<br>
> - static int idle_counter;<br>
> +diff --git a/ui/sdl.c b/ui/sdl.c<br>
> +index a5fd503..ab8d1b1 100644<br>
> +--- a/ui/sdl.c<br>
> ++++ b/ui/sdl.c<br>
> +@@ -68,6 +68,11 @@ static int idle_counter;<br>
> + static const guint16 *keycode_map;<br>
> + static size_t keycode_maplen;<br>
> +<br>
> +#ifndef True<br>
> +#define True 1<br>
> +#endif<br>
> +static doing_grabs = True;<br>
> -<br>
> ++<br>
> #define SDL_REFRESH_INTERVAL_BUSY 10<br>
> #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \<br>
> -@@ -431,14 +435,16 @@ static void sdl_grab_start(void)<br>
> + / SDL_REFRESH_INTERVAL_BUSY + \
1)<br> > +@@ -398,14 +403,16 @@ static void sdl_grab_start(void)<br>
> }<br>
> } else<br>
> sdl_hide_cursor();<br>
> @@ -58,7 +61,7 @@ Index: qemu-2.11.1/ui/sdl.c<br>
> gui_grab = 0;<br>
> sdl_show_cursor();<br>
> sdl_update_caption();<br>
> -@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds,<br>
> +@@ -945,6 +952,8 @@ static void sdl1_display_init(DisplayState *ds, \
DisplayOptions *o)<br> > * This requires SDL >= 1.2.14. */<br>
> setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);<br>
><br>
> diff --git a/meta/recipes-devtools/qemu/qemu/memfd.patch \
b/meta/recipes-devtools/qemu/qemu/memfd.patch<br> > deleted file mode 100644<br>
> index 62e8d3800b..0000000000<br>
> --- a/meta/recipes-devtools/qemu/qemu/memfd.patch<br>
> +++ /dev/null<br>
> @@ -1,57 +0,0 @@<br>
> -Upstream-Status: Backport<br>
> -Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" \
target="_blank">ross.burton@intel.com</a>><br> > -<br>
> -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001<br>
> -From: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com" \
target="_blank">pbonzini@redhat.com</a>><br> > -Date: Tue, 28 Nov 2017 11:51:27 \
+0100<br> > -Subject: [PATCH] memfd: fix configure test<br>
> -MIME-Version: 1.0<br>
> -Content-Type: text/plain; charset=UTF-8<br>
> -Content-Transfer-Encoding: 8bit<br>
> -<br>
> -Recent glibc added memfd_create in sys/mman.h. This conflicts with<br>
> -the definition in util/memfd.c:<br>
> -<br>
> - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static \
declaration of memfd_create follows non-static declaration<br> > -<br>
> -Fix the configure test, and remove the sys/memfd.h inclusion since the<br>
> -file actually does not exist---it is a typo in the memfd_create(2) man<br>
> -page.<br>
> -<br>
> -Cc: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com" \
target="_blank">marcandre.lureau@redhat.com</a>><br> > -Signed-off-by: Paolo \
Bonzini <<a href="mailto:pbonzini@redhat.com" \
target="_blank">pbonzini@redhat.com</a>><br> > ----<br>
> - configure | 2 +-<br>
> - util/memfd.c | 4 +---<br>
> - 2 files changed, 2 insertions(+), 4 deletions(-)<br>
> -<br>
> -diff --git a/configure b/configure<br>
> -index 9c8aa5a98b..99ccc1725a 100755<br>
> ---- a/configure<br>
> -+++ b/configure<br>
> -@@ -3923,7 +3923,7 @@ fi<br>
> - # check if memfd is supported<br>
> - memfd=no<br>
> - cat > $TMPC << EOF<br>
> --#include <sys/memfd.h><br>
> -+#include <sys/mman.h><br>
> -<br>
> - int main(void)<br>
> - {<br>
> -diff --git a/util/memfd.c b/util/memfd.c<br>
> -index 4571d1aba8..412e94a405 100644<br>
> ---- a/util/memfd.c<br>
> -+++ b/util/memfd.c<br>
> -@@ -31,9 +31,7 @@<br>
> -<br>
> - #include "qemu/memfd.h"<br>
> -<br>
> --#ifdef CONFIG_MEMFD<br>
> --#include <sys/memfd.h><br>
> --#elif defined CONFIG_LINUX<br>
> -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD<br>
> - #include <sys/syscall.h><br>
> - #include <asm/unistd.h><br>
> -<br>
> ---<br>
> -2.11.0<br>
> diff --git a/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch \
b/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch<br> > index \
eb99d14639..360519f1a1 100644<br> > --- \
a/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch<br> > +++ \
b/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch<br> > @@ -1,8 +1,19 \
@@<br> > +From 6702ec74a7ba90b99efedde260c9f08b75d5516d Mon Sep 17 00:00:00 \
2001<br> > +From: Stephen Arnold <<a href="mailto:sarnold@vctlabs.com" \
target="_blank">sarnold@vctlabs.com</a>><br> > +Date: Sun, 12 Jun 2016 18:09:56 \
-0700<br> > +Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some \
environment<br> > +<br>
> Upstream-Status: Pending<br>
><br>
> +---<br>
> + configure | 4 ----<br>
> + 1 file changed, 4 deletions(-)<br>
> +<br>
> +diff --git a/configure b/configure<br>
> +index 69e05fb..12fc3d8 100755<br>
> --- a/configure<br>
> +++ b/configure<br>
> -@@ -4468,10 +4468,6 @@ fi<br>
> +@@ -5413,10 +5413,6 @@ write_c_skeleton<br>
> if test "$gcov" = "yes" ; then<br>
> CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"<br>
> LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"<br>
> @@ -12,4 +23,4 @@ Upstream-Status: Pending<br>
> - CFLAGS="-O2 $CFLAGS"<br>
> fi<br>
><br>
> - ##########################################<br>
> + if test "$have_asan" = "yes"; then<br>
> diff --git a/meta/recipes-devtools/qemu/<a href="http://qemu_2.11.1.bb" \
rel="noreferrer" target="_blank">qemu_2.11.1.bb</a> b/meta/recipes-devtools/qemu/<a \
href="http://qemu_2.12.0.bb" rel="noreferrer" target="_blank">qemu_2.12.0.bb</a><br> \
> similarity index 87%<br> > rename from meta/recipes-devtools/qemu/<a \
href="http://qemu_2.11.1.bb" rel="noreferrer" target="_blank">qemu_2.11.1.bb</a><br> \
> rename to meta/recipes-devtools/qemu/<a href="http://qemu_2.12.0.bb" \
rel="noreferrer" target="_blank">qemu_2.12.0.bb</a><br> > index \
f4b7d69fca..63590fc9eb 100644<br> > --- a/meta/recipes-devtools/qemu/<a \
href="http://qemu_2.11.1.bb" rel="noreferrer" target="_blank">qemu_2.11.1.bb</a><br> \
> +++ b/meta/recipes-devtools/qemu/<a href="http://qemu_2.12.0.bb" \
rel="noreferrer" target="_blank">qemu_2.12.0.bb</a><br> > @@ -20,8 +20,6 @@ \
SRC_URI = "<a href="http://wiki.qemu-project.org/download/$%7BBP%7D.tar.bz2" \
rel="noreferrer" target="_blank">http://wiki.qemu-project.org/download/${BP}.tar.bz2</a> \
\<br> > \
file://chardev-connect-socket-to-a-spawned-command.patch \<br> > \
file://apic-fixup-fallthrough-to-PIC.patch \<br> > \
file://linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \<br> > - \
file://memfd.patch \<br> > - \
file://0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch \<br> > \
"<br> > UPSTREAM_CHECK_REGEX = \
"qemu-(?P<pver>\d+\..*)\.tar"<br> ><br>
> @@ -31,8 +29,8 @@ SRC_URI_append_class-native = " \<br>
> file://cpus.c-qemu_cpu_kick_thread_debugging.patch \<br>
> "<br>
><br>
> -SRC_URI[md5sum] = "61cf862b6007eba4ac98247776af2e27"<br>
> -SRC_URI[sha256sum] = \
"d9df2213ceed32e91dab7bc9dd19c1af83f91ba72c7aeef7605dfaaf81732ccb"<br> > \
+SRC_URI[md5sum] = "122fd7cdf241ff7eb1e42c0b503b5d1b"<br> > \
+SRC_URI[sha256sum] = \
"c9f4a147bc915d24df9784affc611a115f42d24720a89210b479f1ba7a3f679c"<br> \
><br> > COMPATIBLE_HOST_mipsarchn32 = "null"<br>
> COMPATIBLE_HOST_mipsarchn64 = "null"<br>
> --<br>
> 2.17.0<br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org" \
target="_blank">Openembedded-core@lists.openembedded.org</a><br> > <a \
href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" \
rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></blockquote></div></blockquote></div></blockquote></div>
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic