pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qemu-virtfs-netbsd: g/c
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Sat Mar 15 21:50:13 2025 +0100
Changeset: dc7a7f6c3d23f924b3606e6616e961b03c16d7e9
Modified Files:
Makefile
Removed Files:
qemu-virtfs-netbsd/DESCR
qemu-virtfs-netbsd/MESSAGE.NetBSD
qemu-virtfs-netbsd/Makefile
qemu-virtfs-netbsd/PLIST
qemu-virtfs-netbsd/distinfo
qemu-virtfs-netbsd/files/Makefile.multinode-NetBSD
qemu-virtfs-netbsd/files/hw-mips-mipssim_virtio.c
qemu-virtfs-netbsd/options.mk
qemu-virtfs-netbsd/patches/patch-audio_jackaudio.c
qemu-virtfs-netbsd/patches/patch-fsdev_file-op-9p.h
qemu-virtfs-netbsd/patches/patch-fsdev_meson.build
qemu-virtfs-netbsd/patches/patch-hw-mips-Kconfig
qemu-virtfs-netbsd/patches/patch-hw-mips-mipssim.c
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-proxy.c
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-synth.c
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util-bsd.c
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.c
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.h
qemu-virtfs-netbsd/patches/patch-hw_9pfs_meson.build
qemu-virtfs-netbsd/patches/patch-hw_9pfs_netbsd-statfs-compat.h
qemu-virtfs-netbsd/patches/patch-hw_display_omap__dss.c
qemu-virtfs-netbsd/patches/patch-hw_mips_meson.build
qemu-virtfs-netbsd/patches/patch-hw_net_etraxfs__eth.c
qemu-virtfs-netbsd/patches/patch-hw_net_xilinx__axienet.c
qemu-virtfs-netbsd/patches/patch-hw_rtc_mc146818rtc.c
qemu-virtfs-netbsd/patches/patch-hw_scsi_scsi-disk.c
qemu-virtfs-netbsd/patches/patch-hw_usb_dev-mtp.c
qemu-virtfs-netbsd/patches/patch-meson.build
qemu-virtfs-netbsd/patches/patch-roms_u-boot-sam460ex_Makefile
qemu-virtfs-netbsd/patches/patch-target_arm_tcg_translate-sve.c
qemu-virtfs-netbsd/patches/patch-target_i386_cpu.c
qemu-virtfs-netbsd/patches/patch-target_i386_meson.build
qemu-virtfs-netbsd/patches/patch-target_sparc_translate.c
qemu-virtfs-netbsd/patches/patch-util_coroutine-ucontext.c
qemu-virtfs-netbsd/patches/patch-util_osdep.c
Log Message:
qemu-virtfs-netbsd: g/c
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dc7a7f6c3d23f924b3606e6616e961b03c16d7e9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
qemu-virtfs-netbsd/DESCR | 11 -
qemu-virtfs-netbsd/MESSAGE.NetBSD | 22 -
qemu-virtfs-netbsd/Makefile | 214 ----------
qemu-virtfs-netbsd/PLIST | 454 ---------------------
qemu-virtfs-netbsd/distinfo | 36 --
qemu-virtfs-netbsd/files/Makefile.multinode-NetBSD | 59 ---
qemu-virtfs-netbsd/files/hw-mips-mipssim_virtio.c | 114 ------
qemu-virtfs-netbsd/options.mk | 101 -----
qemu-virtfs-netbsd/patches/patch-audio_jackaudio.c | 20 -
.../patches/patch-fsdev_file-op-9p.h | 15 -
qemu-virtfs-netbsd/patches/patch-fsdev_meson.build | 14 -
qemu-virtfs-netbsd/patches/patch-hw-mips-Kconfig | 13 -
qemu-virtfs-netbsd/patches/patch-hw-mips-mipssim.c | 75 ----
.../patches/patch-hw_9pfs_9p-proxy.c | 25 --
.../patches/patch-hw_9pfs_9p-synth.c | 30 --
.../patches/patch-hw_9pfs_9p-util-bsd.c | 48 ---
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h | 40 --
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.c | 47 ---
qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.h | 16 -
.../patches/patch-hw_9pfs_meson.build | 14 -
.../patches/patch-hw_9pfs_netbsd-statfs-compat.h | 61 ---
.../patches/patch-hw_display_omap__dss.c | 30 --
.../patches/patch-hw_mips_meson.build | 13 -
.../patches/patch-hw_net_etraxfs__eth.c | 25 --
.../patches/patch-hw_net_xilinx__axienet.c | 16 -
.../patches/patch-hw_rtc_mc146818rtc.c | 32 --
.../patches/patch-hw_scsi_scsi-disk.c | 50 ---
qemu-virtfs-netbsd/patches/patch-hw_usb_dev-mtp.c | 25 --
qemu-virtfs-netbsd/patches/patch-meson.build | 68 ---
.../patches/patch-roms_u-boot-sam460ex_Makefile | 32 --
.../patches/patch-target_arm_tcg_translate-sve.c | 16 -
qemu-virtfs-netbsd/patches/patch-target_i386_cpu.c | 33 --
.../patches/patch-target_i386_meson.build | 14 -
.../patches/patch-target_sparc_translate.c | 24 --
.../patches/patch-util_coroutine-ucontext.c | 19 -
qemu-virtfs-netbsd/patches/patch-util_osdep.c | 18 -
37 files changed, 1845 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 758e178646..368416fab7 100644
--- a/Makefile
+++ b/Makefile
@@ -4987,7 +4987,6 @@ SUBDIR+= qbe-git
SUBDIR+= qcdloop
SUBDIR+= qemu-git
SUBDIR+= qemu-guest-agent
-SUBDIR+= qemu-virtfs-netbsd
SUBDIR+= qgis
SUBDIR+= qico
SUBDIR+= qiew
diff --git a/qemu-virtfs-netbsd/DESCR b/qemu-virtfs-netbsd/DESCR
deleted file mode 100644
index d939711a26..0000000000
--- a/qemu-virtfs-netbsd/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-QEMU is a FAST! processor emulator using dynamic translation to achieve
-good emulation speed, QEMU has two operating modes:
-
- * Full system emulation. In this mode, QEMU emulates a full system
- (for example a PC), including a processor and various peripherals.
- It can be used to launch different Operating Systems without rebooting
- the PC or to debug system code.
- * User mode emulation (Linux host only). In this mode, QEMU can launch
- Linux processes compiled for one CPU on another CPU. It can be used
- to launch the Wine Windows API emulator or to ease cross-compilation
- and cross-debugging.
diff --git a/qemu-virtfs-netbsd/MESSAGE.NetBSD b/qemu-virtfs-netbsd/MESSAGE.NetBSD
deleted file mode 100644
index 7fc17402be..0000000000
--- a/qemu-virtfs-netbsd/MESSAGE.NetBSD
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2022/09/21 18:56:32 wiz Exp $
-
-To use the NetBSD/amd64 Virtual Memory Monitor (NVMM) for QEMU :
-
-Load the NVMM kernel driver if not already loaded
-# modload nvmm
-
-You may want to run the NVMM tests to confirm that your setup is correct:
-# cd /usr/tests/lib/libnvmm/
-# atf-run | atf-report
-
-Configure the permissions once either by adding the username(s) of its users
-to the nvmm group in /etc/groups.
-
-Append "-accel nvmm" to your usual Qemu command line
-$ qemu-system-x86_64 -smp 4 -m 8G -cdrom Win10_2004_English_x64.iso -accel nvmm
-
-See nvmm(4) and nvmmctl(8) or visit
- https://m00nbsd.net/4e0798b7f2620c965d0dd9d6a7a2f296.html for more info.
-
-===========================================================================
diff --git a/qemu-virtfs-netbsd/Makefile b/qemu-virtfs-netbsd/Makefile
deleted file mode 100644
index f6a7ab105d..0000000000
--- a/qemu-virtfs-netbsd/Makefile
+++ /dev/null
@@ -1,214 +0,0 @@
-# $NetBSD: Makefile,v 1.322 2023/09/16 13:20:51 tnn Exp $
-
-DISTNAME= qemu-8.1.0
-CATEGORIES= emulators
-MASTER_SITES= https://download.qemu.org/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.qemu.org/
-COMMENT= CPU emulator using dynamic translation
-LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
-
-TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson
-TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
-TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme
-
-USE_CURSES= resize_term wide
-USE_LANGUAGES+= c c++
-USE_TOOLS+= bison flex makeinfo perl:build pod2man pkg-config
-UNLIMIT_RESOURCES= datasize
-HAS_CONFIGURE= yes
-
-# https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab
-GCC_REQD+= 7
-
-PYTHON_VERSIONS_INCOMPATIBLE= 27
-
-.include "options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-# When upgrading Qemu, you need to determine if this PALcode binary for
-# the Alpha emulator needs to be re-built. If it does not, then you do
-# not need to bump the version of this PALcode binary blob (which is
-# supplied as a separate distfile). Contact thorpej@ for details.
-PALCODE_CLIPPER= palcode-clipper-qemu-5.2.0nb8
-
-DISTFILES= ${DEFAULT_DISTFILES}
-DISTFILES+= ${PALCODE_CLIPPER}
-SITES.${PALCODE_CLIPPER}= http://ftp.NetBSD.org/pub/NetBSD/arch/alpha/qemu/
-
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --python=${PYTHONBIN}
-CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+= --enable-curses
-CONFIGURE_ARGS+= --enable-docs
-CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
-ALL_ENV+= MESON_RSP_THRESHOLD=262144
-
-.if defined(PKGSRC_USE_SSP)
-# do not add flags to everything
-PKGSRC_USE_SSP= no
-CONFIGURE_ARGS+= --enable-stack-protector
-.endif
-
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-hppa
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-m68k
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblaze
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblazeel
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64el
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mipsel
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-nios2
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-or1k
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-riscv32
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-riscv64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-s390x
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4eb
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-tricore
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-x86_64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensa
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb
-
-PKG_SYSCONFSUBDIR= qemu
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
-
-.include "../../mk/oss.buildlink3.mk"
-
-.if ${OSS_TYPE} != "none"
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= pre-configure
-SUBST_MESSAGE.oss= Correcting the path to the OSS device.
-SUBST_FILES.oss+= audio/ossaudio.c
-SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
-.endif
-
-UE_ARCHS+= aarch64 aarch64_be
-UE_ARCHS+= alpha arm armeb cris
-UE_ARCHS+= hexagon hppa
-UE_ARCHS+= i386
-UE_ARCHS+= loongarch64
-UE_ARCHS+= m68k microblaze microblazeel
-UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el
-UE_ARCHS+= nios2
-UE_ARCHS+= or1k ppc ppc64 ppc64le
-UE_ARCHS+= riscv32 riscv64
-UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64
-UE_ARCHS+= x86_64 xtensa xtensaeb
-
-.if ${OPSYS} == "NetBSD"
-PLIST.ga= yes
-PLIST.nbd= yes
-. if !exists(/usr/include/machine/trap.h) \
- || "1"=="1" # XXX usermode emulation is broken
-CONFIGURE_ARGS+= --disable-bsd-user
-. else
-CONFIGURE_ARGS+= --enable-bsd-user
-USER_EMUL= i386 x86_64
-. endif
-.elif ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
-USER_EMUL= i386 x86_64
-PLIST.ga= yes
-PLIST.nbd= yes
-.elif ${OPSYS} == "Darwin"
-USER_EMUL=
-CONFIGURE_ARGS+= --disable-bsd-user
-PLIST.nbd= yes
-.elif ${OPSYS} == "Linux"
-USER_EMUL= ${UE_ARCHS}
-PLIST.bridge-helper= yes
-PLIST.ga= yes
-PLIST.nbd= yes
-PLIST.pr-helper= yes
-.elif ${MACHINE_PLATFORM:MSunOS-5.11-*}
-PLIST.ga= yes
-PLIST.nbd= yes
-CONFIGURE_ARGS+= --disable-coroutine-pool
-.endif
-
-PLIST_VARS+= plugins
-.if ${OPSYS} != "SunOS"
-PLIST.plugins= yes
-CONFIGURE_ARGS+= --enable-plugins
-.else
-CONFIGURE_ARGS+= --disable-plugins
-.endif
-
-PLIST_VARS+= ${UE_ARCHS} bridge-helper ga keymap nbd pr-helper
-.for pvar in ${USER_EMUL}
-PLIST.${pvar}= yes
-.endfor
-
-# different versions of Sphinx generate different static files
-PLIST_SRC= PLIST ${WRKDIR}/PLIST.STATIC
-
-PRINT_PLIST_AWK+= /\/_static\// { next; }
-
-TEST_TARGET= check
-
-PYTHON_FOR_BUILD_ONLY= tool
-
-post-extract:
- cp ${WRKDIR}/${PALCODE_CLIPPER} ${WRKSRC}/pc-bios/palcode-clipper
- cp ${FILESDIR}/hw-mips-mipssim_virtio.c ${WRKSRC}/hw/mips/mipssim_virtio.c
-
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ninja -j ${_MAKE_JOBS_N:U1} -C build
-
-do-install:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
- ninja -j ${_MAKE_JOBS_N:U1} -C build install
-
-# Some dependencies aren't correct and this tries to be re-made on install,
-# failing due to configure bugs.
-post-build:
- ${TOUCH} ${WRKSRC}/config-host.mak
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
- ${DESTDIR}${PREFIX}/share/doc/qemu/
- ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo
- ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo
- ${RM} -f ${WRKDIR}/PLIST.STATIC
- cd ${DESTDIR}${PREFIX} && \
- ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
-
-.include "../../archivers/lzo/buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libusb1/buildlink3.mk"
-.include "../../devel/snappy/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../lang/python/tool.mk"
-.include "../../net/libslirp/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../sysutils/dtc/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.if ${OPSYS} != "Darwin"
-.include "../../x11/xkeyboard-config/buildlink3.mk"
-.endif
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/qemu-virtfs-netbsd/PLIST b/qemu-virtfs-netbsd/PLIST
deleted file mode 100644
index 0e721f3c6c..0000000000
--- a/qemu-virtfs-netbsd/PLIST
+++ /dev/null
@@ -1,454 +0,0 @@
-@comment $NetBSD: PLIST,v 1.86 2023/08/23 15:19:02 adam Exp $
-bin/elf2dmp
-${PLIST.aarch64}bin/qemu-aarch64
-${PLIST.aarch64_be}bin/qemu-aarch64_be
-${PLIST.alpha}bin/qemu-alpha
-${PLIST.arm}bin/qemu-arm
-${PLIST.armeb}bin/qemu-armeb
-${PLIST.cris}bin/qemu-cris
-bin/qemu-edid
-${PLIST.ga}bin/qemu-ga
-${PLIST.hexagon}bin/qemu-hexagon
-${PLIST.hppa}bin/qemu-hppa
-${PLIST.i386}bin/qemu-i386
-bin/qemu-img
-bin/qemu-io
-${PLIST.keymap}bin/qemu-keymap
-${PLIST.loongarch64}bin/qemu-loongarch64
-${PLIST.m68k}bin/qemu-m68k
-${PLIST.microblaze}bin/qemu-microblaze
-${PLIST.microblazeel}bin/qemu-microblazeel
-${PLIST.mips}bin/qemu-mips
-${PLIST.mips64}bin/qemu-mips64
-${PLIST.mips64el}bin/qemu-mips64el
-${PLIST.mipsel}bin/qemu-mipsel
-${PLIST.mipsn32}bin/qemu-mipsn32
-${PLIST.mipsn32el}bin/qemu-mipsn32el
-${PLIST.nbd}bin/qemu-nbd
-${PLIST.nios2}bin/qemu-nios2
-${PLIST.or1k}bin/qemu-or1k
-${PLIST.ppc}bin/qemu-ppc
-${PLIST.ppc64}bin/qemu-ppc64
-${PLIST.ppc64le}bin/qemu-ppc64le
-${PLIST.pr-helper}bin/qemu-pr-helper
-${PLIST.riscv32}bin/qemu-riscv32
-${PLIST.riscv64}bin/qemu-riscv64
-${PLIST.s390x}bin/qemu-s390x
-${PLIST.sh4}bin/qemu-sh4
-${PLIST.sh4eb}bin/qemu-sh4eb
-${PLIST.sparc}bin/qemu-sparc
-${PLIST.sparc32plus}bin/qemu-sparc32plus
-${PLIST.sparc64}bin/qemu-sparc64
-bin/qemu-storage-daemon
-bin/qemu-system-aarch64
-bin/qemu-system-alpha
-bin/qemu-system-arm
-bin/qemu-system-avr
-bin/qemu-system-cris
-bin/qemu-system-hppa
-bin/qemu-system-i386
-bin/qemu-system-loongarch64
-bin/qemu-system-m68k
-bin/qemu-system-microblaze
-bin/qemu-system-microblazeel
-bin/qemu-system-mips
-bin/qemu-system-mips64
-bin/qemu-system-mips64el
-bin/qemu-system-mipsel
-bin/qemu-system-nios2
-bin/qemu-system-or1k
-bin/qemu-system-ppc
-bin/qemu-system-ppc64
-bin/qemu-system-riscv32
-bin/qemu-system-riscv64
-bin/qemu-system-rx
-bin/qemu-system-s390x
-bin/qemu-system-sh4
-bin/qemu-system-sh4eb
-bin/qemu-system-sparc
-bin/qemu-system-sparc64
-bin/qemu-system-tricore
-bin/qemu-system-x86_64
-bin/qemu-system-xtensa
-bin/qemu-system-xtensaeb
-${PLIST.x86_64}bin/qemu-x86_64
-${PLIST.xtensa}bin/qemu-xtensa
-${PLIST.xtensaeb}bin/qemu-xtensaeb
-${PLIST.plugins}include/qemu-plugin.h
-${PLIST.bridge-helper}libexec/qemu-bridge-helper
-${PLIST.virtfs-proxy-helper}libexec/virtfs-proxy-helper
-man/man1/qemu-img.1
-man/man1/qemu-storage-daemon.1
-man/man1/qemu.1
-${PLIST.virtfs-proxy-helper}man/man1/virtfs-proxy-helper.1
-man/man7/qemu-block-drivers.7
-man/man7/qemu-cpu-models.7
-${PLIST.ga}man/man7/qemu-ga-ref.7
-man/man7/qemu-qmp-ref.7
-man/man7/qemu-storage-daemon-qmp-ref.7
-${PLIST.ga}man/man8/qemu-ga.8
-man/man8/qemu-nbd.8
-man/man8/qemu-pr-helper.8
-share/applications/qemu.desktop
-share/doc/qemu/.buildinfo
-share/doc/qemu/Makefile.multinode-NetBSD
-share/doc/qemu/about/build-platforms.html
-share/doc/qemu/about/deprecated.html
-share/doc/qemu/about/emulation.html
-share/doc/qemu/about/index.html
-share/doc/qemu/about/license.html
-share/doc/qemu/about/removed-features.html
-share/doc/qemu/dbus-dbusindex.html
-share/doc/qemu/devel/acpi-bits.html
-share/doc/qemu/devel/atomics.html
-share/doc/qemu/devel/bitops.html
-share/doc/qemu/devel/block-coroutine-wrapper.html
-share/doc/qemu/devel/build-system.html
-share/doc/qemu/devel/ci.html
-share/doc/qemu/devel/clocks.html
-share/doc/qemu/devel/code-of-conduct.html
-share/doc/qemu/devel/conflict-resolution.html
-share/doc/qemu/devel/control-flow-integrity.html
-share/doc/qemu/devel/decodetree.html
-share/doc/qemu/devel/ebpf_rss.html
-share/doc/qemu/devel/fuzzing.html
-share/doc/qemu/devel/index-api.html
-share/doc/qemu/devel/index-build.html
-share/doc/qemu/devel/index-internals.html
-share/doc/qemu/devel/index-process.html
-share/doc/qemu/devel/index-tcg.html
-share/doc/qemu/devel/index.html
-share/doc/qemu/devel/kconfig.html
-share/doc/qemu/devel/loads-stores.html
-share/doc/qemu/devel/maintainers.html
-share/doc/qemu/devel/memory.html
-share/doc/qemu/devel/migration.html
-share/doc/qemu/devel/modules.html
-share/doc/qemu/devel/multi-process.html
-share/doc/qemu/devel/multi-thread-tcg.html
-share/doc/qemu/devel/qapi-code-gen.html
-share/doc/qemu/devel/qdev-api.html
-share/doc/qemu/devel/qgraph.html
-share/doc/qemu/devel/qom-api.html
-share/doc/qemu/devel/qom.html
-share/doc/qemu/devel/qtest.html
-share/doc/qemu/devel/replay.html
-share/doc/qemu/devel/reset.html
-share/doc/qemu/devel/s390-dasd-ipl.html
-share/doc/qemu/devel/secure-coding-practices.html
-share/doc/qemu/devel/stable-process.html
-share/doc/qemu/devel/style.html
-share/doc/qemu/devel/submitting-a-patch.html
-share/doc/qemu/devel/submitting-a-pull-request.html
-share/doc/qemu/devel/tcg-icount.html
-share/doc/qemu/devel/tcg-ops.html
-share/doc/qemu/devel/tcg-plugins.html
-share/doc/qemu/devel/tcg.html
-share/doc/qemu/devel/testing.html
-share/doc/qemu/devel/tracing.html
-share/doc/qemu/devel/trivial-patches.html
-share/doc/qemu/devel/ui.html
-share/doc/qemu/devel/vfio-migration.html
-share/doc/qemu/devel/virtio-backends.html
-share/doc/qemu/devel/writing-monitor-commands.html
-share/doc/qemu/devel/zoned-storage.html
-share/doc/qemu/genindex.html
-share/doc/qemu/index.html
-share/doc/qemu/interop/barrier.html
-share/doc/qemu/interop/bitmaps.html
-share/doc/qemu/interop/dbus-display.html
-share/doc/qemu/interop/dbus-vmstate.html
-share/doc/qemu/interop/dbus.html
-share/doc/qemu/interop/index.html
-share/doc/qemu/interop/live-block-operations.html
-share/doc/qemu/interop/pr-helper.html
-share/doc/qemu/interop/qemu-ga-ref.html
-share/doc/qemu/interop/qemu-ga.html
-share/doc/qemu/interop/qemu-qmp-ref.html
-share/doc/qemu/interop/qemu-storage-daemon-qmp-ref.html
-share/doc/qemu/interop/qmp-spec.html
-share/doc/qemu/interop/vhost-user-gpu.html
-share/doc/qemu/interop/vhost-user.html
-share/doc/qemu/interop/vhost-vdpa.html
-share/doc/qemu/interop/virtio-balloon-stats.html
-share/doc/qemu/interop/vnc-ledstate-pseudo-encoding.html
-share/doc/qemu/objects.inv
-share/doc/qemu/search.html
-share/doc/qemu/searchindex.js
-share/doc/qemu/specs/acpi_cpu_hotplug.html
-share/doc/qemu/specs/acpi_erst.html
-share/doc/qemu/specs/acpi_hest_ghes.html
-share/doc/qemu/specs/acpi_hw_reduced_hotplug.html
-share/doc/qemu/specs/acpi_mem_hotplug.html
-share/doc/qemu/specs/acpi_nvdimm.html
-share/doc/qemu/specs/acpi_pci_hotplug.html
-share/doc/qemu/specs/fw_cfg.html
-share/doc/qemu/specs/index.html
-share/doc/qemu/specs/pci-ids.html
-share/doc/qemu/specs/pci-serial.html
-share/doc/qemu/specs/pci-testdev.html
-share/doc/qemu/specs/ppc-spapr-hcalls.html
-share/doc/qemu/specs/ppc-spapr-hotplug.html
-share/doc/qemu/specs/ppc-spapr-numa.html
-share/doc/qemu/specs/ppc-spapr-uv-hcalls.html
-share/doc/qemu/specs/ppc-spapr-xive.html
-share/doc/qemu/specs/ppc-xive.html
-share/doc/qemu/specs/sev-guest-firmware.html
-share/doc/qemu/specs/tpm.html
-share/doc/qemu/system/arm/aspeed.html
-share/doc/qemu/system/arm/bananapi_m2u.html
-share/doc/qemu/system/arm/collie.html
-share/doc/qemu/system/arm/cpu-features.html
-share/doc/qemu/system/arm/cubieboard.html
-share/doc/qemu/system/arm/digic.html
-share/doc/qemu/system/arm/emcraft-sf2.html
-share/doc/qemu/system/arm/emulation.html
-share/doc/qemu/system/arm/gumstix.html
-share/doc/qemu/system/arm/highbank.html
-share/doc/qemu/system/arm/imx25-pdk.html
-share/doc/qemu/system/arm/integratorcp.html
-share/doc/qemu/system/arm/kzm.html
-share/doc/qemu/system/arm/mainstone.html
-share/doc/qemu/system/arm/mps2.html
-share/doc/qemu/system/arm/musca.html
-share/doc/qemu/system/arm/musicpal.html
-share/doc/qemu/system/arm/nrf.html
-share/doc/qemu/system/arm/nseries.html
-share/doc/qemu/system/arm/nuvoton.html
-share/doc/qemu/system/arm/orangepi.html
-share/doc/qemu/system/arm/palm.html
-share/doc/qemu/system/arm/raspi.html
-share/doc/qemu/system/arm/realview.html
-share/doc/qemu/system/arm/sabrelite.html
-share/doc/qemu/system/arm/sbsa.html
-share/doc/qemu/system/arm/stellaris.html
-share/doc/qemu/system/arm/stm32.html
-share/doc/qemu/system/arm/sx1.html
-share/doc/qemu/system/arm/versatile.html
-share/doc/qemu/system/arm/vexpress.html
-share/doc/qemu/system/arm/virt.html
-share/doc/qemu/system/arm/xenpvh.html
-share/doc/qemu/system/arm/xlnx-versal-virt.html
-share/doc/qemu/system/arm/xscale.html
-share/doc/qemu/system/authz.html
-share/doc/qemu/system/barrier.html
-share/doc/qemu/system/bootindex.html
-share/doc/qemu/system/confidential-guest-support.html
-share/doc/qemu/system/cpu-hotplug.html
-share/doc/qemu/system/device-emulation.html
-share/doc/qemu/system/devices/can.html
-share/doc/qemu/system/devices/canokey.html
-share/doc/qemu/system/devices/ccid.html
-share/doc/qemu/system/devices/cxl.html
-share/doc/qemu/system/devices/igb.html
-share/doc/qemu/system/devices/ivshmem.html
-share/doc/qemu/system/devices/keyboard.html
-share/doc/qemu/system/devices/net.html
-share/doc/qemu/system/devices/nvme.html
-share/doc/qemu/system/devices/usb-u2f.html
-share/doc/qemu/system/devices/usb.html
-share/doc/qemu/system/devices/vhost-user-rng.html
-share/doc/qemu/system/devices/vhost-user.html
-share/doc/qemu/system/devices/virtio-pmem.html
-share/doc/qemu/system/gdb.html
-share/doc/qemu/system/generic-loader.html
-share/doc/qemu/system/guest-loader.html
-share/doc/qemu/system/i386/amd-memory-encryption.html
-share/doc/qemu/system/i386/cpu.html
-share/doc/qemu/system/i386/hyperv.html
-share/doc/qemu/system/i386/kvm-pv.html
-share/doc/qemu/system/i386/microvm.html
-share/doc/qemu/system/i386/pc.html
-share/doc/qemu/system/i386/sgx.html
-share/doc/qemu/system/i386/xen.html
-share/doc/qemu/system/images.html
-share/doc/qemu/system/index.html
-share/doc/qemu/system/introduction.html
-share/doc/qemu/system/invocation.html
-share/doc/qemu/system/keys.html
-share/doc/qemu/system/linuxboot.html
-share/doc/qemu/system/loongarch/virt.html
-share/doc/qemu/system/managed-startup.html
-share/doc/qemu/system/monitor.html
-share/doc/qemu/system/multi-process.html
-share/doc/qemu/system/mux-chardev.html
-share/doc/qemu/system/openrisc/cpu-features.html
-share/doc/qemu/system/openrisc/emulation.html
-share/doc/qemu/system/openrisc/or1k-sim.html
-share/doc/qemu/system/openrisc/virt.html
-share/doc/qemu/system/ppc/embedded.html
-share/doc/qemu/system/ppc/powermac.html
-share/doc/qemu/system/ppc/powernv.html
-share/doc/qemu/system/ppc/ppce500.html
-share/doc/qemu/system/ppc/prep.html
-share/doc/qemu/system/ppc/pseries.html
-share/doc/qemu/system/pr-manager.html
-share/doc/qemu/system/qemu-block-drivers.html
-share/doc/qemu/system/qemu-cpu-models.html
-share/doc/qemu/system/qemu-manpage.html
-share/doc/qemu/system/replay.html
-share/doc/qemu/system/riscv/microchip-icicle-kit.html
-share/doc/qemu/system/riscv/shakti-c.html
-share/doc/qemu/system/riscv/sifive_u.html
-share/doc/qemu/system/riscv/virt.html
-share/doc/qemu/system/s390x/3270.html
-share/doc/qemu/system/s390x/bootdevices.html
-share/doc/qemu/system/s390x/css.html
-share/doc/qemu/system/s390x/pcidevices.html
-share/doc/qemu/system/s390x/protvirt.html
-share/doc/qemu/system/s390x/vfio-ap.html
-share/doc/qemu/system/s390x/vfio-ccw.html
-share/doc/qemu/system/secrets.html
-share/doc/qemu/system/security.html
-share/doc/qemu/system/target-arm.html
-share/doc/qemu/system/target-avr.html
-share/doc/qemu/system/target-i386.html
-share/doc/qemu/system/target-m68k.html
-share/doc/qemu/system/target-mips.html
-share/doc/qemu/system/target-openrisc.html
-share/doc/qemu/system/target-ppc.html
-share/doc/qemu/system/target-riscv.html
-share/doc/qemu/system/target-rx.html
-share/doc/qemu/system/target-s390x.html
-share/doc/qemu/system/target-sparc.html
-share/doc/qemu/system/target-sparc64.html
-share/doc/qemu/system/target-xtensa.html
-share/doc/qemu/system/targets.html
-share/doc/qemu/system/tls.html
-share/doc/qemu/system/virtio-net-failover.html
-share/doc/qemu/system/vnc-security.html
-share/doc/qemu/tools/index.html
-share/doc/qemu/tools/qemu-img.html
-share/doc/qemu/tools/qemu-nbd.html
-share/doc/qemu/tools/qemu-pr-helper.html
-share/doc/qemu/tools/qemu-storage-daemon.html
-share/doc/qemu/tools/qemu-trace-stap.html
-share/doc/qemu/tools/virtfs-proxy-helper.html
-share/doc/qemu/user/index.html
-share/doc/qemu/user/main.html
-share/icons/hicolor/128x128/apps/qemu.png
-share/icons/hicolor/16x16/apps/qemu.png
-share/icons/hicolor/24x24/apps/qemu.png
-share/icons/hicolor/256x256/apps/qemu.png
-share/icons/hicolor/32x32/apps/qemu.bmp
-share/icons/hicolor/32x32/apps/qemu.png
-share/icons/hicolor/48x48/apps/qemu.png
-share/icons/hicolor/512x512/apps/qemu.png
-share/icons/hicolor/64x64/apps/qemu.png
-share/icons/hicolor/scalable/apps/qemu.svg
-${PLIST.gtk}share/locale/bg/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/de_DE/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/fr_FR/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/hu/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/it/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/sv/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/uk/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo
-share/qemu/QEMU,cgthree.bin
-share/qemu/QEMU,tcx.bin
-share/qemu/bamboo.dtb
-share/qemu/bios-256k.bin
-share/qemu/bios-microvm.bin
-share/qemu/bios.bin
-share/qemu/canyonlands.dtb
-share/qemu/edk2-aarch64-code.fd
-share/qemu/edk2-arm-code.fd
-share/qemu/edk2-arm-vars.fd
-share/qemu/edk2-i386-code.fd
-share/qemu/edk2-i386-secure-code.fd
-share/qemu/edk2-i386-vars.fd
-share/qemu/edk2-licenses.txt
-share/qemu/edk2-x86_64-code.fd
-share/qemu/edk2-x86_64-secure-code.fd
-share/qemu/efi-e1000.rom
-share/qemu/efi-e1000e.rom
-share/qemu/efi-eepro100.rom
-share/qemu/efi-ne2k_pci.rom
-share/qemu/efi-pcnet.rom
-share/qemu/efi-rtl8139.rom
-share/qemu/efi-virtio.rom
-share/qemu/efi-vmxnet3.rom
-share/qemu/firmware/50-edk2-i386-secure.json
-share/qemu/firmware/50-edk2-x86_64-secure.json
-share/qemu/firmware/60-edk2-aarch64.json
-share/qemu/firmware/60-edk2-arm.json
-share/qemu/firmware/60-edk2-i386.json
-share/qemu/firmware/60-edk2-x86_64.json
-share/qemu/hppa-firmware.img
-share/qemu/keymaps/ar
-share/qemu/keymaps/bepo
-share/qemu/keymaps/cz
-share/qemu/keymaps/da
-share/qemu/keymaps/de
-share/qemu/keymaps/de-ch
-share/qemu/keymaps/en-gb
-share/qemu/keymaps/en-us
-share/qemu/keymaps/es
-share/qemu/keymaps/et
-share/qemu/keymaps/fi
-share/qemu/keymaps/fo
-share/qemu/keymaps/fr
-share/qemu/keymaps/fr-be
-share/qemu/keymaps/fr-ca
-share/qemu/keymaps/fr-ch
-share/qemu/keymaps/hr
-share/qemu/keymaps/hu
-share/qemu/keymaps/is
-share/qemu/keymaps/it
-share/qemu/keymaps/ja
-share/qemu/keymaps/lt
-share/qemu/keymaps/lv
-share/qemu/keymaps/mk
-share/qemu/keymaps/nl
-share/qemu/keymaps/no
-share/qemu/keymaps/pl
-share/qemu/keymaps/pt
-share/qemu/keymaps/pt-br
-share/qemu/keymaps/ru
-share/qemu/keymaps/sl
-share/qemu/keymaps/sv
-share/qemu/keymaps/th
-share/qemu/keymaps/tr
-share/qemu/kvmvapic.bin
-share/qemu/linuxboot.bin
-share/qemu/linuxboot_dma.bin
-share/qemu/multiboot.bin
-share/qemu/multiboot_dma.bin
-share/qemu/npcm7xx_bootrom.bin
-share/qemu/openbios-ppc
-share/qemu/openbios-sparc32
-share/qemu/openbios-sparc64
-share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
-share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
-share/qemu/palcode-clipper
-share/qemu/petalogix-ml605.dtb
-share/qemu/petalogix-s3adsp1800.dtb
-share/qemu/pvh.bin
-share/qemu/pxe-e1000.rom
-share/qemu/pxe-eepro100.rom
-share/qemu/pxe-ne2k_pci.rom
-share/qemu/pxe-pcnet.rom
-share/qemu/pxe-rtl8139.rom
-share/qemu/pxe-virtio.rom
-share/qemu/qboot.rom
-share/qemu/qemu-nsis.bmp
-share/qemu/qemu_vga.ndrv
-share/qemu/s390-ccw.img
-share/qemu/s390-netboot.img
-share/qemu/skiboot.lid
-share/qemu/slof.bin
-share/qemu/trace-events-all
-share/qemu/u-boot-sam460-20100605.bin
-share/qemu/u-boot.e500
-share/qemu/vgabios-ati.bin
-share/qemu/vgabios-bochs-display.bin
-share/qemu/vgabios-cirrus.bin
-share/qemu/vgabios-qxl.bin
-share/qemu/vgabios-ramfb.bin
-share/qemu/vgabios-stdvga.bin
-share/qemu/vgabios-virtio.bin
-share/qemu/vgabios-vmware.bin
-share/qemu/vgabios.bin
-share/qemu/vof-nvram.bin
-share/qemu/vof.bin
diff --git a/qemu-virtfs-netbsd/distinfo b/qemu-virtfs-netbsd/distinfo
deleted file mode 100644
index a8bcce906d..0000000000
--- a/qemu-virtfs-netbsd/distinfo
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: distinfo,v 1.209 2023/09/10 16:16:14 jperkin Exp $
-
-BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
-SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
-Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
-BLAKE2s (qemu-8.1.0.tar.xz) = 1cc9e5b6997ea9700a6dead14fa02cfa18a72e74f6c4a92c28044a096cd104c6
-SHA512 (qemu-8.1.0.tar.xz) = c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c
-Size (qemu-8.1.0.tar.xz) = 123550284 bytes
-SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
-SHA1 (patch-fsdev_file-op-9p.h) = 76d29b1975495f671ab5b699958c92855e5f1b67
-SHA1 (patch-fsdev_meson.build) = 39cbbcabae262f7ecfd77e5c2d61da4f37340dfe
-SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
-SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
-SHA1 (patch-hw_9pfs_9p-proxy.c) = ce63083f41dcee265e223e4b8a5dd843678347a0
-SHA1 (patch-hw_9pfs_9p-synth.c) = 1fa45cfc58db484a085f78859e10efd83d8719c6
-SHA1 (patch-hw_9pfs_9p-util-bsd.c) = 012bc411103fae3fbf8976803275244b55675111
-SHA1 (patch-hw_9pfs_9p-util.h) = 8bbf2b2b63d24d97859046487804541e33baaf50
-SHA1 (patch-hw_9pfs_9p.c) = 2b9d312a17b1be32a1a0b5a188322a7e0fd56654
-SHA1 (patch-hw_9pfs_9p.h) = 695f764db7ba8412d790f9dff928754891a7469a
-SHA1 (patch-hw_9pfs_meson.build) = c044802ed72729e917d09307b7ddd1e6ebabaf4d
-SHA1 (patch-hw_9pfs_netbsd-statfs-compat.h) = 650d2825f34c031de9cc564fa13aa95036802376
-SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2
-SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
-SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
-SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
-SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
-SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
-SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
-SHA1 (patch-meson.build) = f412bef8b9d42f6a4fc5a2ebe0085283cca7c367
-SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
-SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
-SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4
-SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
-SHA1 (patch-target_sparc_translate.c) = f633b3953847c1a7e93f1d09a67964431979b197
-SHA1 (patch-util_coroutine-ucontext.c) = 890767e1f034b34f4aad6c791745fc0b151b8e3c
-SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25
diff --git a/qemu-virtfs-netbsd/files/Makefile.multinode-NetBSD b/qemu-virtfs-netbsd/files/Makefile.multinode-NetBSD
deleted file mode 100644
index f4313832eb..0000000000
--- a/qemu-virtfs-netbsd/files/Makefile.multinode-NetBSD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: Makefile.multinode-NetBSD,v 1.4 2012/06/07 21:23:46 ryoon Exp $
-# Source: http://mail-index.NetBSD.org/netbsd-help/2005/03/25/0005.html
-#
-# Starts up two qemu instances and networks bridges them to the local
-# ethernet (ETHER_IF}. Works best with NetBSD configured to use serial
-# consoles in DISK[12]
-#
-# Usage:
-# sudo make netbsd1
-# sudo make netbsd2
-#
-# - Hubert Feyrer <hubert%feyrer.de@localhost>
-#
-
-#NETBSD_NOGFX=
-NETBSD_NOGFX= -nographic
-
-ETHER_IF= tlp0
-QEMU_RAM= 20
-DISK1= harddisk.netbsd1
-DISK2= harddisk.netbsd2
-
-
-all: netbsd1 netbsd2
-
-netbsd1: bridge
- ifconfig tap1 create up || echo tap1: already there
- brconfig bridge0 add tap1 up || echo tap1: already on bridge0
- brconfig bridge0 -learn tap1 # real hub mode, step 1b
- brconfig bridge0 flush # real hub more, step 2
- qemu \
- -m ${QEMU_RAM} \
- ${NETBSD_NOGFX} \
- -boot c \
- -net tap,fd=3,ifname=tap1 3<>/dev/tap1 \
- -net nic,macaddr=de:ad:be:ef:00:01 \
- ${DISK1}
- brconfig bridge0 delete tap1
- ifconfig tap1 destroy
-
-netbsd2: bridge
- ifconfig tap2 create up || echo tap2: already there
- brconfig bridge0 add tap2 up || echo tap2: already on bridge0
- brconfig bridge0 -learn tap2 # real hub mode, step 1c
- brconfig bridge0 flush # real hub mode, step 2
- qemu \
- -m ${QEMU_RAM} \
- ${NETBSD_NOGFX} \
- -boot c \
- -net tap,fd=3,ifname=tap2 3<>/dev/tap2 \
- -net nic,macaddr=de:ad:be:ef:00:02 \
- ${DISK2}
- brconfig bridge0 delete tap2
- ifconfig tap2 destroy
-
-bridge:
- ifconfig bridge0 create || echo bridge0: already there
- brconfig bridge0 add ${ETHER_IF} || echo bridge0: ${ETHER_IF} already there
- brconfig bridge0 -learn ${ETHER_IF} # real hub mode, step 1a
diff --git a/qemu-virtfs-netbsd/files/hw-mips-mipssim_virtio.c b/qemu-virtfs-netbsd/files/hw-mips-mipssim_virtio.c
deleted file mode 100644
index b008dd6c31..0000000000
--- a/qemu-virtfs-netbsd/files/hw-mips-mipssim_virtio.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * QEMU/mipssim-virtio extension emulation
- *
- * Emulates a very simple machine model similar to the one used by the
- * proprietary MIPS emulator extended by a virtio device. The purpose is to
- * have a better virt platform in anticipation to a readl `virt' platform for
- * MIPS.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Reinoud Zandijk.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "cpu.h"
-#include "hw/mips/mips.h"
-#include "hw/mips/cpudevs.h"
-#include "hw/char/serial.h"
-#include "hw/isa/isa.h"
-#include "net/net.h"
-#include "sysemu/sysemu.h"
-#include "hw/boards.h"
-#include "hw/mips/bios.h"
-#include "hw/loader.h"
-#include "hw/or-irq.h"
-#include "elf.h"
-#include "hw/sysbus.h"
-#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
-#include "qemu/error-report.h"
-#include "sysemu/qtest.h"
-#include "sysemu/reset.h"
-#include "hw/virtio/virtio-mmio.h"
-
-#define NUM_VIRTIO_TRANSPORTS 32
-#define VIRTIO_STRIDE 512
-
-#define DEV_SPACING 0x10000 /* space devices every 64k */
-#define ISA_BASE 0x1fd00000
-#define VIRTIO_MMIO_BASE (ISA_BASE + DEV_SPACING)
-
-extern void mips_mipssim_init(MachineState *machine);
-
-static void
-mips_mipssim_virtio_init(MachineState *machine)
-{
- DeviceState *virtio_orgate;
- MIPSCPU *cpu;
- CPUMIPSState *env;
-
- /* initialise parent */
- mips_mipssim_init(machine);
-
- cpu = MIPS_CPU(qemu_get_cpu(0));
- env = &cpu->env;
-
- /*
- * TODO: in newer versions, we might need to adjust the cpu clock when its
- * set in mips_mipssim_init()
- */
-
- /*
- * virtio extention; register 32 virtio devices just after the ISA space
- * at 0x1fd10000 with stride of 512 bytes as per i386s microvm target.
- * register these devices in reverse order (see comments in hw/arm/virt.c)
- */
- virtio_orgate = DEVICE(object_new(TYPE_OR_IRQ));
- object_property_set_int(OBJECT(virtio_orgate),
- "num-lines", NUM_VIRTIO_TRANSPORTS, &error_fatal);
- qdev_realize_and_unref(virtio_orgate, NULL, &error_fatal);
-
- for (int i = NUM_VIRTIO_TRANSPORTS - 1; i >= 0; i--) {
- sysbus_create_simple("virtio-mmio",
- VIRTIO_MMIO_BASE + i * VIRTIO_STRIDE,
- qdev_get_gpio_in(virtio_orgate, i));
- }
- qdev_connect_gpio_out(DEVICE(virtio_orgate), 0, env->irq[3]);
-}
-
-static void mips_mipssim_virtio_machine_init(MachineClass *mc)
-{
- mc->desc = "MIPS MIPSsim platform with virtio";
- mc->init = mips_mipssim_virtio_init;
-#ifdef TARGET_MIPS64
- mc->default_cpu_type = MIPS_CPU_TYPE_NAME("5Kf");
-#else
- mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
-#endif
- mc->default_ram_id = "mips_mipssim.ram";
-}
-
-DEFINE_MACHINE("mipssim-virtio", mips_mipssim_virtio_machine_init)
-
diff --git a/qemu-virtfs-netbsd/options.mk b/qemu-virtfs-netbsd/options.mk
deleted file mode 100644
index 2347db3705..0000000000
--- a/qemu-virtfs-netbsd/options.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD: options.mk,v 1.21 2023/08/23 15:19:02 adam Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.qemu
-PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice
-PKG_SUGGESTED_OPTIONS+= iscsi sdl spice
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-PKG_SUPPORTED_OPTIONS+= virtfs-proxy-helper
-.endif
-
-.if ${OPSYS} != "Darwin"
-# NetBSD<9.0 does not have EGL support in native X11,
-# so the QEMU OpenGL display driver cannot build.
-. include "../../graphics/MesaLib/features.mk"
-. if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
-PKG_SUPPORTED_OPTIONS+= opengl
-PKG_SUGGESTED_OPTIONS+= opengl
-. endif
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= gtk keymap virtfs-proxy-helper
-
-.if !empty(PKG_OPTIONS:Mjack)
-CONFIGURE_ARGS+= --enable-jack
-.include "../../audio/jack/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-jack
-.endif
-
-.if !empty(PKG_OPTIONS:Mdebug-info)
-CONFIGURE_ARGS+= --enable-debug-info
-.else
-CONFIGURE_ARGS+= --disable-debug-info
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk3)
-PLIST.gtk= yes
-CONFIGURE_ARGS+= --enable-gtk
-.include "../../x11/gtk3/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gtk
-.endif
-
-.if !empty(PKG_OPTIONS:Mopengl)
-CONFIGURE_ARGS+= --enable-opengl
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/libepoxy/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-opengl
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+= --enable-sdl
-.include "../../devel/SDL2/buildlink3.mk"
-.include "../../graphics/SDL2_image/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-sdl
-.endif
-
-# On Darwin, qemu uses Cocoa
-.if ${OPSYS} != "Darwin"
-. if !empty(PKG_OPTIONS:Mgtk3) || \
- !empty(PKG_OPTIONS:Mopengl) || !empty(PKG_OPTIONS:Msdl)
-PLIST.keymap= yes
-.include "../../x11/libxkbcommon/buildlink3.mk"
-. else
-CONFIGURE_ARGS+= --disable-xkbcommon
-. endif
-.endif
-
-# NB to successfully build virtfs-proxy-helper, the upstream Linux
-# header/development libraries for libcap and libattr must be installed.
-.if ${OPSYS} == "Linux" && !empty(PKG_OPTIONS:Mvirtfs-proxy-helper)
-PLIST.virtfs-proxy-helper= yes
-CONFIGURE_ARGS+= --enable-virtfs
-.elif ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --enable-virtfs
-.elif ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --enable-virtfs
-.else
-CONFIGURE_ARGS+= --disable-virtfs
-.endif
-
-.if !empty(PKG_OPTIONS:Mspice)
-CONFIGURE_ARGS+= --enable-spice
-.include "../../sysutils/spice-protocol/buildlink3.mk"
-.include "../../sysutils/spice-server/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-spice
-.endif
-
-.if !empty(PKG_OPTIONS:Miscsi)
-CONFIGURE_ARGS+= --enable-libiscsi
-.include "../../net/libiscsi/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-libiscsi
-.endif
diff --git a/qemu-virtfs-netbsd/patches/patch-audio_jackaudio.c b/qemu-virtfs-netbsd/patches/patch-audio_jackaudio.c
deleted file mode 100644
index 897cbffed2..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-audio_jackaudio.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-audio_jackaudio.c,v 1.2 2022/06/11 10:13:06 bsiegert Exp $
-
-Teach it about NetBSD's and macOS' pthread_setname_np.
-
---- audio/jackaudio.c.orig 2021-12-14 20:42:02.000000000 +0000
-+++ audio/jackaudio.c
-@@ -631,7 +631,13 @@ static int qjack_thread_creator(jack_nat
- }
-
- /* set the name of the thread */
-+#ifdef __NetBSD__
-+ pthread_setname_np(*thread, "%s", (void *)"jack-client");
-+#elif __APPLE__
-+ pthread_setname_np("jack-client");
-+#else
- pthread_setname_np(*thread, "jack-client");
-+#endif
-
- return ret;
- }
diff --git a/qemu-virtfs-netbsd/patches/patch-fsdev_file-op-9p.h b/qemu-virtfs-netbsd/patches/patch-fsdev_file-op-9p.h
deleted file mode 100644
index 0e48af402e..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-fsdev_file-op-9p.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Provide forward declaration of struct statfs.
-
---- fsdev/file-op-9p.h.orig 2023-08-22 15:34:01.000000000 +0000
-+++ fsdev/file-op-9p.h
-@@ -119,6 +119,8 @@ typedef union V9fsFidOpenState V9fsFidOp
-
- void cred_init(FsCred *);
-
-+struct statfs;
-+
- struct FileOperations {
- int (*parse_opts)(QemuOpts *, FsDriverEntry *, Error **errp);
- int (*init)(FsContext *, Error **errp);
diff --git a/qemu-virtfs-netbsd/patches/patch-fsdev_meson.build b/qemu-virtfs-netbsd/patches/patch-fsdev_meson.build
deleted file mode 100644
index a69fb512d2..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-fsdev_meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- fsdev/meson.build.orig 2023-08-22 15:34:01.000000000 +0000
-+++ fsdev/meson.build
-@@ -8,6 +8,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'],
- ), if_false: files('qemu-fsdev-dummy.c'))
- system_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
- system_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
-+system_ss.add_all(when: 'CONFIG_BSD', if_true: fsdev_ss)
-
- if have_virtfs_proxy_helper
- executable('virtfs-proxy-helper',
diff --git a/qemu-virtfs-netbsd/patches/patch-hw-mips-Kconfig b/qemu-virtfs-netbsd/patches/patch-hw-mips-Kconfig
deleted file mode 100644
index 6ed9d75ce0..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw-mips-Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-hw-mips-Kconfig,v 1.3 2021/02/20 22:59:29 ryoon Exp $
-
---- hw/mips/Kconfig.orig 2020-08-11 19:17:15.000000000 +0000
-+++ hw/mips/Kconfig
-@@ -20,6 +20,8 @@ config MIPSSIM
- select ISA_BUS
- select SERIAL_ISA
- select MIPSNET
-+ select VIRTIO_MMIO
-+ select OR_IRQ
-
- config JAZZ
- bool
diff --git a/qemu-virtfs-netbsd/patches/patch-hw-mips-mipssim.c b/qemu-virtfs-netbsd/patches/patch-hw-mips-mipssim.c
deleted file mode 100644
index 5782411eb6..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw-mips-mipssim.c
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-hw-mips-mipssim.c,v 1.4 2021/08/27 03:32:37 ryoon Exp $
-
---- hw/mips/mipssim.c.orig 2021-08-04 16:29:07.000000000 +0000
-+++ hw/mips/mipssim.c
-@@ -39,12 +39,20 @@
- #include "hw/boards.h"
- #include "hw/mips/bios.h"
- #include "hw/loader.h"
-+#include "hw/or-irq.h"
- #include "elf.h"
- #include "hw/sysbus.h"
- #include "hw/qdev-properties.h"
- #include "qemu/error-report.h"
- #include "sysemu/qtest.h"
- #include "sysemu/reset.h"
-+#include "hw/virtio/virtio-mmio.h"
-+
-+#define NUM_VIRTIO_TRANSPORTS 32
-+
-+#define DEV_SPACING 0x10000 /* space devices every 64k */
-+#define ISA_BASE 0x1fd00000
-+#define VIRTIO_MMIO_BASE (ISA_BASE + DEV_SPACING)
-
- static struct _loaderparams {
- int ram_size;
-@@ -135,7 +143,7 @@ static void mipsnet_init(int base, qemu_
- sysbus_mmio_get_region(s, 0));
- }
-
--static void
-+void
- mips_mipssim_init(MachineState *machine)
- {
- const char *kernel_filename = machine->kernel_filename;
-@@ -146,6 +154,7 @@ mips_mipssim_init(MachineState *machine)
- MemoryRegion *isa = g_new(MemoryRegion, 1);
- MemoryRegion *bios = g_new(MemoryRegion, 1);
- Clock *cpuclk;
-+ DeviceState *virtio_orgate;
- MIPSCPU *cpu;
- CPUMIPSState *env;
- ResetData *reset_info;
-@@ -208,7 +217,7 @@ mips_mipssim_init(MachineState *machine)
- /* Register 64 KB of ISA IO space at 0x1fd00000. */
- memory_region_init_alias(isa, NULL, "isa_mmio",
- get_system_io(), 0, 0x00010000);
-- memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa);
-+ memory_region_add_subregion(get_system_memory(), ISA_BASE, isa);
-
- /*
- * A single 16450 sits at offset 0x3f8. It is attached to
-@@ -229,6 +238,23 @@ mips_mipssim_init(MachineState *machine)
- if (nd_table[0].used)
- /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
- mipsnet_init(0x4200, env->irq[2], &nd_table[0]);
-+
-+ /*
-+ * virtio extention; register 32 virtio devices just after the ISA space
-+ * at 0x1fd10000 with stride of 512 bytes as per i386s microvm target.
-+ * register these devices in reverse order (see comments in hw/arm/virt.c)
-+ */
-+ virtio_orgate = DEVICE(object_new(TYPE_OR_IRQ));
-+ object_property_set_int(OBJECT(virtio_orgate),
-+ "num-lines", NUM_VIRTIO_TRANSPORTS, &error_fatal);
-+ qdev_realize_and_unref(virtio_orgate, NULL, &error_fatal);
-+
-+ for (int i = NUM_VIRTIO_TRANSPORTS - 1; i >= 0; i--) {
-+ sysbus_create_simple("virtio-mmio",
-+ 0x1fd10000 + i * 512,
-+ qdev_get_gpio_in(virtio_orgate, i));
-+ }
-+ qdev_connect_gpio_out(DEVICE(virtio_orgate), 0, env->irq[3]);
- }
-
- static void mips_mipssim_machine_init(MachineClass *mc)
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-proxy.c b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-proxy.c
deleted file mode 100644
index b96eba142a..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-proxy.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- hw/9pfs/9p-proxy.c.orig 2023-08-22 15:34:01.000000000 +0000
-+++ hw/9pfs/9p-proxy.c
-@@ -120,7 +120,9 @@ static ssize_t socket_read(int sockfd, v
- static void prstatfs_to_statfs(struct statfs *stfs, ProxyStatFS *prstfs)
- {
- memset(stfs, 0, sizeof(*stfs));
-+#if !defined(CONFIG_BSD)
- stfs->f_type = prstfs->f_type;
-+#endif
- stfs->f_bsize = prstfs->f_bsize;
- stfs->f_blocks = prstfs->f_blocks;
- stfs->f_bfree = prstfs->f_bfree;
-@@ -131,6 +133,8 @@ static void prstatfs_to_statfs(struct st
- /* f_namelen and f_frsize do not exist on Darwin */
- stfs->f_fsid.val[0] = prstfs->f_fsid[0] & 0xFFFFFFFFU;
- stfs->f_fsid.val[1] = prstfs->f_fsid[1] >> 32 & 0xFFFFFFFFU;
-+#elif defined(CONFIG_BSD)
-+ stfs->f_fsid = (unsigned long)prstfs->f_fsid[0];
- #else
- stfs->f_fsid.__val[0] = prstfs->f_fsid[0] & 0xFFFFFFFFU;
- stfs->f_fsid.__val[1] = prstfs->f_fsid[1] >> 32 & 0xFFFFFFFFU;
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-synth.c b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-synth.c
deleted file mode 100644
index b384a67362..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-synth.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- hw/9pfs/9p-synth.c.orig 2023-08-22 15:34:01.000000000 +0000
-+++ hw/9pfs/9p-synth.c
-@@ -230,6 +230,8 @@ static void synth_direntry(V9fsSynthNode
- entry->d_ino = node->attr->inode;
- #ifdef CONFIG_DARWIN
- entry->d_seekoff = off + 1;
-+#elif defined(CONFIG_BSD)
-+ /* not supported */
- #else
- entry->d_off = off + 1;
- #endif
-@@ -433,11 +435,13 @@ static int synth_fsync(FsContext *ctx, i
- static int synth_statfs(FsContext *s, V9fsPath *fs_path,
- struct statfs *stbuf)
- {
-+#if !defined(CONFIG_BSD)
- stbuf->f_type = 0xABCD;
-+#endif
- stbuf->f_bsize = 512;
- stbuf->f_blocks = 0;
- stbuf->f_files = synth_node_count;
--#ifndef CONFIG_DARWIN
-+#ifdef CONFIG_LINUX
- stbuf->f_namelen = NAME_MAX;
- #endif
- return 0;
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util-bsd.c b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util-bsd.c
deleted file mode 100644
index 30dc4b0b88..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util-bsd.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- hw/9pfs/9p-util-bsd.c.orig 2023-09-17 11:07:36.901331752 +0000
-+++ hw/9pfs/9p-util-bsd.c
-@@ -0,0 +1,41 @@
-+/*
-+ * 9p utilities (BSD stub)
-+ *
-+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-+ * See the COPYING file in the top-level directory.
-+ */
-+
-+#include "qemu/osdep.h"
-+#include "qemu/xattr.h"
-+#include "qapi/error.h"
-+#include "qemu/error-report.h"
-+#include "9p-util.h"
-+
-+ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char *name,
-+ void *value, size_t size)
-+{
-+ return ENOTSUP;
-+}
-+
-+ssize_t flistxattrat_nofollow(int dirfd, const char *filename,
-+ char *list, size_t size)
-+{
-+ return ENOTSUP;
-+}
-+
-+ssize_t fremovexattrat_nofollow(int dirfd, const char *filename,
-+ const char *name)
-+{
-+ return ENOTSUP;
-+}
-+
-+int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name,
-+ void *value, size_t size, int flags)
-+{
-+ return ENOTSUP;
-+}
-+
-+int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
-+{
-+ return mknodat(dirfd, filename, mode, dev);
-+}
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h
deleted file mode 100644
index 071fc597f7..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- hw/9pfs/9p-util.h.orig 2023-08-22 15:34:01.000000000 +0000
-+++ hw/9pfs/9p-util.h
-@@ -64,7 +64,7 @@ static inline uint64_t host_dev_to_dotl_
- static inline int errno_to_dotl(int err) {
- #if defined(CONFIG_LINUX)
- /* nothing to translate (Linux -> Linux) */
--#elif defined(CONFIG_DARWIN)
-+#elif defined(CONFIG_DARWIN) || defined(CONFIG_BSD)
- /*
- * translation mandatory for macOS hosts
- *
-@@ -154,13 +154,13 @@ static inline int openat_file(int dirfd,
- {
- int fd, serrno, ret;
-
--#ifndef CONFIG_DARWIN
-+#ifdef CONFIG_LINUX
- again:
- #endif
- fd = qemu_openat(dirfd, name, flags | O_NOFOLLOW | O_NOCTTY | O_NONBLOCK,
- mode);
- if (fd == -1) {
--#ifndef CONFIG_DARWIN
-+#ifdef CONFIG_LINUX
- if (errno == EPERM && (flags & O_NOATIME)) {
- /*
- * The client passed O_NOATIME but we lack permissions to honor it.
-@@ -213,6 +213,8 @@ static inline off_t qemu_dirent_off(stru
- {
- #ifdef CONFIG_DARWIN
- return dent->d_seekoff;
-+#elif defined(CONFIG_BSD)
-+ return 0; /* not supported */
- #else
- return dent->d_off;
- #endif
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.c b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.c
deleted file mode 100644
index 30c7b24542..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- hw/9pfs/9p.c.orig 2023-08-22 15:34:01.000000000 +0000
-+++ hw/9pfs/9p.c
-@@ -136,7 +136,7 @@ static int dotl_to_open_flags(int flags)
- { P9_DOTL_NONBLOCK, O_NONBLOCK } ,
- { P9_DOTL_DSYNC, O_DSYNC },
- { P9_DOTL_FASYNC, FASYNC },
--#ifndef CONFIG_DARWIN
-+#ifdef CONFIG_LINUX
- { P9_DOTL_NOATIME, O_NOATIME },
- /*
- * On Darwin, we could map to F_NOCACHE, which is
-@@ -3574,7 +3574,11 @@ static int v9fs_fill_statfs(V9fsState *s
- if (!bsize_factor) {
- bsize_factor = 1;
- }
-+#if !defined(CONFIG_BSD)
- f_type = stbuf->f_type;
-+#else
-+ f_type = 0xef53;
-+#endif
- f_bsize = stbuf->f_bsize;
- f_bsize *= bsize_factor;
- /*
-@@ -3591,6 +3595,9 @@ static int v9fs_fill_statfs(V9fsState *s
- fsid_val = (unsigned int)stbuf->f_fsid.val[0] |
- (unsigned long long)stbuf->f_fsid.val[1] << 32;
- f_namelen = NAME_MAX;
-+#elif defined(CONFIG_BSD)
-+ fsid_val = (unsigned long) stbuf->f_fsid;
-+ f_namelen = NAME_MAX;
- #else
- fsid_val = (unsigned int) stbuf->f_fsid.__val[0] |
- (unsigned long long)stbuf->f_fsid.__val[1] << 32;
-@@ -3979,6 +3986,9 @@ out_nofid:
- * Linux guests.
- */
- #define P9_XATTR_SIZE_MAX 65536
-+#elif defined(CONFIG_BSD)
-+/* XXX not implemented */
-+#define P9_XATTR_SIZE_MAX 65536
- #else
- #error Missing definition for P9_XATTR_SIZE_MAX for this host system
- #endif
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.h b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.h
deleted file mode 100644
index c97d472a03..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Emulate statfs(2) on NetBSD via statvfs(2).
-
---- hw/9pfs/9p.h.orig 2023-08-22 15:34:01.000000000 +0000
-+++ hw/9pfs/9p.h
-@@ -4,6 +4,9 @@
- #include <dirent.h>
- #include <utime.h>
- #include <sys/resource.h>
-+#if defined(__NetBSD__)
-+#include "netbsd-statfs-compat.h"
-+#endif
- #include "fsdev/file-op-9p.h"
- #include "fsdev/9p-iov-marshal.h"
- #include "qemu/thread.h"
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_meson.build b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_meson.build
deleted file mode 100644
index 927ddf20b5..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- hw/9pfs/meson.build.orig 2023-08-22 15:34:01.000000000 +0000
-+++ hw/9pfs/meson.build
-@@ -15,6 +15,7 @@ fs_ss.add(files(
- ))
- fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c'))
- fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c'))
-+fs_ss.add(when: 'CONFIG_BSD', if_true: files('9p-util-bsd.c'))
- fs_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-9p-backend.c'))
- system_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
-
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_netbsd-statfs-compat.h b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_netbsd-statfs-compat.h
deleted file mode 100644
index fa849125b3..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_netbsd-statfs-compat.h
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
-9pfs uses statfs(2) alot. Rather than patching all the code to use
-statvfs(2) on NetBSD, provide wrapper functions that emulate statfs(2).
-
---- hw/9pfs/netbsd-statfs-compat.h.orig 2023-09-17 10:56:07.671982907 +0000
-+++ hw/9pfs/netbsd-statfs-compat.h
-@@ -0,0 +1,53 @@
-+#ifndef QEMU_NETBSD_STATFS_COMPAT_H
-+#define QEMU_NETBSD_STATFS_COMPAT_H
-+
-+#include <sys/statvfs.h>
-+
-+/* this is just struct statvfs from sys/statvfs.h */
-+
-+struct statfs {
-+ unsigned long f_flag; /* copy of mount exported flags */
-+ unsigned long f_bsize; /* file system block size */
-+ unsigned long f_frsize; /* fundamental file system block size */
-+ unsigned long f_iosize; /* optimal file system block size */
-+
-+ /* The following are in units of f_frsize */
-+ fsblkcnt_t f_blocks; /* number of blocks in file system, */
-+ fsblkcnt_t f_bfree; /* free blocks avail in file system */
-+ fsblkcnt_t f_bavail; /* free blocks avail to non-root */
-+ fsblkcnt_t f_bresvd; /* blocks reserved for root */
-+
-+ fsfilcnt_t f_files; /* total file nodes in file system */
-+ fsfilcnt_t f_ffree; /* free file nodes in file system */
-+ fsfilcnt_t f_favail; /* free file nodes avail to non-root */
-+ fsfilcnt_t f_fresvd; /* file nodes reserved for root */
-+
-+ uint64_t f_syncreads; /* count of sync reads since mount */
-+ uint64_t f_syncwrites; /* count of sync writes since mount */
-+
-+ uint64_t f_asyncreads; /* count of async reads since mount */
-+ uint64_t f_asyncwrites; /* count of async writes since mount */
-+
-+ fsid_t f_fsidx; /* NetBSD compatible fsid */
-+ unsigned long f_fsid; /* Posix compatible fsid */
-+ unsigned long f_namemax; /* maximum filename length */
-+ uid_t f_owner; /* user that mounted the file system */
-+
-+ uint64_t f_spare[4]; /* spare space */
-+
-+ char f_fstypename[_VFS_NAMELEN]; /* fs type name */
-+ char f_mntonname[_VFS_MNAMELEN]; /* directory on which mounted */
-+ char f_mntfromname[_VFS_MNAMELEN]; /* mounted file system */
-+ char f_mntfromlabel[_VFS_MNAMELEN]; /* disk label name if avail */
-+
-+};
-+
-+static inline int statfs(const char *path, struct statfs *buf) {
-+ return statvfs(path, (struct statvfs *)buf);
-+}
-+
-+static inline int fstatfs(int fd, struct statfs *buf) {
-+ return fstatvfs(fd, (struct statvfs *)buf);
-+}
-+
-+#endif
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_display_omap__dss.c b/qemu-virtfs-netbsd/patches/patch-hw_display_omap__dss.c
deleted file mode 100644
index df87f09186..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_display_omap__dss.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-hw_display_omap__dss.c,v 1.3 2023/01/20 08:36:24 adam Exp $
-
-Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
-(PR lib/43832: ssp causes common names to be defines)
-
---- hw/display/omap_dss.c.orig 2022-12-14 16:28:45.000000000 +0000
-+++ hw/display/omap_dss.c
-@@ -798,18 +798,18 @@ static void omap_rfbi_write(void *opaque
- break;
- case 0x58: /* RFBI_READ */
- if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0])
-- s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1);
-+ s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 1);
- else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1])
-- s->rfbi.rxbuf = s->rfbi.chip[1]->read(s->rfbi.chip[1]->opaque, 1);
-+ s->rfbi.rxbuf = (*s->rfbi.chip[1]->read)(s->rfbi.chip[1]->opaque, 1);
- if (!-- s->rfbi.pixels)
- omap_rfbi_transfer_stop(s);
- break;
-
- case 0x5c: /* RFBI_STATUS */
- if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0])
-- s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0);
-+ s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 0);
- else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1])
-- s->rfbi.rxbuf = s->rfbi.chip[1]->read(s->rfbi.chip[1]->opaque, 0);
-+ s->rfbi.rxbuf = (*s->rfbi.chip[1]->read)(s->rfbi.chip[1]->opaque, 0);
- if (!-- s->rfbi.pixels)
- omap_rfbi_transfer_stop(s);
- break;
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_mips_meson.build b/qemu-virtfs-netbsd/patches/patch-hw_mips_meson.build
deleted file mode 100644
index dc3c04567a..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_mips_meson.build
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-hw_mips_meson.build,v 1.3 2021/08/27 03:32:37 ryoon Exp $
-
---- hw/mips/meson.build.orig 2021-08-04 16:29:07.000000000 +0000
-+++ hw/mips/meson.build
-@@ -7,7 +7,7 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_
-
- if 'CONFIG_TCG' in config_all
- mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
--mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c'))
-+mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c', 'mipssim_virtio.c'))
- mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
- mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt])
- endif
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_net_etraxfs__eth.c b/qemu-virtfs-netbsd/patches/patch-hw_net_etraxfs__eth.c
deleted file mode 100644
index 834cf8dfb1..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_net_etraxfs__eth.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-hw_net_etraxfs__eth.c,v 1.3 2014/01/15 18:26:20 wiz Exp $
-
-Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
-(PR lib/43832: ssp causes common names to be defines)
-
---- hw/net/etraxfs_eth.c.orig 2013-11-27 22:15:55.000000000 +0000
-+++ hw/net/etraxfs_eth.c
-@@ -185,7 +185,7 @@ static void mdio_read_req(struct qemu_md
-
- phy = bus->devs[bus->addr];
- if (phy && phy->read) {
-- bus->data = phy->read(phy, bus->req);
-+ bus->data = (*phy->read)(phy, bus->req);
- } else {
- bus->data = 0xffff;
- }
-@@ -364,7 +364,7 @@ static void eth_validate_duplex(ETRAXFSE
- int new_mm = 0;
-
- phy = eth->mdio_bus.devs[eth->phyaddr];
-- phy_duplex = !!(phy->read(phy, 18) & (1 << 11));
-+ phy_duplex = !!((*phy->read)(phy, 18) & (1 << 11));
- mac_duplex = !!(eth->regs[RW_REC_CTRL] & 128);
-
- if (mac_duplex != phy_duplex) {
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_net_xilinx__axienet.c b/qemu-virtfs-netbsd/patches/patch-hw_net_xilinx__axienet.c
deleted file mode 100644
index af632b972d..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_net_xilinx__axienet.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-hw_net_xilinx__axienet.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
-
-Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
-(PR lib/43832: ssp causes common names to be defines)
-
---- hw/net/xilinx_axienet.c.orig 2013-11-27 22:15:55.000000000 +0000
-+++ hw/net/xilinx_axienet.c
-@@ -207,7 +207,7 @@ static uint16_t mdio_read_req(struct MDI
-
- phy = bus->devs[addr];
- if (phy && phy->read) {
-- data = phy->read(phy, reg);
-+ data = (*phy->read)(phy, reg);
- } else {
- data = 0xffff;
- }
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_rtc_mc146818rtc.c b/qemu-virtfs-netbsd/patches/patch-hw_rtc_mc146818rtc.c
deleted file mode 100644
index 72465142ae..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_rtc_mc146818rtc.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-hw_rtc_mc146818rtc.c,v 1.1 2020/10/04 20:39:25 thorpej Exp $
-
-Ensure the periodic timer is started as soon as the device is realized,
-and follow the real hardware's lead of updating the PF bit in REG_C even
-if it's not going to result in raising an interrupt.
-
---- hw/rtc/mc146818rtc.c.orig 2020-10-01 00:56:55.574093880 +0000
-+++ hw/rtc/mc146818rtc.c 2020-10-01 00:58:40.326479896 +0000
-@@ -155,9 +155,15 @@ static uint32_t rtc_periodic_clock_ticks
- {
- int period_code;
-
-+#if 0
-+ /*
-+ * Real hardware sets the PF bit rergardless if it actually
-+ * raises an interrupt.
-+ */
- if (!(s->cmos_data[RTC_REG_B] & REG_B_PIE)) {
- return 0;
- }
-+#endif
-
- period_code = s->cmos_data[RTC_REG_A] & 0x0f;
-
-@@ -944,6 +950,7 @@ static void rtc_realizefn(DeviceState *d
- }
-
- s->periodic_timer = timer_new_ns(rtc_clock, rtc_periodic_timer, s);
-+ periodic_timer_update(s, qemu_clock_get_ns(rtc_clock), 0, true);
- s->update_timer = timer_new_ns(rtc_clock, rtc_update_timer, s);
- check_update_timer(s);
-
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_scsi_scsi-disk.c b/qemu-virtfs-netbsd/patches/patch-hw_scsi_scsi-disk.c
deleted file mode 100644
index 8b1be70abd..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_scsi_scsi-disk.c
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-hw_scsi_scsi-disk.c,v 1.1 2020/09/27 21:29:57 jakllsch Exp $
-
-Fill in more of SCSI disk block size reports to guest. Allows use of
-sector sizes outside range of 256 to 32768.
-
---- hw/scsi/scsi-disk.c.orig 2020-08-11 19:17:15.000000000 +0000
-+++ hw/scsi/scsi-disk.c
-@@ -1293,9 +1293,9 @@ static int scsi_disk_emulate_mode_sense(
- p[2] = (nb_sectors >> 8) & 0xff;
- p[3] = nb_sectors & 0xff;
- p[4] = 0; /* reserved */
-- p[5] = 0; /* bytes 5-7 are the sector size in bytes */
-- p[6] = s->qdev.blocksize >> 8;
-- p[7] = 0;
-+ p[5] = (s->qdev.blocksize >> 16) & 0xff; /* bytes 5-7 are the sector size in bytes */
-+ p[6] = (s->qdev.blocksize >> 8) & 0xff;
-+ p[7] = s->qdev.blocksize & 0xff;
- p += 8;
- }
-
-@@ -1993,10 +1993,10 @@ static int32_t scsi_disk_emulate_command
- outbuf[1] = (nb_sectors >> 16) & 0xff;
- outbuf[2] = (nb_sectors >> 8) & 0xff;
- outbuf[3] = nb_sectors & 0xff;
-- outbuf[4] = 0;
-- outbuf[5] = 0;
-- outbuf[6] = s->qdev.blocksize >> 8;
-- outbuf[7] = 0;
-+ outbuf[4] = (s->qdev.blocksize >> 24) & 0xff;;
-+ outbuf[5] = (s->qdev.blocksize >> 16) & 0xff;
-+ outbuf[6] = (s->qdev.blocksize >> 8) & 0xff;
-+ outbuf[7] = s->qdev.blocksize & 0xff;;
- break;
- case REQUEST_SENSE:
- /* Just return "NO SENSE". */
-@@ -2062,10 +2062,10 @@ static int32_t scsi_disk_emulate_command
- outbuf[5] = (nb_sectors >> 16) & 0xff;
- outbuf[6] = (nb_sectors >> 8) & 0xff;
- outbuf[7] = nb_sectors & 0xff;
-- outbuf[8] = 0;
-- outbuf[9] = 0;
-- outbuf[10] = s->qdev.blocksize >> 8;
-- outbuf[11] = 0;
-+ outbuf[8] = (s->qdev.blocksize >> 24) & 0xff;
-+ outbuf[9] = (s->qdev.blocksize >> 16) & 0xff;
-+ outbuf[10] = (s->qdev.blocksize >> 8) & 0xff;
-+ outbuf[11] = s->qdev.blocksize & 0xff;
- outbuf[12] = 0;
- outbuf[13] = get_physical_block_exp(&s->qdev.conf);
-
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_usb_dev-mtp.c b/qemu-virtfs-netbsd/patches/patch-hw_usb_dev-mtp.c
deleted file mode 100644
index 995ef0ead1..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-hw_usb_dev-mtp.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-hw_usb_dev-mtp.c,v 1.5 2021/02/20 22:59:29 ryoon Exp $
-
---- hw/usb/dev-mtp.c.orig 2020-12-08 16:59:44.000000000 +0000
-+++ hw/usb/dev-mtp.c
-@@ -30,6 +30,10 @@
- #include "qemu/units.h"
- #include "qom/object.h"
-
-+#ifndef NAME_MAX
-+#define NAME_MAX 255
-+#endif
-+
- /* ----------------------------------------------------------------------- */
-
- enum mtp_container_type {
-@@ -618,6 +622,9 @@ static void usb_mtp_object_readdir(MTPSt
- }
- o->have_children = true;
-
-+#ifndef O_DIRECTORY
-+#define O_DIRECTORY 0
-+#endif
- fd = open(o->path, O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
- if (fd < 0) {
- return;
diff --git a/qemu-virtfs-netbsd/patches/patch-meson.build b/qemu-virtfs-netbsd/patches/patch-meson.build
deleted file mode 100644
index 50fe11b205..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-meson.build
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-meson.build,v 1.13 2023/09/10 16:16:14 jperkin Exp $
-
-* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
- to fix qemu-system-aarch64 link.
-* Detect curses (non-ncurses{,w} too)
-* Enable p9fs on NetBSD
-
---- meson.build.orig 2023-08-22 15:34:02.000000000 +0000
-+++ meson.build
-@@ -225,7 +225,7 @@ if targetos == 'darwin'
- # Disable attempts to use ObjectiveC features in os/object.h since they
- # won't work when we're compiling with gcc as a C compiler.
- qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0'
--elif targetos == 'solaris'
-+elif targetos == 'sunos'
- # needed for CMSG_ macros in sys/socket.h
- qemu_common_flags += '-D_XOPEN_SOURCE=600'
- # needed for TIOCWIN* defines in termios.h
-@@ -1184,7 +1184,7 @@ if have_system and get_option('curses').
- has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
- endif
- if has_curses_h
-- curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
-+ curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
- foreach curses_libname : curses_libname_list
- libcurses = cc.find_library(curses_libname,
- required: false)
-@@ -1201,7 +1201,7 @@ if have_system and get_option('curses').
- endif
- endif
- if get_option('iconv').allowed()
-- foreach link_args : [ ['-liconv'], [] ]
-+ foreach link_args : [ [], ['-liconv'] ]
- # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
- # We need to use libiconv if available because mixing libiconv's headers with
- # the system libc does not work.
-@@ -1986,17 +1986,17 @@ dbus_display = get_option('dbus_display'
- .allowed()
-
- have_virtfs = get_option('virtfs') \
-- .require(targetos == 'linux' or targetos == 'darwin',
-- error_message: 'virtio-9p (virtfs) requires Linux or macOS') \
-- .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'),
-+ .require(targetos == 'linux' or targetos == 'darwin' or targetos == 'netbsd',
-+ error_message: 'virtio-9p (virtfs) requires Linux or macOS or NetBSD') \
-+ .require(targetos == 'linux' or targetos == 'netbsd' or cc.has_function('pthread_fchdir_np'),
- error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \
-- .require(targetos == 'darwin' or libattr.found(),
-+ .require(targetos == 'darwin' or targetos == 'netbsd' or libattr.found(),
- error_message: 'virtio-9p (virtfs) on Linux requires libattr-devel') \
- .disable_auto_if(not have_tools and not have_system) \
- .allowed()
-
- have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \
-- .require(targetos != 'darwin', error_message: 'the virtfs proxy helper is incompatible with macOS') \
-+ .require(targetos != 'darwin' and targetos != 'netbsd', error_message: 'the virtfs proxy helper is incompatible with macOS') \
- .require(have_virtfs, error_message: 'the virtfs proxy helper requires that virtfs is enabled') \
- .disable_auto_if(not have_tools) \
- .require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \
-@@ -2056,7 +2056,7 @@ have_slirp_smbd = get_option('slirp_smbd
- if have_slirp_smbd
- smbd_path = get_option('smbd')
- if smbd_path == ''
-- smbd_path = (targetos == 'solaris' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
-+ smbd_path = (targetos == 'sunos' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
- endif
- config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path)
- endif
diff --git a/qemu-virtfs-netbsd/patches/patch-roms_u-boot-sam460ex_Makefile b/qemu-virtfs-netbsd/patches/patch-roms_u-boot-sam460ex_Makefile
deleted file mode 100644
index e09c20775b..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-roms_u-boot-sam460ex_Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-roms_u-boot-sam460ex_Makefile,v 1.3 2021/02/23 09:28:33 wiz Exp $
-
-Fix unportable test(1) operator.
-
---- roms/u-boot-sam460ex/Makefile.orig 2020-12-08 17:00:58.000000000 +0000
-+++ roms/u-boot-sam460ex/Makefile
-@@ -2189,10 +2189,10 @@ M5475GFE_config : unconfig
- if [ "$${CODE}" != "0" ] ; then \
- echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >> $(obj)include/config.h ; \
- fi; \
-- if [ "$${VID}" == "1" ] ; then \
-+ if [ "$${VID}" = "1" ] ; then \
- echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
- fi; \
-- if [ "$${USB}" == "1" ] ; then \
-+ if [ "$${USB}" = "1" ] ; then \
- echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -a M5475EVB m68k mcf547x_8x m547xevb freescale
-@@ -2224,10 +2224,10 @@ M5485HFE_config : unconfig
- if [ "$${CODE}" != "0" ] ; then \
- echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >> $(obj)include/config.h ; \
- fi; \
-- if [ "$${VID}" == "1" ] ; then \
-+ if [ "$${VID}" = "1" ] ; then \
- echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
- fi; \
-- if [ "$${USB}" == "1" ] ; then \
-+ if [ "$${USB}" = "1" ] ; then \
- echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -a M5485EVB m68k mcf547x_8x m548xevb freescale
diff --git a/qemu-virtfs-netbsd/patches/patch-target_arm_tcg_translate-sve.c b/qemu-virtfs-netbsd/patches/patch-target_arm_tcg_translate-sve.c
deleted file mode 100644
index 59f43450c1..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-target_arm_tcg_translate-sve.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-target_arm_tcg_translate-sve.c,v 1.1 2023/06/07 07:19:22 adam Exp $
-
-Avoid FSCALE define, notably on SunOS.
-
---- target/arm/tcg/translate-sve.c.orig 2022-08-30 16:41:57.000000000 +0000
-+++ target/arm/tcg/translate-sve.c
-@@ -3988,6 +3988,9 @@ TRANS_FEAT_NONSTREAMING(FTSMUL, aa64_sve
- }; \
- TRANS_FEAT(NAME, FEAT, gen_gvec_fpst_arg_zpzz, name##_zpzz_fns[a->esz], a)
-
-+#ifdef FSCALE
-+#undef FSCALE
-+#endif
- DO_ZPZZ_FP(FADD_zpzz, aa64_sve, sve_fadd)
- DO_ZPZZ_FP(FSUB_zpzz, aa64_sve, sve_fsub)
- DO_ZPZZ_FP(FMUL_zpzz, aa64_sve, sve_fmul)
diff --git a/qemu-virtfs-netbsd/patches/patch-target_i386_cpu.c b/qemu-virtfs-netbsd/patches/patch-target_i386_cpu.c
deleted file mode 100644
index 85f354ade5..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-target_i386_cpu.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-target_i386_cpu.c,v 1.2 2022/09/17 09:54:56 tnn Exp $
-
-Permit to use `-cpu host' with NVMM.
-
---- target/i386/cpu.c.orig 2022-08-30 16:41:57.000000000 +0000
-+++ target/i386/cpu.c
-@@ -26,6 +26,7 @@
- #include "tcg/helper-tcg.h"
- #include "sysemu/reset.h"
- #include "sysemu/hvf.h"
-+#include "sysemu/nvmm.h"
- #include "kvm/kvm_i386.h"
- #include "sev.h"
- #include "qapi/error.h"
-@@ -1486,7 +1487,7 @@ static uint32_t xsave_area_size(uint64_t
-
- static inline bool accel_uses_host_cpuid(void)
- {
-- return kvm_enabled() || hvf_enabled();
-+ return kvm_enabled() || hvf_enabled() || nvmm_enabled();
- }
-
- static inline uint64_t x86_cpu_xsave_xcr0_components(X86CPU *cpu)
-@@ -6476,7 +6477,8 @@ static void x86_cpu_realizefn(DeviceStat
-
- if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) {
- g_autofree char *name = x86_cpu_class_get_model_name(xcc);
-- error_setg(&local_err, "CPU model '%s' requires KVM or HVF", name);
-+ error_setg(&local_err,
-+ "CPU model '%s' requires KVM or HVF or NVMM", name);
- goto out;
- }
-
diff --git a/qemu-virtfs-netbsd/patches/patch-target_i386_meson.build b/qemu-virtfs-netbsd/patches/patch-target_i386_meson.build
deleted file mode 100644
index 783b0f9d17..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-target_i386_meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-target_i386_meson.build,v 1.5 2023/08/23 15:19:02 adam Exp $
-
-Permit to use `-cpu host' with NVMM.
-
---- target/i386/meson.build.orig 2023-08-22 15:34:02.000000000 +0000
-+++ target/i386/meson.build
-@@ -11,6 +11,7 @@ i386_ss.add(when: 'CONFIG_SEV', if_true:
- # x86 cpu type
- i386_ss.add(when: 'CONFIG_KVM', if_true: files('host-cpu.c'))
- i386_ss.add(when: 'CONFIG_HVF', if_true: files('host-cpu.c'))
-+i386_ss.add(when: 'CONFIG_NVMM', if_true: files('host-cpu.c'))
-
- i386_system_ss = ss.source_set()
- i386_system_ss.add(files(
diff --git a/qemu-virtfs-netbsd/patches/patch-target_sparc_translate.c b/qemu-virtfs-netbsd/patches/patch-target_sparc_translate.c
deleted file mode 100644
index c58025be54..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-target_sparc_translate.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-target_sparc_translate.c,v 1.2 2023/05/06 19:22:37 ryoon Exp $
-
-Patch from upstream (not integrated there yet) to work around %pc/%npc
-being set to invalid values via ptrace, triggered by the NetBSD ptrace
-ATF tests. Real hardware seems to hardcode the lower bits to zero too.
-
---- target/sparc/translate.c.orig 2023-03-28 20:31:55.000000000 +0000
-+++ target/sparc/translate.c
-@@ -4324,6 +4324,7 @@ static void disas_sparc_insn(DisasContex
-
- r_tsptr = tcg_temp_new_ptr();
- gen_load_trap_state_at_tl(r_tsptr, cpu_env);
-+ tcg_gen_andi_tl(cpu_tmp0, cpu_tmp0, ~3);
- tcg_gen_st_tl(cpu_tmp0, r_tsptr,
- offsetof(trap_state, tpc));
- }
-@@ -4334,6 +4335,7 @@ static void disas_sparc_insn(DisasContex
-
- r_tsptr = tcg_temp_new_ptr();
- gen_load_trap_state_at_tl(r_tsptr, cpu_env);
-+ tcg_gen_andi_tl(cpu_tmp0, cpu_tmp0, ~3);
- tcg_gen_st_tl(cpu_tmp0, r_tsptr,
- offsetof(trap_state, tnpc));
- }
diff --git a/qemu-virtfs-netbsd/patches/patch-util_coroutine-ucontext.c b/qemu-virtfs-netbsd/patches/patch-util_coroutine-ucontext.c
deleted file mode 100644
index 4386a86666..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-util_coroutine-ucontext.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-util_coroutine-ucontext.c,v 1.1 2023/03/15 11:49:20 jperkin Exp $
-
-https://github.com/omniosorg/omnios-extra/blob/master/build/qemu/patches/0008-Temporary-coroutine-patch-pending-illumos-15206.patch
-
---- util/coroutine-ucontext.c.orig 2022-12-14 16:28:45.000000000 +0000
-+++ util/coroutine-ucontext.c
-@@ -305,6 +305,12 @@ qemu_coroutine_switch(Coroutine *from_,
-
- ret = sigsetjmp(from->env, 0);
- if (ret == 0) {
-+#if defined(__sun)
-+#define SIGJMP2UCONTEXT(x) ((ucontext_t *)P2ROUNDUP((uintptr_t)(x), sizeof (upad128_t)))
-+ ucontext_t *f = SIGJMP2UCONTEXT(from->env);
-+ ucontext_t *t = SIGJMP2UCONTEXT(to->env);
-+ t->uc_mcontext.gregs[REG_FSBASE] = f->uc_mcontext.gregs[REG_FSBASE];
-+#endif
- start_switch_fiber_asan(action, &fake_stack_save, to->stack,
- to->stack_size);
- start_switch_fiber_tsan(&fake_stack_save,
diff --git a/qemu-virtfs-netbsd/patches/patch-util_osdep.c b/qemu-virtfs-netbsd/patches/patch-util_osdep.c
deleted file mode 100644
index a7a4f8cf5f..0000000000
--- a/qemu-virtfs-netbsd/patches/patch-util_osdep.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-util_osdep.c,v 1.1 2023/03/15 11:49:20 jperkin Exp $
-
-Don't use OFD locking on SunOS.
-https://github.com/omniosorg/omnios-extra/blob/master/build/qemu/patches/0002-illumos-OFD-locking-must-span-the-entire-file.patch
-
---- util/osdep.c.orig 2022-12-14 16:28:45.000000000 +0000
-+++ util/osdep.c
-@@ -31,6 +31,10 @@
- #include "qemu/hw-version.h"
- #include "monitor/monitor.h"
-
-+#if defined(__sun)
-+#undef F_OFD_SETLK
-+#endif
-+
- static const char *hw_version = QEMU_HW_VERSION;
-
- int socket_set_cork(int fd, int v)
Home |
Main Index |
Thread Index |
Old Index