From 21204daacb323a68d204542fc75ec555254842d4 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 14 Mar 2024 20:19:39 +0000 Subject: kvmtool: update -tip Bumping kvmtool to latest, which comprises the following commits: 4d2c017 Fix 9pfs open device file security flaw e73a6b2 x86: Enable in-kernel irqchip before creating PIT f6cc06d riscv: Fix guest poweroff when using PLIC emulation 4ddaa42 riscv: Handle SBI DBCN calls from Guest/VM ef89838 riscv: Set mmu-type DT property based on satp_mode ONE_REG interface 8cd71ca riscv: Add Zicond extension support 8d02d5a riscv: Add Smstateen extension support 3436684 riscv: Add Zicsr and Zifencei extension support 6676856 riscv: Add Zicntr and Zihpm extension support 6331850 riscv: Add Zba and Zbs extension support 7887b39 riscv: Make CPU_ISA_MAX_LEN depend upon isa_info_arr array size fcb0767 riscv: Improve warning in generate_cpu_nodes() 92ef2dc Sync kernel headers with v6.7 to enable additional Risc-V extensions 095773e riscv: Fix guest/init linkage for multilib toolchain 328f087 riscv: Use AIA in-kernel irqchip whenever KVM RISC-V supports 17aab30 riscv: Add IRQFD support for in-kernel AIA irqchip 0dff350 riscv: Make irqchip support pluggable 56e2d67 riscv: Add Svnapot extension support 26c8589 Sync-up header with Linux-6.6 for KVM RISC-V 74af145 virtio: Cancel and join threads when exiting devices devices 9cb1b46 pci: Deregister KVM_PCI_CFG_AREA on pci__exit d560235 virtio/pci: Use consistent naming for the PCI ISR bit flags 2921448 virtio/pci: Treat PCI ISR as a set of bit flags 353fa0d virtio/pci: Level-trigger the legacy IRQ line in all cases c7b7a54 builtin-run: Document mode=none for -n/--network 4498eb7 Revert "virtio-net: Don't print the compat warning for the default device" 106e2ea riscv: Fix guest RAM alloc size computation for RV32 8659200 riscv: Add Ssaia extension support 8f1e47c riscv: Add Zicboz extension support 8c1584e riscv: Add zbb extension support b346fab riscv: Sort the ISA extension array alphabetically a416fdc riscv: Allow disabling SBI extensions for Guest 9e9cfde riscv: Allow setting custom mvendorid, marchid, and mimpid be98682 Sync-up headers with Linux-6.4 d834369 kvm tools: Add __DECLARE_FLEX_ARRAY() in include/linux/stddef.h 15757e8 virtio-net: Don't print the compat warning for the default device 63643b1 Apply scaling down the calculated guest ram size to the number of pages 834e5ed Factor out getting the number of physical memory host pages b6bae72 Factor out getting the host page size bd4ba57 Add --loglevel argument for the run command fc184a6 util: Use __pr_debug() instead of pr_info() to print debug messages 72e1394 Replace printf/fprintf with pr_* macros 2cc4929 util: Make pr_err() return void 0b5e55f vfio/pci: Clarify the MSI states 3a36d34 vfio/pci: Initialize MSI vectors unmasked 3b1cdcf virtio/vhost: Clear VIRTIO_F_ACCESS_PLATFORM 46aaf3b virtio/vhost: Support line interrupt signaling d30d948 Factor epoll thread 3a70ab1 virtio/net: Warn about enabling multiqueue with vhost 33e026a virtio: Fix messages about missing Linux config 13534ee virtio: Document how to test the devices 53171d5 virtio/net: Fix feature selection cf8358d virtio/vsock: Fix feature selection 13ea439 virtio/scsi: Fix feature selection b8420e8 virtio/scsi: Initialize max_target 7bc3b5d disk/core: Fix segfault on exit with SCSI 145a86f virtio/scsi: Fix and simplify command-line 13e7d62 virtio/scsi: Move VHOST_SCSI_SET_ENDPOINT to device start 029cd2b virtio/vhost: Factor notify_vq_gsi() 676c0c8 virtio/vhost: Factor notify_vq_eventfd() 745221e virtio/vhost: Factor vring operation f84ab9e virtio: Factor vhost initialization 5311413 virtio/rng: Fix build warning from min() 426e875 arm/kvm-cpu: Fix new build warning 8f6cabb Makefile: Refine -s handling in the make parameters b17552e virtio: sanitise virtio endian wrappers c1eecc6 option parsing: fix type of empty .argh parameter bc23b9d virtio/rng: return at least one byte of entropy 62ba372 virtio/rng: switch to using /dev/urandom 77b108c arm: Do not add padding alignment for hugetlbfs backed memory 9b46ebc Add virtio-transport option and deprecate force-pci and virtio-legacy. 2f030d2 riscv: Move serial and rtc from IO port space to MMIO area. e17d182 riscv: Add --disable- options to allow user disable extensions 798398f riscv: Add Zicbom extension support b721ac0 riscv: Move reg encoding helpers to kvm-cpu-arch.h 23a8ed9 riscv: Add zihintpause extension support ac16e94 riscv: Add Svinval extension support 76dfc0c Update UAPI headers based on Linux-6.1-rc1 5a9cde6 hw/i8042: Fix value uninitialized in kbd_io() 78771e7 pci: Disable writes to Status register 717a3ab virtio-net: Fix vq->use_event_idx flag check ed805be riscv: Fix serial0 alias path 3c07aea riscv: Add Sstc extension support 2b4fe0f riscv: Add Svpbmt extension support 8aff29e riscv: Append ISA extensions to the device tree 8d0face Update UAPI headers based on Linux-6.0-rc1 9987a37 net: Use vfork() instead of fork() for script execution 336751f Makefile: Introduce LIBFDT_DIR to specify libfdt location Signed-off-by: Bruce Ashfield --- .../0002-kvmtool-add-EXTRA_CFLAGS-variable.patch | 10 ++++---- .../files/0003-kvmtool-Werror-disabled.patch | 10 ++++---- recipes-extended/kvmtool/kvmtool.bb | 29 ---------------------- recipes-extended/kvmtool/kvmtool_git.bb | 29 ++++++++++++++++++++++ 4 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 recipes-extended/kvmtool/kvmtool.bb create mode 100644 recipes-extended/kvmtool/kvmtool_git.bb 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 1200f707..248d6cc0 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 @@ -14,10 +14,10 @@ Signed-off-by: Dariusz Pelowski Makefile | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Makefile b/Makefile -index c05b2c0..2ce753f 100644 ---- a/Makefile -+++ b/Makefile +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile @@ -2,6 +2,8 @@ # Define WERROR=0 to disable -Werror. # @@ -25,5 +25,5 @@ index c05b2c0..2ce753f 100644 +CFLAGS += $(EXTRA_CFLAGS) + ifeq ($(strip $(V)),) - ifeq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) + ifeq ($(findstring s,$(filter-out --%,$(firstword $(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 3ac3fecc..fbde7cd4 100644 --- a/recipes-extended/kvmtool/files/0003-kvmtool-Werror-disabled.patch +++ b/recipes-extended/kvmtool/files/0003-kvmtool-Werror-disabled.patch @@ -11,15 +11,15 @@ Upstream-Status: Inappropriate [embedded specific] Makefile | 1 + 1 file changed, 1 insertion(+) -diff --git a/Makefile b/Makefile -index 2ce753f..fe2e3cb 100644 ---- a/Makefile -+++ b/Makefile +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile @@ -4,6 +4,7 @@ CFLAGS += $(EXTRA_CFLAGS) +WERROR = 0 ifeq ($(strip $(V)),) - ifeq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) + ifeq ($(findstring s,$(filter-out --%,$(firstword $(MAKEFLAGS)))),) E = @echo diff --git a/recipes-extended/kvmtool/kvmtool.bb b/recipes-extended/kvmtool/kvmtool.bb deleted file mode 100644 index 53d8f9d2..00000000 --- a/recipes-extended/kvmtool/kvmtool.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Native Linux KVM tool" -DESCRIPTION = "kvmtool is a lightweight tool for hosting KVM guests." - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" - -DEPENDS = "dtc libaio zlib" -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -inherit kernel-arch - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git;branch=master \ - file://external-crosscompiler.patch \ - file://0001-kvmtool-9p-fixed-compilation-error.patch \ - file://0002-kvmtool-add-EXTRA_CFLAGS-variable.patch \ - file://0003-kvmtool-Werror-disabled.patch \ - " - -SRCREV = "336751fb10ef24e65cd2f25c450da1d52ff5b33c" -PV = "5.10.0+git" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE='V=1 EXTRA_CFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated -I${STAGING_KERNEL_BUILDDIR}/arch/${ARCH}/include/generated"' - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/lkvm ${D}${bindir}/ -} diff --git a/recipes-extended/kvmtool/kvmtool_git.bb b/recipes-extended/kvmtool/kvmtool_git.bb new file mode 100644 index 00000000..141fb02d --- /dev/null +++ b/recipes-extended/kvmtool/kvmtool_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "Native Linux KVM tool" +DESCRIPTION = "kvmtool is a lightweight tool for hosting KVM guests." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" + +DEPENDS = "dtc libaio zlib" +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +inherit kernel-arch + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git;branch=master \ + file://external-crosscompiler.patch \ + file://0001-kvmtool-9p-fixed-compilation-error.patch \ + file://0002-kvmtool-add-EXTRA_CFLAGS-variable.patch \ + file://0003-kvmtool-Werror-disabled.patch \ + " + +SRCREV = "4d2c017f41533b0e51e00f689050c26190a15318" +PV = "5.10.0+git" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE='V=1 EXTRA_CFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated -I${STAGING_KERNEL_BUILDDIR}/arch/${ARCH}/include/generated"' + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/lkvm ${D}${bindir}/ +} -- cgit v1.2.3-54-g00ecf