From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] qemu: Update to version 6.1.0 Date: Wed, 01 Dec 2021 13:28:44 +0100 Message-ID: <20211201122844.3436661-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6464163479845036490==" List-Id: --===============6464163479845036490== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - Update from 5.2.0 to 6.1.0 - Update of rootfile - Removal of --no-pie patch as the changes are now built into the qemu source= files - Changelog is too long to fully include here. Full details can be read at https://wiki.qemu.org/ChangeLog/ Following are the deprecated options and features from each version. 6.1.0 Using non-persistent backing file with pmem=3Don is now deprecated. '-display sdl,window_close=3D...' should be replaced with '-display sdl,w= indow-close=3D...' (i.e. with a minus instead of an underscore between =E2=80=9Cwindow=E2= =80=9D and =E2=80=9Cclose=E2=80=9D). '-no-quit' is deprecated. '-display ...,window-close=3Doff' should be use= d instead. The Aspeed swift-bmc machine is deprecated and should be replaced by the witherspoon-bmc or the romulus-bmc machines. 6.0.0 The --enable-fips option has been deprecated. Consumers wishing to have F= IPS compliance must build QEMU with libcrypt and gnutls, NOT nettle. The -writeconfig option has been deprecated. The functionality of -writec= onfig is limited and the code does not even try to detect cases where it prints i= ncorrect syntax (for example if values have a quote in them). It will be removed = without replacement. Boolean parameters such as share=3Don / share=3Doff could be written in s= hort form as share and noshare. This is now deprecated and will cause a warning. -chardev backend aliases tty and parport are aliases that will be removed= . Instead, the actual backend names serial and parallel should be used. The delay option for socket character devices is now deprecated. Userspace local APIC with KVM (-M kernel-irqchip=3Doff) hexadecimal sizes with scaling multipliers (e.g. 0x20M) -spice password=3Dstring is deprecated now. Use password-secret option in= stead. opened property of rng-* objects loaded property of secret and secret_keyring MIPS Trap-and-Emulate KVM support Signed-off-by: Adolf Belka --- config/rootfiles/packages/qemu | 1 + lfs/qemu | 7 ++- src/patches/qemu-5.2.0-no-pie.patch | 67 ----------------------------- 3 files changed, 4 insertions(+), 71 deletions(-) delete mode 100644 src/patches/qemu-5.2.0-no-pie.patch diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 3792e7479..443264334 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -16,6 +16,7 @@ usr/bin/qemu-system-i386 usr/bin/qemu-system-riscv64 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 +usr/include/qemu-plugin.h usr/libexec/qemu-bridge-helper usr/libexec/virtiofsd #usr/share/applications/qemu.desktop diff --git a/lfs/qemu b/lfs/qemu index 689dba96d..b15fe985a 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 5.2.0 +VER =3D 6.1.0 =20 THISAPP =3D qemu-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -33,7 +33,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) SUP_ARCH =3D i586 x86_64 PROG =3D qemu -PAK_VER =3D 30 +PAK_VER =3D 31 =20 DEPS =3D libusbredir spice libseccomp =20 @@ -55,7 +55,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 179f86928835da857c237b42f4b2df73 +$(DL_FILE)_MD5 =3D 47f776c276a24f42108ba512a2aa3013 =20 install : $(TARGET) =20 @@ -88,7 +88,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-5.2.0-no-pie.patch cd $(DIR_APP) && ./configure \ --prefix=3D/usr \ --sysconfdir=3D/etc \ diff --git a/src/patches/qemu-5.2.0-no-pie.patch b/src/patches/qemu-5.2.0-no-= pie.patch deleted file mode 100644 index 8f3f4d590..000000000 --- a/src/patches/qemu-5.2.0-no-pie.patch +++ /dev/null @@ -1,67 +0,0 @@ -Recent binutils changes dropping unsupported options [1] caused a build -issue in regard to the optionroms. - - ld -m elf_i386 -T /<>/pc-bios/optionrom//flat.lds -no-pie \ - -s -o multiboot.img multiboot.o - ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) - -This isn't really a regression in ld.bfd, filing the bug upstream -revealed that this never worked as a ld flag [2] - in fact it seems we -were by accident setting --nmagic). - -Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be -droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE -in .mak, therefore we can also remove it from being added there. - -[1]: https://sourceware.org/git/?p=3Dbinutils-gdb.git;a=3Dcommit;h=3D983d925d -[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=3D27050#c5 - -Signed-off-by: Christian Ehrhardt ---- - configure | 3 --- - pc-bios/optionrom/Makefile | 1 - - 2 files changed, 4 deletions(-) - -diff --git a/configure b/configure -index 3f823ed163..61c17c2dde 100755 ---- a/configure -+++ b/configure -@@ -2133,7 +2133,6 @@ EOF - # Check we support --no-pie first; we will need this for building ROMs. - if compile_prog "-Werror -fno-pie" "-no-pie"; then - CFLAGS_NOPIE=3D"-fno-pie" -- LDFLAGS_NOPIE=3D"-no-pie" - fi -=20 - if test "$static" =3D "yes"; then -@@ -2149,7 +2148,6 @@ if test "$static" =3D "yes"; then - fi - elif test "$pie" =3D "no"; then - CONFIGURE_CFLAGS=3D"$CFLAGS_NOPIE $CONFIGURE_CFLAGS" -- CONFIGURE_LDFLAGS=3D"$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" - elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then - CONFIGURE_CFLAGS=3D"-fPIE -DPIE $CONFIGURE_CFLAGS" - CONFIGURE_LDFLAGS=3D"-pie $CONFIGURE_LDFLAGS" -@@ -6768,7 +6766,6 @@ echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_= mak - echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak - echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak - echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak --echo "LDFLAGS_NOPIE=3D$LDFLAGS_NOPIE" >> $config_host_mak - echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_host_mak - echo "EXESUF=3D$EXESUF" >> $config_host_mak - echo "HOST_DSOSUF=3D$HOST_DSOSUF" >> $config_host_mak -diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile -index 084fc10f05..30771f8d17 100644 ---- a/pc-bios/optionrom/Makefile -+++ b/pc-bios/optionrom/Makefile -@@ -41,7 +41,6 @@ override CFLAGS +=3D $(call cc-option, $(Wa)-32) -=20 - LD_I386_EMULATION ?=3D elf_i386 - override LDFLAGS =3D -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds --override LDFLAGS +=3D $(LDFLAGS_NOPIE) -=20 - all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin -=20 ---=20 -2.29.2 - --=20 2.34.0 --===============6464163479845036490==--