From f799dc25f4dd72b2a62d6dae4f4a90158445a28a Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 3 Jun 2022 02:31:19 +0200 Subject: [PATCH] - updated to 7.0.0 --- acpi.patch | 28 ---------------------------- libjpeg-boolean.patch | 6 +++--- qemu-cflags.patch | 8 ++++---- qemu-user-execve.patch | 28 ++++++++++++++-------------- qemu-xattr.patch | 6 +++--- qemu.spec | 14 +++++++------- x32.patch | 12 ++++++------ 7 files changed, 37 insertions(+), 65 deletions(-) delete mode 100644 acpi.patch diff --git a/acpi.patch b/acpi.patch deleted file mode 100644 index d7f41cf..0000000 --- a/acpi.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/hw/acpi/core.c b/hw/acpi/core.c -index 1e004d0078..3e811bf03c 100644 ---- a/hw/acpi/core.c -+++ b/hw/acpi/core.c -@@ -345,8 +345,8 @@ int acpi_get_slic_oem(AcpiSlicOem *oem) - struct acpi_table_header *hdr = (void *)(u - sizeof(hdr->_length)); - - if (memcmp(hdr->sig, "SLIC", 4) == 0) { -- oem->id = hdr->oem_id; -- oem->table_id = hdr->oem_table_id; -+ oem->id = g_strndup(hdr->oem_id, 6); -+ oem->table_id = g_strndup(hdr->oem_table_id, 8); - return 0; - } - } -diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c -index a99c6e4fe3..570f82997b 100644 ---- a/hw/i386/acpi-build.c -+++ b/hw/i386/acpi-build.c -@@ -2721,6 +2721,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) - - /* Cleanup memory that's no longer used. */ - g_array_free(table_offsets, true); -+ g_free(slic_oem.id); -+ g_free(slic_oem.table_id); - } - - static void acpi_ram_update(MemoryRegion *mr, GArray *data) diff --git a/libjpeg-boolean.patch b/libjpeg-boolean.patch index 2428089..62c92fa 100644 --- a/libjpeg-boolean.patch +++ b/libjpeg-boolean.patch @@ -1,6 +1,6 @@ -diff -ur qemu-6.2.0.orig/ui/vnc-enc-tight.c qemu-6.2.0/ui/vnc-enc-tight.c ---- qemu-6.2.0.orig/ui/vnc-enc-tight.c 2022-01-23 13:46:47.943392450 +0100 -+++ qemu-6.2.0/ui/vnc-enc-tight.c 2022-01-23 13:47:49.926517751 +0100 +diff -ur qemu-7.0.0.orig/ui/vnc-enc-tight.c qemu-7.0.0/ui/vnc-enc-tight.c +--- qemu-7.0.0.orig/ui/vnc-enc-tight.c 2022-06-03 00:27:38.314054280 +0200 ++++ qemu-7.0.0/ui/vnc-enc-tight.c 2022-06-03 00:28:00.319098954 +0200 @@ -39,6 +39,8 @@ #include #endif diff --git a/qemu-cflags.patch b/qemu-cflags.patch index 9758778..c256177 100644 --- a/qemu-cflags.patch +++ b/qemu-cflags.patch @@ -1,7 +1,7 @@ -diff -ur qemu-6.2.0.orig/configure qemu-6.2.0/configure ---- qemu-6.2.0.orig/configure 2022-01-23 13:36:55.722195386 +0100 -+++ qemu-6.2.0/configure 2022-01-23 13:37:32.273269267 +0100 -@@ -3256,13 +3256,6 @@ +diff -ur qemu-7.0.0.orig/configure qemu-7.0.0/configure +--- qemu-7.0.0.orig/configure 2022-06-03 00:23:06.016501497 +0200 ++++ qemu-7.0.0/configure 2022-06-03 00:23:29.668549512 +0200 +@@ -2627,13 +2627,6 @@ write_c_skeleton diff --git a/qemu-user-execve.patch b/qemu-user-execve.patch index 7fc709c..ada84ce 100644 --- a/qemu-user-execve.patch +++ b/qemu-user-execve.patch @@ -45,9 +45,9 @@ Reviewed-by: Laurent Vivier v3 changes: - rebase the patchset against current code -diff -urNpa qemu-6.2.0.orig/linux-user/main.c qemu-6.2.0/linux-user/main.c ---- qemu-6.2.0.orig/linux-user/main.c 2022-01-23 13:51:24.451951509 +0100 -+++ qemu-6.2.0/linux-user/main.c 2022-01-23 13:53:07.574160010 +0100 +diff -urNpa qemu-7.0.0.orig/linux-user/main.c qemu-7.0.0/linux-user/main.c +--- qemu-7.0.0.orig/linux-user/main.c 2022-06-03 00:24:41.355695042 +0200 ++++ qemu-7.0.0/linux-user/main.c 2022-06-03 00:25:03.067739119 +0200 @@ -119,6 +119,7 @@ static void usage(int exitcode); static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; @@ -56,7 +56,7 @@ diff -urNpa qemu-6.2.0.orig/linux-user/main.c qemu-6.2.0/linux-user/main.c /* XXX: on x86 MAP_GROWSDOWN only works if ESP <= address + 32, so we allocate a bigger stack. Need a better solution, for example -@@ -338,6 +339,11 @@ static void handle_arg_guest_base(const +@@ -352,6 +353,11 @@ static void handle_arg_guest_base(const have_guest_base = true; } @@ -68,7 +68,7 @@ diff -urNpa qemu-6.2.0.orig/linux-user/main.c qemu-6.2.0/linux-user/main.c static void handle_arg_reserved_va(const char *arg) { char *p; -@@ -440,6 +446,8 @@ static const struct qemu_argument arg_ta +@@ -454,6 +460,8 @@ static const struct qemu_argument arg_ta "uname", "set qemu uname release string to 'uname'"}, {"B", "QEMU_GUEST_BASE", true, handle_arg_guest_base, "address", "set guest_base address to 'address'"}, @@ -77,10 +77,10 @@ diff -urNpa qemu-6.2.0.orig/linux-user/main.c qemu-6.2.0/linux-user/main.c {"R", "QEMU_RESERVED_VA", true, handle_arg_reserved_va, "size", "reserve 'size' bytes for guest virtual address space"}, {"d", "QEMU_LOG", true, handle_arg_log, -diff -urNpa qemu-6.2.0.orig/linux-user/syscall.c qemu-6.2.0/linux-user/syscall.c ---- qemu-6.2.0.orig/linux-user/syscall.c 2022-01-23 13:51:24.453951513 +0100 -+++ qemu-6.2.0/linux-user/syscall.c 2022-01-23 13:53:07.576160014 +0100 -@@ -8072,6 +8072,109 @@ static target_timer_t get_timer_id(abi_l +diff -urNpa qemu-7.0.0.orig/linux-user/syscall.c qemu-7.0.0/linux-user/syscall.c +--- qemu-7.0.0.orig/linux-user/syscall.c 2022-06-03 00:24:41.357695046 +0200 ++++ qemu-7.0.0/linux-user/syscall.c 2022-06-03 00:25:03.070739125 +0200 +@@ -8300,6 +8300,109 @@ static target_timer_t get_timer_id(abi_l return timerid; } @@ -190,7 +190,7 @@ diff -urNpa qemu-6.2.0.orig/linux-user/syscall.c qemu-6.2.0/linux-user/syscall.c static int target_to_host_cpu_mask(unsigned long *host_mask, size_t host_size, abi_ulong target_addr, -@@ -8585,7 +8688,12 @@ static abi_long do_syscall1(void *cpu_en +@@ -8813,7 +8916,12 @@ static abi_long do_syscall1(void *cpu_en * before the execve completes and makes it the other * program's problem. */ @@ -204,10 +204,10 @@ diff -urNpa qemu-6.2.0.orig/linux-user/syscall.c qemu-6.2.0/linux-user/syscall.c unlock_user(p, arg1, 0); goto execve_end; -diff -urNpa qemu-6.2.0.orig/linux-user/user-internals.h qemu-6.2.0/linux-user/user-internals.h ---- qemu-6.2.0.orig/linux-user/user-internals.h 2022-01-23 13:51:24.450951507 +0100 -+++ qemu-6.2.0/linux-user/user-internals.h 2022-01-23 13:54:10.373286987 +0100 -@@ -28,6 +28,7 @@ void init_task_state(TaskState *ts); +diff -urNpa qemu-7.0.0.orig/linux-user/user-internals.h qemu-7.0.0/linux-user/user-internals.h +--- qemu-7.0.0.orig/linux-user/user-internals.h 2022-06-03 00:24:41.355695042 +0200 ++++ qemu-7.0.0/linux-user/user-internals.h 2022-06-03 00:25:03.070739125 +0200 +@@ -27,6 +27,7 @@ void init_task_state(TaskState *ts); void task_settid(TaskState *); void stop_all_tasks(void); extern const char *qemu_uname_release; diff --git a/qemu-xattr.patch b/qemu-xattr.patch index f64e77b..92e9498 100644 --- a/qemu-xattr.patch +++ b/qemu-xattr.patch @@ -1,6 +1,6 @@ -diff -ur qemu-6.2.0.orig/fsdev/virtfs-proxy-helper.c qemu-6.2.0/fsdev/virtfs-proxy-helper.c ---- qemu-6.2.0.orig/fsdev/virtfs-proxy-helper.c 2022-01-23 13:45:27.232229307 +0100 -+++ qemu-6.2.0/fsdev/virtfs-proxy-helper.c 2022-01-23 13:46:12.429320664 +0100 +diff -ur qemu-7.0.0.orig/fsdev/virtfs-proxy-helper.c qemu-7.0.0/fsdev/virtfs-proxy-helper.c +--- qemu-7.0.0.orig/fsdev/virtfs-proxy-helper.c 2022-06-03 00:26:58.520973498 +0200 ++++ qemu-7.0.0/fsdev/virtfs-proxy-helper.c 2022-06-03 00:27:13.052002997 +0200 @@ -10,6 +10,7 @@ */ diff --git a/qemu.spec b/qemu.spec index 12277c7..3fbd4b0 100644 --- a/qemu.spec +++ b/qemu.spec @@ -43,12 +43,12 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 6.2.0 -Release: 2 +Version: 7.0.0 +Release: 1 License: GPL v2, BSD (edk2 firmware files) Group: Applications/Emulators Source0: https://download.qemu.org/%{name}-%{version}.tar.xz -# Source0-md5: a077669ce58b6ee07ec355e54aad25be +# Source0-md5: bfb5b09a0d1f887c8c42a6d5f26971ab # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -66,7 +66,6 @@ Patch2: %{name}-user-execve.patch Patch3: %{name}-xattr.patch Patch4: libjpeg-boolean.patch Patch5: x32.patch -Patch6: acpi.patch URL: https://www.qemu.org/ %{?with_opengl:BuildRequires: Mesa-libgbm-devel} %{?with_opengl:BuildRequires: OpenGL-GLX-devel} @@ -916,7 +915,6 @@ Sondy systemtap/dtrace dla QEMU. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap @@ -1161,6 +1159,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so %attr(755,root,root) %{_libdir}/%{name}/block-dmg-lzfse.so %attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so +%attr(755,root,root) %{_libdir}/%{name}/audio-dbus.so %attr(755,root,root) %{_libdir}/%{name}/audio-jack.so %if %{with oss} %attr(755,root,root) %{_libdir}/%{name}/audio-oss.so @@ -1184,6 +1183,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/hw-usb-redirect.so %attr(755,root,root) %{_libdir}/%{name}/hw-usb-smartcard.so %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so +%attr(755,root,root) %{_libdir}/%{name}/ui-dbus.so %attr(755,root,root) %{_libdir}/%{name}/ui-egl-headless.so %if %{with opengl} %attr(755,root,root) %{_libdir}/%{name}/ui-opengl.so @@ -1398,14 +1398,12 @@ fi %attr(755,root,root) %{_bindir}/qemu-system-riscv32 %attr(755,root,root) %{_libdir}/%{name}/accel-qtest-riscv32.so %{_datadir}/%{name}/opensbi-riscv32-generic-fw_dynamic.bin -%{_datadir}/%{name}/opensbi-riscv32-generic-fw_dynamic.elf %files system-riscv64 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-riscv64 %attr(755,root,root) %{_libdir}/%{name}/accel-qtest-riscv64.so %{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.bin -%{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.elf %files system-rx %defattr(644,root,root,755) @@ -1493,6 +1491,8 @@ fi %{_datadir}/%{name}/vgabios-stdvga.bin %{_datadir}/%{name}/vgabios-virtio.bin %{_datadir}/%{name}/vgabios-vmware.bin +%{_datadir}/%{name}/vof.bin +%{_datadir}/%{name}/vof-nvram.bin %{_datadir}/%{name}/firmware/50-edk2-i386-secure.json %{_datadir}/%{name}/firmware/50-edk2-x86_64-secure.json %{_datadir}/%{name}/firmware/60-edk2-i386.json diff --git a/x32.patch b/x32.patch index 3485456..6088130 100644 --- a/x32.patch +++ b/x32.patch @@ -1,12 +1,12 @@ -diff -ur qemu-6.2.0.orig/configure qemu-6.2.0/configure ---- qemu-6.2.0.orig/configure 2022-01-23 13:48:29.104596968 +0100 -+++ qemu-6.2.0/configure 2022-01-23 13:48:53.080645444 +0100 -@@ -3349,7 +3349,7 @@ +diff -ur qemu-7.0.0.orig/configure qemu-7.0.0/configure +--- qemu-7.0.0.orig/configure 2022-06-03 00:32:41.475669725 +0200 ++++ qemu-7.0.0/configure 2022-06-03 00:33:45.782798282 +0200 +@@ -2701,7 +2701,7 @@ # Mac OS X ships with a broken assembler roms= -if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ +if { test "$cpu" = "i386" || test "$cpu" = "x86_64" || test "$cpu" = "x32"; } && \ - test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \ - test "$targetos" != "Haiku" && test "$softmmu" = yes ; then + test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ + test "$targetos" != "haiku" && test "$softmmu" = yes ; then # Different host OS linkers have different ideas about the name of the ELF -- 2.44.0