[1/2] package/qemu: Move patches to version directory
diff mbox series

Message ID 1559564887-4088-1-git-send-email-guoren@kernel.org
State Accepted
Headers show
Series
  • [1/2] package/qemu: Move patches to version directory
Related show

Commit Message

Guo Ren June 3, 2019, 12:28 p.m. UTC
From: Guo Ren <ren_guo@c-sky.com>

Signed-off-by: Guo Ren <ren_guo@c-sky.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 -------------
 .../qemu/0002-configure-improve-usbfs-check.patch  | 60 ----------------------
 ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 +++++++++++++
 .../3.1.0/0002-configure-improve-usbfs-check.patch | 60 ++++++++++++++++++++++
 4 files changed, 95 insertions(+), 95 deletions(-)
 delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
 delete mode 100644 package/qemu/0002-configure-improve-usbfs-check.patch
 create mode 100644 package/qemu/3.1.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
 create mode 100644 package/qemu/3.1.0/0002-configure-improve-usbfs-check.patch

Comments

Thomas Huth June 4, 2019, 7:56 a.m. UTC | #1
Am Mon,  3 Jun 2019 20:28:06 +0800
schrieb guoren@kernel.org:

> From: Guo Ren <ren_guo@c-sky.com>
> 
> Signed-off-by: Guo Ren <ren_guo@c-sky.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 -------------
>  .../qemu/0002-configure-improve-usbfs-check.patch  | 60
> ---------------------- ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch
> | 35 +++++++++++++ .../3.1.0/0002-configure-improve-usbfs-check.patch
> | 60 ++++++++++++++++++++++ 4 files changed, 95 insertions(+), 95
> deletions(-) delete mode 100644
> package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> delete mode 100644
> package/qemu/0002-configure-improve-usbfs-check.patch create mode
> 100644
> package/qemu/3.1.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> create mode 100644
> package/qemu/3.1.0/0002-configure-improve-usbfs-check.patch

At least the usbfs patch seems to be included in QEMU v4.0, so maybe it
would be better to bump the version to 4.0 first?

Thomas, did you ever send the first patch to upstream QEMU, too? Looks
like a valid patch to me, so I think it should be accepted there,
too...?

 Thomas H
Guo Ren June 4, 2019, 8:34 a.m. UTC | #2
Hi Thomas,

On Tue, Jun 4, 2019 at 3:56 PM Thomas Huth <huth@tuxfamily.org> wrote:
>
> Am Mon,  3 Jun 2019 20:28:06 +0800
> schrieb guoren@kernel.org:
>
> > From: Guo Ren <ren_guo@c-sky.com>
> >
> > Signed-off-by: Guo Ren <ren_guo@c-sky.com>
> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > ---
> >  ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 -------------
> >  .../qemu/0002-configure-improve-usbfs-check.patch  | 60
> > ---------------------- ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch
> > | 35 +++++++++++++ .../3.1.0/0002-configure-improve-usbfs-check.patch
> > | 60 ++++++++++++++++++++++ 4 files changed, 95 insertions(+), 95
> > deletions(-) delete mode 100644
> > package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> > delete mode 100644
> > package/qemu/0002-configure-improve-usbfs-check.patch create mode
> > 100644
> > package/qemu/3.1.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> > create mode 100644
> > package/qemu/3.1.0/0002-configure-improve-usbfs-check.patch
>
> At least the usbfs patch seems to be included in QEMU v4.0, so maybe it
> would be better to bump the version to 4.0 first?
I've no idea about qemu 4.0 and these patch can't apply to
csky-qemu-3.0. So I need to move them
to their own version's directory.

Best Regards
 Guo Ren
Thomas Petazzoni June 22, 2019, 8:18 a.m. UTC | #3
On Tue, 4 Jun 2019 09:56:05 +0200
Thomas Huth <huth@tuxfamily.org> wrote:

