qemu-*: Upgrade QEMU version 2.11 -> 4.1.5

Upgrade QEMU version from 2.11 -> 4.1.5 for 2020.1 release

Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>

7 files changed, 15 insertions, 180 deletions

diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-The-glibc-2.29.9000-6.fc31.x86_64-package-finally-in.patch b/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-The-glibc-2.29.9000-6.fc31.x86_64-package-finally-in.patch
deleted file mode 100644
index 97cf71d9..00000000
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-The-glibc-2.29.9000-6.fc31.x86_64-package-finally-in.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 4fdb6551ea8856cc2df25d33e4103bf1736d7935 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 20 Nov 2019 13:53:16 -0800
-Subject: [PATCH] The glibc-2.29.9000-6.fc31.x86_64 package finally includes
- the gettid() function as part of unistd.h when __USE_GNU is defined. This
- clashes with linux-user code which unconditionally defines this function name
- itself.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-/home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static
-declaration of ‘gettid’ follows non-static declaration
-  253 | _syscall0(int, gettid)
-      |                ^~~~~~
-/home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in
-definition of macro ‘_syscall0’
-  184 | static type name (void)   \
-      |             ^~~~
-In file included from /usr/include/unistd.h:1170,
-                 from
-/home/berrange/src/virt/qemu/include/qemu/osdep.h:107,
-                 from
-/home/berrange/src/virt/qemu/linux-user/syscall.c:20:
-/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of
-‘gettid’ was here
-   34 | extern __pid_t gettid (void) __THROW;
-      |                ^~~~~~
-  CC      aarch64-linux-user/linux-user/signal.o
-make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69:
-linux-user/syscall.o] Error 1
-make[1]: *** Waiting for unfinished jobs....
-make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2
-
-While we could make our definition conditional and rely on glibc's impl,
-this patch simply renames our definition to sys_gettid() which is a
-common pattern in this file.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
----
- linux-user/syscall.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 11c9116..464c3b9 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -34,6 +34,7 @@
- #include <sys/resource.h>
- #include <sys/swap.h>
- #include <linux/capability.h>
-+#include <linux/sockios.h>
- #include <sched.h>
- #include <sys/timex.h>
- #ifdef __ia64__
-@@ -256,12 +257,12 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
- #define TARGET_NR__llseek TARGET_NR_llseek
- #endif
- 
--#ifdef __NR_gettid
--_syscall0(int, gettid)
-+#ifdef __NR_sys_gettid
-+_syscall0(int, sys_gettid)
- #else
- /* This is a replacement for the host gettid() and must return a host
-    errno. */
--static int gettid(void) {
-+static int sys_gettid(void) {
-     return -ENOSYS;
- }
- #endif
-@@ -6246,7 +6247,7 @@ static void *clone_func(void *arg)
-     cpu = ENV_GET_CPU(env);
-     thread_cpu = cpu;
-     ts = (TaskState *)cpu->opaque;
--    info->tid = gettid();
-+    info->tid = sys_gettid();
-     task_settid(ts);
-     if (info->child_tidptr)
-         put_user_u32(info->tid, info->child_tidptr);
-@@ -6390,9 +6391,9 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
-                mapping.  We can't repeat the spinlock hack used above because
-                the child process gets its own copy of the lock.  */
-             if (flags & CLONE_CHILD_SETTID)
--                put_user_u32(gettid(), child_tidptr);
-+                put_user_u32(sys_gettid(), child_tidptr);
-             if (flags & CLONE_PARENT_SETTID)
--                put_user_u32(gettid(), parent_tidptr);
-+                put_user_u32(sys_gettid(), parent_tidptr);
-             ts = (TaskState *)cpu->opaque;
-             if (flags & CLONE_SETTLS)
-                 cpu_set_tls (env, newtls);
-@@ -11454,7 +11455,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
-         break;
- #endif
-     case TARGET_NR_gettid:
--        ret = get_errno(gettid());
-+        ret = get_errno(sys_gettid());
-         break;
- #ifdef TARGET_NR_readahead
-     case TARGET_NR_readahead:
--- 
-2.7.4
-
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-linux-user-disable-qemu-bridge-helper-and-socket_scm.patch b/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-linux-user-disable-qemu-bridge-helper-and-socket_scm.patch
deleted file mode 100644
index 8f41f746..00000000
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-linux-user-disable-qemu-bridge-helper-and-socket_scm.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 206d1b9c38daed50fcc08d2e743e649fbb82d60b Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <laurent@vivier.eu>
-Date: Tue, 5 Jun 2018 18:09:58 +0200
-Subject: [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper
- build
-
-linux-user targets don't need them, and if we ask to build statically
-linked binaries, some static libraries they need are not available.
-
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-Message-Id: <20180605160958.5434-1-laurent@vivier.eu>
-
-Upstream-Status: Pending
-
-
-With the split of qemu-xilinx into target,native and system-native recipes,
-we need to avoid duplicating providers for qemu-brigde-helper.
-
-Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
-
-
----
- Makefile               | 2 +-
- tests/Makefile.include | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 023b343..e4bc34a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -351,7 +351,7 @@ $(call set-vpath, $(SRC_PATH))
- 
- LIBS+=-lz $(LIBS_TOOLS)
- 
--HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
-+HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
- 
- ifdef BUILD_DOCS
- DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
-diff --git a/tests/Makefile.include b/tests/Makefile.include
-index d098a10..10397ed 100644
---- a/tests/Makefile.include
-+++ b/tests/Makefile.include
-@@ -930,7 +930,7 @@ check-report.html: check-report.xml
- 
- # Other tests
- 
--QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
-+QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
- 
- .PHONY: check-tests/qemu-iotests-quick.sh
- check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
--- 
-2.7.4
-
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.2.bb
index 22f19bfd..26914f5a 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.2.bb
@@ -1,4 +1,4 @@
 require qemu-devicetrees.inc
 
-BRANCH ?= "branch/xilinx-v2019.2"
-SRCREV ?= "d119986a6dd800bc3e71ea171b5b6741e0128289"
+BRANCH ?= "master"
+SRCREV ?= "${AUTOREV}"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc
index 438b9246..41e91dab 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc
@@ -5,3 +5,8 @@ DEPENDS = "glib-2.0-native zlib-native"
 
 SRC_URI_remove = "file://0010-fix-libcap-header-issue-on-some-distro.patch"
 SRC_URI_remove = "file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch"
+SRC_URI_remove = "file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch"
+
+do_install_append(){
+       rm -rf ${D}${datadir}/icons
+}
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2019.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2019.2.bb
index 2814de0c..87ea8553 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2019.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2019.2.bb
@@ -2,5 +2,3 @@ require qemu-xilinx-native.inc
 BPN = "qemu-xilinx"
 
 EXTRA_OECONF_append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
-
-SRC_URI_append = " file://0001-linux-user-disable-qemu-bridge-helper-and-socket_scm.patch"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
index e9efee6f..b624d366 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
@@ -5,14 +5,14 @@ QEMU_TARGETS = "aarch64 arm microblaze microblazeel"
 
 LIC_FILES_CHKSUM = " \
                 file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
-                file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913 \
+                file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f \
                 "
 DEPENDS = "glib-2.0 zlib pixman"
 
 XILINX_RELEASE_VERSION = "v2019.2"
-XILINX_QEMU_VERSION ?= "v2.11.1"
-BRANCH ?= "branch/xilinx-v2019.2"
-SRCREV ?= "6617fbc8be3525ca524f7d4ef7fc7b14c5b0c822"
+XILINX_QEMU_VERSION ?= "v4.1.50"
+BRANCH ?= "master-next"
+SRCREV ?= "${AUTOREV}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
@@ -23,18 +23,17 @@ REPO ?= "git://github.com/Xilinx/qemu.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-SRC_URI_append = " file://0001-The-glibc-2.29.9000-6.fc31.x86_64-package-finally-in.patch"
+SRC_URI_append = " file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF_append= " --python=python2.7"
-
 # Disable KVM completely
 PACKAGECONFIG_remove = "kvm"
-PACKAGECONFIG[ssh] = "--enable-libssh,,"
+PACKAGECONFIG_append = " fdt"
 
 # Enable libgcrypt
-PACKAGECONFIG_append = " gcrypt fdt alsa kvm"
+PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
+PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
 
 DISABLE_STATIC_pn-${PN} = ""
 
@@ -46,11 +45,6 @@ EXTRA_OECONF_append = " \
                 --libexecdir=${libexecdir}/qemu-xilinx \
                 "
 
-do_configure_prepend() {
-        # rewrite usage of 'libgcrypt-config' with 'pkg-config libgcrypt'
-        sed -r -i 's/libgcrypt-config(\s*--)/pkg-config libgcrypt\1/g' ${S}/configure
-}
-
 do_install_append() {
         # Prevent QA warnings about installed ${localstatedir}/run
         if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.2.bb
index d540f6c3..c158b185 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.2.bb
@@ -11,4 +11,3 @@ EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)
 do_install_append_class-nativesdk() {
     ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)}
 }
-