updated patches

diff --git a/qemu-whitelist.patch b/qemu-whitelist.patch
index 318b9906fe3923ed186a27535526e2564863316c..f267a2c4983dff8acf34dee7ee78e14bcb85c5b7 100644 (file)
--- a/qemu-whitelist.patch
+++ b/qemu-whitelist.patch
@@ -1,8 +1,18 @@
---- scripts/create_config.org  2011-02-16 15:44:05.000000000 +0100
-+++ scripts/create_config      2011-03-21 21:26:16.136615526 +0100
-@@ -33,7 +33,9 @@
-  CONFIG_BDRV_WHITELIST=*)
-     echo "#define CONFIG_BDRV_WHITELIST \\"
+--- qemu-5.0.0/scripts/create_config.orig      2021-03-09 12:06:01.531473021 +0100
++++ qemu-5.0.0/scripts/create_config   2021-03-09 12:08:49.823397889 +0100
+@@ -43,14 +43,18 @@
+  CONFIG_BDRV_RW_WHITELIST=*)
+     echo "#define CONFIG_BDRV_RW_WHITELIST\\"
+     for drv in ${line#*=}; do
+-      echo "    \"${drv}\",\\"
++      if [ ! -z "$drv" ]; then
++        echo "    \"${drv}\",\\"
++      fi
+     done
+     echo "    NULL"
+     ;;
+  CONFIG_BDRV_RO_WHITELIST=*)
+     echo "#define CONFIG_BDRV_RO_WHITELIST\\"
      for drv in ${line#*=}; do
 -      echo "    \"${drv}\",\\"
 +      if [ ! -z "$drv" ]; then

diff --git a/qemu-xattr.patch b/qemu-xattr.patch
index c137485ed33f6a0e027a3bcc69ebad5a5070b021..edf27c9c2cd237ca05ff3a502420de3461cd3564 100644 (file)
--- a/qemu-xattr.patch
+++ b/qemu-xattr.patch
@@ -14,7 +14,7 @@ before <sys/capability.h> (which includes <linux/xattr.h>.
  #include <getopt.h>
  #include <syslog.h>
 @@ -23,7 +24,6 @@
- #endif
+ #include <cap-ng.h>
  #include "qemu-common.h"
  #include "qemu/sockets.h"
 -#include "qemu/xattr.h"

diff --git a/qemu.spec b/qemu.spec
index 193cd1895d3c08d3a788986bbee02781c8381ce9..6fab38cd2d2bec56eee84491d16605fcf109a544 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -951,7 +951,7 @@ Sondy systemtap/dtrace dla QEMU.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

diff --git a/x32.patch b/x32.patch
index 54e6a61f51738b66d2c7d9f0c095d8741b49e8c1..00b573046e1f949159e03dcc72e05f545c4e1e90 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -12,8 +12,8 @@
 --- qemu-2.6.0/include/qemu/atomic.h~  2016-07-17 18:37:57.000000000 +0200
 +++ qemu-2.6.0/include/qemu/atomic.h   2016-07-17 18:38:33.485893530 +0200
 @@ -20,7 +20,7 @@
- /* Compiler barrier */
- #define barrier()   ({ asm volatile("" ::: "memory"); (void)0; })
+         (unsigned short)1,                                                         \
+       (expr)+0))))))
  
 -#ifdef __ATOMIC_RELAXED
 +#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__)