未验证 提交 5ffee929 编写于 作者: C coolsnowwolf 提交者: GitHub

Merge pull request #679 from littoy/patch

qemu io_uring feature and bonding patches
......@@ -21,8 +21,11 @@ set_driver_values() {
for varname in "$@"; do
local value
json_get_var value "$varname"
[ -n "$value" ] && echo "$value" > /sys/class/net/"$link"/bonding/"$varname"
[ "$varname" = 'num_grat_arp__num_unsol_na' ] && [ ! -f /sys/class/net/"$link"/bonding/"$varname" ] && {
[ -n "$value" ] && echo "$value" > /sys/class/net/"$link"/bonding/num_grat_arp
[ -n "$value" ] && echo "$value" > /sys/class/net/"$link"/bonding/num_unsol_na
}
[ -n "$value" ] && [ -f /sys/class/net/"$link"/bonding/"$varname" ] && echo "$value" > /sys/class/net/"$link"/bonding/"$varname"
done
}
......
......@@ -6,7 +6,10 @@ config irqbalance 'irqbalance'
#option deepestcache '2'
# The default value is 10 seconds
#option interval '10'
option interval '10'
# IRQBALANCE_BANNED_CPUS, hex, like 0000ff00
option banned ''
# List of IRQ's to ignore
#list banirq '36'
......
......@@ -21,6 +21,8 @@ start_service() {
# 10 is the default
config_get interval irqbalance interval 10
# IRQBALANCE_BANNED_CPUS
config_get banned irqbalance banned ''
# A list of IRQ's to ignore
banirq=""
......@@ -29,7 +31,7 @@ start_service() {
banirq="$banirq -i $1"
}
config_list_foreach irqbalance banirq handle_banirq_value
procd_set_param env IRQBALANCE_BANNED_CPUS="$banned"
procd_open_instance "irqbalance"
procd_set_param command /usr/sbin/irqbalance -f -c "$deepestcache" -t "$interval" "$banirq"
procd_set_param respawn
......
......@@ -9,10 +9,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qemu
PKG_VERSION:=7.2.0
PKG_VERSION:=7.2.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157
PKG_HASH:=8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b
PKG_SOURCE_URL:=http://download.qemu.org/
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=LICENSE tcg/LICENSE
......@@ -67,6 +67,7 @@ define Package/qemu-ga/install
endef
PKG_CONFIG_DEPENDS += CONFIG_PACKAGE_qemu-ga
PKG_CONFIG_DEPENDS += CONFIG_PACKAGE_libaio
define Package/qemu-bridge-helper
......@@ -92,7 +93,7 @@ define Package/qemu-img
SUBMENU:=Virtualization
TITLE:=QEMU Image utility
URL:=http://www.qemu.org
DEPENDS:=+glib2 $(QEMU_DEPS_IN_HOST)
DEPENDS:=+glib2 +libaio +KERNEL_IO_URING:liburing $(QEMU_DEPS_IN_HOST)
endef
define Package/qemu-img/install
......@@ -107,7 +108,7 @@ define Package/qemu-nbd
SUBMENU:=Virtualization
TITLE:=QEMU Network Block Device Utility
URL:=http://www.qemu.org
DEPENDS:=+glib2 $(QEMU_DEPS_IN_HOST) +kmod-nbd
DEPENDS:=+glib2 +libaio +KERNEL_IO_URING:liburing $(QEMU_DEPS_IN_HOST) +kmod-nbd
endef
define Package/qemu-nbd/install
......@@ -191,7 +192,7 @@ define qemu-target
SUBMENU:=Virtualization
TITLE:=QEMU target $(1)
URL:=http://www.qemu.org
DEPENDS:= +glib2 +libpthread +zlib +libbpf $(QEMU_DEPS_IN_HOST) $(qemu-target-$(1)-deps) \
DEPENDS:= +glib2 +libpthread +zlib +libbpf +libaio +KERNEL_IO_URING:liburing $(QEMU_DEPS_IN_HOST) $(qemu-target-$(1)-deps) \
+QEMU_UI_VNC:qemu-keymaps \
+QEMU_UI_VNC:libpng \
+QEMU_UI_VNC_JPEG:libjpeg \
......@@ -395,8 +396,8 @@ CONFIGURE_ARGS += \
--disable-libpmem \
--disable-libssh \
--$(if $(CONFIG_QEMU_DEV_USB),enable,disable)-libusb \
--disable-linux-aio \
--disable-linux-io-uring \
--$(if $(CONFIG_KERNEL_AIO),enable,disable)-linux-aio \
--$(if $(CONFIG_KERNEL_IO_URING),enable,disable)-linux-io-uring \
--disable-lzfse \
--disable-lzo \
--disable-modules \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册