Skip to content

Commit bcd14a1

Browse files
committed
Update QEMU to 11.1.0
1 parent 1da383f commit bcd14a1

8 files changed

Lines changed: 11 additions & 642 deletions

.github/workflows/prepare-qemu-release.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
description: QEMU version"
88
value: ${{ jobs.build.outputs.qemu_version }}
99
env:
10-
QEMU_VERSION: 11.0.2
10+
QEMU_VERSION: 11.1.0-rc0
1111
MSYS: "winsymlinks:native"
1212
jobs:
1313
build:
@@ -68,11 +68,9 @@ jobs:
6868
cd qemu-release
6969
patch --binary -l -p 1 < ../patches/qemu/0001-9pfs-Add-9pfs-support-for-Windows-host.patch
7070
patch --binary -l -p 1 < ../patches/qemu/0002-win32-Add-ftruncate-function-detection.patch
71-
patch --binary -l -p 1 < ../patches/qemu/0003-accel-tcg-Remove-non-explicit-endian-cpu_ld-_code-wrappers.patch
72-
patch --binary -l -p 1 < ../patches/qemu/0004-thread-win32-replace-CRITICAL_SECTION-with-SRWLOCK.patch
73-
patch --binary -l -p 1 < ../patches/qemu/0005-hw-q35-fix-VGA-text-console-with-SMM-disabled.patch
74-
patch --binary -l -p 1 < ../patches/qemu/0006-win32-Windows-specific-fixes-from-the-mailing-list.patch
75-
patch --binary -l -p 1 < ../patches/qemu/0007-whpx-i386-arm-do-partition-reset-on-boot-CPU-reset.patch
71+
patch --binary -l -p 1 < ../patches/qemu/0003-hw-q35-fix-VGA-text-console-with-SMM-disabled.patch
72+
patch --binary -l -p 1 < ../patches/qemu/0004-win32-Windows-specific-fixes-from-the-mailing-list.patch
73+
patch --binary -l -p 1 < ../patches/qemu/0005-whpx-i386-arm-do-partition-reset-on-boot-CPU-reset.patch
7674
- name: "🛠️ Build QEMU"
7775
working-directory: qemu-release
7876
shell: msys2 {0}

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@ Should be installed via official setup mechanism.
9696

9797
Starting from version `0.0.18` of qcw it is possible to use with official Windows builds of QEMU (including msys2).
9898

99-
Version `11.0.2` with 7 patch sets:
99+
Version `11.1.0-rc0` with 5 patch sets:
100100
* hw/9pfs: Add 9pfs support for Windows https://lists.nongnu.org/archive/html/qemu-devel/2023-02/msg05533.html;
101101
* ftruncate detection fixes https://lists.nongnu.org/archive/html/qemu-devel/2026-01/msg01237.html;
102-
* tcg cleanups https://lists.nongnu.org/archive/html/qemu-devel/2026-03/msg06151.html;
103-
* critical section fixes https://lists.nongnu.org/archive/html/qemu-devel/2026-03/msg08040.html;
104102
* q35 fixes https://lists.nongnu.org/archive/html/qemu-devel/2026-04/msg02141.html;
105103
* win32 fixes https://lists.nongnu.org/archive/html/qemu-devel/2026-04/msg02137.html;
106104
* WHPX CPU reset patch https://lists.nongnu.org/archive/html/qemu-devel/2026-04/msg03811.html.

patches/qemu/0001-9pfs-Add-9pfs-support-for-Windows-host.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,9 +2181,9 @@ index bd19aed4a9..e7441c5c5b 100644
21812181
+#else
21822182
return dirfd(fs->dir.stream);
21832183
+#endif
2184-
} else {
2184+
} else if (fid_type == P9_FID_FILE) {
21852185
return fs->fd;
2186-
}
2186+
} else {
21872187
@@ -775,6 +840,12 @@ static int local_fid_fd(int fid_type, V9fsFidOpenState *fs)
21882188
static int local_fstat(FsContext *fs_ctx, int fid_type,
21892189
V9fsFidOpenState *fs, struct stat *stbuf)
@@ -3490,18 +3490,18 @@ diff --git a/tests/qtest/libqos/virtio-9p-client.h b/tests/qtest/libqos/virtio-9
34903490
index e3221a3104..0058a5b1b3 100644
34913491
--- a/tests/qtest/libqos/virtio-9p-client.h
34923492
+++ b/tests/qtest/libqos/virtio-9p-client.h
3493-
@@ -525,4 +525,11 @@ void v9fs_rlink(P9Req *req);
3493+
@@ -525,4 +525,10 @@ void v9fs_rlink(P9Req *req);
34943494
TunlinkatRes v9fs_tunlinkat(TunlinkatOpt);
34953495
void v9fs_runlinkat(P9Req *req);
3496-
34973496
+#ifdef CONFIG_WIN32
34983497
+static inline uint32_t getuid(void)
34993498
+{
35003499
+ return 0;
35013500
+}
35023501
+#endif
3503-
+
3504-
#endif
3502+
TReadRes v9fs_tread(TReadOpt opt);
3503+
void v9fs_rread(P9Req *req, uint32_t *count, void *data);
3504+
TClunkRes v9fs_tclunk(TClunkOpt opt);
35053505
--
35063506
2.52.0
35073507

patches/qemu/0003-accel-tcg-Remove-non-explicit-endian-cpu_ld-_code-wrappers.patch

Lines changed: 0 additions & 410 deletions
This file was deleted.

patches/qemu/0005-hw-q35-fix-VGA-text-console-with-SMM-disabled.patch renamed to patches/qemu/0003-hw-q35-fix-VGA-text-console-with-SMM-disabled.patch

File renamed without changes.

patches/qemu/0004-thread-win32-replace-CRITICAL_SECTION-with-SRWLOCK.patch

Lines changed: 0 additions & 217 deletions
This file was deleted.

patches/qemu/0006-win32-Windows-specific-fixes-from-the-mailing-list.patch renamed to patches/qemu/0004-win32-Windows-specific-fixes-from-the-mailing-list.patch

File renamed without changes.

patches/qemu/0007-whpx-i386-arm-do-partition-reset-on-boot-CPU-reset.patch renamed to patches/qemu/0005-whpx-i386-arm-do-partition-reset-on-boot-CPU-reset.patch

File renamed without changes.

0 commit comments

Comments
 (0)