Re: [ptxdist] [APPLIED] qemu: Version bump. 7.1.0 -> 7.2.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as e3060a69c0190dfa7131e5955ab1a444f628c501.

Michael

[sent from post-receive hook]

On Tue, 03 Jan 2023 12:08:31 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> A bunch of traffic in QEMU, as usual.
> Notable is the RISC-V work and x86 TCG gains support for AVX, AVX2, F16C, FMA3 and VAES instructions.
> Changelog: https://wiki.qemu.org/ChangeLog/7.2
> This release plugs CVEs: CVE-2022-3872, CVE-2022-2962, CVE-2022-3165 and CVE-2022-4144.
> 
> * Forward patches, with a minor correction, seems to apply cleanly.
> * Be more explicit about libvduse, disable it.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20221215141131.3689507-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-7.2.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> similarity index 100%
> rename from patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> rename to patches/qemu-7.2.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> diff --git a/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch b/patches/qemu-7.2.0/0101-let-ninja-use-the-jobserver.patch
> similarity index 89%
> rename from patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
> rename to patches/qemu-7.2.0/0101-let-ninja-use-the-jobserver.patch
> index d54558a93dba..a039bfef9389 100644
> --- a/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
> +++ b/patches/qemu-7.2.0/0101-let-ninja-use-the-jobserver.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/Makefile b/Makefile
> -index e5fd1ebdf619..23128172d02a 100644
> +index a48103cc8a1a..9fbd7b095ca9 100644
>  --- a/Makefile
>  +++ b/Makefile
> -@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> +@@ -145,7 +145,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
>   MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
>   MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
>   NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
> @@ -22,4 +22,4 @@ index e5fd1ebdf619..23128172d02a 100644
>  +        $(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS)))) \
>           -d keepdepfile
>   ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
> - ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))))
> + ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))
> diff --git a/patches/qemu-7.1.0/series b/patches/qemu-7.2.0/series
> similarity index 100%
> rename from patches/qemu-7.1.0/series
> rename to patches/qemu-7.2.0/series
> diff --git a/rules/qemu.make b/rules/qemu.make
> index 579715684ed8..79be513c666d 100644
> --- a/rules/qemu.make
> +++ b/rules/qemu.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
>  #
>  # Paths and names
>  #
> -QEMU_VERSION	:= 7.1.0
> -QEMU_MD5	:= 3be5458a9171b4ec5220c65d5d52bdcf
> +QEMU_VERSION	:= 7.2.0
> +QEMU_MD5	:= 7630d6a9eba7ab2bcb9979d6d24c2697
>  QEMU		:= qemu-$(QEMU_VERSION)
>  QEMU_SUFFIX	:= tar.xz
>  QEMU_URL	:= https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
> @@ -128,6 +128,7 @@ QEMU_CONF_OPT	:= \
>  	--disable-usb-redir \
>  	--disable-vde \
>  	--disable-vhost-user-blk-server \
> +	--disable-libvduse \
>  	--disable-virglrenderer \
>  	--$(call ptx/endis, PTXCONF_QEMU_SYS)-virtfs \
>  	--disable-virtiofsd \