From: Vladimir Ermakov Date: Tue, 8 Oct 2024 13:44:46 +0000 (+0000) Subject: qemu: fix guest agent patch X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=850b2609c68c595349f6d4de1d7a8969b782ef76;p=openwrt-packages.git qemu: fix guest agent patch I've used wrong type in qemu guest agent patch, found by: @curtdept Fixes https://github.com/vooon/openwrt-packages/commit/d9da6e792a25e8b34c271d4c3752c7185c77878d#r147673510 Signed-off-by: Vladimir Ermakov --- diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index c12ee1292..5592f79e3 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qemu PKG_VERSION:=9.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834 PKG_SOURCE_URL:=https://download.qemu.org/ diff --git a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch index da00996fd..4cb98ff51 100644 --- a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch +++ b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch @@ -41,7 +41,7 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf if (local_err) { - error_propagate(errp, local_err); - return; -+ const char fallback_argv[] = {fallback_cmd, (char *) NULL}; ++ const char *fallback_argv[] = {fallback_cmd, (char *) NULL}; + ga_run_command(fallback_argv, NULL, fallback_cmd, &local_err); + if (local_err) { + error_propagate(errp, local_err);