Merge pull request #434 from no92/qemu-9.2.0

managarm · Jan 8, 2025 · b4f4e18 · b4f4e18
2 parents 68ea73a + 3bb0d90
commit b4f4e18
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/bootstrap.d/app-emulation.y4.yml b/bootstrap.d/app-emulation.y4.yml
@@ -2,8 +2,8 @@ sources:
   - name: qemu
     subdir: 'ports'
     git: 'https://github.com/qemu/qemu.git'
-    tag: 'v9.1.1'
-    version: '9.1.1'
+    tag: 'v9.2.0'
+    version: '9.2.0'
 
 tools:
   - name: host-qemu

diff --git a/patches/qemu/0001-configure-add-managarm-support.patch b/patches/qemu/0001-configure-add-managarm-support.patch
@@ -1,4 +1,4 @@
-From 00b7c9d68c5f6e8b01e8c8dcf6febb43b399682c Mon Sep 17 00:00:00 2001
+From 6269020afa91236f2c210b5cec3680e9172e52f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
  <kacper.slominski72@gmail.com>
 Date: Tue, 21 Dec 2021 13:07:19 +0100
@@ -9,10 +9,10 @@ Subject: [PATCH 1/5] configure: add managarm support
  1 file changed, 2 insertions(+)
 
 diff --git a/configure b/configure
-index d08b71f..c0bbb66 100755
+index 1833637..78b077a 100755
 --- a/configure
 +++ b/configure
-@@ -353,6 +353,8 @@ elif check_define __NetBSD__; then
+@@ -360,6 +360,8 @@ elif check_define __NetBSD__; then
    host_os=netbsd
  elif check_define __APPLE__; then
    host_os=darwin
@@ -22,5 +22,5 @@ index d08b71f..c0bbb66 100755
    # This is a fatal error, but don't report it yet, because we
    # might be going to just print the --help text, or it might
 -- 
-2.47.0
+2.47.1
 
diff --git a/patches/qemu/0002-dmalog-Add-device.patch b/patches/qemu/0002-dmalog-Add-device.patch
@@ -1,4 +1,4 @@
-From b46f13478bfa60da71769f543029c25c1c34cb46 Mon Sep 17 00:00:00 2001
+From bbe76689bdb023c8de8301feabf099970779581b Mon Sep 17 00:00:00 2001
 From: Matteo Semenzato <mattew8898@gmail.com>
 Date: Sun, 6 Aug 2023 23:29:54 +0200
 Subject: [PATCH 2/5] dmalog: Add device
@@ -11,7 +11,7 @@ Subject: [PATCH 2/5] dmalog: Add device
  create mode 100644 hw/misc/dmalog.c
 
 diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
-index 1e08785..52dee72 100644
+index 1f1baa5..cd25dea 100644
 --- a/hw/misc/Kconfig
 +++ b/hw/misc/Kconfig
 @@ -58,6 +58,10 @@ config ARM11SCU
@@ -371,7 +371,7 @@ index 0000000..d7938d6
 +}
 +type_init(pci_dmalog_register_types)
 diff --git a/hw/misc/meson.build b/hw/misc/meson.build
-index 2ca8717..7f13ec9 100644
+index d02d96e..3402a6b 100644
 --- a/hw/misc/meson.build
 +++ b/hw/misc/meson.build
 @@ -1,6 +1,7 @@
@@ -383,5 +383,5 @@ index 2ca8717..7f13ec9 100644
  system_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c'))
  system_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c'))
 -- 
-2.47.0
+2.47.1
 
diff --git a/patches/qemu/0003-Add-managarm-support.patch b/patches/qemu/0003-Add-managarm-support.patch
@@ -1,4 +1,4 @@
-From 520703e64241fe22153393eebe1ae9766fa7f8c7 Mon Sep 17 00:00:00 2001
+From 9184054b6fcbbd8c1ca9f49cf84fb1c9d44dac08 Mon Sep 17 00:00:00 2001
 From: no92 <no92.mail@gmail.com>
 Date: Wed, 24 Jan 2024 19:34:27 +0100
 Subject: [PATCH 3/5] Add managarm support
@@ -9,7 +9,7 @@ Subject: [PATCH 3/5] Add managarm support
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/block/file-posix.c b/block/file-posix.c
-index ff928b5..cf32e77 100644
+index 90fa543..bf45f08 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
 @@ -110,6 +110,13 @@
@@ -45,10 +45,10 @@ index ff928b5..cf32e77 100644
  {
      g_autofree char *str = NULL;
 diff --git a/meson.build b/meson.build
-index a11018b..ab40bf0 100644
+index 147097c..9a47399 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2370,6 +2370,7 @@ config_host_data.set('CONFIG_PIXMAN', pixman.found())
+@@ -2487,6 +2487,7 @@ config_host_data.set('CONFIG_PIXMAN', pixman.found())
  config_host_data.set('CONFIG_SLIRP', slirp.found())
  config_host_data.set('CONFIG_SNAPPY', snappy.found())
  config_host_data.set('CONFIG_SOLARIS', host_os == 'sunos')
@@ -57,5 +57,5 @@ index a11018b..ab40bf0 100644
    config_host_data.set('CONFIG_TCG', 1)
    config_host_data.set('CONFIG_TCG_INTERPRETER', tcg_arch == 'tci')
 -- 
-2.47.0
+2.47.1
 
diff --git a/patches/qemu/0004-smbios-zero-terminate-strings-read-from-files.patch b/patches/qemu/0004-smbios-zero-terminate-strings-read-from-files.patch
@@ -1,4 +1,4 @@
-From f8cf4816b6ab27f4ba1f8e932d3a12f9af88eacc Mon Sep 17 00:00:00 2001
+From 07524962ca54c90db33f8dc174a47b360b307090 Mon Sep 17 00:00:00 2001
 From: no92 <no92.mail@gmail.com>
 Date: Sun, 3 Nov 2024 22:25:14 +0100
 Subject: [PATCH 4/5] smbios: zero-terminate strings read from files
@@ -22,5 +22,5 @@ index a394514..6b3d015 100644
 
          *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1);
 -- 
-2.47.0
+2.47.1
 
diff --git a/patches/qemu/0005-smbios-remove-unnecessary-snprintf.patch b/patches/qemu/0005-smbios-remove-unnecessary-snprintf.patch
@@ -1,4 +1,4 @@
-From 60c4f5d4716e9048111772cea0e62e7edb655748 Mon Sep 17 00:00:00 2001
+From 3651120093a58f887005638adcdd26a1e08e3904 Mon Sep 17 00:00:00 2001
 From: no92 <no92.mail@gmail.com>
 Date: Sun, 3 Nov 2024 22:25:49 +0100
 Subject: [PATCH 5/5] smbios: remove unnecessary snprintf
@@ -28,5 +28,5 @@ index 6b3d015..1609e1a 100644
 
      for (i = 0; i < type11.nvalues; i++) {
 -- 
-2.47.0
+2.47.1