On Sat, Jan 06, 2024 at 09:40:50PM -0500, Brad Smith wrote: > Here is an update to QEMU 8.2.0. > > > https://wiki.qemu.org/ChangeLog/8.2 > > Due to the additional churn with the Meson migration I am no > longer going to try and maintain the backported patch for dealing > with the older linker, so that knocks out sparc64 for now. > > daniel@ provided a diff to bump the verion numbers in the README and > they're all in sync. I also replaced the sparc bits with sparc64.
Here is an update to QEMU 8.2.1. https://marc.info/?l=qemu-devel&m=170655982018482&w=2 Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.235 diff -u -p -u -p -r1.235 Makefile --- Makefile 15 Nov 2023 19:44:12 -0000 1.235 +++ Makefile 24 Feb 2024 02:40:59 -0000 @@ -1,4 +1,4 @@ -ONLY_FOR_ARCHS= aarch64 amd64 arm i386 powerpc powerpc64 riscv64 sparc64 +ONLY_FOR_ARCHS= aarch64 amd64 arm i386 powerpc powerpc64 riscv64 DPB_PROPERTIES= parallel USE_NOBTCFI= Yes @@ -6,12 +6,11 @@ USE_NOBTCFI= Yes COMMENT-main= multi system emulator COMMENT-ga= QEMU guest agent -VERSION= 8.0.2 +VERSION= 8.2.1 DISTNAME= qemu-${VERSION} CATEGORIES= emulators SITES= https://download.qemu.org/ EXTRACT_SUFX= .tar.xz -REVISION= 0 HOMEPAGE= https://www.qemu.org/ @@ -21,10 +20,10 @@ MAINTAINER= Brad Smith <b...@comstyle.co PERMIT_PACKAGE= Yes WANTLIB= c glib-2.0 pthread -WANTLIB-main= ${COMPILER_LIBCXX} ${WANTLIB} SDL2 X11 bz2 cairo capstone curl \ - curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 gnutls \ - gobject-2.0 gtk-3 iconv intl iscsi jpeg lzo2 m nfs pixman-1 \ - png slirp sndio ssh usb-1.0 util vte-2.91 xkbcommon z zstd +WANTLIB-main= ${WANTLIB} SDL2 X11 bz2 cairo capstone curl curses epoxy fdt \ + gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 gmodule-2.0 gnutls gobject-2.0 \ + gtk-3 iconv intl iscsi jpeg lzo2 m nfs pixman-1 png slirp sndio \ + ssh usb-1.0 util vte-2.91 xkbcommon z zstd WANTLIB-ga= ${WANTLIB} MULTI_PACKAGES= -main -ga @@ -115,24 +114,8 @@ TEST_TARGET= check # XXX Optimizer bug, using -O2 causes segfaults, -O1 linking errors .if ${MACHINE_ARCH:Mpowerpc} -CFLAGS+= -O0 -.endif - -.include <bsd.port.arch.mk> - -# Only lld has --dynamic-list -.if ${PROPERTIES:Mlld} -WANTLIB-main+= gmodule-2.0 -PKG_ARGS+= -Dplugins=1 -.else -PKG_ARGS+= -Dplugins=0 +#CFLAGS+= -O0 .endif - -# XXX: Remove when updating. -# https://gitlab.com/qemu-project/qemu/-/commit/8c0e8ed327c8ff7b48a5f2b7f5295c0541fcdbf4 -pre-configure: - perl -pi -e 's,tricore_feature,tricore_has_feature,g' ${WRKSRC}/target/tricore/cpu.c \ - ${WRKSRC}/target/tricore/cpu.h ${WRKSRC}/target/tricore/op_helper.c post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.70 diff -u -p -u -p -r1.70 distinfo --- distinfo 18 Aug 2023 11:20:17 -0000 1.70 +++ distinfo 24 Feb 2024 02:40:59 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-8.0.2.tar.xz) = 8GCr1DX75nlBJeLDmFaP/Dz6VABCWWkHqLGO3KNM9qU= -SIZE (qemu-8.0.2.tar.xz) = 126707132 +SHA256 (qemu-8.2.1.tar.xz) = hWJ1EVgXX50YfF8itXVVq+PIcPAyXIztEsNMbZh3Kb4= +SIZE (qemu-8.2.1.tar.xz) = 129848448 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 18 Aug 2023 11:20:17 -0000 1.77 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,97 +0,0 @@ -Revert.. - -[PATCH] configure: simplify creation of plugin symbol list -37650689473c4cdb5838f90cbc1aefbcd9332fb0 - -Index: configure ---- configure.orig -+++ configure -@@ -81,6 +81,7 @@ TMPC="${TMPDIR1}/${TMPB}.c" - TMPO="${TMPDIR1}/${TMPB}.o" - TMPM="${TMPDIR1}/${TMPB}.m" - TMPE="${TMPDIR1}/${TMPB}.exe" -+TMPTXT="${TMPDIR1}/${TMPB}.txt" - - rm -f config.log - -@@ -1330,7 +1331,6 @@ if test "$static" = "yes" ; then - plugins="no" - fi - fi --test "$plugins" = "" && plugins=yes - - cat > $TMPC << EOF - -@@ -1475,6 +1475,56 @@ if ! has "$pkg_config_exe"; then - fi - - ########################################## -+# plugin linker support probe -+ -+if test "$plugins" != "no"; then -+ -+ ######################################### -+ # See if --dynamic-list is supported by the linker -+ -+ ld_dynamic_list="no" -+ cat > $TMPTXT <<EOF -+{ -+ foo; -+}; -+EOF -+ -+ cat > $TMPC <<EOF -+#include <stdio.h> -+void foo(void); -+ -+void foo(void) -+{ -+ printf("foo\n"); -+} -+ -+int main(void) -+{ -+ foo(); -+ return 0; -+} -+EOF -+ -+ if compile_prog "" "-Wl,--dynamic-list=$TMPTXT" ; then -+ ld_dynamic_list="yes" -+ fi -+ -+ if test "$ld_dynamic_list" = "no" ; then -+ if test "$plugins" = "yes"; then -+ error_exit \ -+ "Plugin support requires dynamic linking and specifying a set of symbols " \ -+ "that are exported to plugins. Unfortunately your linker doesn't " \ -+ "support the flag (--dynamic-list) used " \ -+ "for this purpose." -+ else -+ plugins="no" -+ fi -+ else -+ plugins="yes" -+ fi -+fi -+ -+########################################## - # glib support probe - - # When bumping glib_req_ver, please check also whether we should increase -@@ -2404,6 +2454,15 @@ fi - - if test "$plugins" = "yes" ; then - echo "CONFIG_PLUGIN=y" >> $config_host_mak -+ # Copy the export object list to the build dir -+ if test "$ld_dynamic_list" = "yes" ; then -+ echo "CONFIG_HAS_LD_DYNAMIC_LIST=yes" >> $config_host_mak -+ ld_symbols=qemu-plugins-ld.symbols -+ cp "$source_path/plugins/qemu-plugins.symbols" $ld_symbols -+ else -+ error_exit \ -+ "If \$plugins=yes, \$ld_dynamic_list should have been set to 'yes'." -+ fi - fi - - if test -n "$gdb_bin"; then Index: patches/patch-meson_build =================================================================== RCS file: /cvs/ports/emulators/qemu/patches/patch-meson_build,v retrieving revision 1.11 diff -u -p -u -p -r1.11 patch-meson_build --- patches/patch-meson_build 18 Aug 2023 11:20:17 -0000 1.11 +++ patches/patch-meson_build 24 Feb 2024 02:40:59 -0000 @@ -4,7 +4,7 @@ Index: meson.build --- meson.build.orig +++ meson.build -@@ -1802,7 +1802,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_ +@@ -2070,7 +2070,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_ config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir')) config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / qemu_icondir) config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir')) @@ -13,13 +13,13 @@ Index: meson.build config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir) config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir')) -@@ -3810,9 +3810,6 @@ if targetos == 'darwin' - summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())} +@@ -4144,9 +4144,6 @@ else + summary_info += {'Objective-C compiler': false} endif option_cflags = (get_option('debug') ? ['-g'] : []) -if get_option('optimization') != 'plain' - option_cflags += ['-O' + get_option('optimization')] -endif summary_info += {'CFLAGS': ' '.join(get_option('c_args') + option_cflags)} - if link_language == 'cpp' + if 'cpp' in all_languages summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args') + option_cflags)} Index: patches/patch-meson_mesonbuild_compilers_cpp_py =================================================================== RCS file: patches/patch-meson_mesonbuild_compilers_cpp_py diff -N patches/patch-meson_mesonbuild_compilers_cpp_py --- patches/patch-meson_mesonbuild_compilers_cpp_py 4 Jan 2023 21:33:42 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -Index: meson/mesonbuild/compilers/cpp.py ---- meson/mesonbuild/compilers/cpp.py.orig -+++ meson/mesonbuild/compilers/cpp.py -@@ -254,7 +254,7 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler): - search_dirs: T.List[str] = [] - for d in self.get_compiler_dirs(env, 'libraries'): - search_dirs.append(f'-L{d}') -- return search_dirs + ['-lstdc++'] -+ return search_dirs + ['-lc++'] - - - class AppleClangCPPCompiler(ClangCPPCompiler): -@@ -418,7 +418,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler): - search_dirs: T.List[str] = [] - for d in self.get_compiler_dirs(env, 'libraries'): - search_dirs.append(f'-L{d}') -- return ['-lstdc++'] -+ return ['-lestdc++'] - - - class PGICPPCompiler(PGICompiler, CPPCompiler): Index: patches/patch-plugins_meson_build =================================================================== RCS file: patches/patch-plugins_meson_build diff -N patches/patch-plugins_meson_build --- patches/patch-plugins_meson_build 4 Jan 2023 21:33:42 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -Revert.. - -[PATCH] configure: simplify creation of plugin symbol list -37650689473c4cdb5838f90cbc1aefbcd9332fb0 - -Index: plugins/meson.build ---- plugins/meson.build.orig -+++ plugins/meson.build -@@ -1,15 +1,8 @@ - plugin_ldflags = [] - # Modules need more symbols than just those in plugins/qemu-plugins.symbols - if not enable_modules -- if targetos == 'darwin' -- configure_file( -- input: files('qemu-plugins.symbols'), -- output: 'qemu-plugins-ld64.symbols', -- capture: true, -- command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p', '@INPUT@']) -- plugin_ldflags = ['-Wl,-exported_symbols_list,plugins/qemu-plugins-ld64.symbols'] -- else -- plugin_ldflags = ['-Xlinker', '--dynamic-list=' + (meson.project_source_root() / 'plugins/qemu-plugins.symbols')] -+ if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host -+ plugin_ldflags = ['-Wl,--dynamic-list=qemu-plugins-ld.symbols'] - endif - endif - Index: patches/patch-qga_commands-posix_c =================================================================== RCS file: /cvs/ports/emulators/qemu/patches/patch-qga_commands-posix_c,v retrieving revision 1.8 diff -u -p -u -p -r1.8 patch-qga_commands-posix_c --- patches/patch-qga_commands-posix_c 23 Apr 2023 19:07:49 -0000 1.8 +++ patches/patch-qga_commands-posix_c 24 Feb 2024 02:40:59 -0000 @@ -17,7 +17,7 @@ Index: qga/commands-posix.c static void ga_wait_child(pid_t pid, int *status, Error **errp) { pid_t rpid; -@@ -2743,7 +2748,7 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp +@@ -2747,7 +2752,7 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp return head; } @@ -26,7 +26,7 @@ Index: qga/commands-posix.c void qmp_guest_suspend_disk(Error **errp) { -@@ -2762,10 +2767,99 @@ void qmp_guest_suspend_hybrid(Error **errp) +@@ -2766,10 +2771,99 @@ void qmp_guest_suspend_hybrid(Error **errp) GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp) { @@ -126,7 +126,7 @@ Index: qga/commands-posix.c int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp) { error_setg(errp, QERR_UNSUPPORTED); -@@ -3060,11 +3154,245 @@ GuestNetworkInterfaceList *qmp_guest_network_get_inter +@@ -3064,11 +3158,245 @@ GuestNetworkInterfaceList *qmp_guest_network_get_inter #if !defined(CONFIG_FSFREEZE) @@ -372,7 +372,7 @@ Index: qga/commands-posix.c GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **errp) { -@@ -3130,12 +3458,21 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) +@@ -3134,12 +3462,21 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) { #if !defined(__linux__) { @@ -394,7 +394,7 @@ Index: qga/commands-posix.c char **p = (char **)list; while (*p) { -@@ -3151,11 +3488,19 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) +@@ -3155,11 +3492,19 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) #if !defined(CONFIG_FSFREEZE) { Index: patches/patch-qga_main_c =================================================================== RCS file: /cvs/ports/emulators/qemu/patches/patch-qga_main_c,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-qga_main_c --- patches/patch-qga_main_c 23 Apr 2023 19:07:49 -0000 1.7 +++ patches/patch-qga_main_c 24 Feb 2024 02:40:59 -0000 @@ -15,7 +15,7 @@ Index: qga/main.c #define QGA_STATE_RELATIVE_DIR "run" #else #define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0" -@@ -1524,7 +1528,11 @@ int main(int argc, char **argv) +@@ -1597,7 +1601,11 @@ int main(int argc, char **argv) } if (config->method == NULL) { Index: pkg/PFRAG.plugins-main =================================================================== RCS file: pkg/PFRAG.plugins-main diff -N pkg/PFRAG.plugins-main --- pkg/PFRAG.plugins-main 11 Mar 2022 18:59:40 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@ -include/qemu-plugin.h Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/emulators/qemu/pkg/PLIST-main,v retrieving revision 1.15 diff -u -p -u -p -r1.15 PLIST-main --- pkg/PLIST-main 18 Aug 2023 11:20:17 -0000 1.15 +++ pkg/PLIST-main 24 Feb 2024 02:40:59 -0000 @@ -37,7 +37,7 @@ @bin bin/qemu-system-x86_64 @bin bin/qemu-system-xtensa @bin bin/qemu-system-xtensaeb -%%plugins%% +include/qemu-plugin.h @man man/man1/qemu-img.1 @man man/man1/qemu-storage-daemon.1 @man man/man1/qemu.1 @@ -127,12 +127,16 @@ 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/pci.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-cpu-topology.html share/doc/qemu/devel/s390-dasd-ipl.html share/doc/qemu/devel/secure-coding-practices.html share/doc/qemu/devel/stable-process.html @@ -150,6 +154,7 @@ 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 @@ -162,6 +167,7 @@ share/doc/qemu/interop/live-block-operat share/doc/qemu/interop/pr-helper.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 @@ -178,19 +184,31 @@ share/doc/qemu/specs/acpi_hw_reduced_hot 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/edu.html share/doc/qemu/specs/fw_cfg.html share/doc/qemu/specs/index.html +share/doc/qemu/specs/ivshmem-spec.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/pvpanic.html share/doc/qemu/specs/sev-guest-firmware.html +share/doc/qemu/specs/standard-vga.html share/doc/qemu/specs/tpm.html +share/doc/qemu/specs/virt-ctlr.html +share/doc/qemu/specs/vmcoreinfo.html +share/doc/qemu/specs/vmgenid.html +share/doc/qemu/specs/vmw_pvscsi-spec.html share/doc/qemu/system/ share/doc/qemu/system/arm/ 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 @@ -221,6 +239,7 @@ 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 @@ -236,12 +255,16 @@ 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-gpu.html share/doc/qemu/system/devices/virtio-pmem.html +share/doc/qemu/system/devices/virtio-snd.html share/doc/qemu/system/gdb.html share/doc/qemu/system/generic-loader.html share/doc/qemu/system/guest-loader.html @@ -291,6 +314,7 @@ share/doc/qemu/system/riscv/virt.html share/doc/qemu/system/s390x/ share/doc/qemu/system/s390x/3270.html share/doc/qemu/system/s390x/bootdevices.html +share/doc/qemu/system/s390x/cpu-topology.html share/doc/qemu/system/s390x/css.html share/doc/qemu/system/s390x/pcidevices.html share/doc/qemu/system/s390x/protvirt.html @@ -314,6 +338,7 @@ 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/vm-templating.html share/doc/qemu/system/vnc-security.html share/doc/qemu/tools/ share/doc/qemu/tools/index.html Index: pkg/README-main =================================================================== RCS file: /cvs/ports/emulators/qemu/pkg/README-main,v retrieving revision 1.3 diff -u -p -u -p -r1.3 README-main --- pkg/README-main 11 Mar 2022 18:59:40 -0000 1.3 +++ pkg/README-main 24 Feb 2024 02:40:59 -0000 @@ -6,13 +6,13 @@ 1. Get a bootable CDROM image: - $ ftp https://cdn.openbsd.org/pub/OpenBSD/snapshots/i386/cd70.iso + $ ftp https://cdn.openbsd.org/pub/OpenBSD/snapshots/i386/cd74.iso - or to use a 64-bit client OS or SPARC, respectively: + or to use a 64-bit client OS or SPARC64, respectively: - $ ftp https://cdn.openbsd.org/pub/OpenBSD/snapshots/amd64/cd70.iso + $ ftp https://cdn.openbsd.org/pub/OpenBSD/snapshots/amd64/cd74.iso - $ ftp https://cdn.openbsd.org/pub/OpenBSD/snapshots/sparc/cd70.iso + $ ftp https://cdn.openbsd.org/pub/OpenBSD/snapshots/sparc64/cd74.iso 2. Create a virtual disk image: @@ -20,16 +20,17 @@ 3. Install the OS: - $ qemu-system-i386 -m 32 -monitor stdio -no-fd-bootchk \ - -hda virtual.img -cdrom cd70.iso -boot d + $ qemu-system-i386 -m 64 -monitor stdio -no-fd-bootchk \ + -hda virtual.img -cdrom cd74.iso -boot d or: - $ qemu-system-x86_64 -m 32 -monitor stdio -no-fd-bootchk \ - -hda virtual.img -cdrom cd70.iso -boot d + $ qemu-system-x86_64 -m 64 -monitor stdio -no-fd-bootchk \ + -hda virtual.img -cdrom cd74.iso -boot d - $ qemu-system-sparc -m 32 -monitor stdio \ - -hda virtual.img -cdrom cd70.iso -boot d + $ qemu-system-sparc64 -m 64 -monitor stdio \ + -hda virtual.img -cdrom cd74.iso -boot d \ + -net nic,model=ne2k_pci -net user NOTE: start this inside an xterm or equivalent. NOTE: be sure to choose serial console during install. @@ -48,13 +49,14 @@ 5. Boot normally from the virtual disk: - $ qemu-system-i386 -m 32 -nographic -no-fd-bootchk -hda virtual.img + $ qemu-system-i386 -m 64 -nographic -no-fd-bootchk -hda virtual.img or: - $ qemu-system-x86_64 -m 32 -nographic -no-fd-bootchk -hda virtual.img + $ qemu-system-x86_64 -m 64 -nographic -no-fd-bootchk -hda virtual.img - $ qemu-system-sparc -m 32 -nographic -hda virtual.img + $ qemu-system-sparc64 -m 64 -nographic -hda virtual.img \ + -net nic,model=ne2k_pci -net user ==> Networking @@ -196,7 +198,7 @@ accomplish this, both in effect the same solution: a. qemu-system-i386 -vnc :0 -serial stdio .. virtual.img \ - -cdrom install52.iso -boot d + -cdrom install74.iso -boot d - this option permits you to use VNC from some system to connect to the QEMU instance and 'set tty com0' at the @@ -204,7 +206,7 @@ - you may then disconnect VNC and use the terminal from which you started QEMU to do the install. - b. qemu-system-i386 -nographic .. virtual.img -fda floppy52.fs -boot a + b. qemu-system-i386 -nographic .. virtual.img -fda floppy74.fs -boot a - this maps both the serial port and the (qemu) monitor prompt to the terminal QEMU was started on. @@ -213,7 +215,7 @@ - preparation of the floppy image to force serial console mode is straightforward: - vnconfig vnd0 floppy52.fs + vnconfig vnd0 floppy74.fs mount /dev/vnd0c /mnt mkdir /mnt/etc echo set tty com0 > /mnt/etc/boot.conf
