6 files changed, 34 insertions, 69 deletions

diff --git a/recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch b/recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch
deleted file mode 100644
index 863e86a8..00000000
--- a/recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2e22df7c24dadf5e16004cd832cabca76a699d4d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 21 Mar 2017 23:32:39 -0700
-Subject: [PATCH] Avoid pointers for address of packed members
-
-Fixes Clang warning due to -Waddress-of-packed-member
-
-virtio/blk.c:161:37: error: taking address of packed member 'geometry' of class or structure 'virtio_blk_config' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
-        struct virtio_blk_geometry *geo = &conf->geometry;
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- virtio/blk.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/virtio/blk.c b/virtio/blk.c
-index c485e4f..1f7365d 100644
---- a/virtio/blk.c
-+++ b/virtio/blk.c
-@@ -158,7 +158,6 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features)
- {
-        struct blk_dev *bdev = dev;
-        struct virtio_blk_config *conf = &bdev->blk_config;
--       struct virtio_blk_geometry *geo = &conf->geometry;
- 
-        bdev->features = features;
- 
-@@ -167,7 +166,7 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features)
-        conf->seg_max = virtio_host_to_guest_u32(&bdev->vdev, conf->seg_max);
- 
-        /* Geometry */
--       geo->cylinders = virtio_host_to_guest_u16(&bdev->vdev, geo->cylinders);
-+       conf->geometry.cylinders = virtio_host_to_guest_u16(&bdev->vdev, conf->geometry.cylinders);
- 
-        conf->blk_size = virtio_host_to_guest_u32(&bdev->vdev, conf->blk_size);
-        conf->min_io_size = virtio_host_to_guest_u16(&bdev->vdev, conf->min_io_size);
--- 
-2.12.0
-
diff --git a/recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch b/recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch
index 63911fc2..4582285b 100644
--- a/recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch
+++ b/recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch
@@ -1,20 +1,21 @@
-From bcd954ffdb9383030e02d356b51e09e4e2a7105a Mon Sep 17 00:00:00 2001
+From 6b864b05b7aea74f375502250e99f54564cfe829 Mon Sep 17 00:00:00 2001
 From: Dariusz Pelowski <dariusz.pelowski@gmail.com>
 Date: Sun, 5 Nov 2017 12:39:52 +0100
-Subject: [PATCH 1/2] kvmtool: 9p: fixed compilation error
+Subject: [PATCH] kvmtool: 9p: fixed compilation error
 
 makedev is defined in sys/sysmacros.h
 
 Signed-off-by: Dariusz Pelowski <dariusz.pelowski@gmail.com>
+
 ---
  virtio/9p.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/virtio/9p.c b/virtio/9p.c
-index 6acbfdd..1dee2c2 100644
+index b78f2b3..838c5c4 100644
 --- a/virtio/9p.c
 +++ b/virtio/9p.c
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,7 @@
  #include <string.h>
  #include <errno.h>
  #include <sys/vfs.h>
@@ -22,6 +23,3 @@ index 6acbfdd..1dee2c2 100644
  
  #include <linux/virtio_ring.h>
  #include <linux/virtio_9p.h>
--- 
-2.15.0
-
diff --git a/recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch b/recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch
index 262531ca..dbb2bebe 100644
--- a/recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch
+++ b/recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch
@@ -1,18 +1,19 @@
-From 977a4d41012d1814f5a5330cacc2e4944de387cc Mon Sep 17 00:00:00 2001
+From 80eb205fd165072724a6e6db1dff8ab0bf2aa667 Mon Sep 17 00:00:00 2001
 From: Dariusz Pelowski <dariusz.pelowski@gmail.com>
 Date: Sun, 5 Nov 2017 12:39:21 +0100
-Subject: [PATCH 2/2] kvmtool: add EXTRA_CFLAGS variable
+Subject: [PATCH] kvmtool: add EXTRA_CFLAGS variable
 
 to avoid CFLAGS overriding introduce new EXTRA_CFLAGS variable
 for setting via command argument
 
 Signed-off-by: Dariusz Pelowski <dariusz.pelowski@gmail.com>
+
 ---
  Makefile | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 64a0a16..bca1b26 100644
+index 3787df2..ece3d2a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -2,6 +2,8 @@
@@ -22,8 +23,5 @@ index 64a0a16..bca1b26 100644
 +CFLAGS += $(EXTRA_CFLAGS)
 +
  ifeq ($(strip $(V)),)