> At least the usbfs patch seems to be included in QEMU v4.0, so maybe it
> would be better to bump the version to 4.0 first?

Bumping to 4.0 would certainly be nice, but it really is a different
thing than what Guo is doing. Since it's not really necessary to add
support for C-SKY's Qemu version, I don't want to make bumping to 4.0 a
requirement for Guo's work.

> Thomas, did you ever send the first patch to upstream QEMU, too? Looks
> like a valid patch to me, so I think it should be accepted there,
> too...?

To be honest, I don't remember if I ever sent it upstream :-/

Thomas
Thomas Petazzoni June 22, 2019, 3:49 p.m. UTC | #4
On Mon,  3 Jun 2019 20:28:06 +0800
guoren@kernel.org wrote:

> From: Guo Ren <ren_guo@c-sky.com>
> 
> Signed-off-by: Guo Ren <ren_guo@c-sky.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 -------------
>  .../qemu/0002-configure-improve-usbfs-check.patch  | 60 ----------------------
>  ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 +++++++++++++
>  .../3.1.0/0002-configure-improve-usbfs-check.patch | 60 ++++++++++++++++++++++
>  4 files changed, 95 insertions(+), 95 deletions(-)
>  delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
>  delete mode 100644 package/qemu/0002-configure-improve-usbfs-check.patch
>  create mode 100644 package/qemu/3.1.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
>  create mode 100644 package/qemu/3.1.0/0002-configure-improve-usbfs-check.patch

Thanks, both patches applied!

Thomas

Patch
diff mbox series

diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
deleted file mode 100644
index a0c4a62..0000000
--- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From d3f1e7e9ff9aae3f770b0bcb9aa3c2f787f76a1b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 5 May 2017 09:07:15 +0200
-Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc
-
-user-exec.c has some conditional code to decide how to use the
-mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but
-with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path
-gets used, which doesn't apply to uClibc.
-
-Fix this by excluding __UCLIBC__, which ensures we fall back to the
-general case of using uc_mcontext.arm_pc, which works fine with
-uClibc.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- user-exec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
-index 6db0758..2b3d116 100644
---- a/accel/tcg/user-exec.c
-+++ b/accel/tcg/user-exec.c
-@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
- 
- #if defined(__NetBSD__)
-     pc = uc->uc_mcontext.__gregs[_REG_R15];
--#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-     pc = uc->uc_mcontext.gregs[R15];
- #else
-     pc = uc->uc_mcontext.arm_pc;
--- 
-2.7.4
-
diff --git a/package/qemu/0002-configure-improve-usbfs-check.patch b/package/qemu/0002-configure-improve-usbfs-check.patch
deleted file mode 100644
index d693b5d..0000000
--- a/package/qemu/0002-configure-improve-usbfs-check.patch
+++ /dev/null
@@ -1,60 +0,0 @@ 
-From 9672cccd64c446369b5649fe23d575917638be46 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Tue, 5 Feb 2019 15:07:43 +0100
-Subject: [PATCH] configure: improve usbfs check
-
-The current check to test if usbfs support should be compiled or not
-solely relies on the presence of <linux/usbdevice_fs.h>, without
-actually checking that all definition used by Qemu are provided by
-this header file.
-
-With sufficiently old kernel headers, <linux/usbdevice_fs.h> may be
-present, but some of the definitions needed by Qemu may not be
-available.
-
-This commit improves the check by building a small program that
-actually tests whether the necessary definitions are available.
-
-In addition, it fixes a bug where have_usbfs was set to "yes"
-regardless of the result of the test.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- configure | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 3d89870d99..799c8e3b08 100755
---- a/configure
-+++ b/configure
-@@ -4266,10 +4266,25 @@ fi
- # check for usbfs
- have_usbfs=no
- if test "$linux_user" = "yes"; then
--  if check_include linux/usbdevice_fs.h; then
-+  cat > $TMPC << EOF
-+#include <linux/usbdevice_fs.h>
-+
-+#ifndef USBDEVFS_GET_CAPABILITIES
-+#error "USBDEVFS_GET_CAPABILITIES undefined"
-+#endif
-+
-+#ifndef USBDEVFS_DISCONNECT_CLAIM
-+#error "USBDEVFS_DISCONNECT_CLAIM undefined"
-+#endif
-+
-+int main(void)
-+{
-+    return 0;
-+}
-+EOF
-+  if compile_prog "" ""; then
-     have_usbfs=yes
-   fi
--  have_usbfs=yes
- fi
- 
- # check for fallocate
--- 
-2.20.1
-
diff --git a/package/qemu/3.1.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/3.1.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
new file mode 100644
index 0000000..a0c4a62
--- /dev/null
+++ b/package/qemu/3.1.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
@@ -0,0 +1,35 @@ 
+From d3f1e7e9ff9aae3f770b0bcb9aa3c2f787f76a1b Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 5 May 2017 09:07:15 +0200
+Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc
+
+user-exec.c has some conditional code to decide how to use the
+mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but
+with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path
+gets used, which doesn't apply to uClibc.
+
+Fix this by excluding __UCLIBC__, which ensures we fall back to the
+general case of using uc_mcontext.arm_pc, which works fine with
+uClibc.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ user-exec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
+index 6db0758..2b3d116 100644
+--- a/accel/tcg/user-exec.c
++++ b/accel/tcg/user-exec.c
+@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
+ 
+ #if defined(__NetBSD__)
+     pc = uc->uc_mcontext.__gregs[_REG_R15];
+-#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
++#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
+     pc = uc->uc_mcontext.gregs[R15];
+ #else
+     pc = uc->uc_mcontext.arm_pc;
+-- 
+2.7.4
+
diff --git a/package/qemu/3.1.0/0002-configure-improve-usbfs-check.patch b/package/qemu/3.1.0/0002-configure-improve-usbfs-check.patch
new file mode 100644
index 0000000..d693b5d
--- /dev/null
+++ b/package/qemu/3.1.0/0002-configure-improve-usbfs-check.patch
@@ -0,0 +1,60 @@ 
+From 9672cccd64c446369b5649fe23d575917638be46 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Tue, 5 Feb 2019 15:07:43 +0100
+Subject: [PATCH] configure: improve usbfs check
+
+The current check to test if usbfs support should be compiled or not
+solely relies on the presence of <linux/usbdevice_fs.h>, without
+actually checking that all definition used by Qemu are provided by
+this header file.
+
+With sufficiently old kernel headers, <linux/usbdevice_fs.h> may be
+present, but some of the definitions needed by Qemu may not be
+available.
+
+This commit improves the check by building a small program that
+actually tests whether the necessary definitions are available.
+
+In addition, it fixes a bug where have_usbfs was set to "yes"
+regardless of the result of the test.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ configure | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 3d89870d99..799c8e3b08 100755
+--- a/configure
++++ b/configure
+@@ -4266,10 +4266,25 @@ fi
+ # check for usbfs
+ have_usbfs=no
+ if test "$linux_user" = "yes"; then
+-  if check_include linux/usbdevice_fs.h; then
++  cat > $TMPC << EOF
++#include <linux/usbdevice_fs.h>
++
++#ifndef USBDEVFS_GET_CAPABILITIES
++#error "USBDEVFS_GET_CAPABILITIES undefined"
++#endif
++
++#ifndef USBDEVFS_DISCONNECT_CLAIM
++#error "USBDEVFS_DISCONNECT_CLAIM undefined"
++#endif
++
++int main(void)
++{
++    return 0;
++}
++EOF
++  if compile_prog "" ""; then
+     have_usbfs=yes
+   fi
+-  have_usbfs=yes
+ fi
+ 
+ # check for fallocate
+-- 
+2.20.1
+