From 86077bafc0c83c12c8d56499da559d8a9bdb2d3e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org>
Date: Mon, 1 Aug 2022 15:52:24 +0000
Subject: [PATCH] qemu: Update to 7.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Please refer to https://wiki.qemu.org/ChangeLog/7.0 for the changelog of
this version.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/packages/qemu | 5 +++--
 lfs/qemu                       | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 6d1652cd1b..5f6cbffb41 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -120,14 +120,13 @@ usr/share/qemu/kvmvapic.bin
 usr/share/qemu/linuxboot.bin
 usr/share/qemu/linuxboot_dma.bin
 usr/share/qemu/multiboot.bin
+usr/share/qemu/multiboot_dma.bin
 usr/share/qemu/npcm7xx_bootrom.bin
 #usr/share/qemu/openbios-ppc
 #usr/share/qemu/openbios-sparc32
 #usr/share/qemu/openbios-sparc64
 #usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
-#usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
 usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
-usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
 #usr/share/qemu/palcode-clipper
 #usr/share/qemu/petalogix-ml605.dtb
 #usr/share/qemu/petalogix-s3adsp1800.dtb
@@ -160,3 +159,5 @@ usr/share/qemu/vgabios-vmware.bin
 usr/share/qemu/vgabios.bin
 usr/share/qemu/vhost-user
 usr/share/qemu/vhost-user/50-qemu-virtiofsd.json
+usr/share/qemu/vof-nvram.bin
+usr/share/qemu/vof.bin
diff --git a/lfs/qemu b/lfs/qemu
index c0b840a9e3..1edab05d19 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -27,7 +27,7 @@ include Config
 SUMMARY    = Machine emulator and virtualizer
 
 # If you update the version also qemu-ga !!!
-VER        = 6.1.0
+VER        = 7.0.0
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu
-PAK_VER    = 32
+PAK_VER    = 33
 
 DEPS       = libusbredir spice libseccomp
 
@@ -61,7 +61,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee
+$(DL_FILE)_BLAKE2 = ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68
 
 install : $(TARGET)
 
-- 
2.39.2