-        E = @echo
-        Q = @
--- 
-2.15.0
-
+        ifeq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
+                E = @echo
diff --git a/recipes-extended/kvmtool/files/0003-kvmtool-Werror-disabled.patch b/recipes-extended/kvmtool/files/0003-kvmtool-Werror-disabled.patch
index 4d2f2555..7b1b7f6f 100644
--- a/recipes-extended/kvmtool/files/0003-kvmtool-Werror-disabled.patch
+++ b/recipes-extended/kvmtool/files/0003-kvmtool-Werror-disabled.patch
@@ -1,24 +1,23 @@
-From 377a09c16003eaa40f7f337127b10728ee0ade35 Mon Sep 17 00:00:00 2001
+From 532043e6937b78b12d89d0c6001f0e1853143247 Mon Sep 17 00:00:00 2001
 From: Cevat Bostancioglu <bostancioglucevat@gmail.com>
 Date: Wed, 19 Jun 2019 20:36:56 +0300
 Subject: [PATCH] WERROR override disabled.
 
 WERROR override causes gcc sizeof-pointer-memaccess,  format-truncation errors.
+
 ---
  Makefile | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index 030ff4e..fc5e177 100644
+index ece3d2a..da6c1f0 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -2,6 +2,7 @@
- # Define WERROR=0 to disable -Werror.
- #
+@@ -4,6 +4,7 @@
+ 
+ CFLAGS += $(EXTRA_CFLAGS)
  
 +WERROR = 0
  ifeq ($(strip $(V)),)
-        E = @echo
-        Q = @
--- 
-2.7.4
+        ifeq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
+                E = @echo
diff --git a/recipes-extended/kvmtool/files/external-crosscompiler.patch b/recipes-extended/kvmtool/files/external-crosscompiler.patch
index 75cef3b1..ab030c73 100644
--- a/recipes-extended/kvmtool/files/external-crosscompiler.patch
+++ b/recipes-extended/kvmtool/files/external-crosscompiler.patch
@@ -1,14 +1,23 @@
+From b89ba4256cb6074aee74ea5386bc5ca8e75d4653 Mon Sep 17 00:00:00 2001
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 6 Sep 2016 11:51:40 -0700
+Subject: [PATCH] kvmtool: add lightweight hypervisor native Linux KVM tool
+
 Upstream-Status: Inappropriate [embedded specific]
 
 This allows OpenEmbedded to pass in cross compiler configuration using
 the default envirnment variables. It is required so that kvmtool can
 be linked against the cross-compiled libfdt library.
 
+---
+ Makefile | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
 diff --git a/Makefile b/Makefile
-index 1f0196f..8bfb068 100644
+index 35bb118..3787df2 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -14,11 +14,6 @@ export E Q
+@@ -18,12 +18,6 @@ export E Q
  include config/utilities.mak
  include config/feature-tests.mak
  
@@ -16,11 +25,12 @@ index 1f0196f..8bfb068 100644
 -CFLAGS :=
 -LD     := $(CROSS_COMPILE)ld
 -LDFLAGS        :=
+-OBJCOPY        := $(CROSS_COMPILE)objcopy
 -
  FIND   := find
  CSCOPE := cscope
  TAGS   := ctags
-@@ -297,7 +292,7 @@ $(warning No static libc found. Skipping guest init)
+@@ -319,7 +313,7 @@ $(warning No static libc found. Skipping guest init)
  endif
  
  ifeq (y,$(ARCH_WANT_LIBFDT))
diff --git a/recipes-extended/kvmtool/kvmtool.bb b/recipes-extended/kvmtool/kvmtool.bb
index 90ad8a1f..822d97b9 100644
--- a/recipes-extended/kvmtool/kvmtool.bb
+++ b/recipes-extended/kvmtool/kvmtool.bb
@@ -11,14 +11,13 @@ inherit kernel-arch
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git \
            file://external-crosscompiler.patch \
-           file://0001-Avoid-pointers-for-address-of-packed-members.patch \
            file://0001-kvmtool-9p-fixed-compilation-error.patch \
            file://0002-kvmtool-add-EXTRA_CFLAGS-variable.patch \
            file://0003-kvmtool-Werror-disabled.patch \
            "
 
-SRCREV = "0e1882a49f81cb15d328ef83a78849c0ea26eecc"
-PV = "4.14.0+git${SRCPV}"
+SRCREV = "90b2d3adadf218dfc6bdfdfcefe269843360223c"
+PV = "5.10.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"