Misc patches for 2021-07-06
Subsystems (2)
The following changes since commit 715167a36c2b152f6511cff690180c1254ae039f:
Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210705a' into staging (2021-07-05 12:45:24 +0100)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 7ca6f2ad375d32e81844788dbc2b05a04cc391b5:
config-host.mak: remove unused compiler-related lines (2021-07-06 09:35:08 +0200)
----------------------------------------------------------------
* More Meson test conversions and configure cleanups
* Generalize XSAVE area offset so that it matches AMD processors on KVM
* Improvements for -display and deprecation of -no-quit
* Enable SMP configuration as a compound machine property ("-M smp.cpus=...")
* Haiku compilation fix
* Add icon on Darwin
----------------------------------------------------------------
David Edmondson (8):
target/i386: Declare constants for XSAVE offsets
target/i386: Consolidate the X86XSaveArea offset checks target/i386: Clarify the padding requirements of X86XSaveArea target/i386: Pass buffer and length to XSAVE helper target/i386: Make x86_ext_save_areas visible outside cpu.c target/i386: Observe XSAVE state area offsets
target/i386: Populate x86_ext_save_areas offsets using cpuid where possible target/i386: Move X86XSaveArea into TCG
John Arbuckle (1):
Set icon for QEMU binary on Mac OS
Paolo Bonzini (25):
coverity-scan: switch to vpath build
configure: drop vte-2.90 check
configure, meson: convert vte detection to meson configure, meson: convert virgl detection to meson configure, meson: convert libdaxctl detection to meson configure, meson: convert libpmem detection to meson configure, meson: convert liburing detection to meson configure, meson: convert libxml2 detection to meson
meson: sort existing compiler tests
meson: store dependency('threads') in a variable configure, meson: move CONFIG_IVSHMEM to meson
configure: convert HAVE_BROKEN_SIZE_MAX to meson
configure: convert compiler tests to meson, part 1
configure: convert compiler tests to meson, part 2
configure: convert compiler tests to meson, part 3
configure: convert compiler tests to meson, part 4
configure: convert compiler tests to meson, part 5
configure: convert compiler tests to meson, part 6
qom: export more functions for use with non-UserCreatable objects
keyval: introduce keyval_merge
keyval: introduce keyval_parse_into
vl: switch -M parsing to keyval
machine: add smp compound property
qemu-option: remove now-dead code
config-host.mak: remove unused compiler-related lines
Philippe Mathieu-Daudé (1):
coverity-scan: Remove lm32 / unicore32 targets
Thomas Huth (5):
Makefile: Remove /usr/bin/env wrapper from the SHELL variable softmmu/vl: Remove obsolete comment about the "frame" parameter
ui: Fix the "-display sdl,window_close=..." parameter
ui: Mark the '-no-quit' option as deprecated
qemu-options: Improve the documentation of the -display options
Makefile | 2 +- configure | 1023 +------------------------------ docs/devel/kconfig.rst | 2 +- docs/system/deprecated.rst | 12 + hw/core/machine.c | 108 ++-- hw/display/meson.build | 6 +- include/hw/boards.h | 1 - include/qemu/option.h | 6 +- include/qom/object.h | 23 + meson.build | 231 +++++-- meson_options.txt | 12 + qemu-options.hx | 50 +- qom/object_interfaces.c | 58 +- scripts/coverity-scan/COMPONENTS.md | 6 - scripts/coverity-scan/run-coverity-scan | 8 +- scripts/entitlement.sh | 10 +- softmmu/vl.c | 359 +++++------ target/i386/cpu.c | 18 +- target/i386/cpu.h | 41 +- target/i386/hvf/hvf-cpu.c | 29 + target/i386/hvf/hvf.c | 9 +- target/i386/hvf/x86hvf.c | 19 +- target/i386/kvm/kvm-cpu.c | 30 + target/i386/kvm/kvm.c | 59 +- target/i386/tcg/fpu_helper.c | 1 + target/i386/tcg/tcg-cpu.c | 20 + target/i386/tcg/tcg-cpu.h | 57 ++ target/i386/xsave_helper.c | 273 +++++++-- tests/qtest/numa-test.c | 22 +- tests/unit/test-keyval.c | 58 ++ tests/unit/test-qemu-opts.c | 35 -- util/keyval.c | 123 +++- util/meson.build | 5 +- util/qemu-option.c | 51 +- 34 files changed, 1179 insertions(+), 1588 deletions(-)
Signature · 1 line
2.31.1
[PULL 03/40] ui: Fix the "-display sdl,window_close=..." parameter
From: Thomas Huth <[email protected]>
According to the QAPI schema, there is a "-" and not a "_" between "window" and "close", and we're also talking about "window-close" in the long parameter description in qemu-options.hx, so we should make sure that we rather use the variant with the "-" by default instead of only allowing the one with the "_" here. The old way still stays enabled for compatibility, but we deprecate it, so that we can switch to a QAPIfied parameter one day more easily.
Message-Id: <[email protected]>
--- docs/system/deprecated.rst | 6 ++++++ qemu-options.hx | 2 +- softmmu/vl.c | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-)
docs/system/deprecated.rst +6 -0
@@ -126,6 +126,12 @@ other options have been processed. This will either have no effect (if if they were not given. The property is therefore useless and should not be specified. +``-display sdl,window_close=...`` (since 6.1) +''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of +an underscore between "window" and "close"). + QEMU Machine Protocol (QMP) commands ------------------------------------
qemu-options.hx +1 -1
@@ -1784,7 +1784,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_SDL) "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off]\n" - " [,window_close=on|off][,gl=on|core|es|off]\n" + " [,window-close=on|off][,gl=on|core|es|off]\n" #endif #if defined(CONFIG_GTK) "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n"
softmmu/vl.c +6 -1
@@ -1089,7 +1089,12 @@ static void parse_display(const char *p) }else { goto invalid_sdl_args; } - }else if (strstart (opts,",window_close=" , &nextopt)) { + }else if (strstart (opts,",window_close=" , &nextopt) || +strstart (opts,",window-close=" , &nextopt)) { +if (strstart (opts,",window_close=" ,NULL )) { +warn_report ("window_close with an underscore is deprecated," +" please use window-close instead." ); + } opts = nextopt; dpy.has_window_close = true;if (strstart (opts,"on" , &nextopt)) {
Signature · 1 line
2.31.1
[PULL 12/40] target/i386: Make x86_ext_save_areas visible outside cpu.c
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
Provide visibility of the x86_ext_save_areas array and associated type outside of cpu.c.
Message-Id: <[email protected]>
--- target/i386/cpu.c | 7 +------ target/i386/cpu.h | 9 +++++++++ 2 files changed, 10 insertions(+), 6 deletions(-)
target/i386/cpu.c +1 -6
@@ -1304,12 +1304,7 @@ static const X86RegisterInfo32 x86_reg_info_32[CPU_NB_REGS32] = { };#undef REGISTER -typedef struct ExtSaveArea { -uint32_t feature, bits; -uint32_t offset, size; -}ExtSaveArea ; - -static const ExtSaveArea x86_ext_save_areas[] = { +const ExtSaveArea x86_ext_save_areas[XSAVE_STATE_AREA_COUNT ] = { [XSTATE_FP_BIT ] = {/* x87 FP state component is always enabled if XSAVE is supported */ .feature =FEAT_1_ECX , .bits =CPUID_EXT_XSAVE ,
target/i386/cpu.h +9 -0
@@ -1370,6 +1370,15 @@ QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, zmm_hi256_state) != XSAVE_ZMM_HI256_OFFQEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , hi16_zmm_state) !=XSAVE_HI16_ZMM_OFFSET );QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , pkru_state) !=XSAVE_PKRU_OFFSET ); +typedef struct ExtSaveArea { +uint32_t feature, bits; +uint32_t offset, size; +}ExtSaveArea ; + +#define XSAVE_STATE_AREA_COUNT (XSTATE_PKRU_BIT + 1) + +extern const ExtSaveArea x86_ext_save_areas[XSAVE_STATE_AREA_COUNT ]; + typedef enum TPRAccess { TPR_ACCESS_READ, TPR_ACCESS_WRITE,
Signature · 1 line
2.31.1
[PULL 16/40] configure: drop vte-2.90 check
In reply to Paolo BonziniAll currently supported distros have vte 0.37 or newer, which is where the ABI changed from 2.90 to 2.91. So drop support for the older ABI.
--- configure | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
configure +4 -10
@@ -2803,19 +2803,13 @@ fi # VTE probe if test "$vte" != "no"; then - vteminversion="0.32.0" if $pkg_config --exists "vte-2.91"; then - vtepackage="vte-2.91" - else - vtepackage="vte-2.90" - fi - if $pkg_config --exists "$vtepackage >= $vteminversion"; then - vte_cflags=$($pkg_config --cflags $vtepackage) - vte_libs=$($pkg_config --libs $vtepackage) - vteversion=$($pkg_config --modversion $vtepackage) + vte_cflags=$($pkg_config --cflags vte-2.91) + vte_libs=$($pkg_config --libs vte-2.91) + vteversion=$($pkg_config --modversion vte-2.91) vte="yes" elif test "$vte" = "yes"; then - feature_not_found "vte" "Install libvte-2.90/2.91 devel" + feature_not_found "vte" "Install libvte-2.91 devel" else vte="no" fi
Signature · 1 line
2.31.1
[PULL 02/40] softmmu/vl: Remove obsolete comment about the "frame" parameter
In reply to Paolo BonziniFrom: Thomas Huth <[email protected]>
The frame parameter has been removed along with the support for SDL 1.2.
Message-Id: <[email protected]>
--- softmmu/vl.c | 2 -- 1 file changed, 2 deletions(-)
softmmu/vl.c +0 -2
@@ -1062,8 +1062,6 @@ static void parse_display(const char *p)* sdl DisplayType needs hand-crafted parser instead of * parse_display_qapi() due to some options not in * DisplayOptions, specifically: -* - frame -* Already deprecated. * - ctrl_grab + alt_grab * Not clear yet what happens to them long-term. Should * replaced by something better or deprecated and dropped.
Signature · 1 line
2.31.1
[PULL 19/40] configure, meson: convert libdaxctl detection to meson
In reply to Paolo Bonzini--- configure | 28 ++++------------------------ meson.build | 8 +++++--- meson_options.txt | 2 ++ 3 files changed, 11 insertions(+), 27 deletions(-)
configure +4 -24
@@ -433,7 +433,7 @@ plugins="no" fuzzing="no" rng_none="no" secret_keyring="$default_feature" -libdaxctl="$default_feature" +libdaxctl="auto" meson="" ninja="" skip_meson=no
@@ -1534,9 +1534,9 @@ for opt do ;; --disable-keyring) secret_keyring="no" ;; - --enable-libdaxctl) libdaxctl=yes + --enable-libdaxctl) libdaxctl=disabled ;; - --disable-libdaxctl) libdaxctl=no + --disable-libdaxctl) libdaxctl=enabled ;; --enable-fuse) fuse="enabled" ;;
@@ -4949,22 +4949,6 @@ if test "$libpmem" != "no"; then fi fi -########################################## -# check for libdaxctl - -if test "$libdaxctl" != "no"; then - if $pkg_config --atleast-version=57 "libdaxctl"; then - libdaxctl="yes" - libdaxctl_libs=$($pkg_config --libs libdaxctl) - libdaxctl_cflags=$($pkg_config --cflags libdaxctl) - else - if test "$libdaxctl" = "yes" ; then - feature_not_found "libdaxctl" "Install libdaxctl" - fi - libdaxctl="no" - fi -fi - ########################################## # check for slirp
@@ -5738,11 +5722,6 @@ if test "$libpmem" = "yes" ; then echo "LIBPMEM_CFLAGS=$libpmem_cflags" >> $config_host_mak fi -if test "$libdaxctl" = "yes" ; then - echo "CONFIG_LIBDAXCTL=y" >> $config_host_mak - echo "LIBDAXCTL_LIBS=$libdaxctl_libs" >> $config_host_mak -fi - if test "$bochs" = "yes" ; then echo "CONFIG_BOCHS=y" >> $config_host_mak fi
@@ -6108,6 +6087,7 @@ if test "$skip_meson" = no; then -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ + -Dlibdaxctl=$libdaxctl \ -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ -Dattr=$attr -Ddefault_devices=$default_devices -Dvirglrenderer=$virglrenderer \
meson.build +5 -3
@@ -1011,8 +1011,10 @@ if 'CONFIG_LIBPMEM' in config_host link_args: config_host['LIBPMEM_LIBS'].split()) endif libdaxctl = not_found -if 'CONFIG_LIBDAXCTL' in config_host - libdaxctl = declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'].split()) +if not get_option('libdaxctl').auto() or have_system + libdaxctl = dependency('libdaxctl', required: get_option('libdaxctl'), + version: '>=57', method: 'pkg-config', + kwargs: static_kwargs) endif tasn1 = not_found if gnutls.found()
@@ -2821,7 +2823,7 @@ summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')} summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')} summary_info += {'capstone': capstone_opt == 'disabled' ? false : capstone_opt} summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')} -summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')} +summary_info += {'libdaxctl support': libdaxctl.found()} summary_info += {'libudev': libudev.found()} summary_info += {'FUSE lseek': fuse_lseek.found()} summary(summary_info, bool_yn: true, section: 'Dependencies')
meson_options.txt +2 -0
@@ -84,6 +84,8 @@ option('nettle', type : 'feature', value : 'auto', description: 'nettle cryptography support') option('gcrypt', type : 'feature', value : 'auto', description: 'libgcrypt cryptography support') +option('libdaxctl', type : 'feature', value : 'auto', + description: 'libdaxctl support') option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto',
Signature · 1 line
2.31.1
[PULL 04/40] ui: Mark the '-no-quit' option as deprecated
In reply to Paolo BonziniFrom: Thomas Huth <[email protected]>
It's just a wrapper around the -display ...,window-close=off parameter, and the name "no-quit" is rather confusing compared to "window-close" (since there are still other means to quit the emulator), so we should rather tell our users to use the "window-close" parameter instead.
While we're at it, update the documentation to state that "-no-quit" is available for GTK, too, not only for SDL.
Message-Id: <[email protected]>
--- docs/system/deprecated.rst | 6 ++++++ qemu-options.hx | 5 +++-- softmmu/vl.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-)
docs/system/deprecated.rst +6 -0
@@ -132,6 +132,12 @@ specified. Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of an underscore between "window" and "close"). +``-no-quit`` (since 6.1) +'''''''''''''''''''''''' + +The ``-no-quit`` is a synonym for ``-display ...,window-close=off`` which +should be used instead. + QEMU Machine Protocol (QMP) commands ------------------------------------
qemu-options.hx +3 -2
@@ -1910,10 +1910,11 @@ SRST ERST DEF("no-quit", 0, QEMU_OPTION_no_quit, - "-no-quit disable SDL window close capability\n", QEMU_ARCH_ALL) + "-no-quit disable SDL/GTK window close capability (deprecated)\n", QEMU_ARCH_ALL) SRST ``-no-quit`` - Disable SDL window close capability. + Disable window close capability (SDL and GTK only). This option is + deprecated, please use ``-display ...,window-close=off`` instead. ERST DEF("sdl", 0, QEMU_OPTION_sdl,
softmmu/vl.c +2 -0
@@ -3237,6 +3237,8 @@ void qemu_init(int argc, char **argv, char **envp)case QEMU_OPTION_no_quit: dpy.has_window_close = true; dpy.window_close = false; +warn_report ("-no-quit is deprecated, please use " +"-display ...,window-close=off instead." );break ;case QEMU_OPTION_sdl:#ifdef CONFIG_SDL
Signature · 1 line
2.31.1
[PULL 05/40] qemu-options: Improve the documentation of the -display options
In reply to Paolo BonziniFrom: Thomas Huth <[email protected]>
The sdl and gtk display options support more parameters than currently documented. Also the "vnc" option got lost during a recent commit, add it again.
Message-Id: <[email protected]>
--- qemu-options.hx | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-)
qemu-options.hx +33 -12
@@ -1783,11 +1783,12 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, "-display spice-app[,gl=on|off]\n" #endif #if defined(CONFIG_SDL) - "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off]\n" - " [,window-close=on|off][,gl=on|core|es|off]\n" + "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off][,gl=on|core|es|off]\n" + " [,show-cursor=on|off][,window-close=on|off]\n" #endif #if defined(CONFIG_GTK) - "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n" + "-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n" + " [,show-cursor=on|off][,window-close=on|off]\n" #endif #if defined(CONFIG_VNC) "-display vnc=<display>[,<optargs>]\n"
@@ -1824,17 +1825,37 @@ SRST application. The Spice server will redirect the serial consoles and QEMU monitors. (Since 4.0) - ``sdl[,window-close=on|off][,gl=on|core|es|off]`` - + ``sdl`` Display video output via SDL (usually in a separate graphics window; see the SDL documentation for other possibilities). + Valid parameters are: - ``gtk[,grab-on-hover=on|off][,gl=on|off]`` + ``alt_grab=on|off`` : Use Control+Alt+Shift-g to toggle mouse grabbing + + ``ctrl_grab=on|off`` : Use Right-Control-g to toggle mouse grabbing + + ``gl=on|off|core|es`` : Use OpenGL for displaying + + ``show-cursor=on|off`` : Force showing the mouse cursor + + ``window-close=on|off`` : Allow to quit qemu with window close button + + ``gtk`` Display video output in a GTK window. This interface provides drop-down menus and other UI elements to configure and control - the VM during runtime. + the VM during runtime. Valid parameters are: - ``curses [,charset=<encoding>]`` + ``full-screen=on|off`` : Start in fullscreen mode + + ``gl=on|off`` : Use OpenGL for displaying + + ``grab-on-hover=on|off`` : Grab keyboard input on mouse hover + + ``show-cursor=on|off`` : Force showing the mouse cursor + + ``window-close=on|off`` : Allow to quit qemu with window close button + + ``curses[,charset=<encoding>]`` Display video output via curses. For graphics device models which support a text mode, QEMU can display this output using a curses/ncurses interface. Nothing is displayed when the graphics
@@ -1845,11 +1866,14 @@ SRST ``charset=CP850`` for IBM CP850 encoding. The default is ``CP437``. - ``egl-headless[,rendernode<file>]`` + ``egl-headless[,rendernode=<file>]`` Offload all OpenGL operations to a local DRI device. For any graphical display, this display needs to be paired with either VNC or SPICE displays. + ``vnc=<display>`` + Start a VNC server on display <display> + ``none`` Do not display video output. The guest will still see an emulated graphics card, but its output will not be displayed to
@@ -1857,9 +1881,6 @@ SRST that it only affects what is done with video output; -nographic also changes the destination of the serial and parallel port data. - - - ERST DEF("nographic", 0, QEMU_OPTION_nographic,
Signature · 1 line
2.31.1
[PULL 07/40] coverity-scan: switch to vpath build
In reply to Paolo BonziniThis is the patch that has been running on the coverity cronjob for a few weeks now.
--- scripts/coverity-scan/run-coverity-scan | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
scripts/coverity-scan/run-coverity-scan +5 -3
@@ -380,15 +380,17 @@ export PATH="$TOOLBIN:$PATH" cd "$SRCDIR" -echo "Doing make distclean..." -make distclean +echo "Nuking build directory..." +rm -rf +build +mkdir +build +cd +build echo "Configuring..." # We configure with a fixed set of enables here to ensure that we don't # accidentally reduce the scope of the analysis by doing the build on # the system that's missing a dependency that we need to build part of # the codebase. -./configure --disable-modules --enable-sdl --enable-gtk \ +../configure --disable-modules --enable-sdl --enable-gtk \ --enable-opengl --enable-vte --enable-gnutls \ --enable-nettle --enable-curses --enable-curl \ --audio-drv-list=oss,alsa,sdl,pa --enable-virtfs \
Signature · 1 line
2.31.1
[PULL 01/40] Makefile: Remove /usr/bin/env wrapper from the SHELL variable
In reply to Paolo BonziniFrom: Thomas Huth <[email protected]>
The wrapper should not be needed here (it's not the shebang line of a shell script), and it is causing trouble on Haiku where "env" resides in a different directory.
Message-Id: <[email protected]>
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -14,7 +14,7 @@ SRC_PATH=. # we have explicit rules for everything MAKEFLAGS += -rR -SHELL = /usr/bin/env bash -o pipefail +SHELL = bash -o pipefail # Usage: $(call quiet-command,command and args,"NAME","args to print") # This will run "command and args", and either:
Signature · 1 line
2.31.1
[PULL 22/40] configure, meson: convert libxml2 detection to meson
In reply to Paolo Bonzini--- configure | 29 ++++------------------------- meson.build | 8 ++++---- meson_options.txt | 2 ++ 3 files changed, 10 insertions(+), 29 deletions(-)
configure +4 -25
@@ -425,7 +425,7 @@ vdi=${default_feature:-yes} vvfat=${default_feature:-yes} qed=${default_feature:-yes} parallels=${default_feature:-yes} -libxml2="$default_feature" +libxml2="auto" debug_mutex="no" libpmem="auto" default_devices="true"
@@ -1419,9 +1419,9 @@ for opt do ;; --enable-numa) numa="yes" ;; - --disable-libxml2) libxml2="no" + --disable-libxml2) libxml2="disabled" ;; - --enable-libxml2) libxml2="yes" + --enable-libxml2) libxml2="enabled" ;; --disable-tcmalloc) tcmalloc="no" ;;
@@ -3409,21 +3409,6 @@ EOF fi fi -########################################## -# libxml2 probe -if test "$libxml2" != "no" ; then - if $pkg_config --exists libxml-2.0; then - libxml2="yes" - libxml2_cflags=$($pkg_config --cflags libxml-2.0) - libxml2_libs=$($pkg_config --libs libxml-2.0) - else - if test "$libxml2" = "yes"; then - feature_not_found "libxml2" "Install libxml2 devel" - fi - libxml2="no" - fi -fi - # Check for inotify functions when we are building linux-user # emulator. This is done because older glibc versions don't # have syscall stubs for these implemented. In that case we
@@ -5636,12 +5621,6 @@ if test "$have_rtnetlink" = "yes" ; then echo "CONFIG_RTNETLINK=y" >> $config_host_mak fi -if test "$libxml2" = "yes" ; then - echo "CONFIG_LIBXML2=y" >> $config_host_mak - echo "LIBXML2_CFLAGS=$libxml2_cflags" >> $config_host_mak - echo "LIBXML2_LIBS=$libxml2_libs" >> $config_host_mak -fi - if test "$replication" = "yes" ; then echo "CONFIG_REPLICATION=y" >> $config_host_mak fi
@@ -6050,7 +6029,7 @@ if test "$skip_meson" = no; then -Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \ -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ - -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ + -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse -Dlibxml2=$libxml2 \ -Dlibdaxctl=$libdaxctl -Dlibpmem=$libpmem -Dlinux_io_uring=$linux_io_uring \ -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
meson.build +4 -4
@@ -334,9 +334,9 @@ if not get_option('linux_io_uring').auto() or have_block method: 'pkg-config', kwargs: static_kwargs) endif libxml2 = not_found -if 'CONFIG_LIBXML2' in config_host - libxml2 = declare_dependency(compile_args: config_host['LIBXML2_CFLAGS'].split(), - link_args: config_host['LIBXML2_LIBS'].split()) +if not get_option('libxml2').auto() or have_block + libxml2 = dependency('libxml-2.0', required: get_option('libxml2'), + method: 'pkg-config', kwargs: static_kwargs) endif libnfs = not_found if not get_option('libnfs').auto() or have_block
@@ -2821,7 +2821,7 @@ summary_info += {'bzip2 support': libbzip2.found()} summary_info += {'lzfse support': liblzfse.found()} summary_info += {'zstd support': zstd.found()} summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')} -summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')} +summary_info += {'libxml2': libxml2.found()} summary_info += {'capstone': capstone_opt == 'disabled' ? false : capstone_opt} summary_info += {'libpmem support': libpmem.found()} summary_info += {'libdaxctl support': libdaxctl.found()}
meson_options.txt +2 -0
@@ -92,6 +92,8 @@ option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', description: 'libusb support for USB passthrough') +option('libxml2', type : 'feature', value : 'auto', + description: 'libxml2 support for Parallels image format') option('linux_io_uring', type : 'feature', value : 'auto', description: 'Linux io_uring support') option('lzfse', type : 'feature', value : 'auto',
Signature · 1 line
2.31.1
[PULL 06/40] coverity-scan: Remove lm32 / unicore32 targets
In reply to Paolo BonziniFrom: Philippe Mathieu-Daudé <[email protected]>
lm32 has been removed in commit 9d49bcf6992 ("Drop the deprecated lm32 target"), and unicore32 in 4369223902a ("Drop the deprecated unicore32 target").
Message-Id: <[email protected]>
--- scripts/coverity-scan/COMPONENTS.md | 6 ------ 1 file changed, 6 deletions(-)
scripts/coverity-scan/COMPONENTS.md +0 -6
@@ -21,9 +21,6 @@ hppa i386 ~ (/qemu)?((/include)?/hw/i386/.*|/target/i386/.*|/hw/intc/[^/]*apic[^/]*\.c) -lm32 - ~ (/qemu)?((/include)?/hw/lm32/.*|/target/lm32/.*|/hw/.*/(milkymist|lm32).*) - m68k ~ (/qemu)?((/include)?/hw/m68k/.*|/target/m68k/.*|(/include)?/hw(/.*)?/mcf.*)
@@ -60,9 +57,6 @@ tilegx tricore ~ (/qemu)?((/include)?/hw/tricore/.*|/target/tricore/.*) -unicore32 - ~ (/qemu)?((/include)?/hw/unicore32/.*|/target/unicore32/.*) - 9pfs ~ (/qemu)?(/hw/9pfs/.*|/fsdev/.*)
Signature · 1 line
2.31.1
[PULL 09/40] target/i386: Consolidate the X86XSaveArea offset checks
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
Rather than having similar but different checks in cpu.h and kvm.c, move them all to cpu.h.
Message-Id: <[email protected]>
--- target/i386/cpu.h | 22 +++++++++++++++------- target/i386/kvm/kvm.c | 39 --------------------------------------- 2 files changed, 15 insertions(+), 46 deletions(-)
target/i386/cpu.h +15 -7
@@ -1341,21 +1341,29 @@ typedef struct X86XSaveArea {XSavePKRU pkru_state; } X86XSaveArea; -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , avx_state) !=XSAVE_AVX_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveAVX) !=0x100 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndreg_state) !=XSAVE_BNDREG_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveBNDREG) !=0x40 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndcsr_state) !=XSAVE_BNDCSR_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveBNDCSR) !=0x40 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , opmask_state) !=XSAVE_OPMASK_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveOpmask) !=0x40 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , zmm_hi256_state) !=XSAVE_ZMM_HI256_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveZMM_Hi256) !=0x200 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , hi16_zmm_state) !=XSAVE_HI16_ZMM_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveHi16_ZMM) !=0x400 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , pkru_state) !=XSAVE_PKRU_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSavePKRU) !=0x8 ); +QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fcw) != XSAVE_FCW_FSW_OFFSET); +QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.ftw) != XSAVE_FTW_FOP_OFFSET); +QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fpip) != XSAVE_CWD_RIP_OFFSET); +QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fpdp) != XSAVE_CWD_RDP_OFFSET); +QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.mxcsr) != XSAVE_MXCSR_OFFSET); +QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fpregs) != XSAVE_ST_SPACE_OFFSET); +QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.xmm_regs) != XSAVE_XMM_SPACE_OFFSET); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , avx_state) !=XSAVE_AVX_OFFSET ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndreg_state) !=XSAVE_BNDREG_OFFSET ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndcsr_state) !=XSAVE_BNDCSR_OFFSET ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , opmask_state) !=XSAVE_OPMASK_OFFSET ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , zmm_hi256_state) !=XSAVE_ZMM_HI256_OFFSET ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , hi16_zmm_state) !=XSAVE_HI16_ZMM_OFFSET ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , pkru_state) !=XSAVE_PKRU_OFFSET ); + typedef enum TPRAccess { TPR_ACCESS_READ, TPR_ACCESS_WRITE,
target/i386/kvm/kvm.c +0 -39
@@ -2466,45 +2466,6 @@ static int kvm_put_fpu(X86CPU *cpu)return kvm_vcpu_ioctl (CPU (cpu),KVM_SET_FPU , &fpu); } -#define XSAVE_FCW_FSW 0 -#define XSAVE_FTW_FOP 1 -#define XSAVE_CWD_RIP 2 -#define XSAVE_CWD_RDP 4 -#define XSAVE_MXCSR 6 -#define XSAVE_ST_SPACE 8 -#define XSAVE_XMM_SPACE 40 -#define XSAVE_XSTATE_BV 128 -#define XSAVE_YMMH_SPACE 144 -#define XSAVE_BNDREGS 240 -#define XSAVE_BNDCSR 256 -#define XSAVE_OPMASK 272 -#define XSAVE_ZMM_Hi256 288 -#define XSAVE_Hi16_ZMM 416 -#define XSAVE_PKRU 672 - -#define XSAVE_BYTE_OFFSET (word_offset) \ - ((word_offset) * sizeof_field(struct kvm_xsave, region[0])) - -#define ASSERT_OFFSET (word_offset, field) \ - QEMU_BUILD_BUG_ON(XSAVE_BYTE_OFFSET(word_offset) != \ - offsetof(X86XSaveArea, field)) - -ASSERT_OFFSET (XSAVE_FCW_FSW , legacy.fcw); -ASSERT_OFFSET (XSAVE_FTW_FOP , legacy.ftw); -ASSERT_OFFSET (XSAVE_CWD_RIP , legacy.fpip); -ASSERT_OFFSET (XSAVE_CWD_RDP , legacy.fpdp); -ASSERT_OFFSET (XSAVE_MXCSR , legacy.mxcsr); -ASSERT_OFFSET (XSAVE_ST_SPACE , legacy.fpregs); -ASSERT_OFFSET (XSAVE_XMM_SPACE , legacy.xmm_regs); -ASSERT_OFFSET (XSAVE_XSTATE_BV , header.xstate_bv); -ASSERT_OFFSET (XSAVE_YMMH_SPACE , avx_state); -ASSERT_OFFSET (XSAVE_BNDREGS , bndreg_state); -ASSERT_OFFSET (XSAVE_BNDCSR , bndcsr_state); -ASSERT_OFFSET (XSAVE_OPMASK , opmask_state); -ASSERT_OFFSET (XSAVE_ZMM_Hi256, zmm_hi256_state); -ASSERT_OFFSET (XSAVE_Hi16_ZMM, hi16_zmm_state); -ASSERT_OFFSET (XSAVE_PKRU , pkru_state); -static int kvm_put_xsave (X86CPU *cpu) {CPUX86State *env = &cpu->env;
Signature · 1 line
2.31.1
[PULL 14/40] target/i386: Populate x86_ext_save_areas offsets using cpuid where possible
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
Rather than relying on the X86XSaveArea structure definition, determine the offset of XSAVE state areas using CPUID leaf 0xd where possible (KVM and HVF).
Message-Id: <[email protected]>
--- target/i386/cpu.c | 13 +------------ target/i386/cpu.h | 2 +- target/i386/hvf/hvf-cpu.c | 29 +++++++++++++++++++++++++++++ target/i386/hvf/hvf.c | 6 ++++++ target/i386/kvm/kvm-cpu.c | 30 ++++++++++++++++++++++++++++++ target/i386/kvm/kvm.c | 7 +++++++ target/i386/tcg/tcg-cpu.c | 20 ++++++++++++++++++++ 7 files changed, 94 insertions(+), 13 deletions(-)
target/i386/cpu.c +1 -12
@@ -1304,48 +1304,37 @@ static const X86RegisterInfo32 x86_reg_info_32[CPU_NB_REGS32] = { };#undef REGISTER -const ExtSaveArea x86_ext_save_areas[XSAVE_STATE_AREA_COUNT ] = { +ExtSaveArea x86_ext_save_areas[XSAVE_STATE_AREA_COUNT ] = { [XSTATE_FP_BIT ] = {/* x87 FP state component is always enabled if XSAVE is supported */ .feature =FEAT_1_ECX , .bits =CPUID_EXT_XSAVE , -/* x87 state is in the legacy region of the XSAVE area */ - .offset =0 , .size =sizeof (X86LegacyXSaveArea) +sizeof (X86XSaveHeader), }, [XSTATE_SSE_BIT ] = {/* SSE state component is always enabled if XSAVE is supported */ .feature =FEAT_1_ECX , .bits =CPUID_EXT_XSAVE , -/* SSE state is in the legacy region of the XSAVE area */ - .offset =0 , .size =sizeof (X86LegacyXSaveArea) +sizeof (X86XSaveHeader), }, [XSTATE_YMM_BIT ] = { .feature =FEAT_1_ECX , .bits =CPUID_EXT_AVX , - .offset = offsetof(X86XSaveArea , avx_state), .size =sizeof (XSaveAVX) }, [XSTATE_BNDREGS_BIT ] = { .feature =FEAT_7_0_EBX , .bits =CPUID_7_0_EBX_MPX , - .offset = offsetof(X86XSaveArea , bndreg_state), .size =sizeof (XSaveBNDREG) }, [XSTATE_BNDCSR_BIT ] = { .feature =FEAT_7_0_EBX , .bits =CPUID_7_0_EBX_MPX , - .offset = offsetof(X86XSaveArea , bndcsr_state), .size =sizeof (XSaveBNDCSR) }, [XSTATE_OPMASK_BIT ] = { .feature =FEAT_7_0_EBX , .bits =CPUID_7_0_EBX_AVX512F , - .offset = offsetof(X86XSaveArea , opmask_state), .size =sizeof (XSaveOpmask) }, [XSTATE_ZMM_Hi256_BIT] = { .feature =FEAT_7_0_EBX , .bits =CPUID_7_0_EBX_AVX512F , - .offset = offsetof(X86XSaveArea , zmm_hi256_state), .size =sizeof (XSaveZMM_Hi256) }, [XSTATE_Hi16_ZMM_BIT] = { .feature =FEAT_7_0_EBX , .bits =CPUID_7_0_EBX_AVX512F , - .offset = offsetof(X86XSaveArea , hi16_zmm_state), .size =sizeof (XSaveHi16_ZMM) }, [XSTATE_PKRU_BIT ] = { .feature =FEAT_7_0_ECX , .bits =CPUID_7_0_ECX_PKU , - .offset = offsetof(X86XSaveArea , pkru_state), .size =sizeof (XSavePKRU) }, };
target/i386/cpu.h +1 -1
@@ -1377,7 +1377,7 @@ typedef struct ExtSaveArea {#define XSAVE_STATE_AREA_COUNT (XSTATE_PKRU_BIT + 1) -extern const ExtSaveArea x86_ext_save_areas[XSAVE_STATE_AREA_COUNT ]; +extern ExtSaveArea x86_ext_save_areas[XSAVE_STATE_AREA_COUNT ]; typedef enum TPRAccess { TPR_ACCESS_READ,
target/i386/hvf/hvf-cpu.c +29 -0
@@ -30,6 +30,33 @@ static void hvf_cpu_max_instance_init(X86CPU *cpu)hvf_get_supported_cpuid (0xC0000000 ,0 ,R_EAX ); } +static void hvf_cpu_xsave_init (void ) +{ +static bool first = true; +int i; + +if (!first) { +return ; + } + first = false; + +/* x87 and SSE states are in the legacy region of the XSAVE area. */ + x86_ext_save_areas[XSTATE_FP_BIT ].offset =0 ; + x86_ext_save_areas[XSTATE_SSE_BIT ].offset =0 ; + +for (i =XSTATE_SSE_BIT +1 ; i <XSAVE_STATE_AREA_COUNT ; i++) { +ExtSaveArea *esa = &x86_ext_save_areas[i]; + +if (esa->size) { +int sz =hvf_get_supported_cpuid (0xd , i,R_EAX ); +if (sz !=0 ) { +assert (esa->size == sz); + esa->offset =hvf_get_supported_cpuid (0xd , i,R_EBX ); + } + } + } +} +static void hvf_cpu_instance_init (CPUState *cs) {X86CPU *cpu =X86_CPU (cs);
@@ -42,6 +69,8 @@ static void hvf_cpu_instance_init(CPUState *cs)if (cpu->max_features) {hvf_cpu_max_instance_init (cpu); } + +hvf_cpu_xsave_init (); }static void hvf_cpu_accel_class_init (ObjectClass *oc,void *data)
target/i386/hvf/hvf.c +6 -0
@@ -270,6 +270,12 @@ int hvf_arch_init_vcpu(CPUState *cpu) x86cpu->env.xsave_buf_len =4096 ; x86cpu->env.xsave_buf =qemu_memalign (4096 , x86cpu->env.xsave_buf_len); +/* +* The allocated storage must be large enough for all of the +* possible XSAVE state components. +*/ +assert (hvf_get_supported_cpuid (0xd ,0 ,R_ECX ) <= x86cpu->env.xsave_buf_len); +hv_vcpu_enable_native_msr (cpu->hvf->fd,MSR_STAR ,1 );hv_vcpu_enable_native_msr (cpu->hvf->fd,MSR_LSTAR ,1 );hv_vcpu_enable_native_msr (cpu->hvf->fd,MSR_CSTAR ,1 );
target/i386/kvm/kvm-cpu.c +30 -0
@@ -122,6 +122,34 @@ static void kvm_cpu_max_instance_init(X86CPU *cpu)kvm_arch_get_supported_cpuid (s,0xC0000000 ,0 ,R_EAX ); } +static void kvm_cpu_xsave_init (void ) +{ +static bool first = true; +KVMState *s = kvm_state; +int i; + +if (!first) { +return ; + } + first = false; + +/* x87 and SSE states are in the legacy region of the XSAVE area. */ + x86_ext_save_areas[XSTATE_FP_BIT ].offset =0 ; + x86_ext_save_areas[XSTATE_SSE_BIT ].offset =0 ; + +for (i =XSTATE_SSE_BIT +1 ; i <XSAVE_STATE_AREA_COUNT ; i++) { +ExtSaveArea *esa = &x86_ext_save_areas[i]; + +if (esa->size) { +int sz =kvm_arch_get_supported_cpuid (s,0xd , i,R_EAX ); +if (sz !=0 ) { +assert (esa->size == sz); + esa->offset =kvm_arch_get_supported_cpuid (s,0xd , i,R_EBX ); + } + } + } +} +static void kvm_cpu_instance_init (CPUState *cs) {X86CPU *cpu =X86_CPU (cs);
@@ -141,6 +169,8 @@ static void kvm_cpu_instance_init(CPUState *cs)if (cpu->max_features) {kvm_cpu_max_instance_init (cpu); } + +kvm_cpu_xsave_init (); }static void kvm_cpu_accel_class_init (ObjectClass *oc,void *data)
target/i386/kvm/kvm.c +7 -0
@@ -1891,6 +1891,13 @@ int kvm_arch_init_vcpu(CPUState *cs) env->xsave_buf_len =sizeof (struct kvm_xsave ); env->xsave_buf =qemu_memalign (4096 , env->xsave_buf_len);memset (env->xsave_buf,0 , env->xsave_buf_len); + +/* +* The allocated storage must be large enough for all of the +* possible XSAVE state components. +*/ +assert (kvm_arch_get_supported_cpuid (kvm_state,0xd ,0 ,R_ECX ) + <= env->xsave_buf_len); } max_nested_state_len =kvm_max_nested_state_length ();
target/i386/tcg/tcg-cpu.c +20 -0
@@ -80,6 +80,24 @@ static void tcg_cpu_class_init(CPUClass *cc) cc->init_accel_cpu = tcg_cpu_init_ops; } +static void tcg_cpu_xsave_init (void ) +{ +#define XO (bit, field) \ + x86_ext_save_areas[bit].offset = offsetof(X86XSaveArea, field); + +XO (XSTATE_FP_BIT , legacy); +XO (XSTATE_SSE_BIT , legacy); +XO (XSTATE_YMM_BIT , avx_state); +XO (XSTATE_BNDREGS_BIT , bndreg_state); +XO (XSTATE_BNDCSR_BIT , bndcsr_state); +XO (XSTATE_OPMASK_BIT , opmask_state); +XO (XSTATE_ZMM_Hi256_BIT, zmm_hi256_state); +XO (XSTATE_Hi16_ZMM_BIT, hi16_zmm_state); +XO (XSTATE_PKRU_BIT , pkru_state); + +#undef XO +} +/* * TCG-specific defaults that override all CPU models when using TCG */
@@ -93,6 +111,8 @@ static void tcg_cpu_instance_init(CPUState *cs)X86CPU *cpu =X86_CPU (cs);/* Special cases not set in the X86CPUDefinition structs: */ x86_cpu_apply_props (cpu, tcg_default_props); + +tcg_cpu_xsave_init (); }static void tcg_cpu_accel_class_init (ObjectClass *oc,void *data)
Signature · 1 line
2.31.1
[PULL 21/40] configure, meson: convert liburing detection to meson
In reply to Paolo Bonzini--- configure | 28 ++++------------------------ meson.build | 9 +++++---- meson_options.txt | 2 ++ 3 files changed, 11 insertions(+), 28 deletions(-)
configure +4 -24
@@ -315,7 +315,7 @@ xen="$default_feature" xen_ctrl_version="$default_feature" xen_pci_passthrough="auto" linux_aio="$default_feature" -linux_io_uring="$default_feature" +linux_io_uring="auto" cap_ng="auto" attr="auto" xfs="$default_feature"
@@ -1205,9 +1205,9 @@ for opt do ;; --enable-linux-aio) linux_aio="yes" ;; - --disable-linux-io-uring) linux_io_uring="no" + --disable-linux-io-uring) linux_io_uring="disabled" ;; - --enable-linux-io-uring) linux_io_uring="yes" + --enable-linux-io-uring) linux_io_uring="enabled" ;; --disable-attr) attr="disabled" ;;
@@ -3334,21 +3334,6 @@ EOF linux_aio=no fi fi -########################################## -# linux-io-uring probe - -if test "$linux_io_uring" != "no" ; then - if $pkg_config liburing; then - linux_io_uring_cflags=$($pkg_config --cflags liburing) - linux_io_uring_libs=$($pkg_config --libs liburing) - linux_io_uring=yes - else - if test "$linux_io_uring" = "yes" ; then - feature_not_found "linux io_uring" "Install liburing devel" - fi - linux_io_uring=no - fi -fi ########################################## # TPM emulation is only on POSIX
@@ -5421,11 +5406,6 @@ fi if test "$linux_aio" = "yes" ; then echo "CONFIG_LINUX_AIO=y" >> $config_host_mak fi -if test "$linux_io_uring" = "yes" ; then - echo "CONFIG_LINUX_IO_URING=y" >> $config_host_mak - echo "LINUX_IO_URING_CFLAGS=$linux_io_uring_cflags" >> $config_host_mak - echo "LINUX_IO_URING_LIBS=$linux_io_uring_libs" >> $config_host_mak -fi if test "$vhost_scsi" = "yes" ; then echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak fi
@@ -6071,7 +6051,7 @@ if test "$skip_meson" = no; then -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ - -Dlibdaxctl=$libdaxctl -Dlibpmem=$libpmem \ + -Dlibdaxctl=$libdaxctl -Dlibpmem=$libpmem -Dlinux_io_uring=$linux_io_uring \ -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ -Dattr=$attr -Ddefault_devices=$default_devices -Dvirglrenderer=$virglrenderer \
meson.build +5 -4
@@ -327,10 +327,11 @@ if have_system or have_tools endif libaio = cc.find_library('aio', required: false) zlib = dependency('zlib', required: true, kwargs: static_kwargs) + linux_io_uring = not_found -if 'CONFIG_LINUX_IO_URING' in config_host - linux_io_uring = declare_dependency(compile_args: config_host['LINUX_IO_URING_CFLAGS'].split(), - link_args: config_host['LINUX_IO_URING_LIBS'].split()) +if not get_option('linux_io_uring').auto() or have_block + linux_io_uring = dependency('liburing', required: get_option('linux_io_uring'), + method: 'pkg-config', kwargs: static_kwargs) endif libxml2 = not_found if 'CONFIG_LIBXML2' in config_host
@@ -2785,7 +2786,7 @@ summary_info += {'brlapi support': brlapi.found()} summary_info += {'vde support': config_host.has_key('CONFIG_VDE')} summary_info += {'netmap support': config_host.has_key('CONFIG_NETMAP')} summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')} -summary_info += {'Linux io_uring support': config_host.has_key('CONFIG_LINUX_IO_URING')} +summary_info += {'Linux io_uring support': linux_io_uring.found()} summary_info += {'ATTR/XATTR support': libattr.found()} summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')} summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')}
meson_options.txt +2 -0
@@ -92,6 +92,8 @@ option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', description: 'libusb support for USB passthrough') +option('linux_io_uring', type : 'feature', value : 'auto', + description: 'Linux io_uring support') option('lzfse', type : 'feature', value : 'auto', description: 'lzfse support for DMG images') option('lzo', type : 'feature', value : 'auto',
Signature · 1 line
2.31.1
[PULL 11/40] target/i386: Pass buffer and length to XSAVE helper
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
In preparation for removing assumptions about XSAVE area offsets, pass a buffer pointer and buffer length to the XSAVE helper functions.
Message-Id: <[email protected]>
--- target/i386/cpu.h | 5 +++-- target/i386/hvf/hvf.c | 3 ++- target/i386/hvf/x86hvf.c | 19 ++++++++----------- target/i386/kvm/kvm.c | 13 +++++++------ target/i386/xsave_helper.c | 17 +++++++++-------- 5 files changed, 29 insertions(+), 28 deletions(-)
target/i386/cpu.h +3 -2
@@ -1667,6 +1667,7 @@ typedef struct CPUX86State {uint64_t apic_bus_freq;#if defined(CONFIG_KVM ) || defined(CONFIG_HVF )void *xsave_buf; +uint32_t xsave_buf_len;#endif #if defined(CONFIG_KVM )struct kvm_nested_state *nested_state;
@@ -2227,8 +2228,8 @@ void x86_cpu_dump_local_apic_state(CPUState *cs, int flags);/* cpu.c */ bool cpu_is_bsp (X86CPU *cpu); -void x86_cpu_xrstor_all_areas (X86CPU *cpu,const X86XSaveArea *buf); -void x86_cpu_xsave_all_areas (X86CPU *cpu,X86XSaveArea *buf); +void x86_cpu_xrstor_all_areas (X86CPU *cpu,const void *buf,uint32_t buflen); +void x86_cpu_xsave_all_areas (X86CPU *cpu,void *buf,uint32_t buflen);void x86_update_hflags (CPUX86State * env);static inline bool hyperv_feat_enabled (X86CPU *cpu,int feat)
target/i386/hvf/hvf.c +2 -1
@@ -267,7 +267,8 @@ int hvf_arch_init_vcpu(CPUState *cpu)wvmcs (cpu->hvf->fd,VMCS_TPR_THRESHOLD ,0 ); x86cpu =X86_CPU (cpu); - x86cpu->env.xsave_buf =qemu_memalign (4096 ,4096 ); + x86cpu->env.xsave_buf_len =4096 ; + x86cpu->env.xsave_buf =qemu_memalign (4096 , x86cpu->env.xsave_buf_len);hv_vcpu_enable_native_msr (cpu->hvf->fd,MSR_STAR ,1 );hv_vcpu_enable_native_msr (cpu->hvf->fd,MSR_LSTAR ,1 );
target/i386/hvf/x86hvf.c +8 -11
@@ -73,14 +73,12 @@ void hvf_get_segment(SegmentCache *qseg, struct vmx_segment *vmx_seg)void hvf_put_xsave (CPUState *cpu_state) { +void *xsave =X86_CPU (cpu_state)->env.xsave_buf; +uint32_t xsave_len =X86_CPU (cpu_state)->env.xsave_buf_len; -struct X86XSaveArea *xsave; +x86_cpu_xsave_all_areas (X86_CPU (cpu_state), xsave, xsave_len); - xsave =X86_CPU (cpu_state)->env.xsave_buf; - -x86_cpu_xsave_all_areas (X86_CPU (cpu_state), xsave); - -if (hv_vcpu_write_fpstate (cpu_state->hvf->fd, (void *)xsave,4096 )) { +if (hv_vcpu_write_fpstate (cpu_state->hvf->fd, xsave, xsave_len)) {abort (); } }
@@ -158,15 +156,14 @@ void hvf_put_msrs(CPUState *cpu_state)void hvf_get_xsave (CPUState *cpu_state) { -struct X86XSaveArea *xsave; +void *xsave =X86_CPU (cpu_state)->env.xsave_buf; +uint32_t xsave_len =X86_CPU (cpu_state)->env.xsave_buf_len; - xsave =X86_CPU (cpu_state)->env.xsave_buf; - -if (hv_vcpu_read_fpstate (cpu_state->hvf->fd, (void *)xsave,4096 )) { +if (hv_vcpu_read_fpstate (cpu_state->hvf->fd, xsave, xsave_len)) {abort (); } -x86_cpu_xrstor_all_areas (X86_CPU (cpu_state), xsave); +x86_cpu_xrstor_all_areas (X86_CPU (cpu_state), xsave, xsave_len); }void hvf_get_segments (CPUState *cpu_state)
target/i386/kvm/kvm.c +7 -6
@@ -1888,8 +1888,9 @@ int kvm_arch_init_vcpu(CPUState *cs) }if (has_xsave) { - env->xsave_buf =qemu_memalign (4096 ,sizeof (struct kvm_xsave )); -memset (env->xsave_buf,0 ,sizeof (struct kvm_xsave )); + env->xsave_buf_len =sizeof (struct kvm_xsave ); + env->xsave_buf =qemu_memalign (4096 , env->xsave_buf_len); +memset (env->xsave_buf,0 , env->xsave_buf_len); } max_nested_state_len =kvm_max_nested_state_length ();
@@ -2469,12 +2470,12 @@ static int kvm_put_fpu(X86CPU *cpu)static int kvm_put_xsave (X86CPU *cpu) {CPUX86State *env = &cpu->env; -X86XSaveArea *xsave = env->xsave_buf; +void *xsave = env->xsave_buf;if (!has_xsave) {return kvm_put_fpu (cpu); } -x86_cpu_xsave_all_areas (cpu, xsave); +x86_cpu_xsave_all_areas (cpu, xsave, env->xsave_buf_len);return kvm_vcpu_ioctl (CPU (cpu),KVM_SET_XSAVE , xsave); }
@@ -3119,7 +3120,7 @@ static int kvm_get_fpu(X86CPU *cpu)static int kvm_get_xsave (X86CPU *cpu) {CPUX86State *env = &cpu->env; -X86XSaveArea *xsave = env->xsave_buf; +void *xsave = env->xsave_buf;int ret;if (!has_xsave) {
@@ -3130,7 +3131,7 @@ static int kvm_get_xsave(X86CPU *cpu)if (ret <0 ) {return ret; } -x86_cpu_xrstor_all_areas (cpu, xsave); +x86_cpu_xrstor_all_areas (cpu, xsave, env->xsave_buf_len);return 0 ; }
target/i386/xsave_helper.c +9 -8
@@ -6,14 +6,16 @@#include "cpu.h" -void x86_cpu_xsave_all_areas (X86CPU *cpu,X86XSaveArea *buf) +void x86_cpu_xsave_all_areas (X86CPU *cpu,void *buf,uint32_t buflen) {CPUX86State *env = &cpu->env;X86XSaveArea *xsave = buf; -uint16_t cwd, swd, twd;int i; -memset (xsave,0 ,sizeof (X86XSaveArea)); + +assert (buflen >=sizeof (*xsave)); + +memset (xsave,0 , buflen); twd =0 ; swd = env->fpus & ~(7 <<11 ); swd |= (env->fpstt &7 ) <<11 ;
@@ -56,17 +58,17 @@ void x86_cpu_xsave_all_areas(X86CPU *cpu, X86XSaveArea *buf) 16 * sizeof env->xmm_regs[16]);memcpy (&xsave->pkru_state, &env->pkru,sizeof env->pkru);#endif - } -void x86_cpu_xrstor_all_areas (X86CPU *cpu,const X86XSaveArea *buf) +void x86_cpu_xrstor_all_areas (X86CPU *cpu,const void *buf,uint32_t buflen) { -CPUX86State *env = &cpu->env;const X86XSaveArea *xsave = buf; -int i;uint16_t cwd, swd, twd; + +assert (buflen >=sizeof (*xsave)); + cwd = xsave->legacy.fcw; swd = xsave->legacy.fsw; twd = xsave->legacy.ftw;
@@ -108,5 +110,4 @@ void x86_cpu_xrstor_all_areas(X86CPU *cpu, const X86XSaveArea *buf) 16 * sizeof env->xmm_regs[16]);memcpy (&env->pkru, &xsave->pkru_state,sizeof env->pkru);#endif - }
Signature · 1 line
2.31.1
[PULL 10/40] target/i386: Clarify the padding requirements of X86XSaveArea
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
Replace the hard-coded size of offsets or structure elements with defined constants or sizeof().
Message-Id: <[email protected]>
--- target/i386/cpu.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
target/i386/cpu.h +7 -1
@@ -1329,7 +1329,13 @@ typedef struct X86XSaveArea {/* AVX State: */ XSaveAVX avx_state; -uint8_t padding[960 -576 -sizeof (XSaveAVX)]; + +/* Ensure that XSaveBNDREG is properly aligned. */ +uint8_t padding[XSAVE_BNDREG_OFFSET + -sizeof (X86LegacyXSaveArea) + -sizeof (X86XSaveHeader) + -sizeof (XSaveAVX)]; +/* MPX State: */ XSaveBNDREG bndreg_state;XSaveBNDCSR bndcsr_state;
Signature · 1 line
2.31.1
[PULL 17/40] configure, meson: convert vte detection to meson
In reply to Paolo Bonzini--- configure | 29 ++++------------------------- meson.build | 16 ++++++++++------ meson_options.txt | 2 ++ 3 files changed, 16 insertions(+), 31 deletions(-)
configure +4 -25
@@ -408,7 +408,7 @@ gnutls="auto" nettle="auto" gcrypt="auto" auth_pam="auto" -vte="$default_feature" +vte="auto" virglrenderer="$default_feature" tpm="$default_feature" libssh="$default_feature"
@@ -1395,9 +1395,9 @@ for opt do ;; --disable-pvrdma) pvrdma="no" ;; - --disable-vte) vte="no" + --disable-vte) vte="disabled" ;; - --enable-vte) vte="yes" + --enable-vte) vte="enabled" ;; --disable-virglrenderer) virglrenderer="no" ;;
@@ -2799,22 +2799,6 @@ EOF fi fi -########################################## -# VTE probe - -if test "$vte" != "no"; then - if $pkg_config --exists "vte-2.91"; then - vte_cflags=$($pkg_config --cflags vte-2.91) - vte_libs=$($pkg_config --libs vte-2.91) - vteversion=$($pkg_config --modversion vte-2.91) - vte="yes" - elif test "$vte" = "yes"; then - feature_not_found "vte" "Install libvte-2.91 devel" - else - vte="no" - fi -fi - ########################################## # RDMA needs OpenFabrics libraries if test "$rdma" != "no" ; then
@@ -5482,11 +5466,6 @@ fi if test "$have_copy_file_range" = "yes" ; then echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak fi -if test "$vte" = "yes" ; then - echo "CONFIG_VTE=y" >> $config_host_mak - echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak - echo "VTE_LIBS=$vte_libs" >> $config_host_mak -fi if test "$virglrenderer" = "yes" ; then echo "CONFIG_VIRGL=y" >> $config_host_mak echo "VIRGL_CFLAGS=$virgl_cflags" >> $config_host_mak
@@ -6149,7 +6128,7 @@ if test "$skip_meson" = no; then -Dkvm=$kvm -Dhax=$hax -Dwhpx=$whpx -Dhvf=$hvf -Dnvmm=$nvmm \ -Dxen=$xen -Dxen_pci_passthrough=$xen_pci_passthrough -Dtcg=$tcg \ -Dcocoa=$cocoa -Dgtk=$gtk -Dmpath=$mpath -Dsdl=$sdl -Dsdl_image=$sdl_image \ - -Dlibusb=$libusb -Dsmartcard=$smartcard -Dusb_redir=$usb_redir \ + -Dlibusb=$libusb -Dsmartcard=$smartcard -Dusb_redir=$usb_redir -Dvte=$vte \ -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \ -Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f -Dvirtiofsd=$virtiofsd \ -Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \
meson.build +10 -6
@@ -860,6 +860,7 @@ endif gtk = not_found gtkx11 = not_found +vte = not_found if not get_option('gtk').auto() or (have_system and not cocoa.found()) gtk = dependency('gtk+-3.0', version: '>=3.22.0', method: 'pkg-config',
@@ -871,14 +872,16 @@ if not get_option('gtk').auto() or (have_system and not cocoa.found()) required: false, kwargs: static_kwargs) gtk = declare_dependency(dependencies: [gtk, gtkx11]) + + if not get_option('vte').auto() or have_system + vte = dependency('vte-2.91', + method: 'pkg-config', + required: get_option('vte'), + kwargs: static_kwargs) + endif endif endif -vte = not_found -if 'CONFIG_VTE' in config_host - vte = declare_dependency(compile_args: config_host['VTE_CFLAGS'].split(), - link_args: config_host['VTE_LIBS'].split()) -endif x11 = not_found if gtkx11.found() x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found(),
@@ -1208,6 +1211,7 @@ if glusterfs.found() config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT', glusterfs_iocb_has_stat) endif config_host_data.set('CONFIG_GTK', gtk.found()) +config_host_data.set('CONFIG_VTE', vte.found()) config_host_data.set('CONFIG_LIBATTR', have_old_libattr) config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found()) config_host_data.set('CONFIG_EBPF', libbpf.found())
@@ -2756,7 +2760,7 @@ summary_info += {'SDL image support': sdl_image.found()} summary_info += {'GTK support': gtk.found()} summary_info += {'pixman': pixman.found()} # TODO: add back version -summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')} +summary_info += {'VTE support': vte.found()} # TODO: add back version summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt} summary_info += {'libtasn1': tasn1.found()}
meson_options.txt +2 -0
@@ -118,6 +118,8 @@ option('vnc_png', type : 'feature', value : 'auto', description: 'PNG compression for VNC server') option('vnc_sasl', type : 'feature', value : 'auto', description: 'SASL authentication for VNC server') +option('vte', type : 'feature', value : 'auto', + description: 'vte support for the gtk UI') option('xkbcommon', type : 'feature', value : 'auto', description: 'xkbcommon support') option('zstd', type : 'feature', value : 'auto',
Signature · 1 line
2.31.1
[PULL 25/40] configure, meson: move CONFIG_IVSHMEM to meson
In reply to Paolo BonziniThis is a duplicate of CONFIG_EVENTFD, handle it directly in meson.build.
--- configure | 8 -------- docs/devel/kconfig.rst | 2 +- meson.build | 5 +++-- 3 files changed, 4 insertions(+), 11 deletions(-)
configure +0 -8
@@ -5037,11 +5037,6 @@ if test "$mingw32" = "yes" ; then done fi -# We can only support ivshmem if we have eventfd -if [ "$eventfd" = "yes" ]; then - ivshmem=yes -fi - # Probe for guest agent support/options if [ "$guest_agent" != "no" ]; then
@@ -5639,9 +5634,6 @@ fi if test "$have_getrandom" = "yes" ; then echo "CONFIG_GETRANDOM=y" >> $config_host_mak fi -if test "$ivshmem" = "yes" ; then - echo "CONFIG_IVSHMEM=y" >> $config_host_mak -fi if test "$debug_mutex" = "yes" ; then echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak fi
docs/devel/kconfig.rst +1 -1
@@ -303,5 +303,5 @@ variable:: host_kconfig = \ ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \ ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \ - ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=y'] : []) + \ + (have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \ ...
meson.build +3 -2
@@ -1335,10 +1335,11 @@ if link_language == 'cpp' } endif +have_ivshmem = config_host.has_key('CONFIG_EVENTFD') host_kconfig = \ ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \ ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \ - ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=y'] : []) + \ + (have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \ ('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=y'] : []) + \ (x11.found() ? ['CONFIG_X11=y'] : []) + \ ('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=y'] : []) + \
@@ -2489,7 +2490,7 @@ if have_tools install: true) endif - if 'CONFIG_IVSHMEM' in config_host + if have_ivshmem subdir('contrib/ivshmem-client') subdir('contrib/ivshmem-server') endif
Signature · 1 line
2.31.1
[PULL 13/40] target/i386: Observe XSAVE state area offsets
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
Rather than relying on the X86XSaveArea structure definition directly, the routines that manipulate the XSAVE state area should observe the offsets declared in the x86_ext_save_areas array.
Currently the offsets declared in the array are derived from the structure definition, resulting in no functional change.
Message-Id: <[email protected]>
--- target/i386/xsave_helper.c | 262 ++++++++++++++++++++++++++++--------- 1 file changed, 200 insertions(+), 62 deletions(-)
target/i386/xsave_helper.c +200 -62
@@ -9,13 +9,20 @@void x86_cpu_xsave_all_areas (X86CPU *cpu,void *buf,uint32_t buflen) {CPUX86State *env = &cpu->env; -X86XSaveArea *xsave = buf; -uint16_t cwd, swd, twd; +const ExtSaveArea *e, *f;int i; -assert (buflen >=sizeof (*xsave)); +X86LegacyXSaveArea *legacy; +X86XSaveHeader *header; +uint16_t cwd, swd, twd; + +memset (buf,0 , buflen); + + e = &x86_ext_save_areas[XSTATE_FP_BIT ]; + + legacy = buf + e->offset; + header = buf + e->offset +sizeof (*legacy); -memset (xsave,0 , buflen); twd =0 ; swd = env->fpus & ~(7 <<11 ); swd |= (env->fpstt &7 ) <<11 ;
@@ -23,91 +30,222 @@ void x86_cpu_xsave_all_areas(X86CPU *cpu, void *buf, uint32_t buflen)for (i =0 ; i <8 ; ++i) { twd |= (!env->fptags[i]) << i; } - xsave->legacy.fcw = cwd; - xsave->legacy.fsw = swd; - xsave->legacy.ftw = twd; - xsave->legacy.fpop = env->fpop; - xsave->legacy.fpip = env->fpip; - xsave->legacy.fpdp = env->fpdp; -memcpy (&xsave->legacy.fpregs, env->fpregs, -sizeof env->fpregs); - xsave->legacy.mxcsr = env->mxcsr; - xsave->header.xstate_bv = env->xstate_bv; -memcpy (&xsave->bndreg_state.bnd_regs, env->bnd_regs, -sizeof env->bnd_regs); - xsave->bndcsr_state.bndcsr = env->bndcs_regs; -memcpy (&xsave->opmask_state.opmask_regs, env->opmask_regs, -sizeof env->opmask_regs); + legacy->fcw = cwd; + legacy->fsw = swd; + legacy->ftw = twd; + legacy->fpop = env->fpop; + legacy->fpip = env->fpip; + legacy->fpdp = env->fpdp; +memcpy (&legacy->fpregs, env->fpregs, +sizeof (env->fpregs)); + legacy->mxcsr = env->mxcsr;for (i =0 ; i <CPU_NB_REGS ; i++) { -uint8_t *xmm = xsave->legacy.xmm_regs[i]; -uint8_t *ymmh = xsave->avx_state.ymmh[i]; -uint8_t *zmmh = xsave->zmm_hi256_state.zmm_hi256[i]; +uint8_t *xmm = legacy->xmm_regs[i]; +stq_p (xmm, env->xmm_regs[i].ZMM_Q (0 )); -stq_p (xmm+8 , env->xmm_regs[i].ZMM_Q (1 )); -stq_p (ymmh, env->xmm_regs[i].ZMM_Q (2 )); -stq_p (ymmh+8 , env->xmm_regs[i].ZMM_Q (3 )); -stq_p (zmmh, env->xmm_regs[i].ZMM_Q (4 )); -stq_p (zmmh+8 , env->xmm_regs[i].ZMM_Q (5 )); -stq_p (zmmh+16 , env->xmm_regs[i].ZMM_Q (6 )); -stq_p (zmmh+24 , env->xmm_regs[i].ZMM_Q (7 )); +stq_p (xmm +8 , env->xmm_regs[i].ZMM_Q (1 )); + } + + header->xstate_bv = env->xstate_bv; + + e = &x86_ext_save_areas[XSTATE_YMM_BIT ]; +if (e->size && e->offset) { +XSaveAVX *avx; + + avx = buf + e->offset; + +for (i =0 ; i <CPU_NB_REGS ; i++) { +uint8_t *ymmh = avx->ymmh[i]; + +stq_p (ymmh, env->xmm_regs[i].ZMM_Q (2 )); +stq_p (ymmh +8 , env->xmm_regs[i].ZMM_Q (3 )); + } + } + + e = &x86_ext_save_areas[XSTATE_BNDREGS_BIT ]; +if (e->size && e->offset) { +XSaveBNDREG *bndreg; +XSaveBNDCSR *bndcsr; + + f = &x86_ext_save_areas[XSTATE_BNDCSR_BIT ]; +assert (f->size); +assert (f->offset); + + bndreg = buf + e->offset; + bndcsr = buf + f->offset; + +memcpy (&bndreg->bnd_regs, env->bnd_regs, +sizeof (env->bnd_regs)); + bndcsr->bndcsr = env->bndcs_regs; + } + + e = &x86_ext_save_areas[XSTATE_OPMASK_BIT ]; +if (e->size && e->offset) { +XSaveOpmask *opmask; +XSaveZMM_Hi256 *zmm_hi256; +#ifdef TARGET_X86_64 +XSaveHi16_ZMM *hi16_zmm; +#endif + + f = &x86_ext_save_areas[XSTATE_ZMM_Hi256_BIT]; +assert (f->size); +assert (f->offset); + + opmask = buf + e->offset; + zmm_hi256 = buf + f->offset; + +memcpy (&opmask->opmask_regs, env->opmask_regs, +sizeof (env->opmask_regs)); + +for (i =0 ; i <CPU_NB_REGS ; i++) { +uint8_t *zmmh = zmm_hi256->zmm_hi256[i]; + +stq_p (zmmh, env->xmm_regs[i].ZMM_Q (4 )); +stq_p (zmmh +8 , env->xmm_regs[i].ZMM_Q (5 )); +stq_p (zmmh +16 , env->xmm_regs[i].ZMM_Q (6 )); +stq_p (zmmh +24 , env->xmm_regs[i].ZMM_Q (7 )); + } + +#ifdef TARGET_X86_64 + f = &x86_ext_save_areas[XSTATE_Hi16_ZMM_BIT]; +assert (f->size); +assert (f->offset); + + hi16_zmm = buf + f->offset; + +memcpy (&hi16_zmm->hi16_zmm, &env->xmm_regs[16 ], +16 *sizeof (env->xmm_regs[16 ])); +#endif }#ifdef TARGET_X86_64 -memcpy (&xsave->hi16_zmm_state.hi16_zmm, &env->xmm_regs[16 ], -16 *sizeof env->xmm_regs[16 ]); -memcpy (&xsave->pkru_state, &env->pkru,sizeof env->pkru); + e = &x86_ext_save_areas[XSTATE_PKRU_BIT ]; +if (e->size && e->offset) { +XSavePKRU *pkru = buf + e->offset; + +memcpy (pkru, &env->pkru,sizeof (env->pkru)); + }#endif }void x86_cpu_xrstor_all_areas (X86CPU *cpu,const void *buf,uint32_t buflen) {CPUX86State *env = &cpu->env; -const X86XSaveArea *xsave = buf; +const ExtSaveArea *e, *f, *g;int i; + +const X86LegacyXSaveArea *legacy; +const X86XSaveHeader *header;uint16_t cwd, swd, twd; -assert (buflen >=sizeof (*xsave)); + e = &x86_ext_save_areas[XSTATE_FP_BIT ]; - cwd = xsave->legacy.fcw; - swd = xsave->legacy.fsw; - twd = xsave->legacy.ftw; - env->fpop = xsave->legacy.fpop; + legacy = buf + e->offset; + header = buf + e->offset +sizeof (*legacy); + + cwd = legacy->fcw; + swd = legacy->fsw; + twd = legacy->ftw; + env->fpop = legacy->fpop; env->fpstt = (swd >>11 ) &7 ; env->fpus = swd; env->fpuc = cwd;for (i =0 ; i <8 ; ++i) { env->fptags[i] = !((twd >> i) &1 ); } - env->fpip = xsave->legacy.fpip; - env->fpdp = xsave->legacy.fpdp; - env->mxcsr = xsave->legacy.mxcsr; -memcpy (env->fpregs, &xsave->legacy.fpregs, -sizeof env->fpregs); - env->xstate_bv = xsave->header.xstate_bv; -memcpy (env->bnd_regs, &xsave->bndreg_state.bnd_regs, -sizeof env->bnd_regs); - env->bndcs_regs = xsave->bndcsr_state.bndcsr; -memcpy (env->opmask_regs, &xsave->opmask_state.opmask_regs, -sizeof env->opmask_regs); + env->fpip = legacy->fpip; + env->fpdp = legacy->fpdp; + env->mxcsr = legacy->mxcsr; +memcpy (env->fpregs, &legacy->fpregs, +sizeof (env->fpregs));for (i =0 ; i <CPU_NB_REGS ; i++) { -const uint8_t *xmm = xsave->legacy.xmm_regs[i]; -const uint8_t *ymmh = xsave->avx_state.ymmh[i]; -const uint8_t *zmmh = xsave->zmm_hi256_state.zmm_hi256[i]; +const uint8_t *xmm = legacy->xmm_regs[i]; + env->xmm_regs[i].ZMM_Q (0 ) =ldq_p (xmm); - env->xmm_regs[i].ZMM_Q (1 ) =ldq_p (xmm+8 ); - env->xmm_regs[i].ZMM_Q (2 ) =ldq_p (ymmh); - env->xmm_regs[i].ZMM_Q (3 ) =ldq_p (ymmh+8 ); - env->xmm_regs[i].ZMM_Q (4 ) =ldq_p (zmmh); - env->xmm_regs[i].ZMM_Q (5 ) =ldq_p (zmmh+8 ); - env->xmm_regs[i].ZMM_Q (6 ) =ldq_p (zmmh+16 ); - env->xmm_regs[i].ZMM_Q (7 ) =ldq_p (zmmh+24 ); + env->xmm_regs[i].ZMM_Q (1 ) =ldq_p (xmm +8 ); + } + + env->xstate_bv = header->xstate_bv; + + e = &x86_ext_save_areas[XSTATE_YMM_BIT ]; +if (e->size && e->offset) { +const XSaveAVX *avx; + + avx = buf + e->offset; +for (i =0 ; i <CPU_NB_REGS ; i++) { +const uint8_t *ymmh = avx->ymmh[i]; + + env->xmm_regs[i].ZMM_Q (2 ) =ldq_p (ymmh); + env->xmm_regs[i].ZMM_Q (3 ) =ldq_p (ymmh +8 ); + } + } + + e = &x86_ext_save_areas[XSTATE_BNDREGS_BIT ]; +if (e->size && e->offset) { +const XSaveBNDREG *bndreg; +const XSaveBNDCSR *bndcsr; + + f = &x86_ext_save_areas[XSTATE_BNDCSR_BIT ]; +assert (f->size); +assert (f->offset); + + bndreg = buf + e->offset; + bndcsr = buf + f->offset; + +memcpy (env->bnd_regs, &bndreg->bnd_regs, +sizeof (env->bnd_regs)); + env->bndcs_regs = bndcsr->bndcsr; + } + + e = &x86_ext_save_areas[XSTATE_OPMASK_BIT ]; +if (e->size && e->offset) { +const XSaveOpmask *opmask; +const XSaveZMM_Hi256 *zmm_hi256; +#ifdef TARGET_X86_64 +const XSaveHi16_ZMM *hi16_zmm; +#endif + + f = &x86_ext_save_areas[XSTATE_ZMM_Hi256_BIT]; +assert (f->size); +assert (f->offset); + + g = &x86_ext_save_areas[XSTATE_Hi16_ZMM_BIT]; +assert (g->size); +assert (g->offset); + + opmask = buf + e->offset; + zmm_hi256 = buf + f->offset; +#ifdef TARGET_X86_64 + hi16_zmm = buf + g->offset; +#endif + +memcpy (env->opmask_regs, &opmask->opmask_regs, +sizeof (env->opmask_regs)); + +for (i =0 ; i <CPU_NB_REGS ; i++) { +const uint8_t *zmmh = zmm_hi256->zmm_hi256[i]; + + env->xmm_regs[i].ZMM_Q (4 ) =ldq_p (zmmh); + env->xmm_regs[i].ZMM_Q (5 ) =ldq_p (zmmh +8 ); + env->xmm_regs[i].ZMM_Q (6 ) =ldq_p (zmmh +16 ); + env->xmm_regs[i].ZMM_Q (7 ) =ldq_p (zmmh +24 ); + } + +#ifdef TARGET_X86_64 +memcpy (&env->xmm_regs[16 ], &hi16_zmm->hi16_zmm, +16 *sizeof (env->xmm_regs[16 ])); +#endif }#ifdef TARGET_X86_64 -memcpy (&env->xmm_regs[16 ], &xsave->hi16_zmm_state.hi16_zmm, -16 *sizeof env->xmm_regs[16 ]); -memcpy (&env->pkru, &xsave->pkru_state,sizeof env->pkru); + e = &x86_ext_save_areas[XSTATE_PKRU_BIT ]; +if (e->size && e->offset) { +const XSavePKRU *pkru; + + pkru = buf + e->offset; +memcpy (&env->pkru, pkru,sizeof (env->pkru)); + }#endif }
Signature · 1 line
2.31.1
[PULL 08/40] target/i386: Declare constants for XSAVE offsets
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
Declare and use manifest constants for the XSAVE state component offsets.
Message-Id: <[email protected]>
--- target/i386/cpu.h | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
target/i386/cpu.h +23 -7
@@ -1305,6 +1305,22 @@ typedef struct XSavePKRU {uint32_t padding; } XSavePKRU; +#define XSAVE_FCW_FSW_OFFSET 0x000 +#define XSAVE_FTW_FOP_OFFSET 0x004 +#define XSAVE_CWD_RIP_OFFSET 0x008 +#define XSAVE_CWD_RDP_OFFSET 0x010 +#define XSAVE_MXCSR_OFFSET 0x018 +#define XSAVE_ST_SPACE_OFFSET 0x020 +#define XSAVE_XMM_SPACE_OFFSET 0x0a0 +#define XSAVE_XSTATE_BV_OFFSET 0x200 +#define XSAVE_AVX_OFFSET 0x240 +#define XSAVE_BNDREG_OFFSET 0x3c0 +#define XSAVE_BNDCSR_OFFSET 0x400 +#define XSAVE_OPMASK_OFFSET 0x440 +#define XSAVE_ZMM_HI256_OFFSET 0x480 +#define XSAVE_HI16_ZMM_OFFSET 0x680 +#define XSAVE_PKRU_OFFSET 0xa80 + typedef struct X86XSaveArea { X86LegacyXSaveArea legacy; X86XSaveHeader header;
@@ -1325,19 +1341,19 @@ typedef struct X86XSaveArea {XSavePKRU pkru_state; } X86XSaveArea; -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , avx_state) !=0x240 ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , avx_state) !=XSAVE_AVX_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveAVX) !=0x100 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndreg_state) !=0x3c0 ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndreg_state) !=XSAVE_BNDREG_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveBNDREG) !=0x40 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndcsr_state) !=0x400 ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndcsr_state) !=XSAVE_BNDCSR_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveBNDCSR) !=0x40 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , opmask_state) !=0x440 ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , opmask_state) !=XSAVE_OPMASK_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveOpmask) !=0x40 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , zmm_hi256_state) !=0x480 ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , zmm_hi256_state) !=XSAVE_ZMM_HI256_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveZMM_Hi256) !=0x200 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , hi16_zmm_state) !=0x680 ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , hi16_zmm_state) !=XSAVE_HI16_ZMM_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSaveHi16_ZMM) !=0x400 ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , pkru_state) !=0xA80 ); +QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , pkru_state) !=XSAVE_PKRU_OFFSET );QEMU_BUILD_BUG_ON (sizeof (XSavePKRU) !=0x8 ); typedef enum TPRAccess {
Signature · 1 line
2.31.1
[PULL 15/40] target/i386: Move X86XSaveArea into TCG
In reply to Paolo BonziniFrom: David Edmondson <[email protected]>
Given that TCG is now the only consumer of X86XSaveArea, move the structure definition and associated offset declarations and checks to a TCG specific header.
Message-Id: <[email protected]>
--- target/i386/cpu.h | 57 ------------------------------------ target/i386/tcg/fpu_helper.c | 1 + target/i386/tcg/tcg-cpu.h | 57 ++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 57 deletions(-)
target/i386/cpu.h +0 -57
@@ -1305,48 +1305,6 @@ typedef struct XSavePKRU {uint32_t padding; } XSavePKRU; -#define XSAVE_FCW_FSW_OFFSET 0x000 -#define XSAVE_FTW_FOP_OFFSET 0x004 -#define XSAVE_CWD_RIP_OFFSET 0x008 -#define XSAVE_CWD_RDP_OFFSET 0x010 -#define XSAVE_MXCSR_OFFSET 0x018 -#define XSAVE_ST_SPACE_OFFSET 0x020 -#define XSAVE_XMM_SPACE_OFFSET 0x0a0 -#define XSAVE_XSTATE_BV_OFFSET 0x200 -#define XSAVE_AVX_OFFSET 0x240 -#define XSAVE_BNDREG_OFFSET 0x3c0 -#define XSAVE_BNDCSR_OFFSET 0x400 -#define XSAVE_OPMASK_OFFSET 0x440 -#define XSAVE_ZMM_HI256_OFFSET 0x480 -#define XSAVE_HI16_ZMM_OFFSET 0x680 -#define XSAVE_PKRU_OFFSET 0xa80 - -typedef struct X86XSaveArea { -X86LegacyXSaveArea legacy; -X86XSaveHeader header; - -/* Extended save areas: */ - -/* AVX State: */ -XSaveAVX avx_state; - -/* Ensure that XSaveBNDREG is properly aligned. */ -uint8_t padding[XSAVE_BNDREG_OFFSET - -sizeof (X86LegacyXSaveArea) - -sizeof (X86XSaveHeader) - -sizeof (XSaveAVX)]; - -/* MPX State: */ -XSaveBNDREG bndreg_state; -XSaveBNDCSR bndcsr_state; -/* AVX-512 State: */ -XSaveOpmask opmask_state; -XSaveZMM_Hi256 zmm_hi256_state; -XSaveHi16_ZMM hi16_zmm_state; -/* PKRU State: */ -XSavePKRU pkru_state; -}X86XSaveArea ; -QEMU_BUILD_BUG_ON (sizeof (XSaveAVX) !=0x100 );QEMU_BUILD_BUG_ON (sizeof (XSaveBNDREG) !=0x40 );QEMU_BUILD_BUG_ON (sizeof (XSaveBNDCSR) !=0x40 );
@@ -1355,21 +1313,6 @@ QEMU_BUILD_BUG_ON(sizeof(XSaveZMM_Hi256) != 0x200);QEMU_BUILD_BUG_ON (sizeof (XSaveHi16_ZMM) !=0x400 );QEMU_BUILD_BUG_ON (sizeof (XSavePKRU) !=0x8 ); -QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fcw) != XSAVE_FCW_FSW_OFFSET); -QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.ftw) != XSAVE_FTW_FOP_OFFSET); -QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fpip) != XSAVE_CWD_RIP_OFFSET); -QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fpdp) != XSAVE_CWD_RDP_OFFSET); -QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.mxcsr) != XSAVE_MXCSR_OFFSET); -QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.fpregs) != XSAVE_ST_SPACE_OFFSET); -QEMU_BUILD_BUG_ON(offsetof(X86XSaveArea, legacy.xmm_regs) != XSAVE_XMM_SPACE_OFFSET); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , avx_state) !=XSAVE_AVX_OFFSET ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndreg_state) !=XSAVE_BNDREG_OFFSET ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , bndcsr_state) !=XSAVE_BNDCSR_OFFSET ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , opmask_state) !=XSAVE_OPMASK_OFFSET ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , zmm_hi256_state) !=XSAVE_ZMM_HI256_OFFSET ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , hi16_zmm_state) !=XSAVE_HI16_ZMM_OFFSET ); -QEMU_BUILD_BUG_ON (offsetof(X86XSaveArea , pkru_state) !=XSAVE_PKRU_OFFSET ); - typedef struct ExtSaveArea { uint32_t feature, bits; uint32_t offset, size;
target/i386/tcg/fpu_helper.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include <math.h> #include "cpu.h" +#include "tcg-cpu.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" #include "fpu/softfloat-macros.h"
target/i386/tcg/tcg-cpu.h +57 -0
63 lines not on this page · raw message
Signature · 1 line
2.31.1
[PULL 24/40] meson: store dependency('threads') in a variable
In reply to Paolo BonziniIt can be useful for has_function checks.
--- meson.build | 3 ++- util/meson.build | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)
meson.build +2 -1
@@ -164,6 +164,7 @@ endif multiprocess_allowed = targetos == 'linux' and not get_option('multiprocess').disabled() libm = cc.find_library('m', required: false) +threads = dependency('threads') util = cc.find_library('util', required: false) winmm = [] socket = []
@@ -1999,7 +2000,7 @@ util_ss.add_all(trace_ss) util_ss = util_ss.apply(config_all, strict: false) libqemuutil = static_library('qemuutil', sources: util_ss.sources() + stub_ss.sources() + genh, - dependencies: [util_ss.dependencies(), libm, glib, socket, malloc, pixman]) + dependencies: [util_ss.dependencies(), libm, threads, glib, socket, malloc, pixman]) qemuutil = declare_dependency(link_with: libqemuutil, sources: genh + version_res)
util/meson.build +0 -1
@@ -1,4 +1,3 @@ -util_ss.add(dependency('threads')) util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c')) util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c'))
Signature · 1 line
2.31.1
[PULL 18/40] configure, meson: convert virgl detection to meson
In reply to Paolo Bonzini--- configure | 35 ++++------------------------------- hw/display/meson.build | 6 +++--- meson.build | 10 ++++++---- meson_options.txt | 2 ++ 4 files changed, 15 insertions(+), 38 deletions(-)
configure +4 -31
@@ -409,7 +409,7 @@ nettle="auto" gcrypt="auto" auth_pam="auto" vte="auto" -virglrenderer="$default_feature" +virglrenderer="auto" tpm="$default_feature" libssh="$default_feature" live_block_migration=${default_feature:-yes}
@@ -1399,9 +1399,9 @@ for opt do ;; --enable-vte) vte="enabled" ;; - --disable-virglrenderer) virglrenderer="no" + --disable-virglrenderer) virglrenderer="disabled" ;; - --enable-virglrenderer) virglrenderer="yes" + --enable-virglrenderer) virglrenderer="enabled" ;; --disable-tpm) tpm="no" ;;
@@ -4036,28 +4036,6 @@ EOF fi fi -########################################## -# virgl renderer probe - -if test "$virglrenderer" != "no" ; then - cat > $TMPC << EOF -#include <virglrenderer.h> -int main(void) { virgl_renderer_poll(); return 0; } -EOF - virgl_cflags=$($pkg_config --cflags virglrenderer 2>/dev/null) - virgl_libs=$($pkg_config --libs virglrenderer 2>/dev/null) - virgl_version=$($pkg_config --modversion virglrenderer 2>/dev/null) - if $pkg_config virglrenderer >/dev/null 2>&1 && \ - compile_prog "$virgl_cflags" "$virgl_libs" ; then - virglrenderer="yes" - else - if test "$virglrenderer" = "yes" ; then - feature_not_found "virglrenderer" - fi - virglrenderer="no" - fi -fi - ########################################## # capstone
@@ -5466,11 +5444,6 @@ fi if test "$have_copy_file_range" = "yes" ; then echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak fi -if test "$virglrenderer" = "yes" ; then - echo "CONFIG_VIRGL=y" >> $config_host_mak - echo "VIRGL_CFLAGS=$virgl_cflags" >> $config_host_mak - echo "VIRGL_LIBS=$virgl_libs" >> $config_host_mak -fi if test "$xen" = "enabled" ; then echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
@@ -6137,7 +6110,7 @@ if test "$skip_meson" = no; then -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ - -Dattr=$attr -Ddefault_devices=$default_devices \ + -Dattr=$attr -Ddefault_devices=$default_devices -Dvirglrenderer=$virglrenderer \ -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \ -Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \ -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi -Dbpf=$bpf\
hw/display/meson.build +3 -3
@@ -61,7 +61,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU') hw_display_modules += {'virtio-gpu': virtio_gpu_ss} virtio_gpu_gl_ss = ss.source_set() - virtio_gpu_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRGL', opengl], + virtio_gpu_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', virgl, opengl], if_true: [files('virtio-gpu-gl.c', 'virtio-gpu-virgl.c'), pixman, virgl]) hw_display_modules += {'virtio-gpu-gl': virtio_gpu_gl_ss} endif
@@ -75,7 +75,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_PCI') hw_display_modules += {'virtio-gpu-pci': virtio_gpu_pci_ss} virtio_gpu_pci_gl_ss = ss.source_set() - virtio_gpu_pci_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI', 'CONFIG_VIRGL', opengl], + virtio_gpu_pci_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI', virgl, opengl], if_true: [files('virtio-gpu-pci-gl.c'), pixman]) hw_display_modules += {'virtio-gpu-pci-gl': virtio_gpu_pci_gl_ss} endif
@@ -89,7 +89,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA') hw_display_modules += {'virtio-vga': virtio_vga_ss} virtio_vga_gl_ss = ss.source_set() - virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', 'CONFIG_VIRGL', opengl], + virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl], if_true: [files('virtio-vga-gl.c'), pixman]) hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss} endif
meson.build +6 -4
@@ -471,9 +471,11 @@ if 'CONFIG_GBM' in config_host link_args: config_host['GBM_LIBS'].split()) endif virgl = not_found -if 'CONFIG_VIRGL' in config_host - virgl = declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].split(), - link_args: config_host['VIRGL_LIBS'].split()) +if not get_option('virglrenderer').auto() or have_system + virgl = dependency('virglrenderer', + method: 'pkg-config', + required: get_option('virglrenderer'), + kwargs: static_kwargs) endif curl = not_found if not get_option('curl').auto() or have_block
@@ -2768,7 +2770,7 @@ summary_info += {'PAM': pam.found()} summary_info += {'iconv support': iconv.found()} summary_info += {'curses support': curses.found()} # TODO: add back version -summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')} +summary_info += {'virgl support': virgl.found()} summary_info += {'curl support': curl.found()} summary_info += {'Multipath support': mpathpersist.found()} summary_info += {'VNC support': vnc.found()}
meson_options.txt +2 -0
@@ -110,6 +110,8 @@ option('u2f', type : 'feature', value : 'auto', description: 'U2F emulation support') option('usb_redir', type : 'feature', value : 'auto', description: 'libusbredir support') +option('virglrenderer', type : 'feature', value : 'auto', + description: 'virgl rendering support') option('vnc', type : 'feature', value : 'enabled', description: 'VNC server') option('vnc_jpeg', type : 'feature', value : 'auto',
Signature · 1 line
2.31.1
[PULL 26/40] configure: convert HAVE_BROKEN_SIZE_MAX to meson
In reply to Paolo Bonzini--- configure | 17 ----------------- meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 17 deletions(-)
configure +0 -17
@@ -2375,20 +2375,6 @@ if test "$softmmu" = "no"; then audio_drv_list="" fi -########################################## -# Some versions of Mac OS X incorrectly define SIZE_MAX -cat > $TMPC << EOF -#include <stdint.h> -#include <stdio.h> -int main(int argc, char *argv[]) { - return printf("%zu", SIZE_MAX); -} -EOF -have_broken_size_max=no -if ! compile_object -Werror ; then - have_broken_size_max=yes -fi - ########################################## # L2TPV3 probe
@@ -5360,9 +5346,6 @@ if test "$gdbus_codegen" != "" ; then echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak fi echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak -if test "$have_broken_size_max" = "yes" ; then - echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak -fi if test "$have_openpty" = "yes" ; then echo "HAVE_OPENPTY=y" >> $config_host_mak fi
meson.build +9 -0
@@ -1268,6 +1268,15 @@ config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>')) +# Some versions of Mac OS X incorrectly define SIZE_MAX +config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles(''' + #include <stdint.h> + #include <stdio.h> + int main(int argc, char *argv[]) { + return printf("%zu", SIZE_MAX); + }''', args: ['-Werror'])) + + ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST'] strings = ['HOST_DSOSUF', 'CONFIG_IASL']
Signature · 1 line
2.31.1
[PULL 30/40] configure: convert compiler tests to meson, part 4
In reply to Paolo BonziniAnd remove them from the summary, since now their outcome is verbosely included in the meson output.
--- configure | 137 ---------------------------------------------------- meson.build | 39 +++++++++++++-- 2 files changed, 34 insertions(+), 142 deletions(-)
configure +0 -137
@@ -3511,59 +3511,6 @@ elif test "$jemalloc" = "yes" ; then malloc=jemalloc fi -########################################## -# signalfd probe -signalfd="no" -cat > $TMPC << EOF -#include <unistd.h> -#include <sys/syscall.h> -#include <signal.h> -int main(void) { return syscall(SYS_signalfd, -1, NULL, _NSIG / 8); } -EOF - -if compile_prog "" "" ; then - signalfd=yes -fi - -# check if optreset global is declared by <getopt.h> -optreset="no" -cat > $TMPC << EOF -#include <getopt.h> -int main(void) { return optreset; } -EOF - -if compile_prog "" "" ; then - optreset=yes -fi - -# check if eventfd is supported -eventfd=no -cat > $TMPC << EOF -#include <sys/eventfd.h> - -int main(void) -{ - return eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); -} -EOF -if compile_prog "" "" ; then - eventfd=yes -fi - -# check if memfd is supported -memfd=no -cat > $TMPC << EOF -#include <sys/mman.h> - -int main(void) -{ - return memfd_create("foo", MFD_ALLOW_SEALING); -} -EOF -if compile_prog "" "" ; then - memfd=yes -fi - # check for usbfs have_usbfs=no if test "$linux_user" = "yes"; then
@@ -3711,66 +3658,6 @@ case "$capstone" in ;; esac -########################################## -# check if we have fdatasync - -fdatasync=no -cat > $TMPC << EOF -#include <unistd.h> -int main(void) { -#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0 -return fdatasync(0); -#else -#error Not supported -#endif -} -EOF -if compile_prog "" "" ; then - fdatasync=yes -fi - -########################################## -# check if we have madvise - -madvise=no -cat > $TMPC << EOF -#include <sys/types.h> -#include <sys/mman.h> -#include <stddef.h> -int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } -EOF -if compile_prog "" "" ; then - madvise=yes -fi - -########################################## -# check if we have posix_madvise - -posix_madvise=no -cat > $TMPC << EOF -#include <sys/mman.h> -#include <stddef.h> -int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } -EOF -if compile_prog "" "" ; then - posix_madvise=yes -fi - -########################################## -# check if we have posix_memalign() - -posix_memalign=no -cat > $TMPC << EOF -#include <stdlib.h> -int main(void) { - void *p; - return posix_memalign(&p, 8, 8); -} -EOF -if compile_prog "" "" ; then - posix_memalign=yes -fi - ########################################## # check if we have posix_syslog
@@ -4842,12 +4729,6 @@ fi if test "$splice" = "yes" ; then echo "CONFIG_SPLICE=y" >> $config_host_mak fi -if test "$eventfd" = "yes" ; then - echo "CONFIG_EVENTFD=y" >> $config_host_mak -fi -if test "$memfd" = "yes" ; then - echo "CONFIG_MEMFD=y" >> $config_host_mak -fi if test "$have_usbfs" = "yes" ; then echo "CONFIG_USBFS=y" >> $config_host_mak fi
@@ -4922,27 +4803,9 @@ fi if test "$membarrier" = "yes" ; then echo "CONFIG_MEMBARRIER=y" >> $config_host_mak fi -if test "$signalfd" = "yes" ; then - echo "CONFIG_SIGNALFD=y" >> $config_host_mak -fi -if test "$optreset" = "yes" ; then - echo "HAVE_OPTRESET=y" >> $config_host_mak -fi if test "$tcg" = "enabled" -a "$tcg_interpreter" = "true" ; then echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak fi -if test "$fdatasync" = "yes" ; then - echo "CONFIG_FDATASYNC=y" >> $config_host_mak -fi -if test "$madvise" = "yes" ; then - echo "CONFIG_MADVISE=y" >> $config_host_mak -fi -if test "$posix_madvise" = "yes" ; then - echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak -fi -if test "$posix_memalign" = "yes" ; then - echo "CONFIG_POSIX_MEMALIGN=y" >> $config_host_mak -fi if test "$spice_protocol" = "yes" ; then echo "CONFIG_SPICE_PROTOCOL=y" >> $config_host_mak
meson.build +34 -5
@@ -1272,6 +1272,7 @@ config_host_data.set('CONFIG_CLOCK_ADJTIME', cc.has_function('clock_adjtime')) config_host_data.set('CONFIG_DUP3', cc.has_function('dup3')) config_host_data.set('CONFIG_FALLOCATE', cc.has_function('fallocate')) config_host_data.set('CONFIG_POSIX_FALLOCATE', cc.has_function('posix_fallocate')) +config_host_data.set('CONFIG_POSIX_MEMALIGN', cc.has_function('posix_memalign')) config_host_data.set('CONFIG_PPOLL', cc.has_function('ppoll')) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>')) config_host_data.set('CONFIG_SEM_TIMEDWAIT', cc.has_function('sem_timedwait', dependencies: threads))
@@ -1311,6 +1312,8 @@ config_host_data.set('CONFIG_RTNETLINK', cc.has_header_symbol('linux/rtnetlink.h', 'IFLA_PROTO_DOWN')) config_host_data.set('CONFIG_SYSMACROS', cc.has_header_symbol('sys/sysmacros.h', 'makedev')) +config_host_data.set('HAVE_OPTRESET', + cc.has_header_symbol('getopt.h', 'optreset')) config_host_data.set('HAVE_UTMPX', cc.has_header_symbol('utmpx.h', 'struct utmpx'))
@@ -1322,6 +1325,36 @@ config_host_data.set('HAVE_STRUCT_STAT_ST_ATIM', cc.has_member('struct stat', 'st_atim', prefix: '#include <sys/stat.h>')) +config_host_data.set('CONFIG_EVENTFD', cc.compiles(''' + #include <sys/eventfd.h> + int main(void) { return eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); }''')) +config_host_data.set('CONFIG_FDATASYNC', cc.compiles(gnu_source_prefix + ''' + #include <unistd.h> + int main(void) { + #if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0 + return fdatasync(0); + #else + #error Not supported + #endif + }''')) +config_host_data.set('CONFIG_MADVISE', cc.compiles(gnu_source_prefix + ''' + #include <sys/types.h> + #include <sys/mman.h> + #include <stddef.h> + int main(void) { return madvise(NULL, 0, MADV_DONTNEED); }''')) +config_host_data.set('CONFIG_MEMFD', cc.compiles(gnu_source_prefix + ''' + #include <sys/mman.h> + int main(void) { return memfd_create("foo", MFD_ALLOW_SEALING); }''')) +config_host_data.set('CONFIG_POSIX_MADVISE', cc.compiles(gnu_source_prefix + ''' + #include <sys/mman.h> + #include <stddef.h> + int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); }''')) +config_host_data.set('CONFIG_SIGNALFD', cc.compiles(gnu_source_prefix + ''' + #include <unistd.h> + #include <sys/syscall.h> + #include <signal.h> + int main(void) { return syscall(SYS_signalfd, -1, NULL, _NSIG / 8); }''')) + # Some versions of Mac OS X incorrectly define SIZE_MAX config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles(''' #include <stdint.h>
@@ -1398,7 +1431,7 @@ if link_language == 'cpp' } endif -have_ivshmem = config_host.has_key('CONFIG_EVENTFD') +have_ivshmem = config_host_data.get('CONFIG_EVENTFD') host_kconfig = \ ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \ ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
@@ -2711,10 +2744,6 @@ summary_info += {'PIE': get_option('b_pie')} summary_info += {'static build': config_host.has_key('CONFIG_STATIC')} summary_info += {'malloc trim support': has_malloc_trim} summary_info += {'membarrier': config_host.has_key('CONFIG_MEMBARRIER')} -summary_info += {'fdatasync': config_host.has_key('CONFIG_FDATASYNC')} -summary_info += {'madvise': config_host.has_key('CONFIG_MADVISE')} -summary_info += {'posix_madvise': config_host.has_key('CONFIG_POSIX_MADVISE')} -summary_info += {'posix_memalign': config_host.has_key('CONFIG_POSIX_MEMALIGN')} summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')} summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')} summary_info += {'memory allocator': get_option('malloc')}
Signature · 1 line
2.31.1
[PULL 28/40] configure: convert compiler tests to meson, part 2
In reply to Paolo Bonzini--- configure | 49 ------------------------------------------------- meson.build | 5 +++++ 2 files changed, 5 insertions(+), 49 deletions(-)
configure +0 -49
@@ -3783,46 +3783,6 @@ if compile_prog "" "" ; then posix_syslog=yes fi -########################################## -# check if we have sem_timedwait - -sem_timedwait=no -cat > $TMPC << EOF -#include <semaphore.h> -int main(void) { sem_t s; struct timespec t = {0}; return sem_timedwait(&s, &t); } -EOF -if compile_prog "" "" ; then - sem_timedwait=yes -fi - -########################################## -# check if we have strchrnul - -strchrnul=no -cat > $TMPC << EOF -#include <string.h> -int main(void); -// Use a haystack that the compiler shouldn't be able to constant fold -char *haystack = (char*)&main; -int main(void) { return strchrnul(haystack, 'x') != &haystack[6]; } -EOF -if compile_prog "" "" ; then - strchrnul=yes -fi - -######################################### -# check if we have st_atim - -st_atim=no -cat > $TMPC << EOF -#include <sys/stat.h> -#include <stddef.h> -int main(void) { return offsetof(struct stat, st_atim); } -EOF -if compile_prog "" "" ; then - st_atim=yes -fi - ########################################## # check if trace backend exists
@@ -4967,15 +4927,6 @@ fi if test "$inotify1" = "yes" ; then echo "CONFIG_INOTIFY1=y" >> $config_host_mak fi -if test "$sem_timedwait" = "yes" ; then - echo "CONFIG_SEM_TIMEDWAIT=y" >> $config_host_mak -fi -if test "$strchrnul" = "yes" ; then - echo "HAVE_STRCHRNUL=y" >> $config_host_mak -fi -if test "$st_atim" = "yes" ; then - echo "HAVE_STRUCT_STAT_ST_ATIM=y" >> $config_host_mak -fi if test "$gio" = "yes" ; then echo "CONFIG_GIO=y" >> $config_host_mak echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak
meson.build +5 -0
@@ -1274,12 +1274,14 @@ config_host_data.set('CONFIG_FALLOCATE', cc.has_function('fallocate')) config_host_data.set('CONFIG_POSIX_FALLOCATE', cc.has_function('posix_fallocate')) config_host_data.set('CONFIG_PPOLL', cc.has_function('ppoll')) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>')) +config_host_data.set('CONFIG_SEM_TIMEDWAIT', cc.has_function('sem_timedwait', dependencies: threads)) config_host_data.set('CONFIG_SENDFILE', cc.has_function('sendfile')) config_host_data.set('CONFIG_SETNS', cc.has_function('setns') and cc.has_function('unshare')) config_host_data.set('CONFIG_SYNCFS', cc.has_function('syncfs')) config_host_data.set('CONFIG_SYNC_FILE_RANGE', cc.has_function('sync_file_range')) config_host_data.set('CONFIG_TIMERFD', cc.has_function('timerfd_create')) config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util)) +config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>')) # has_header_symbol
@@ -1306,6 +1308,9 @@ config_host_data.set('CONFIG_PRCTL_PR_SET_TIMERSLACK', config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', cc.has_member('struct sigevent', 'sigev_notify_thread_id', prefix: '#include <signal.h>')) +config_host_data.set('HAVE_STRUCT_STAT_ST_ATIM', + cc.has_member('struct stat', 'st_atim', + prefix: '#include <sys/stat.h>')) # Some versions of Mac OS X incorrectly define SIZE_MAX config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
Signature · 1 line
2.31.1
[PULL 20/40] configure, meson: convert libpmem detection to meson
In reply to Paolo Bonzini--- configure | 24 ++++-------------------- meson.build | 8 ++++---- meson_options.txt | 2 ++ 3 files changed, 10 insertions(+), 24 deletions(-)
configure +4 -20
@@ -427,7 +427,7 @@ qed=${default_feature:-yes} parallels=${default_feature:-yes} libxml2="$default_feature" debug_mutex="no" -libpmem="$default_feature" +libpmem="auto" default_devices="true" plugins="no" fuzzing="no"
@@ -1504,9 +1504,9 @@ for opt do ;; --disable-debug-mutex) debug_mutex=no ;; - --enable-libpmem) libpmem=yes + --enable-libpmem) libpmem=disabled ;; - --disable-libpmem) libpmem=no + --disable-libpmem) libpmem=enabled ;; --enable-xkbcommon) xkbcommon="enabled" ;;
@@ -4933,22 +4933,6 @@ EOF fi fi -########################################## -# check for libpmem - -if test "$libpmem" != "no"; then - if $pkg_config --exists "libpmem"; then - libpmem="yes" - libpmem_libs=$($pkg_config --libs libpmem) - libpmem_cflags=$($pkg_config --cflags libpmem) - else - if test "$libpmem" = "yes" ; then - feature_not_found "libpmem" "Install nvml or pmdk" - fi - libpmem="no" - fi -fi - ########################################## # check for slirp
@@ -6087,7 +6071,7 @@ if test "$skip_meson" = no; then -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ - -Dlibdaxctl=$libdaxctl \ + -Dlibdaxctl=$libdaxctl -Dlibpmem=$libpmem \ -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ -Dattr=$attr -Ddefault_devices=$default_devices -Dvirglrenderer=$virglrenderer \
meson.build +4 -4
@@ -1006,9 +1006,9 @@ if not get_option('libusb').auto() or have_system endif libpmem = not_found -if 'CONFIG_LIBPMEM' in config_host - libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(), - link_args: config_host['LIBPMEM_LIBS'].split()) +if not get_option('libpmem').auto() or have_system + libpmem = dependency('libpmem', required: get_option('libpmem'), + method: 'pkg-config', kwargs: static_kwargs) endif libdaxctl = not_found if not get_option('libdaxctl').auto() or have_system
@@ -2822,7 +2822,7 @@ summary_info += {'zstd support': zstd.found()} summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')} summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')} summary_info += {'capstone': capstone_opt == 'disabled' ? false : capstone_opt} -summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')} +summary_info += {'libpmem support': libpmem.found()} summary_info += {'libdaxctl support': libdaxctl.found()} summary_info += {'libudev': libudev.found()} summary_info += {'FUSE lseek': fuse_lseek.found()}
meson_options.txt +2 -0
@@ -86,6 +86,8 @@ option('gcrypt', type : 'feature', value : 'auto', description: 'libgcrypt cryptography support') option('libdaxctl', type : 'feature', value : 'auto', description: 'libdaxctl support') +option('libpmem', type : 'feature', value : 'auto', + description: 'libpmem support') option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto',
Signature · 1 line
2.31.1
[PULL 31/40] configure: convert compiler tests to meson, part 5
In reply to Paolo Bonzini--- configure | 101 ---------------------------------------------------- meson.build | 26 ++++++++++++++ 2 files changed, 26 insertions(+), 101 deletions(-)
configure +0 -101
@@ -3395,92 +3395,6 @@ EOF fi fi -# Check for inotify functions when we are building linux-user -# emulator. This is done because older glibc versions don't -# have syscall stubs for these implemented. In that case we -# don't provide them even if kernel supports them. -# -inotify=no -cat > $TMPC << EOF -#include <sys/inotify.h> - -int -main(void) -{ - /* try to start inotify */ - return inotify_init(); -} -EOF -if compile_prog "" "" ; then - inotify=yes -fi - -inotify1=no -cat > $TMPC << EOF -#include <sys/inotify.h> - -int -main(void) -{ - /* try to start inotify */ - return inotify_init1(0); -} -EOF -if compile_prog "" "" ; then - inotify1=yes -fi - -# check if pipe2 is there -pipe2=no -cat > $TMPC << EOF -#include <unistd.h> -#include <fcntl.h> - -int main(void) -{ - int pipefd[2]; - return pipe2(pipefd, O_CLOEXEC); -} -EOF -if compile_prog "" "" ; then - pipe2=yes -fi - -# check if accept4 is there -accept4=no -cat > $TMPC << EOF -#include <sys/socket.h> -#include <stddef.h> - -int main(void) -{ - accept4(0, NULL, NULL, SOCK_CLOEXEC); - return 0; -} -EOF -if compile_prog "" "" ; then - accept4=yes -fi - -# check if tee/splice is there. vmsplice was added same time. -splice=no -cat > $TMPC << EOF -#include <unistd.h> -#include <fcntl.h> -#include <limits.h> - -int main(void) -{ - int len, fd = 0; - len = tee(STDIN_FILENO, STDOUT_FILENO, INT_MAX, SPLICE_F_NONBLOCK); - splice(STDIN_FILENO, NULL, fd, NULL, len, SPLICE_F_MOVE); - return 0; -} -EOF -if compile_prog "" "" ; then - splice=yes -fi - ########################################## # libnuma probe
@@ -4720,24 +4634,9 @@ fi if test "$module_upgrades" = "yes"; then echo "CONFIG_MODULE_UPGRADES=y" >> $config_host_mak fi -if test "$pipe2" = "yes" ; then - echo "CONFIG_PIPE2=y" >> $config_host_mak -fi -if test "$accept4" = "yes" ; then - echo "CONFIG_ACCEPT4=y" >> $config_host_mak -fi -if test "$splice" = "yes" ; then - echo "CONFIG_SPLICE=y" >> $config_host_mak -fi if test "$have_usbfs" = "yes" ; then echo "CONFIG_USBFS=y" >> $config_host_mak fi -if test "$inotify" = "yes" ; then - echo "CONFIG_INOTIFY=y" >> $config_host_mak -fi -if test "$inotify1" = "yes" ; then - echo "CONFIG_INOTIFY1=y" >> $config_host_mak -fi if test "$gio" = "yes" ; then echo "CONFIG_GIO=y" >> $config_host_mak echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak
meson.build +26 -0
@@ -1268,6 +1268,7 @@ config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) # has_function +config_host_data.set('CONFIG_ACCEPT4', cc.has_function('accept4')) config_host_data.set('CONFIG_CLOCK_ADJTIME', cc.has_function('clock_adjtime')) config_host_data.set('CONFIG_DUP3', cc.has_function('dup3')) config_host_data.set('CONFIG_FALLOCATE', cc.has_function('fallocate'))
@@ -1302,6 +1303,10 @@ config_host_data.set('CONFIG_FIEMAP', config_host_data.set('CONFIG_GETRANDOM', cc.has_function('getrandom') and cc.has_header_symbol('sys/random.h', 'GRND_NONBLOCK')) +config_host_data.set('CONFIG_INOTIFY', + cc.has_header_symbol('sys/inotify.h', 'inotify_init')) +config_host_data.set('CONFIG_INOTIFY1', + cc.has_header_symbol('sys/inotify.h', 'inotify_init1')) config_host_data.set('CONFIG_MACHINE_BSWAP_H', cc.has_header_symbol('machine/bswap.h', 'bswap32', prefix: '''#include <sys/endian.h>
@@ -1345,6 +1350,15 @@ config_host_data.set('CONFIG_MADVISE', cc.compiles(gnu_source_prefix + ''' config_host_data.set('CONFIG_MEMFD', cc.compiles(gnu_source_prefix + ''' #include <sys/mman.h> int main(void) { return memfd_create("foo", MFD_ALLOW_SEALING); }''')) +config_host_data.set('CONFIG_PIPE2', cc.compiles(gnu_source_prefix + ''' + #include <unistd.h> + #include <fcntl.h> + + int main(void) + { + int pipefd[2]; + return pipe2(pipefd, O_CLOEXEC); + }''')) config_host_data.set('CONFIG_POSIX_MADVISE', cc.compiles(gnu_source_prefix + ''' #include <sys/mman.h> #include <stddef.h>
@@ -1354,6 +1368,18 @@ config_host_data.set('CONFIG_SIGNALFD', cc.compiles(gnu_source_prefix + ''' #include <sys/syscall.h> #include <signal.h> int main(void) { return syscall(SYS_signalfd, -1, NULL, _NSIG / 8); }''')) +config_host_data.set('CONFIG_SPLICE', cc.compiles(gnu_source_prefix + ''' + #include <unistd.h> + #include <fcntl.h> + #include <limits.h> + + int main(void) + { + int len, fd = 0; + len = tee(STDIN_FILENO, STDOUT_FILENO, INT_MAX, SPLICE_F_NONBLOCK); + splice(STDIN_FILENO, NULL, fd, NULL, len, SPLICE_F_MOVE); + return 0; + }''')) # Some versions of Mac OS X incorrectly define SIZE_MAX config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
Signature · 1 line
2.31.1
[PULL 39/40] Set icon for QEMU binary on Mac OS
In reply to Paolo BonziniFrom: John Arbuckle <[email protected]>
Before switching the build system over to Meson, an icon was added to the QEMU binary on Mac OS. This patch adds back that feature; it piggybacks on the existing scripts/entitlement.sh, which already does in-place changes to the executable on Darwin.
Message-Id: <[email protected]>
--- meson.build | 15 ++++++++++----- scripts/entitlement.sh | 10 +++++++++- 2 files changed, 19 insertions(+), 6 deletions(-)
meson.build +10 -5
@@ -2507,8 +2507,7 @@ foreach target : target_dirs endif foreach exe: execs exe_name = exe['name'] - exe_sign = 'CONFIG_HVF' in config_target - if exe_sign + if targetos == 'darwin' exe_name += '-unsigned' endif
@@ -2522,7 +2521,13 @@ foreach target : target_dirs link_args: link_args, gui_app: exe['gui']) - if exe_sign + if 'CONFIG_HVF' in config_target + entitlements = meson.current_source_dir() / 'accel/hvf/entitlements.plist' + else + entitlements = '/dev/null' + endif + if targetos == 'darwin' + icon = meson.current_source_dir() / 'pc-bios/qemu.rsrc' emulators += {exe['name'] : custom_target(exe['name'], depends: emulator, output: exe['name'],
@@ -2530,14 +2535,14 @@ foreach target : target_dirs meson.current_source_dir() / 'scripts/entitlement.sh', meson.current_build_dir() / exe_name, meson.current_build_dir() / exe['name'], - meson.current_source_dir() / 'accel/hvf/entitlements.plist' + entitlements, icon ]) } meson.add_install_script('scripts/entitlement.sh', '--install', get_option('bindir') / exe_name, get_option('bindir') / exe['name'], - meson.current_source_dir() / 'accel/hvf/entitlements.plist') + entitlements, icon) else emulators += {exe['name']: emulator} endif
scripts/entitlement.sh +9 -1
@@ -11,6 +11,7 @@ fi SRC="$1" DST="$2" ENTITLEMENT="$3" +ICON="$4" if $in_place; then trap 'rm "$DST.tmp"' exit
@@ -20,6 +21,13 @@ else cd "$MESON_INSTALL_DESTDIR_PREFIX" fi -codesign --entitlements "$ENTITLEMENT" --force -s - "$SRC" +if test "$ENTITLEMENT" != '/dev/null'; then + codesign --entitlements "$ENTITLEMENT" --force -s - "$SRC" +fi + +# Add the QEMU icon to the binary on Mac OS +Rez -append "$ICON" -o "$SRC" +SetFile -a C "$SRC" + mv -f "$SRC" "$DST" trap '' exit
Signature · 1 line
2.31.1
[PULL 23/40] meson: sort existing compiler tests
In reply to Paolo BonziniThe next patches will add more compiler tests. Sort and group the existing tests, keeping similar cc.has_* tests together and sorting them alphabetically by macro name. This should make it easier to look for examples when adding new tests to meson.build.
--- meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
meson.build +6 -3
@@ -1253,16 +1253,19 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0] config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1]) config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]) +config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) + +# has_header config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.h')) config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) +config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) -config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>')) -config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) -config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) +# has_function config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>')) +config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>')) ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
Signature · 1 line
2.31.1
[PULL 35/40] keyval: introduce keyval_parse_into
In reply to Paolo BonziniAllow parsing multiple keyval sequences into the same dictionary. This will be used to simplify the parsing of the -M command line option, which is currently a .merge_lists = true QemuOpts group.
--- include/qemu/option.h | 2 ++ util/keyval.c | 43 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-)
include/qemu/option.h +2 -0
@@ -147,6 +147,8 @@ void qemu_opts_print_help(QemuOptsList *list, bool print_caption);void qemu_opts_free (QemuOptsList *list);QemuOptsList *qemu_opts_append (QemuOptsList *dst,QemuOptsList *list); +QDict *keyval_parse_into (QDict *qdict,const char *params,const char *implied_key, +bool *p_help,Error **errp);QDict *keyval_parse (const char *params,const char *implied_key,bool *help,Error **errp);void keyval_merge (QDict *old,const QDict *new,Error **errp);
util/keyval.c +35 -8
70 lines not on this page · raw message
Signature · 1 line
2.31.1
[PULL 38/40] qemu-option: remove now-dead code
In reply to Paolo Bonzini-M was the sole user of qemu_opts_set and qemu_opts_set_defaults, remove them and the arguments that they used.
--- include/qemu/option.h | 3 --- tests/unit/test-qemu-opts.c | 35 ------------------------- util/qemu-option.c | 51 ++++++++----------------------------- 3 files changed, 10 insertions(+), 79 deletions(-)
include/qemu/option.h +0 -3
@@ -119,7 +119,6 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, int fail_if_exists, Error **errp);void qemu_opts_reset (QemuOptsList *list);void qemu_opts_loc_restore (QemuOpts *opts); -bool qemu_opts_set (QemuOptsList *list,const char *name,const char *value,Error **errp);const char *qemu_opts_id (QemuOpts *opts);void qemu_opts_set_id (QemuOpts *opts,char *id);void qemu_opts_del (QemuOpts *opts);
@@ -130,8 +129,6 @@ QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, const char *params, bool permit_abbrev);QemuOpts *qemu_opts_parse (QemuOptsList *list,const char *params,bool permit_abbrev,Error **errp); -void qemu_opts_set_defaults (QemuOptsList *list,const char *params, -int permit_abbrev);QemuOpts *qemu_opts_from_qdict (QemuOptsList *list,const QDict *qdict,Error **errp); QDict *qemu_opts_to_qdict_filtered(QemuOpts *opts, QDict *qdict,
tests/unit/test-qemu-opts.c +0 -35
@@ -410,40 +410,6 @@ static void test_qemu_opts_reset(void)g_assert (opts ==NULL ); } -static void test_qemu_opts_set (void ) -{ -QemuOptsList *list; -QemuOpts *opts; -const char *opt; - - list =qemu_find_opts ("opts_list_04" ); -g_assert (list !=NULL ); -g_assert (QTAILQ_EMPTY (&list->head)); - g_assert_cmpstr(list->name, ==, "opts_list_04"); - -/* should not find anything at this point */ - opts =qemu_opts_find (list,NULL ); -g_assert (opts ==NULL ); - -/* implicitly create opts and set str3 value */ -qemu_opts_set (list,"str3" ,"value" , &error_abort); -g_assert (!QTAILQ_EMPTY (&list->head)); - -/* get the just created opts */ - opts =qemu_opts_find (list,NULL ); -g_assert (opts !=NULL ); - -/* check the str3 value */ - opt =qemu_opt_get (opts,"str3" ); - g_assert_cmpstr(opt, ==, "value"); - -qemu_opts_del (opts); - -/* should not find anything at this point */ - opts =qemu_opts_find (list,NULL ); -g_assert (opts ==NULL ); -} -static int opts_count_iter (void *opaque,const char *name,const char *value,Error **errp) {
@@ -1041,7 +1007,6 @@ int main(int argc, char *argv[])g_test_add_func ("/qemu-opts/opt_get_size" , test_qemu_opt_get_size);g_test_add_func ("/qemu-opts/opt_unset" , test_qemu_opt_unset);g_test_add_func ("/qemu-opts/opts_reset" , test_qemu_opts_reset); -g_test_add_func ("/qemu-opts/opts_set" , test_qemu_opts_set);g_test_add_func ("/qemu-opts/opts_parse/general" , test_opts_parse);g_test_add_func ("/qemu-opts/opts_parse/bool" , test_opts_parse_bool);g_test_add_func ("/qemu-opts/opts_parse/number" , test_opts_parse_number);
util/qemu-option.c +10 -41
126 lines not on this page · raw message
Signature · 1 line
2.31.1
[PULL 27/40] configure: convert compiler tests to meson, part 1
In reply to Paolo Bonzini--- configure | 364 ----------------------------------------------- meson.build | 41 +++++- util/meson.build | 4 +- 3 files changed, 43 insertions(+), 366 deletions(-)
configure +0 -364
@@ -3588,297 +3588,6 @@ EOF fi fi -# check for fallocate -fallocate=no -cat > $TMPC << EOF -#include <fcntl.h> - -int main(void) -{ - fallocate(0, 0, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - fallocate=yes -fi - -# check for fallocate hole punching -fallocate_punch_hole=no -cat > $TMPC << EOF -#include <fcntl.h> -#include <linux/falloc.h> - -int main(void) -{ - fallocate(0, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - fallocate_punch_hole=yes -fi - -# check that fallocate supports range zeroing inside the file -fallocate_zero_range=no -cat > $TMPC << EOF -#include <fcntl.h> -#include <linux/falloc.h> - -int main(void) -{ - fallocate(0, FALLOC_FL_ZERO_RANGE, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - fallocate_zero_range=yes -fi - -# check for posix_fallocate -posix_fallocate=no -cat > $TMPC << EOF -#include <fcntl.h> - -int main(void) -{ - posix_fallocate(0, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - posix_fallocate=yes -fi - -# check for sync_file_range -sync_file_range=no -cat > $TMPC << EOF -#include <fcntl.h> - -int main(void) -{ - sync_file_range(0, 0, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - sync_file_range=yes -fi - -# check for linux/fiemap.h and FS_IOC_FIEMAP -fiemap=no -cat > $TMPC << EOF -#include <sys/ioctl.h> -#include <linux/fs.h> -#include <linux/fiemap.h> - -int main(void) -{ - ioctl(0, FS_IOC_FIEMAP, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - fiemap=yes -fi - -# check for dup3 -dup3=no -cat > $TMPC << EOF -#include <unistd.h> - -int main(void) -{ - dup3(0, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - dup3=yes -fi - -# check for ppoll support -ppoll=no -cat > $TMPC << EOF -#include <poll.h> - -int main(void) -{ - struct pollfd pfd = { .fd = 0, .events = 0, .revents = 0 }; - ppoll(&pfd, 1, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - ppoll=yes -fi - -# check for prctl(PR_SET_TIMERSLACK , ... ) support -prctl_pr_set_timerslack=no -cat > $TMPC << EOF -#include <sys/prctl.h> - -int main(void) -{ - prctl(PR_SET_TIMERSLACK, 1, 0, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - prctl_pr_set_timerslack=yes -fi - -# check for epoll support -epoll=no -cat > $TMPC << EOF -#include <sys/epoll.h> - -int main(void) -{ - epoll_create(0); - return 0; -} -EOF -if compile_prog "" "" ; then - epoll=yes -fi - -# epoll_create1 is a later addition -# so we must check separately for its presence -epoll_create1=no -cat > $TMPC << EOF -#include <sys/epoll.h> - -int main(void) -{ - /* Note that we use epoll_create1 as a value, not as - * a function being called. This is necessary so that on - * old SPARC glibc versions where the function was present in - * the library but not declared in the header file we will - * fail the configure check. (Otherwise we will get a compiler - * warning but not an error, and will proceed to fail the - * qemu compile where we compile with -Werror.) - */ - return (int)(uintptr_t)&epoll_create1; -} -EOF -if compile_prog "" "" ; then - epoll_create1=yes -fi - -# check for sendfile support -sendfile=no -cat > $TMPC << EOF -#include <sys/sendfile.h> - -int main(void) -{ - return sendfile(0, 0, 0, 0); -} -EOF -if compile_prog "" "" ; then - sendfile=yes -fi - -# check for timerfd support (glibc 2.8 and newer) -timerfd=no -cat > $TMPC << EOF -#include <sys/timerfd.h> - -int main(void) -{ - return(timerfd_create(CLOCK_REALTIME, 0)); -} -EOF -if compile_prog "" "" ; then - timerfd=yes -fi - -# check for setns and unshare support -setns=no -cat > $TMPC << EOF -#include <sched.h> - -int main(void) -{ - int ret; - ret = setns(0, 0); - ret = unshare(0); - return ret; -} -EOF -if compile_prog "" "" ; then - setns=yes -fi - -# clock_adjtime probe -clock_adjtime=no -cat > $TMPC <<EOF -#include <time.h> -#include <sys/timex.h> - -int main(void) -{ - return clock_adjtime(0, 0); -} -EOF -clock_adjtime=no -if compile_prog "" "" ; then - clock_adjtime=yes -fi - -# syncfs probe -syncfs=no -cat > $TMPC <<EOF -#include <unistd.h> - -int main(void) -{ - return syncfs(0); -} -EOF -syncfs=no -if compile_prog "" "" ; then - syncfs=yes -fi - -# Search for bswap_32 function -byteswap_h=no -cat > $TMPC << EOF -#include <byteswap.h> -int main(void) { return bswap_32(0); } -EOF -if compile_prog "" "" ; then - byteswap_h=yes -fi - -# Search for bswap32 function -bswap_h=no -cat > $TMPC << EOF -#include <sys/endian.h> -#include <sys/types.h> -#include <machine/bswap.h> -int main(void) { return bswap32(0); } -EOF -if compile_prog "" "" ; then - bswap_h=yes -fi - -# Check whether we have openpty() in either libc or libutil -cat > $TMPC << EOF -extern int openpty(int *am, int *as, char *name, void *termp, void *winp); -int main(void) { return openpty(0, 0, 0, 0, 0); } -EOF - -have_openpty="no" -if compile_prog "" "" ; then - have_openpty="yes" -else - if compile_prog "" "-lutil" ; then - have_openpty="yes" - fi -fi - ########################################## # spice probe if test "$spice_protocol" != "no" ; then
@@ -4114,19 +3823,6 @@ if compile_prog "" "" ; then st_atim=yes fi -########################################## -# check if we have sigev_notify_thread_id - -sigev_notify_thread_id=no -cat > $TMPC << EOF -#include <stddef.h> -#include <signal.h> -int main(void) { return offsetof(struct sigevent, sigev_notify_thread_id); } -EOF -if compile_prog "" "" ; then - sigev_notify_thread_id=yes -fi - ########################################## # check if trace backend exists
@@ -5265,54 +4961,6 @@ fi if test "$have_usbfs" = "yes" ; then echo "CONFIG_USBFS=y" >> $config_host_mak fi -if test "$fallocate" = "yes" ; then - echo "CONFIG_FALLOCATE=y" >> $config_host_mak -fi -if test "$fallocate_punch_hole" = "yes" ; then - echo "CONFIG_FALLOCATE_PUNCH_HOLE=y" >> $config_host_mak -fi -if test "$fallocate_zero_range" = "yes" ; then - echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak -fi -if test "$posix_fallocate" = "yes" ; then - echo "CONFIG_POSIX_FALLOCATE=y" >> $config_host_mak -fi -if test "$sync_file_range" = "yes" ; then - echo "CONFIG_SYNC_FILE_RANGE=y" >> $config_host_mak -fi -if test "$fiemap" = "yes" ; then - echo "CONFIG_FIEMAP=y" >> $config_host_mak -fi -if test "$dup3" = "yes" ; then - echo "CONFIG_DUP3=y" >> $config_host_mak -fi -if test "$ppoll" = "yes" ; then - echo "CONFIG_PPOLL=y" >> $config_host_mak -fi -if test "$prctl_pr_set_timerslack" = "yes" ; then - echo "CONFIG_PRCTL_PR_SET_TIMERSLACK=y" >> $config_host_mak -fi -if test "$epoll" = "yes" ; then - echo "CONFIG_EPOLL=y" >> $config_host_mak -fi -if test "$epoll_create1" = "yes" ; then - echo "CONFIG_EPOLL_CREATE1=y" >> $config_host_mak -fi -if test "$sendfile" = "yes" ; then - echo "CONFIG_SENDFILE=y" >> $config_host_mak -fi -if test "$timerfd" = "yes" ; then - echo "CONFIG_TIMERFD=y" >> $config_host_mak -fi -if test "$setns" = "yes" ; then - echo "CONFIG_SETNS=y" >> $config_host_mak -fi -if test "$clock_adjtime" = "yes" ; then - echo "CONFIG_CLOCK_ADJTIME=y" >> $config_host_mak -fi -if test "$syncfs" = "yes" ; then - echo "CONFIG_SYNCFS=y" >> $config_host_mak -fi if test "$inotify" = "yes" ; then echo "CONFIG_INOTIFY=y" >> $config_host_mak fi
@@ -5328,15 +4976,6 @@ fi if test "$st_atim" = "yes" ; then echo "HAVE_STRUCT_STAT_ST_ATIM=y" >> $config_host_mak fi -if test "$sigev_notify_thread_id" = "yes" ; then - echo "HAVE_SIGEV_NOTIFY_THREAD_ID=y" >> $config_host_mak -fi -if test "$byteswap_h" = "yes" ; then - echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak -fi -if test "$bswap_h" = "yes" ; then - echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak -fi if test "$gio" = "yes" ; then echo "CONFIG_GIO=y" >> $config_host_mak echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak
@@ -5346,9 +4985,6 @@ if test "$gdbus_codegen" != "" ; then echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak fi echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak -if test "$have_openpty" = "yes" ; then - echo "HAVE_OPENPTY=y" >> $config_host_mak -fi # Work around a system header bug with some kernel/XFS header # versions where they both try to define 'struct fsxattr':
meson.build +40 -1
65 lines not on this page · raw message
util/meson.build +3 -1
@@ -2,7 +2,9 @@ util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c')) util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('fdmon-poll.c')) -util_ss.add(when: 'CONFIG_EPOLL_CREATE1', if_true: files('fdmon-epoll.c')) +if config_host_data.get('CONFIG_EPOLL_CREATE1') + util_ss.add(files('fdmon-epoll.c')) +endif util_ss.add(when: ['CONFIG_LINUX_IO_URING', linux_io_uring], if_true: files('fdmon-io_uring.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c'))
Signature · 1 line
2.31.1
[PULL 29/40] configure: convert compiler tests to meson, part 3
In reply to Paolo Bonzini--- configure | 87 ----------------------------------------------------- meson.build | 10 ++++++ 2 files changed, 10 insertions(+), 87 deletions(-)
configure +0 -87
@@ -4293,20 +4293,6 @@ if test "$fortify_source" != "no"; then fi fi -############################################### -# Check if copy_file_range is provided by glibc -have_copy_file_range=no -cat > $TMPC << EOF -#include <unistd.h> -int main(void) { - copy_file_range(0, NULL, 0, NULL, 0, 0); - return 0; -} -EOF -if compile_prog "" "" ; then - have_copy_file_range=yes -fi - ########################################## # check if struct fsxattr is available via linux/fs.h
@@ -4353,19 +4339,6 @@ else membarrier=no fi -########################################## -# check if rtnetlink.h exists and is useful -have_rtnetlink=no -cat > $TMPC << EOF -#include <linux/rtnetlink.h> -int main(void) { - return IFLA_PROTO_DOWN; -} -EOF -if compile_prog "" "" ; then - have_rtnetlink=yes -fi - ########################################## # check for usable AF_VSOCK environment have_af_vsock=no
@@ -4419,49 +4392,6 @@ then fi -################################################# -# check for sysmacros.h - -have_sysmacros=no -cat > $TMPC << EOF -#include <sys/sysmacros.h> -int main(void) { - return makedev(0, 0); -} -EOF -if compile_prog "" "" ; then - have_sysmacros=yes -fi - -########################################## -# check for utmpx.h, it is missing e.g. on OpenBSD - -have_utmpx=no -cat > $TMPC << EOF -#include <utmpx.h> -struct utmpx user_info; -int main(void) { - return 0; -} -EOF -if compile_prog "" "" ; then - have_utmpx=yes -fi - -########################################## -# check for getrandom() - -have_getrandom=no -cat > $TMPC << EOF -#include <sys/random.h> -int main(void) { - return getrandom(0, 0, GRND_NONBLOCK); -} -EOF -if compile_prog "" "" ; then - have_getrandom=yes -fi - ########################################## # checks for sanitizers
@@ -4944,9 +4874,6 @@ echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak if test "$have_fsxattr" = "yes" ; then echo "HAVE_FSXATTR=y" >> $config_host_mak fi -if test "$have_copy_file_range" = "yes" ; then - echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak -fi if test "$xen" = "enabled" ; then echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
@@ -5182,10 +5109,6 @@ if test "$pvrdma" = "yes" ; then echo "CONFIG_PVRDMA=y" >> $config_host_mak fi -if test "$have_rtnetlink" = "yes" ; then - echo "CONFIG_RTNETLINK=y" >> $config_host_mak -fi - if test "$replication" = "yes" ; then echo "CONFIG_REPLICATION=y" >> $config_host_mak fi
@@ -5194,16 +5117,6 @@ if test "$have_af_vsock" = "yes" ; then echo "CONFIG_AF_VSOCK=y" >> $config_host_mak fi -if test "$have_sysmacros" = "yes" ; then - echo "CONFIG_SYSMACROS=y" >> $config_host_mak -fi - -if test "$have_utmpx" = "yes" ; then - echo "HAVE_UTMPX=y" >> $config_host_mak -fi -if test "$have_getrandom" = "yes" ; then - echo "CONFIG_GETRANDOM=y" >> $config_host_mak -fi if test "$debug_mutex" = "yes" ; then echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak fi
meson.build +10 -0
@@ -1280,6 +1280,7 @@ config_host_data.set('CONFIG_SETNS', cc.has_function('setns') and cc.has_functio config_host_data.set('CONFIG_SYNCFS', cc.has_function('syncfs')) config_host_data.set('CONFIG_SYNC_FILE_RANGE', cc.has_function('sync_file_range')) config_host_data.set('CONFIG_TIMERFD', cc.has_function('timerfd_create')) +config_host_data.set('HAVE_COPY_FILE_RANGE', cc.has_function('copy_file_range')) config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util)) config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>'))
@@ -1297,12 +1298,21 @@ config_host_data.set('CONFIG_FALLOCATE_ZERO_RANGE', config_host_data.set('CONFIG_FIEMAP', cc.has_header('linux/fiemap.h') and cc.has_header_symbol('linux/fs.h', 'FS_IOC_FIEMAP')) +config_host_data.set('CONFIG_GETRANDOM', + cc.has_function('getrandom') and + cc.has_header_symbol('sys/random.h', 'GRND_NONBLOCK')) config_host_data.set('CONFIG_MACHINE_BSWAP_H', cc.has_header_symbol('machine/bswap.h', 'bswap32', prefix: '''#include <sys/endian.h> #include <sys/types.h>''')) config_host_data.set('CONFIG_PRCTL_PR_SET_TIMERSLACK', cc.has_header_symbol('sys/prctl.h', 'PR_SET_TIMERSLACK')) +config_host_data.set('CONFIG_RTNETLINK', + cc.has_header_symbol('linux/rtnetlink.h', 'IFLA_PROTO_DOWN')) +config_host_data.set('CONFIG_SYSMACROS', + cc.has_header_symbol('sys/sysmacros.h', 'makedev')) +config_host_data.set('HAVE_UTMPX', + cc.has_header_symbol('utmpx.h', 'struct utmpx')) # has_member config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
Signature · 1 line
2.31.1
[PULL 37/40] machine: add smp compound property
In reply to Paolo BonziniMake -smp syntactic sugar for a compound property "-machine smp.{cores,threads,cpu,...}". machine_smp_parse is replaced by the setter for the property.
numa-test will now cover the new syntax, while other tests still use -smp.
--- hw/core/machine.c | 108 +++++++++++++++++++++------------------- include/hw/boards.h | 1 - softmmu/vl.c | 33 +++++++++--- tests/qtest/numa-test.c | 22 ++++---- 4 files changed, 95 insertions(+), 69 deletions(-)
hw/core/machine.c +58 -50
@@ -19,6 +19,7 @@#include "hw/loader.h" #include "qapi/error.h" #include "qapi/qapi-visit-common.h" +#include "qapi/qapi-visit-machine.h" #include "qapi/visitor.h" #include "hw/sysbus.h" #include "sysemu/cpus.h"
@@ -799,6 +800,57 @@ static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) ms->smp.sockets = sockets; } +static void machine_get_smp (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +MachineState *ms =MACHINE (obj); +SMPConfiguration *config = &(SMPConfiguration ){ + .has_cores = true, .cores = ms->smp.cores, + .has_sockets = true, .sockets = ms->smp.sockets, + .has_dies = true, .dies = ms->smp.dies, + .has_threads = true, .threads = ms->smp.threads, + .has_cpus = true, .cpus = ms->smp.cpus, + .has_maxcpus = true, .maxcpus = ms->smp.max_cpus, + }; +if (!visit_type_SMPConfiguration (v, name, &config, &error_abort)) { +return ; + } +} + +static void machine_set_smp (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +MachineClass *mc =MACHINE_GET_CLASS (obj); +MachineState *ms =MACHINE (obj); +SMPConfiguration *config; +ERRP_GUARD (); + +if (!visit_type_SMPConfiguration (v, name, &config, errp)) { +return ; + } + + mc->smp_parse (ms, config, errp); +if (errp) { + goto out_free; + } + +/* sanity-check smp_cpus and max_cpus against mc */ +if (ms->smp.cpus < mc->min_cpus) { +error_setg (errp,"Invalid SMP CPUs %d. The min CPUs " +"supported by machine '%s' is %d" , + ms->smp.cpus, + mc->name, mc->min_cpus); + }else if (ms->smp.max_cpus > mc->max_cpus) { +error_setg (errp,"Invalid SMP CPUs %d. The max CPUs " +"supported by machine '%s' is %d" , + current_machine->smp.max_cpus, + mc->name, mc->max_cpus); + } + +out_free: +qapi_free_SMPConfiguration (config); +} +static void machine_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc);
@@ -838,6 +890,12 @@ static void machine_class_init(ObjectClass *oc, void *data)object_class_property_set_description (oc,"dumpdtb" ,"Dump current dtb to a file and quit" ); +object_class_property_add (oc,"smp" ,"SMPConfiguration" , + machine_get_smp, machine_set_smp, +NULL ,NULL ); +object_class_property_set_description (oc,"smp" , +"CPU topology" ); +object_class_property_add (oc,"phandle-start" ,"int" , machine_get_phandle_start, machine_set_phandle_start,NULL ,NULL );
@@ -1126,56 +1184,6 @@ MemoryRegion *machine_consume_memdev(MachineState *machine,return ret; } -bool machine_smp_parse (MachineState *ms,QemuOpts *opts,Error **errp) -{ -MachineClass *mc =MACHINE_GET_CLASS (ms); -ERRP_GUARD (); - -if (opts) { -SMPConfiguration config = { - .has_cpus = !!qemu_opt_get (opts,"cpus" ), - .cpus =qemu_opt_get_number (opts,"cpus" ,0 ), - .has_sockets = !!qemu_opt_get (opts,"sockets" ), - .sockets =qemu_opt_get_number (opts,"sockets" ,0 ), - .has_dies = !!qemu_opt_get (opts,"dies" ), - .dies =qemu_opt_get_number (opts,"dies" ,0 ), - .has_cores = !!qemu_opt_get (opts,"cores" ), - .cores =qemu_opt_get_number (opts,"cores" ,0 ), - .has_threads = !!qemu_opt_get (opts,"threads" ), - .threads =qemu_opt_get_number (opts,"threads" ,0 ), - .has_maxcpus = !!qemu_opt_get (opts,"maxcpus" ), - .maxcpus =qemu_opt_get_number (opts,"maxcpus" ,0 ), - }; - - mc->smp_parse (ms, &config, errp); -if (*errp) { -return false; - } - } - -/* sanity-check smp_cpus and max_cpus against mc */ -if (ms->smp.cpus < mc->min_cpus) { -error_setg (errp,"Invalid SMP CPUs %d. The min CPUs " -"supported by machine '%s' is %d" , - ms->smp.cpus, - mc->name, mc->min_cpus); -return false; - }else if (ms->smp.max_cpus > mc->max_cpus) { -error_setg (errp,"Invalid SMP CPUs %d. The max CPUs " -"supported by machine '%s' is %d" , - current_machine->smp.max_cpus, - mc->name, mc->max_cpus); -return false; - } - -if (ms->smp.cpus >1 ) { -Error *blocker =NULL ; -error_setg (&blocker,QERR_REPLAY_NOT_SUPPORTED ,"smp" ); -replay_add_blocker (blocker); - } -return true; -} -void machine_run_board_init (MachineState *machine) {MachineClass *machine_class =MACHINE_GET_CLASS (machine);
include/hw/boards.h +0 -1
@@ -26,7 +26,6 @@ OBJECT_DECLARE_TYPE(MachineState, MachineClass, MACHINE)extern MachineState *current_machine;void machine_run_board_init (MachineState *machine); -bool machine_smp_parse (MachineState *ms,QemuOpts *opts,Error **errp);bool machine_usb (MachineState *machine);int machine_phandle_start (MachineState *machine);bool machine_dump_guest_core (MachineState *machine);
softmmu/vl.c +26 -7
@@ -1531,6 +1531,25 @@ static void machine_help_func(const QDict *qdict) } } +static void +machine_parse_property_opt (QemuOptsList *opts_list,const char *propname, +const char *arg,Error **errp) +{ +QDict *opts, *prop; +bool help = false; +ERRP_GUARD (); + + prop =keyval_parse (arg, opts_list->implied_opt_name, &help, errp); +if (help) { +qemu_opts_print_help (opts_list, true); +return ; + } + opts =qdict_new (); +qdict_put (opts, propname, prop); +keyval_merge (machine_opts_dict, opts, errp); +qobject_unref (opts); +} +static const char *pid_file;static Notifier qemu_unlink_pidfile_notifier;
@@ -1841,6 +1860,12 @@ static void qemu_apply_machine_options(QDict *qdict)/* fall back to the -kernel/-append */ semihosting_arg_fallback (current_machine->kernel_filename, current_machine->kernel_cmdline); } + +if (current_machine->smp.cpus >1 ) { +Error *blocker =NULL ; +error_setg (&blocker,QERR_REPLAY_NOT_SUPPORTED ,"smp" ); +replay_add_blocker (blocker); + } }static void qemu_create_early_backends (void )
@@ -2091,9 +2116,6 @@ static void qemu_create_machine(QDict *qdict)qemu_set_hw_version (machine_class->hw_version); } -machine_smp_parse (current_machine, -qemu_opts_find (qemu_find_opts ("smp-opts" ),NULL ), &error_fatal); -/* * Get the default machine options from the machine if it is not already * specified either by the configuration file or by the command line.
@@ -3310,10 +3332,7 @@ void qemu_init(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_smp: -if (!qemu_opts_parse_noisily (qemu_find_opts ("smp-opts" ), - optarg, true)) { -exit (1 ); - } +machine_parse_property_opt (qemu_find_opts ("smp-opts" ),"smp" , optarg, &error_fatal);break ;case QEMU_OPTION_vnc:vnc_parse (optarg);
tests/qtest/numa-test.c +11 -11
@@ -25,7 +25,7 @@ static void test_mon_explicit(const void *data) g_autofree char *s = NULL; g_autofree char *cli = NULL; - cli =make_cli (data,"-smp 8 -numa node,nodeid=0,memdev=ram,cpus=0-3 " + cli =make_cli (data,"-machine smp.cpus=8 -numa node,nodeid=0,memdev=ram,cpus=0-3 " "-numa node,nodeid=1,cpus=4-7" ); qts =qtest_init (cli);
@@ -42,7 +42,7 @@ static void test_def_cpu_split(const void *data) g_autofree char *s = NULL; g_autofree char *cli = NULL; - cli =make_cli (data,"-smp 8 -numa node,memdev=ram -numa node" ); + cli =make_cli (data,"-machine smp.cpus=8 -numa node,memdev=ram -numa node" ); qts =qtest_init (cli); s =qtest_hmp (qts,"info numa" );
@@ -58,7 +58,7 @@ static void test_mon_partial(const void *data) g_autofree char *s = NULL; g_autofree char *cli = NULL; - cli =make_cli (data,"-smp 8 " + cli =make_cli (data,"-machine smp.cpus=8 " "-numa node,nodeid=0,memdev=ram,cpus=0-1 " "-numa node,nodeid=1,cpus=4-5 " ); qts =qtest_init (cli);
@@ -86,7 +86,7 @@ static void test_query_cpus(const void *data)QTestState *qts; g_autofree char *cli = NULL; - cli =make_cli (data,"-smp 8 -numa node,memdev=ram,cpus=0-3 " + cli =make_cli (data,"-machine smp.cpus=8 -numa node,memdev=ram,cpus=0-3 " "-numa node,cpus=4-7" ); qts =qtest_init (cli); cpus =get_cpus (qts, &resp);
@@ -124,7 +124,7 @@ static void pc_numa_cpu(const void *data)QTestState *qts; g_autofree char *cli = NULL; - cli =make_cli (data,"-cpu pentium -smp 8,sockets=2,cores=2,threads=2 " + cli =make_cli (data,"-cpu pentium -machine smp.cpus=8,smp.sockets=2,smp.cores=2,smp.threads=2 " "-numa node,nodeid=0,memdev=ram -numa node,nodeid=1 " "-numa cpu,node-id=1,socket-id=0 " "-numa cpu,node-id=0,socket-id=1,core-id=0 "
@@ -177,7 +177,7 @@ static void spapr_numa_cpu(const void *data)QTestState *qts; g_autofree char *cli = NULL; - cli =make_cli (data,"-smp 4,cores=4 " + cli =make_cli (data,"-machine smp.cpus=4,smp.cores=4 " "-numa node,nodeid=0,memdev=ram -numa node,nodeid=1 " "-numa cpu,node-id=0,core-id=0 " "-numa cpu,node-id=0,core-id=1 "
@@ -222,7 +222,7 @@ static void aarch64_numa_cpu(const void *data)QTestState *qts; g_autofree char *cli = NULL; - cli =make_cli (data,"-smp 2 " + cli =make_cli (data,"-machine smp.cpus=2 " "-numa node,nodeid=0,memdev=ram -numa node,nodeid=1 " "-numa cpu,node-id=1,thread-id=0 " "-numa cpu,node-id=0,thread-id=1" );
@@ -265,7 +265,7 @@ static void pc_dynamic_cpu_cfg(const void *data)QTestState *qs; g_autofree char *cli = NULL; - cli =make_cli (data,"-nodefaults --preconfig -smp 2" ); + cli =make_cli (data,"-nodefaults --preconfig -machine smp.cpus=2" ); qs =qtest_init (cli);/* create 2 numa nodes */
@@ -324,7 +324,7 @@ static void pc_hmat_build_cfg(const void *data) g_autofree char *cli = NULL; cli =make_cli (data,"-nodefaults --preconfig -machine hmat=on " -"-smp 2,sockets=2 " +"-machine smp.cpus=2,smp.sockets=2 " "-m 128M,slots=2,maxmem=1G " "-object memory-backend-ram,size=64M,id=m0 " "-object memory-backend-ram,size=64M,id=m1 "
@@ -453,7 +453,7 @@ static void pc_hmat_off_cfg(const void *data) g_autofree char *cli = NULL; cli =make_cli (data,"-nodefaults --preconfig " -"-smp 2,sockets=2 " +"-machine smp.cpus=2,smp.sockets=2 " "-m 128M,slots=2,maxmem=1G " "-object memory-backend-ram,size=64M,id=m0,prealloc=y " "-object memory-backend-ram,size=64M,id=m1 "
@@ -492,7 +492,7 @@ static void pc_hmat_erange_cfg(const void *data) g_autofree char *cli = NULL; cli =make_cli (data,"-nodefaults --preconfig -machine hmat=on " -"-smp 2,sockets=2 " +"-machine smp.cpus=2,smp.sockets=2 " "-m 128M,slots=2,maxmem=1G " "-object memory-backend-ram,size=64M,id=m0 " "-object memory-backend-ram,size=64M,id=m1 "
Signature · 1 line
2.31.1
Re: [PULL 37/40] machine: add smp compound property
Quoted 9 lines · Paolo Bonzini
Make -smp syntactic sugar for a compound property "-machine smp.{cores,threads,cpu,...}".
machine_smp_parseis replaced by the setter for the property.numa-test will now cover the new syntax, while other tests still use -smp.
Signed-off-by Paolo Bonzini <[email protected]>
Hi; Coverity reports a leak in this code (CID 1458085):
softmmu/vl.c static void machine_help_func(const QDict *qdict) · line 1545
Quoted 12 lines
softmmu/vl.c +12
-0+static void +machine_parse_property_opt (QemuOptsList *opts_list,const char *propname, +const char *arg,Error **errp) +{ +QDict *opts, *prop; +bool help = false; +ERRP_GUARD (); + + prop =keyval_parse (arg, opts_list->implied_opt_name, &help, errp); +if (help) { +qemu_opts_print_help (opts_list, true); +return ;
In this return path we don't unref 'prop'.
softmmu/vl.c static void machine_help_func(const QDict *qdict) · line 1551
Quoted 6 lines
softmmu/vl.c +6
-0+ } + opts =qdict_new (); +qdict_put (opts, propname, prop); +keyval_merge (machine_opts_dict, opts, errp); +qobject_unref (opts); +}
thanks
-- PMM
Re: [PULL 37/40] machine: add smp compound property
Quoted 13 lines · Peter Maydell
Quoted 9 lines · Paolo Bonzini
Make -smp syntactic sugar for a compound property "-machine smp.{cores,threads,cpu,...}".
machine_smp_parseis replaced by the setter for the property.numa-test will now cover the new syntax, while other tests still use -smp.
Signed-off-by Paolo Bonzini <[email protected]>Hi; Coverity reports a leak in this code (CID 1458085):
Quoted 16 lines
softmmu/vl.c static void machine_help_func(const QDict *qdict) · line 1545
Quoted 12 lines
softmmu/vl.c +12
-0+static void +machine_parse_property_opt (QemuOptsList *opts_list,const char *propname, +const char *arg,Error **errp) +{ +QDict *opts, *prop; +bool help = false; +ERRP_GUARD (); + + prop =keyval_parse (arg, opts_list->implied_opt_name, &help, errp); +if (help) { +qemu_opts_print_help (opts_list, true); +return ;In this return path we don't unref 'prop'.
Quoted 1 line
+ }
Moreover, when keyval_parse() fails without setting help, we pass an errp that doesn't point to null to keyval_merge(). Potential crash bug.
Quoted 5 lines
softmmu/vl.c static void machine_help_func(const QDict *qdict) · line 1551
Quoted 5 lines
softmmu/vl.c +5
-0+ opts =qdict_new (); +qdict_put (opts, propname, prop); +keyval_merge (machine_opts_dict, opts, errp); +qobject_unref (opts); +}
I started to fix this, but got sidetracked into also fixing related bugs. Need to finish and and post.
Re: [PULL 37/40] machine: add smp compound property
In reply to Paolo BonziniQuoted 9 lines · Paolo Bonzini
Make -smp syntactic sugar for a compound property "-machine smp.{cores,threads,cpu,...}".
machine_smp_parseis replaced by the setter for the property.numa-test will now cover the new syntax, while other tests still use -smp.
Signed-off-by Paolo Bonzini <[email protected]>
Hi; Coverity reports a bug in this function (CID 1458083):
hw/core/machine.c static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) · line 826
Quoted 7 lines
hw/core/machine.c +7
-0+static void machine_set_smp (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +MachineClass *mc =MACHINE_GET_CLASS (obj); +MachineState *ms =MACHINE (obj); +SMPConfiguration *config; +ERRP_GUARD ();
ERRP_GUARD() ensures that 'errp' is never NULL...
hw/core/machine.c static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) · line 834
Quoted 8 lines
hw/core/machine.c +8
-0+ +if (!visit_type_SMPConfiguration (v, name, &config, errp)) { +return ; + } + + mc->smp_parse (ms, config, errp); +if (errp) { + goto out_free;
...so this condition is always true, and we always take the goto...
Quoted 1 line
+ }
...and the sanity-checks below here are dead code.
Quoted 7 lines
hw/core/machine.c +7
-0+ +/* sanity-check smp_cpus and max_cpus against mc */ +if (ms->smp.cpus < mc->min_cpus) { +error_setg (errp,"Invalid SMP CPUs %d. The min CPUs " +"supported by machine '%s' is %d" , + ms->smp.cpus, + mc->name, mc->min_cpus);
hw/core/machine.c static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) · line 852
Quoted 10 lines
hw/core/machine.c +10
-0+ }else if (ms->smp.max_cpus > mc->max_cpus) { +error_setg (errp,"Invalid SMP CPUs %d. The max CPUs " +"supported by machine '%s' is %d" , + current_machine->smp.max_cpus, + mc->name, mc->max_cpus); + } + +out_free: +qapi_free_SMPConfiguration (config); +}
With ERRP_GUARD(), the test you want for "is there an error?" is "if (*errp) {..."
thanks
-- PMM
[PULL 33/40] qom: export more functions for use with non-UserCreatable objects
In reply to Paolo BonziniMachines and accelerators are not user-creatable but they are going to share similar command-line parsing machinery. Export functions that will be used with -machine and -accel in softmmu/vl.c.
--- include/qom/object.h | 23 ++++++++++++++++ qom/object_interfaces.c | 58 +++++++++++++++++++++++++++++------------ 2 files changed, 65 insertions(+), 16 deletions(-)
include/qom/object.h +23 -0
@@ -861,6 +861,29 @@ static void do_qemu_init_ ## type_array(void) \ } \ type_init(do_qemu_init_ ## type_array) +/** +* type_print_class_properties: +* @type: a QOM class name +* +* Print the object's class properties to stdout or the monitor. +* Return whether an object was found. +*/ +bool type_print_class_properties (const char *type); + +/** +* object_set_properties_from_keyval: +* @obj: a QOM object +* @qdict: a dictionary with the properties to be set +* @from_json: true if leaf values of @qdict are typed, false if they +* are strings +* @errp: pointer to error object +* +* For each key in the dictionary, parse the value string if needed, +* then set the corresponding property in @obj. +*/ +void object_set_properties_from_keyval (Object *obj,const QDict *qdict, +bool from_json,Error **errp); +/** * object_class_dynamic_cast_assert: * @klass: The #ObjectClass to attempt to cast.
qom/object_interfaces.c +42 -16
94 lines not on this page · raw message
Signature · 1 line
2.31.1
[PULL 34/40] keyval: introduce keyval_merge
In reply to Paolo BonziniThis patch introduces a function that merges two keyval-produced (or keyval-like) QDicts. It can be used to emulate the behavior of .merge_lists = true QemuOpts groups, merging -readconfig sections and command-line options in a single QDict, and also to implement -set.
--- include/qemu/option.h | 1 + tests/unit/test-keyval.c | 58 +++++++++++++++++++++++++++++ util/keyval.c | 80 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+)
include/qemu/option.h +1 -0
@@ -149,5 +149,6 @@ QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);QDict *keyval_parse (const char *params,const char *implied_key,bool *help,Error **errp); +void keyval_merge (QDict *old,const QDict *new,Error **errp);#endif
tests/unit/test-keyval.c +58 -0
70 lines not on this page · raw message
util/keyval.c +80 -0
86 lines not on this page · raw message
Signature · 1 line
2.31.1
[PULL 32/40] configure: convert compiler tests to meson, part 6
In reply to Paolo Bonzini--- configure | 75 ----------------------------------------------------- meson.build | 11 ++++++++ 2 files changed, 11 insertions(+), 75 deletions(-)
configure +0 -75
@@ -3763,65 +3763,6 @@ else # "$safe_stack" = "" fi fi -########################################## -# check if we have open_by_handle_at - -open_by_handle_at=no -cat > $TMPC << EOF -#include <fcntl.h> -#if !defined(AT_EMPTY_PATH) -# error missing definition -#else -int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); } -#endif -EOF -if compile_prog "" "" ; then - open_by_handle_at=yes -fi - -######################################## -# check if we have linux/magic.h - -linux_magic_h=no -cat > $TMPC << EOF -#include <linux/magic.h> -int main(void) { - return 0; -} -EOF -if compile_prog "" "" ; then - linux_magic_h=yes -fi - -######################################## -# check if we have valgrind/valgrind.h - -valgrind_h=no -cat > $TMPC << EOF -#include <valgrind/valgrind.h> -int main(void) { - return 0; -} -EOF -if compile_prog "" "" ; then - valgrind_h=yes -fi - -######################################## -# check if environ is declared - -has_environ=no -cat > $TMPC << EOF -#include <unistd.h> -int main(void) { - environ = 0; - return 0; -} -EOF -if compile_prog "" "" ; then - has_environ=yes -fi - ######################################## # check if cpuid.h is usable.
@@ -4761,18 +4702,6 @@ if test "$crypto_afalg" = "yes" ; then echo "CONFIG_AF_ALG=y" >> $config_host_mak fi -if test "$open_by_handle_at" = "yes" ; then - echo "CONFIG_OPEN_BY_HANDLE=y" >> $config_host_mak -fi - -if test "$linux_magic_h" = "yes" ; then - echo "CONFIG_LINUX_MAGIC_H=y" >> $config_host_mak -fi - -if test "$valgrind_h" = "yes" ; then - echo "CONFIG_VALGRIND_H=y" >> $config_host_mak -fi - if test "$have_asan_iface_fiber" = "yes" ; then echo "CONFIG_ASAN_IFACE_FIBER=y" >> $config_host_mak fi
@@ -4781,10 +4710,6 @@ if test "$have_tsan" = "yes" && test "$have_tsan_iface_fiber" = "yes" ; then echo "CONFIG_TSAN=y" >> $config_host_mak fi -if test "$has_environ" = "yes" ; then - echo "CONFIG_HAS_ENVIRON=y" >> $config_host_mak -fi - if test "$cpuid_h" = "yes" ; then echo "CONFIG_CPUID_H=y" >> $config_host_mak fi
meson.build +11 -0
@@ -1260,6 +1260,8 @@ config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) # has_header config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) +config_host_data.set('CONFIG_LINUX_MAGIC_H', cc.has_header('linux/magic.h')) +config_host_data.set('CONFIG_VALGRIND_H', cc.has_header('valgrind/valgrind.h')) config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.h')) config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
@@ -1292,6 +1294,8 @@ config_host_data.set('CONFIG_BYTESWAP_H', cc.has_header_symbol('byteswap.h', 'bswap_32')) config_host_data.set('CONFIG_EPOLL_CREATE1', cc.has_header_symbol('sys/epoll.h', 'epoll_create1')) +config_host_data.set('CONFIG_HAS_ENVIRON', + cc.has_header_symbol('unistd.h', 'environ', prefix: gnu_source_prefix)) config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE', cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_PUNCH_HOLE') and cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_KEEP_SIZE'))
@@ -1350,6 +1354,13 @@ config_host_data.set('CONFIG_MADVISE', cc.compiles(gnu_source_prefix + ''' config_host_data.set('CONFIG_MEMFD', cc.compiles(gnu_source_prefix + ''' #include <sys/mman.h> int main(void) { return memfd_create("foo", MFD_ALLOW_SEALING); }''')) +config_host_data.set('CONFIG_OPEN_BY_HANDLE', cc.compiles(gnu_source_prefix + ''' + #include <fcntl.h> + #if !defined(AT_EMPTY_PATH) + # error missing definition + #else + int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); } + #endif''')) config_host_data.set('CONFIG_PIPE2', cc.compiles(gnu_source_prefix + ''' #include <unistd.h> #include <fcntl.h>
Signature · 1 line
2.31.1
[PULL 36/40] vl: switch -M parsing to keyval
In reply to Paolo BonziniSwitch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one -M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soon as -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)
softmmu/vl.c +146 -169
@@ -145,6 +145,8 @@ static const char *cpu_option;static const char *mem_path;static const char *incoming;static const char *loadvm; +static const char *accelerators; +static QDict *machine_opts_dict; static QTAILQ_HEAD(, ObjectOption) object_opts = QTAILQ_HEAD_INITIALIZER(object_opts);static ram_addr_t maxram_size;static uint64_t ram_slots;
@@ -235,21 +237,6 @@ static QemuOptsList qemu_option_rom_opts = { }, }; -static QemuOptsList qemu_machine_opts = { - .name ="machine" , - .implied_opt_name ="type" , - .merge_lists = true, - .head =QTAILQ_HEAD_INITIALIZER (qemu_machine_opts.head), - .desc = { -/* -* no elements => accept any -* sanity checking will happen later -* when setting machine properties -*/ - { } - }, -}; -static QemuOptsList qemu_accel_opts = { .name ="accel" , .implied_opt_name ="accel" ,
@@ -498,16 +485,6 @@ static QemuOptsList qemu_action_opts = { }, }; -/** -* Get machine options -* -* Returns: machine options (never null). -*/ -static QemuOpts *qemu_get_machine_opts (void ) -{ -return qemu_find_opts_singleton ("machine" ); -} -const char *qemu_get_vm_name (void ) {return qemu_name;
@@ -815,33 +792,6 @@ static MachineClass *find_default_machine(GSList *machines)return default_machineclass; } -static int machine_help_func (QemuOpts *opts,MachineState *machine) -{ -ObjectProperty *prop; -ObjectPropertyIterator iter; - -if (!qemu_opt_has_help_opt (opts)) { -return 0 ; - } - -object_property_iter_init (&iter,OBJECT (machine)); -while ((prop =object_property_iter_next (&iter))) { -if (!prop->set) { -continue ; - } - -printf ("%s.%s=%s" ,MACHINE_GET_CLASS (machine)->name, - prop->name, prop->type); -if (prop->description) { -printf (" (%s)\n" , prop->description); - }else { -printf ("\n" ); - } - } - -return 1 ; -} -static void version (void ) { printf("QEMU emulator version " QEMU_FULL_VERSION "\n"
@@ -1554,33 +1504,31 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) object_class_get_name(OBJECT_CLASS(mc1))); } -static MachineClass *machine_parse (const char *name,GSList *machines) +static void machine_help_func (const QDict *qdict) { -MachineClass *mc; -GSList *el; +GSList *machines, *el; +const char *type =qdict_get_try_str (qdict,"type" ); -if (is_help_option (name)) { -printf ("Supported machines are:\n" ); - machines =g_slist_sort (machines, machine_class_cmp); -for (el = machines; el; el = el->next) { -MachineClass *mc = el->data; -if (mc->alias) { -printf ("%-20s %s (alias of %s)\n" , mc->alias, mc->desc, mc->name); - } -printf ("%-20s %s%s%s\n" , mc->name, mc->desc, - mc->is_default ?" (default)" :"" , - mc->deprecation_reason ?" (deprecated)" :"" ); + machines =object_class_get_list (TYPE_MACHINE , false); +if (type) { +ObjectClass *machine_class =OBJECT_CLASS (find_machine (type, machines)); +if (machine_class) { +type_print_class_properties (object_class_get_name (machine_class)); +return ; } -exit (0 ); } - mc =find_machine (name, machines); -if (!mc) { -error_report ("unsupported machine type" ); -error_printf ("Use -machine help to list supported machines\n" ); -exit (1 ); +printf ("Supported machines are:\n" ); + machines =g_slist_sort (machines, machine_class_cmp); +for (el = machines; el; el = el->next) { +MachineClass *mc = el->data; +if (mc->alias) { +printf ("%-20s %s (alias of %s)\n" , mc->alias, mc->desc, mc->name); + } +printf ("%-20s %s%s%s\n" , mc->name, mc->desc, + mc->is_default ?" (default)" :"" , + mc->deprecation_reason ?" (deprecated)" :"" ); } -return mc; }static const char *pid_file;
@@ -1633,32 +1581,31 @@ static const QEMUOption *lookup_opt(int argc, char **argv,return popt; } -static MachineClass *select_machine (void ) +static MachineClass *select_machine (QDict *qdict,Error **errp) { +const char *optarg =qdict_get_try_str (qdict,"type" );GSList *machines =object_class_get_list (TYPE_MACHINE , false); -MachineClass *machine_class =find_default_machine (machines); -const char *optarg; -QemuOpts *opts; -Location loc; +MachineClass *machine_class; +Error *local_err =NULL ; -loc_push_none (&loc); - - opts =qemu_get_machine_opts (); -qemu_opts_loc_restore (opts); - - optarg =qemu_opt_get (opts,"type" );if (optarg) { - machine_class =machine_parse (optarg, machines); + machine_class =find_machine (optarg, machines); +qdict_del (qdict,"type" ); +if (!machine_class) { +error_setg (&local_err,"unsupported machine type" ); + } + }else { + machine_class =find_default_machine (machines); +if (!machine_class) { +error_setg (&local_err,"No machine specified, and there is no default" ); + } } -if (!machine_class) { -error_report ("No machine specified, and there is no default" ); -error_printf ("Use -machine help to list supported machines\n" ); -exit (1 ); - } - -loc_pop (&loc);g_slist_free (machines); +if (local_err) { +error_append_hint (&local_err,"Use -machine help to list supported machines\n" ); +error_propagate (errp, local_err); + }return machine_class; }
@@ -1677,42 +1624,70 @@ static int object_parse_property_opt(Object *obj,return 0 ; } -static int machine_set_property (void *opaque, -const char *name,const char *value, -Error **errp) +/* *Non*recursively replace underscores with dashes in QDict keys. */ +static void keyval_dashify (QDict *qdict,Error **errp) { - g_autofree char *qom_name = g_strdup(name); +const QDictEntry *ent, *next;char *p; -for (p = qom_name; *p; p++) { -if (*p =='_' ) { - *p ='-' ; +for (ent =qdict_first (qdict); ent; ent = next) { + g_autofree char *new_key = NULL; + + next =qdict_next (qdict, ent); +if (!strchr (ent->key,'_' )) { +continue ; } + new_key =g_strdup (ent->key); +for (p = new_key; *p; p++) { +if (*p =='_' ) { + *p ='-' ; + } + } +if (qdict_haskey (qdict, new_key)) { +error_setg (errp,"Conflict between '%s' and '%s'" , ent->key, new_key); +return ; + } +qobject_ref (ent->value); +qdict_put_obj (qdict, new_key, ent->value); +qdict_del (qdict, ent->key); } +} + +static void qemu_apply_legacy_machine_options (QDict *qdict) +{ +const char *value; + +keyval_dashify (qdict, &error_fatal);/* Legacy options do not correspond to MachineState properties. */ -if (g_str_equal (qom_name,"accel" )) { -return 0 ; - } -if (g_str_equal (qom_name,"igd-passthru" )) { -object_register_sugar_prop (ACCEL_CLASS_NAME ("xen" ), qom_name, value, - false); -return 0 ; - } -if (g_str_equal (qom_name,"kvm-shadow-mem" )) { -object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ), qom_name, value, - false); -return 0 ; - } -if (g_str_equal (qom_name,"kernel-irqchip" )) { -object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ), qom_name, value, - false); -object_register_sugar_prop (ACCEL_CLASS_NAME ("whpx" ), qom_name, value, - false); -return 0 ; + value =qdict_get_try_str (qdict,"accel" ); +if (value) { + accelerators =g_strdup (value); +qdict_del (qdict,"accel" ); } -return object_parse_property_opt (opaque, name, value,"type" , errp); + value =qdict_get_try_str (qdict,"igd-passthru" ); +if (value) { +object_register_sugar_prop (ACCEL_CLASS_NAME ("xen" ),"igd-passthru" , value, + false); +qdict_del (qdict,"igd-passthru" ); + } + + value =qdict_get_try_str (qdict,"kvm-shadow-mem" ); +if (value) { +object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ),"kvm-shadow-mem" , value, + false); +qdict_del (qdict,"kvm-shadow-mem" ); + } + + value =qdict_get_try_str (qdict,"kernel-irqchip" ); +if (value) { +object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ),"kernel-irqchip" , value, + false); +object_register_sugar_prop (ACCEL_CLASS_NAME ("whpx" ),"kernel-irqchip" , value, + false); +qdict_del (qdict,"kernel-irqchip" ); + } }static void object_option_foreach_add (bool (*type_opt_predicate)(const char *))
@@ -1827,16 +1802,14 @@ static bool object_create_early(const char *type)return true; } -static void qemu_apply_machine_options (void ) +static void qemu_apply_machine_options (QDict *qdict) {MachineClass *machine_class =MACHINE_GET_CLASS (current_machine); -QemuOpts *machine_opts =qemu_get_machine_opts ();const char *boot_order =NULL ;const char *boot_once =NULL ;QemuOpts *opts; -qemu_opt_foreach (machine_opts, machine_set_property, current_machine, - &error_fatal); +object_set_properties_from_keyval (OBJECT (current_machine), qdict, false, &error_fatal); current_machine->ram_size = ram_size; current_machine->maxram_size = maxram_size; current_machine->ram_slots = ram_slots;
@@ -1865,10 +1838,8 @@ static void qemu_apply_machine_options(void) current_machine->boot_once = boot_once;if (semihosting_enabled () && !semihosting_get_argc ()) { -const char *kernel_filename =qemu_opt_get (machine_opts,"kernel" ); -const char *kernel_cmdline =qemu_opt_get (machine_opts,"append" ) ?:"" ;/* fall back to the -kernel/-append */ -semihosting_arg_fallback (kernel_filename, kernel_cmdline); +semihosting_arg_fallback (current_machine->kernel_filename, current_machine->kernel_cmdline); } }
@@ -1924,8 +1895,7 @@ static void qemu_create_early_backends(void)/* * Note: we need to create audio and block backends before -* machine_set_property(), so machine properties can refer to -* them. +* setting machine properties, so they can be referred to. */ configure_blockdev (&bdo_queue, machine_class, snapshot);audio_init_audiodevs ();
@@ -2091,16 +2061,14 @@ static void set_memory_options(MachineClass *mc)loc_pop (&loc); } -static void qemu_create_machine (MachineClass *machine_class) +static void qemu_create_machine (QDict *qdict) { +MachineClass *machine_class =select_machine (qdict, &error_fatal);object_set_machine_compat_props (machine_class->compat_props);set_memory_options (machine_class); current_machine =MACHINE (object_new_with_class (OBJECT_CLASS (machine_class))); -if (machine_help_func (qemu_get_machine_opts (), current_machine)) { -exit (0 ); - }object_property_add_child (object_get_root (),"machine" ,OBJECT (current_machine)); object_property_add_child(container_get(OBJECT(current_machine),
@@ -2131,8 +2099,12 @@ static void qemu_create_machine(MachineClass *machine_class)* specified either by the configuration file or by the command line. */ if (machine_class->default_machine_opts) { -qemu_opts_set_defaults (qemu_find_opts ("machine" ), - machine_class->default_machine_opts,0 ); +QDict *default_opts = +keyval_parse (machine_class->default_machine_opts,NULL ,NULL , + &error_abort); +object_set_properties_from_keyval (OBJECT (current_machine), default_opts, + false, &error_abort); +qobject_unref (default_opts); } }
@@ -2154,7 +2126,8 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp)*/ static bool is_qemuopts_group (const char *group) { -if (g_str_equal (group,"object" )) { +if (g_str_equal (group,"object" ) || +g_str_equal (group,"machine" )) {return false; }return true;
@@ -2167,6 +2140,13 @@ static void qemu_record_config_group(const char *group, QDict *dict,Visitor *v =qobject_input_visitor_new_keyval (QOBJECT (dict));object_option_add_visitor (v);visit_free (v); + }else if (g_str_equal (group,"machine" )) { +/* +* Cannot merge string-valued and type-safe dictionaries, so JSON +* is not accepted yet for -M. +*/ +assert (!from_json); +keyval_merge (machine_opts_dict, dict, errp); }else {abort (); }
@@ -2297,13 +2277,11 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)static void configure_accelerators (const char *progname) { -const char *accelerators;bool init_failed = false;qemu_opts_foreach (qemu_find_opts ("icount" ), do_configure_icount,NULL , &error_fatal); - accelerators =qemu_opt_get (qemu_get_machine_opts (),"accel" );if (QTAILQ_EMPTY (&qemu_accel_opts.head)) {char **accel_list, **tmp;
@@ -2391,12 +2369,11 @@ static void create_default_memdev(MachineState *ms, const char *path) &error_fatal); } -static void qemu_validate_options (void ) +static void qemu_validate_options (const QDict *machine_opts) { -QemuOpts *machine_opts =qemu_get_machine_opts (); -const char *kernel_filename =qemu_opt_get (machine_opts,"kernel" ); -const char *initrd_filename =qemu_opt_get (machine_opts,"initrd" ); -const char *kernel_cmdline =qemu_opt_get (machine_opts,"append" ); +const char *kernel_filename =qdict_get_try_str (machine_opts,"kernel" ); +const char *initrd_filename =qdict_get_try_str (machine_opts,"initrd" ); +const char *kernel_cmdline =qdict_get_try_str (machine_opts,"append" );if (kernel_filename ==NULL ) {if (kernel_cmdline !=NULL ) {
@@ -2736,7 +2713,6 @@ void qemu_init(int argc, char **argv, char **envp)qemu_add_opts (&qemu_trace_opts);qemu_plugin_add_opts ();qemu_add_opts (&qemu_option_rom_opts); -qemu_add_opts (&qemu_machine_opts);qemu_add_opts (&qemu_accel_opts);qemu_add_opts (&qemu_mem_opts);qemu_add_opts (&qemu_smp_opts);
@@ -2777,6 +2753,7 @@ void qemu_init(int argc, char **argv, char **envp) } } + machine_opts_dict =qdict_new ();if (userconfig) {qemu_read_default_config_file (&error_fatal); }
@@ -2866,8 +2843,7 @@ void qemu_init(int argc, char **argv, char **envp)parse_display (optarg);break ;case QEMU_OPTION_nographic: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"graphics=off" , false); +qdict_put_str (machine_opts_dict,"graphics" ,"off" ); nographic = true; dpy.type =DISPLAY_TYPE_NONE ;break ;
@@ -2891,16 +2867,16 @@ void qemu_init(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_kernel: -qemu_opts_set (qemu_find_opts ("machine" ),"kernel" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"kernel" , optarg);break ;case QEMU_OPTION_initrd: -qemu_opts_set (qemu_find_opts ("machine" ),"initrd" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"initrd" , optarg);break ;case QEMU_OPTION_append: -qemu_opts_set (qemu_find_opts ("machine" ),"append" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"append" , optarg);break ;case QEMU_OPTION_dtb: -qemu_opts_set (qemu_find_opts ("machine" ),"dtb" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"dtb" , optarg);break ;case QEMU_OPTION_cdrom:drive_add (IF_DEFAULT ,2 , optarg,CDROM_OPTS );
@@ -3010,7 +2986,7 @@ void qemu_init(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_bios: -qemu_opts_set (qemu_find_opts ("machine" ),"firmware" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"firmware" , optarg);break ;case QEMU_OPTION_singlestep: singlestep =1 ;
@@ -3281,17 +3257,20 @@ void qemu_init(int argc, char **argv, char **envp) preconfig_requested = true;break ;case QEMU_OPTION_enable_kvm: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"accel=kvm" , false); +qdict_put_str (machine_opts_dict,"accel" ,"kvm" );break ;case QEMU_OPTION_M :case QEMU_OPTION_machine: - olist =qemu_find_opts ("machine" ); - opts =qemu_opts_parse_noisily (olist, optarg, true); -if (!opts) { -exit (1 ); + { +bool help; + +keyval_parse_into (machine_opts_dict, optarg,"type" , &help, &error_fatal); +if (help) { +machine_help_func (machine_opts_dict); +exit (EXIT_SUCCESS ); + } +break ; } -break ;case QEMU_OPTION_accel: accel_opts =qemu_opts_parse_noisily (qemu_find_opts ("accel" ), optarg, true);
@@ -3318,12 +3297,10 @@ void qemu_init(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_usb: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"usb=on" , false); +qdict_put_str (machine_opts_dict,"usb" ,"on" );break ;case QEMU_OPTION_usbdevice: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"usb=on" , false); +qdict_put_str (machine_opts_dict,"usb" ,"on" );add_device_config (DEV_USB , optarg);break ;case QEMU_OPTION_device:
@@ -3342,12 +3319,10 @@ void qemu_init(int argc, char **argv, char **envp)vnc_parse (optarg);break ;case QEMU_OPTION_no_acpi: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"acpi=off" , false); +qdict_put_str (machine_opts_dict,"acpi" ,"off" );break ;case QEMU_OPTION_no_hpet: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"hpet=off" , false); +qdict_put_str (machine_opts_dict,"hpet" ,"off" );break ;case QEMU_OPTION_no_reboot: olist =qemu_find_opts ("action" );
@@ -3600,7 +3575,7 @@ void qemu_init(int argc, char **argv, char **envp)*/ loc_set_none (); -qemu_validate_options (); +qemu_validate_options (machine_opts_dict);qemu_process_sugar_options ();/*
@@ -3633,7 +3608,7 @@ void qemu_init(int argc, char **argv, char **envp)configure_rtc (qemu_find_opts_singleton ("rtc" )); -qemu_create_machine (select_machine ()); +qemu_create_machine (machine_opts_dict);suspend_mux_open ();
@@ -3641,12 +3616,14 @@ void qemu_init(int argc, char **argv, char **envp)qemu_create_default_devices ();qemu_create_early_backends (); -qemu_apply_machine_options (); +qemu_apply_legacy_machine_options (machine_opts_dict); +qemu_apply_machine_options (machine_opts_dict); +qobject_unref (machine_opts_dict);phase_advance (PHASE_MACHINE_CREATED );/* * Note: uses machine properties such as kernel-irqchip, must run -* after machine_set_property(). +* after qemu_apply_machine_options. */ configure_accelerators (argv[0 ]);phase_advance (PHASE_ACCEL_CREATED );
Signature · 1 line
2.31.1
Re: [PULL 36/40] vl: switch -M parsing to keyval
Quoted 23 lines · Paolo Bonzini
Switch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one
(quoted diff) +0
-2-M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soonas -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
Quoted 4 lines
Signed-off-by Paolo Bonzini <[email protected]>--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)
Xen's osstest bisector found this commit breaks starting a Xen vm:
https://lore.kernel.org/xen-devel/[email protected]/
qemu fails to start with:
Unexpected error in object_property_find_err() at ../qemu-xen-dir-remote/qom/object.c:1299:
qemu-system-i386: Property 'xenfv-3.1-machine.accel' not found
The Xen machines have default_machine_opts = "accel=xen,suppress-vmdesc=on" which may be the problem?
Regards,
Jason
Quoted 572 lines
softmmu/vl.c +146
-170@@ -145,6 +145,8 @@ static const char *cpu_option;static const char *mem_path;static const char *incoming;static const char *loadvm; +static const char *accelerators; +static QDict *machine_opts_dict; static QTAILQ_HEAD(, ObjectOption) object_opts = QTAILQ_HEAD_INITIALIZER(object_opts);static ram_addr_t maxram_size;static uint64_t ram_slots;@@ -235,21 +237,6 @@ static QemuOptsList qemu_option_rom_opts = { }, }; -static QemuOptsList qemu_machine_opts = { - .name ="machine" , - .implied_opt_name ="type" , - .merge_lists = true, - .head =QTAILQ_HEAD_INITIALIZER (qemu_machine_opts.head), - .desc = { -/* -* no elements => accept any -* sanity checking will happen later -* when setting machine properties -*/ - { } - }, -}; -static QemuOptsList qemu_accel_opts = { .name ="accel" , .implied_opt_name ="accel" ,@@ -498,16 +485,6 @@ static QemuOptsList qemu_action_opts = { }, }; -/** -* Get machine options -* -* Returns: machine options (never null). -*/ -static QemuOpts *qemu_get_machine_opts (void ) -{ -return qemu_find_opts_singleton ("machine" ); -} -const char *qemu_get_vm_name (void ) {return qemu_name;@@ -815,33 +792,6 @@ static MachineClass *find_default_machine(GSList *machines)return default_machineclass; } -static int machine_help_func (QemuOpts *opts,MachineState *machine) -{ -ObjectProperty *prop; -ObjectPropertyIterator iter; - -if (!qemu_opt_has_help_opt (opts)) { -return 0 ; - } - -object_property_iter_init (&iter,OBJECT (machine)); -while ((prop =object_property_iter_next (&iter))) { -if (!prop->set) { -continue ; - } - -printf ("%s.%s=%s" ,MACHINE_GET_CLASS (machine)->name, - prop->name, prop->type); -if (prop->description) { -printf (" (%s)\n" , prop->description); - }else { -printf ("\n" ); - } - } - -return 1 ; -} -static void version (void ) { printf("QEMU emulator version " QEMU_FULL_VERSION "\n"@@ -1554,33 +1504,31 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) object_class_get_name(OBJECT_CLASS(mc1))); } -static MachineClass *machine_parse (const char *name,GSList *machines) +static void machine_help_func (const QDict *qdict) { -MachineClass *mc; -GSList *el; +GSList *machines, *el; +const char *type =qdict_get_try_str (qdict,"type" ); -if (is_help_option (name)) { -printf ("Supported machines are:\n" ); - machines =g_slist_sort (machines, machine_class_cmp); -for (el = machines; el; el = el->next) { -MachineClass *mc = el->data; -if (mc->alias) { -printf ("%-20s %s (alias of %s)\n" , mc->alias, mc->desc, mc->name); - } -printf ("%-20s %s%s%s\n" , mc->name, mc->desc, - mc->is_default ?" (default)" :"" , - mc->deprecation_reason ?" (deprecated)" :"" ); + machines =object_class_get_list (TYPE_MACHINE , false); +if (type) { +ObjectClass *machine_class =OBJECT_CLASS (find_machine (type, machines)); +if (machine_class) { +type_print_class_properties (object_class_get_name (machine_class)); +return ; } -exit (0 ); } - mc =find_machine (name, machines); -if (!mc) { -error_report ("unsupported machine type" ); -error_printf ("Use -machine help to list supported machines\n" ); -exit (1 ); +printf ("Supported machines are:\n" ); + machines =g_slist_sort (machines, machine_class_cmp); +for (el = machines; el; el = el->next) { +MachineClass *mc = el->data; +if (mc->alias) { +printf ("%-20s %s (alias of %s)\n" , mc->alias, mc->desc, mc->name); + } +printf ("%-20s %s%s%s\n" , mc->name, mc->desc, + mc->is_default ?" (default)" :"" , + mc->deprecation_reason ?" (deprecated)" :"" ); } -return mc; }static const char *pid_file;@@ -1633,32 +1581,31 @@ static const QEMUOption *lookup_opt(int argc, char **argv,return popt; } -static MachineClass *select_machine (void ) +static MachineClass *select_machine (QDict *qdict,Error **errp) { +const char *optarg =qdict_get_try_str (qdict,"type" );GSList *machines =object_class_get_list (TYPE_MACHINE , false); -MachineClass *machine_class =find_default_machine (machines); -const char *optarg; -QemuOpts *opts; -Location loc; +MachineClass *machine_class; +Error *local_err =NULL ; -loc_push_none (&loc); - - opts =qemu_get_machine_opts (); -qemu_opts_loc_restore (opts); - - optarg =qemu_opt_get (opts,"type" );if (optarg) { - machine_class =machine_parse (optarg, machines); + machine_class =find_machine (optarg, machines); +qdict_del (qdict,"type" ); +if (!machine_class) { +error_setg (&local_err,"unsupported machine type" ); + } + }else { + machine_class =find_default_machine (machines); +if (!machine_class) { +error_setg (&local_err,"No machine specified, and there is no default" ); + } } -if (!machine_class) { -error_report ("No machine specified, and there is no default" ); -error_printf ("Use -machine help to list supported machines\n" ); -exit (1 ); - } - -loc_pop (&loc);g_slist_free (machines); +if (local_err) { +error_append_hint (&local_err,"Use -machine help to list supported machines\n" ); +error_propagate (errp, local_err); + }return machine_class; }@@ -1677,42 +1624,70 @@ static int object_parse_property_opt(Object *obj,return 0 ; } -static int machine_set_property (void *opaque, -const char *name,const char *value, -Error **errp) +/* *Non*recursively replace underscores with dashes in QDict keys. */ +static void keyval_dashify (QDict *qdict,Error **errp) { - g_autofree char *qom_name = g_strdup(name); +const QDictEntry *ent, *next;char *p; -for (p = qom_name; *p; p++) { -if (*p =='_' ) { - *p ='-' ; +for (ent =qdict_first (qdict); ent; ent = next) { + g_autofree char *new_key = NULL; + + next =qdict_next (qdict, ent); +if (!strchr (ent->key,'_' )) { +continue ; } + new_key =g_strdup (ent->key); +for (p = new_key; *p; p++) { +if (*p =='_' ) { + *p ='-' ; + } + } +if (qdict_haskey (qdict, new_key)) { +error_setg (errp,"Conflict between '%s' and '%s'" , ent->key, new_key); +return ; + } +qobject_ref (ent->value); +qdict_put_obj (qdict, new_key, ent->value); +qdict_del (qdict, ent->key); } +} + +static void qemu_apply_legacy_machine_options (QDict *qdict) +{ +const char *value; + +keyval_dashify (qdict, &error_fatal);/* Legacy options do not correspond to MachineState properties. */ -if (g_str_equal (qom_name,"accel" )) { -return 0 ; - } -if (g_str_equal (qom_name,"igd-passthru" )) { -object_register_sugar_prop (ACCEL_CLASS_NAME ("xen" ), qom_name, value, - false); -return 0 ; - } -if (g_str_equal (qom_name,"kvm-shadow-mem" )) { -object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ), qom_name, value, - false); -return 0 ; - } -if (g_str_equal (qom_name,"kernel-irqchip" )) { -object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ), qom_name, value, - false); -object_register_sugar_prop (ACCEL_CLASS_NAME ("whpx" ), qom_name, value, - false); -return 0 ; + value =qdict_get_try_str (qdict,"accel" ); +if (value) { + accelerators =g_strdup (value); +qdict_del (qdict,"accel" ); } -return object_parse_property_opt (opaque, name, value,"type" , errp); + value =qdict_get_try_str (qdict,"igd-passthru" ); +if (value) { +object_register_sugar_prop (ACCEL_CLASS_NAME ("xen" ),"igd-passthru" , value, + false); +qdict_del (qdict,"igd-passthru" ); + } + + value =qdict_get_try_str (qdict,"kvm-shadow-mem" ); +if (value) { +object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ),"kvm-shadow-mem" , value, + false); +qdict_del (qdict,"kvm-shadow-mem" ); + } + + value =qdict_get_try_str (qdict,"kernel-irqchip" ); +if (value) { +object_register_sugar_prop (ACCEL_CLASS_NAME ("kvm" ),"kernel-irqchip" , value, + false); +object_register_sugar_prop (ACCEL_CLASS_NAME ("whpx" ),"kernel-irqchip" , value, + false); +qdict_del (qdict,"kernel-irqchip" ); + } }static void object_option_foreach_add (bool (*type_opt_predicate)(const char *))@@ -1827,16 +1802,14 @@ static bool object_create_early(const char *type)return true; } -static void qemu_apply_machine_options (void ) +static void qemu_apply_machine_options (QDict *qdict) {MachineClass *machine_class =MACHINE_GET_CLASS (current_machine); -QemuOpts *machine_opts =qemu_get_machine_opts ();const char *boot_order =NULL ;const char *boot_once =NULL ;QemuOpts *opts; -qemu_opt_foreach (machine_opts, machine_set_property, current_machine, - &error_fatal); +object_set_properties_from_keyval (OBJECT (current_machine), qdict, false, &error_fatal); current_machine->ram_size = ram_size; current_machine->maxram_size = maxram_size; current_machine->ram_slots = ram_slots;@@ -1865,10 +1838,8 @@ static void qemu_apply_machine_options(void) current_machine->boot_once = boot_once;if (semihosting_enabled () && !semihosting_get_argc ()) { -const char *kernel_filename =qemu_opt_get (machine_opts,"kernel" ); -const char *kernel_cmdline =qemu_opt_get (machine_opts,"append" ) ?:"" ;/* fall back to the -kernel/-append */ -semihosting_arg_fallback (kernel_filename, kernel_cmdline); +semihosting_arg_fallback (current_machine->kernel_filename, current_machine->kernel_cmdline); } }@@ -1924,8 +1895,7 @@ static void qemu_create_early_backends(void)/* * Note: we need to create audio and block backends before -* machine_set_property(), so machine properties can refer to -* them. +* setting machine properties, so they can be referred to. */ configure_blockdev (&bdo_queue, machine_class, snapshot);audio_init_audiodevs ();@@ -2091,16 +2061,14 @@ static void set_memory_options(MachineClass *mc)loc_pop (&loc); } -static void qemu_create_machine (MachineClass *machine_class) +static void qemu_create_machine (QDict *qdict) { +MachineClass *machine_class =select_machine (qdict, &error_fatal);object_set_machine_compat_props (machine_class->compat_props);set_memory_options (machine_class); current_machine =MACHINE (object_new_with_class (OBJECT_CLASS (machine_class))); -if (machine_help_func (qemu_get_machine_opts (), current_machine)) { -exit (0 ); - }object_property_add_child (object_get_root (),"machine" ,OBJECT (current_machine)); object_property_add_child(container_get(OBJECT(current_machine),@@ -2131,8 +2099,12 @@ static void qemu_create_machine(MachineClass *machine_class)* specified either by the configuration file or by the command line. */ if (machine_class->default_machine_opts) { -qemu_opts_set_defaults (qemu_find_opts ("machine" ), - machine_class->default_machine_opts,0 ); +QDict *default_opts = +keyval_parse (machine_class->default_machine_opts,NULL ,NULL , + &error_abort); +object_set_properties_from_keyval (OBJECT (current_machine), default_opts, + false, &error_abort); +qobject_unref (default_opts); } }@@ -2154,7 +2126,8 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp)*/ static bool is_qemuopts_group (const char *group) { -if (g_str_equal (group,"object" )) { +if (g_str_equal (group,"object" ) || +g_str_equal (group,"machine" )) {return false; }return true;@@ -2167,6 +2140,13 @@ static void qemu_record_config_group(const char *group, QDict *dict,Visitor *v =qobject_input_visitor_new_keyval (QOBJECT (dict));object_option_add_visitor (v);visit_free (v); + }else if (g_str_equal (group,"machine" )) { +/* +* Cannot merge string-valued and type-safe dictionaries, so JSON +* is not accepted yet for -M. +*/ +assert (!from_json); +keyval_merge (machine_opts_dict, dict, errp); }else {abort (); }@@ -2297,13 +2277,11 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)static void configure_accelerators (const char *progname) { -const char *accelerators;bool init_failed = false;qemu_opts_foreach (qemu_find_opts ("icount" ), do_configure_icount,NULL , &error_fatal); - accelerators =qemu_opt_get (qemu_get_machine_opts (),"accel" );if (QTAILQ_EMPTY (&qemu_accel_opts.head)) {char **accel_list, **tmp;@@ -2391,12 +2369,11 @@ static void create_default_memdev(MachineState *ms, const char *path) &error_fatal); } -static void qemu_validate_options (void ) +static void qemu_validate_options (const QDict *machine_opts) { -QemuOpts *machine_opts =qemu_get_machine_opts (); -const char *kernel_filename =qemu_opt_get (machine_opts,"kernel" ); -const char *initrd_filename =qemu_opt_get (machine_opts,"initrd" ); -const char *kernel_cmdline =qemu_opt_get (machine_opts,"append" ); +const char *kernel_filename =qdict_get_try_str (machine_opts,"kernel" ); +const char *initrd_filename =qdict_get_try_str (machine_opts,"initrd" ); +const char *kernel_cmdline =qdict_get_try_str (machine_opts,"append" );if (kernel_filename ==NULL ) {if (kernel_cmdline !=NULL ) {@@ -2736,7 +2713,6 @@ void qemu_init(int argc, char **argv, char **envp)qemu_add_opts (&qemu_trace_opts);qemu_plugin_add_opts ();qemu_add_opts (&qemu_option_rom_opts); -qemu_add_opts (&qemu_machine_opts);qemu_add_opts (&qemu_accel_opts);qemu_add_opts (&qemu_mem_opts);qemu_add_opts (&qemu_smp_opts);@@ -2777,6 +2753,7 @@ void qemu_init(int argc, char **argv, char **envp) } } + machine_opts_dict =qdict_new ();if (userconfig) {qemu_read_default_config_file (&error_fatal); }@@ -2866,8 +2843,7 @@ void qemu_init(int argc, char **argv, char **envp)parse_display (optarg);break ;case QEMU_OPTION_nographic: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"graphics=off" , false); +qdict_put_str (machine_opts_dict,"graphics" ,"off" ); nographic = true; dpy.type =DISPLAY_TYPE_NONE ;break ;@@ -2891,16 +2867,16 @@ void qemu_init(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_kernel: -qemu_opts_set (qemu_find_opts ("machine" ),"kernel" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"kernel" , optarg);break ;case QEMU_OPTION_initrd: -qemu_opts_set (qemu_find_opts ("machine" ),"initrd" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"initrd" , optarg);break ;case QEMU_OPTION_append: -qemu_opts_set (qemu_find_opts ("machine" ),"append" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"append" , optarg);break ;case QEMU_OPTION_dtb: -qemu_opts_set (qemu_find_opts ("machine" ),"dtb" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"dtb" , optarg);break ;case QEMU_OPTION_cdrom:drive_add (IF_DEFAULT ,2 , optarg,CDROM_OPTS );@@ -3010,7 +2986,7 @@ void qemu_init(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_bios: -qemu_opts_set (qemu_find_opts ("machine" ),"firmware" , optarg, &error_abort); +qdict_put_str (machine_opts_dict,"firmware" , optarg);break ;case QEMU_OPTION_singlestep: singlestep =1 ;@@ -3281,17 +3257,20 @@ void qemu_init(int argc, char **argv, char **envp) preconfig_requested = true;break ;case QEMU_OPTION_enable_kvm: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"accel=kvm" , false); +qdict_put_str (machine_opts_dict,"accel" ,"kvm" );break ;case QEMU_OPTION_M :case QEMU_OPTION_machine: - olist =qemu_find_opts ("machine" ); - opts =qemu_opts_parse_noisily (olist, optarg, true); -if (!opts) { -exit (1 ); + { +bool help; + +keyval_parse_into (machine_opts_dict, optarg,"type" , &help, &error_fatal); +if (help) { +machine_help_func (machine_opts_dict); +exit (EXIT_SUCCESS ); + } +break ; } -break ;case QEMU_OPTION_accel: accel_opts =qemu_opts_parse_noisily (qemu_find_opts ("accel" ), optarg, true);@@ -3318,12 +3297,10 @@ void qemu_init(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_usb: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"usb=on" , false); +qdict_put_str (machine_opts_dict,"usb" ,"on" );break ;case QEMU_OPTION_usbdevice: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"usb=on" , false); +qdict_put_str (machine_opts_dict,"usb" ,"on" );add_device_config (DEV_USB , optarg);break ;case QEMU_OPTION_device:@@ -3342,12 +3319,10 @@ void qemu_init(int argc, char **argv, char **envp)vnc_parse (optarg);break ;case QEMU_OPTION_no_acpi: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"acpi=off" , false); +qdict_put_str (machine_opts_dict,"acpi" ,"off" );break ;case QEMU_OPTION_no_hpet: - olist =qemu_find_opts ("machine" ); -qemu_opts_parse_noisily (olist,"hpet=off" , false); +qdict_put_str (machine_opts_dict,"hpet" ,"off" );break ;case QEMU_OPTION_no_reboot: olist =qemu_find_opts ("action" );@@ -3600,7 +3575,7 @@ void qemu_init(int argc, char **argv, char **envp)*/ loc_set_none (); -qemu_validate_options (); +qemu_validate_options (machine_opts_dict);qemu_process_sugar_options ();/* @@ -3633,7 +3608,7 @@ void qemu_init(int argc, char **argv, char **envp)configure_rtc (qemu_find_opts_singleton ("rtc" )); -qemu_create_machine (select_machine ()); +qemu_create_machine (machine_opts_dict);suspend_mux_open ();@@ -3641,12 +3616,14 @@ void qemu_init(int argc, char **argv, char **envp)qemu_create_default_devices ();qemu_create_early_backends (); -qemu_apply_machine_options (); +qemu_apply_legacy_machine_options (machine_opts_dict); +qemu_apply_machine_options (machine_opts_dict); +qobject_unref (machine_opts_dict);phase_advance (PHASE_MACHINE_CREATED );/* * Note: uses machine properties such as kernel-irqchip, must run -* after machine_set_property(). +* after qemu_apply_machine_options. */ configure_accelerators (argv[0 ]);phase_advance (PHASE_ACCEL_CREATED ); --2.31.1
PATCH 1/1 vl: Parse legacy default_machine_opts
qemu can't start a xen vm after commit d8fb7d0969d5 "vl: switch -M parsing to keyval" with:
$ ./qemu-system-i386 -M xenfv Unexpected error in object_property_find_err() at ../qom/object.c:1298: qemu-system-i386: Property 'xenfv-3.1-machine.accel' not found Aborted (core dumped)
The default_machine_opts handling doesn't process the legacy machine options like "accel". Call qemu_apply_legacy_machine_options to provide the legacy handling.
--- softmmu/vl.c | 1 + 1 file changed, 1 insertion(+)
softmmu/vl.c +1 -0
@@ -2126,6 +2126,7 @@ static void qemu_create_machine(QDict *qdict)QDict *default_opts =keyval_parse (machine_class->default_machine_opts,NULL ,NULL , &error_abort); +qemu_apply_legacy_machine_options (default_opts);object_set_properties_from_keyval (OBJECT (current_machine), default_opts, false, &error_abort);qobject_unref (default_opts);
Signature · 1 line
2.30.2
Re: [PATCH] vl: Parse legacy default_machine_opts
Quoted 8 lines · Jason Andryuk
qemu can't start a xen vm after commit
d8fb7d0969d5"vl: switch -M parsing to keyval" with:$ ./qemu-system-i386 -M xenfv Unexpected error in object_property_find_err() at ../qom/object.c:1298: qemu-system-i386: Property 'xenfv-3.1-machine.accel' not found Aborted (core dumped)
Quoted 5 lines
The
default_machine_optshandling doesn't process the legacy machine options like "accel". Callqemu_apply_legacy_machine_optionsto provide the legacy handling.Signed-off-by Jason Andryuk <[email protected]>
I can't find a different way to set a default "accelerator" to a machine, so this patch seems necessary.
Thanks,
Quoted 16 lines
--- softmmu/vl.c | 1 + 1 file changed, 1 insertion(+)softmmu/vl.c +1
-0@@ -2126,6 +2126,7 @@ static void qemu_create_machine(QDict *qdict)QDict *default_opts =keyval_parse (machine_class->default_machine_opts,NULL ,NULL , &error_abort); +qemu_apply_legacy_machine_options (default_opts);object_set_properties_from_keyval (OBJECT (current_machine), default_opts, false, &error_abort);qobject_unref (default_opts);
Signature · 1 line
Anthony PERARD
Re: [PATCH] vl: Parse legacy default_machine_opts
Quoted 4 lines · Anthony PERARD via
Reviewed-by Anthony PERARD<[email protected]>I can't find a different way to set a default "accelerator" to a machine, so this patch seems necessary.
I agree, and I'll be sending a pull request shortly.
Paolo
Re: [PULL 36/40] vl: switch -M parsing to keyval
In reply to Paolo BonziniQuoted 22 lines
Switch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one
(quoted diff) +0
-2-M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soonas -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
Quoted 6 lines
Signed-off-by Paolo Bonzini <[email protected]>--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)
Since this commit QEMU fails to start on my system.
./qemu-system-i386 -machine pc,pcspk-audiodev=audio0 -audiodev pa,id=audio0
qemu-system-i386: Parameter 'audiodev' is missing
With best regards,
Volker
Re: [PULL 36/40] vl: switch -M parsing to keyval
In reply to Paolo BonziniQuoted 22 lines · On Tue, 6 Jul 2021 12:01:37 +0200 Paolo Bonzini <[email protected]> wrote:
Switch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one
(quoted diff) +0
-2-M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soonas -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
Quoted 4 lines
Signed-off-by Paolo Bonzini <[email protected]>--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)
This breaks the below long standing test VM. libvirt log and xml provided below. I'm using libvirt version 7.3.0.
/usr/local/bin/qemu-system-x86_64 \
-name guest=Steam-GeForce,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain-2-Steam-GeForce/master-key.aes"}' \
-blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/Steam_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
-machine pc-i440fx-6.0,accel=kvm,usb=off,vmport=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
-cpu host,migratable=on,hv-time,hv-relaxed,hv-vapic,hv-spinlocks=0x1fff,hv-vendor-id=KeenlyKVM,kvm=off \
-m 4096 \
-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/hugepages/libvirt/qemu/2-Steam-GeForce","x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":4294967296}' \
-overcommit mem-lock=off \
-smp 4,sockets=1,dies=1,cores=2,threads=2 \
-uuid 2b417d4b-f25b-4522-a5be-e105f032f99c \
-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,fd=38,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=localtime,driftfix=slew \
-global kvm-pit.lost_tick_policy=delay \
-no-hpet \
-no-shutdown \
-boot menu=on,strict=on \
-device nec-usb-xhci,id=usb,bus=pci.0,addr=0x8 \
-device virtio-scsi-pci,id=scsi0,num_queues=4,bus=pci.0,addr=0x5 \
-blockdev '{"driver":"file","filename":"/mnt/ssd/Steam-2019-08-02.img","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-2-format","read-only":true,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \
-blockdev '{"driver":"file","filename":"/mnt/ssd/Steam.qcow2","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \
-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,drive=libvirt-1-format,id=scsi0-0-0-0,bootindex=2,write-cache=on \
-netdev tap,fd=41,id=hostnet0,vhost=on,vhostfd=42 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:60:ef:ac,bus=pci.0,addr=0x3 \
-audiodev id=audio1,driver=none \
-device vfio-pci,host=0000:01:00.0,id=hostdev0,bus=pci.0,addr=0x4,rombar=1 \
-device vfio-pci,host=0000:01:00.1,id=hostdev1,bus=pci.0,addr=0x6,rombar=0 \
-device vfio-pci,host=0000:02:00.0,id=hostdev2,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
2021-07-13T19:37:27.680710Z qemu-system-x86_64: Parameter 'drive' is missing 2021-07-13 19:37:27.703+0000: shutting down, reason=failed
<domain type='kvm'>
<name>Steam-GeForce</name> <uuid>2b417d4b-f25b-4522-a5be-e105f032f99c</uuid> <memory unit='KiB'>4194304</memory> <currentMemory unit='KiB'>4194304</currentMemory> <memoryBacking>
<hugepages/>
</memoryBacking>
<vcpu placement='static'>4</vcpu> <cputune>
<vcpupin vcpu='0' cpuset='3'/>
<vcpupin vcpu='1' cpuset='7'/>
<vcpupin vcpu='2' cpuset='2'/>
<vcpupin vcpu='3' cpuset='6'/>
<emulatorpin cpuset='0,4'/>
</cputune>
<os>
<type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
<loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
<nvram template='/usr/share/edk2/ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/Steam_VARS.fd</nvram>
<bootmenu enable='yes'/>
</os>
<features>
<acpi/>
<apic/>
<pae/>
<hyperv>
<relaxed state='on'/>
<vapic state='on'/>
<spinlocks state='on' retries='8191'/>
<vendor_id state='on' value='KeenlyKVM'/>
</hyperv>
<kvm>
<hidden state='on'/>
</kvm>
<vmport state='off'/>
</features>
<cpu mode='host-passthrough' check='none' migratable='on'>
<topology sockets='1' dies='1' cores='2' threads='2'/>
</cpu>
<clock offset='localtime'>
<timer name='rtc' tickpolicy='catchup'/>
<timer name='pit' tickpolicy='delay'/>
<timer name='hpet' present='no'/>
<timer name='hypervclock' present='yes'/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/local/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/mnt/ssd/Steam.qcow2'/>
<target dev='sda' bus='scsi'/>
<boot order='2'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
<driver queues='4'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='usb' index='0' model='nec-xhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
</controller>
<interface type='direct'>
<mac address='52:54:00:60:ef:ac'/>
<source dev='enp4s0' mode='bridge'/>
<model type='virtio'/>
<link state='up'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
<address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</source>
<rom bar='on'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
<address domain='0x0000' bus='0x01' slot='0x00' function='0x1'/>
</source>
<rom bar='off'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
<address domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
</source>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</hostdev>
<memballoon model='none'/> </devices>
</domain>
Re: [PULL 36/40] vl: switch -M parsing to keyval
Quoted 25 lines · On Tue, 13 Jul 2021 13:43:47 -0600 Alex Williamson…
Quoted 22 lines · On Tue, 6 Jul 2021 12:01:37 +0200 Paolo Bonzini <[email protected]> wrote:
Switch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one
(quoted diff) +0
-2-M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soonas -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Paolo Bonzini <[email protected]>--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)This breaks the below long standing test VM. libvirt log and xml provided below. I'm using libvirt version 7.3.0.
A trivial reproducer:
qemu-system-x86_64 -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"pflash0-storage","auto-read-only":true,"discard":"unmap"}' -blockdev '{"node-name":"pflash0-format","read-only":true,"driver":"raw","file":"pflash0-storage"}' -machine pc,pflash0=pflash0-format
backtrace:
#0 error_setg_internal
(errp=0x7fffffffd6c8, src=0x55555618bc10 "../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c", line=172, func=0x55555618bf20 <__func__.27> "qobject_input_get_object", fmt=0x55555618bc98 "Parameter '%s' is missing") at ../../home/alwillia/Work/qemu.git/util/error.c:93
#1 0x0000555555f8d255 in qobject_input_get_object (qiv=0x5555569c59b0, name=0x555556920ef0 "drive", consume=true, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:172
#2 0x0000555555f8d28b in qobject_input_get_keyval (qiv=0x5555569c59b0, name=0x555556920ef0 "drive", errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:184
#3 0x0000555555f8e3a9 in qobject_input_type_str_keyval (v=0x5555569c59b0, name=0x555556920ef0 "drive", obj=0x7fffffffd5a8, errp=0x7fffffffd6c8)
at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:551
#4 0x0000555555f59e51 in visit_type_str (v=0x5555569c59b0, name=0x555556920ef0 "drive", obj=0x7fffffffd5a8, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qapi-visit-core.c:337
#5 0x00005555558c3b70 in set_drive_helper (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, iothread=false, errp=0x7fffffffd6c8)
at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties-system.c:97
#6 0x00005555558c3e0b in set_drive (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, errp=0x7fffffffd6c8)
at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties-system.c:171
#7 0x0000555555edb821 in field_prop_set (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, errp=0x7fffffffd6c8)
at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties.c:86
#8 0x0000555555eb7f15 in object_property_set (obj=0x5555569208a0, name=0x555556920ef0 "drive", v=0x5555569c59b0, errp=0x7fffffffd768) at ../../home/alwillia/Work/qemu.git/qom/object.c:1402
#9 0x0000555555ebad9e in property_set_alias (obj=0x55555683dde0, v=0x5555569c59b0, name=0x5555566fc8a0 "pflash0", opaque=0x555556920ed0, errp=0x7fffffffd768)
at ../../home/alwillia/Work/qemu.git/qom/object.c:2695
#10 0x0000555555eb7f15 in object_property_set (obj=0x55555683dde0, name=0x5555566fc8a0 "pflash0", v=0x5555569c59b0, errp=0x7fffffffd7b8) at ../../home/alwillia/Work/qemu.git/qom/object.c:1402
#11 0x0000555555eb3aa3 in object_set_properties_from_qdict (obj=0x55555683dde0, qdict=0x5555566fa5b0, v=0x5555569c59b0, errp=0x5555565d9308 <error_fatal>)
at ../../home/alwillia/Work/qemu.git/qom/object_interfaces.c:55
#12 0x0000555555eb3bc3 in object_set_properties_from_keyval (obj=0x55555683dde0, qdict=0x5555566fa5b0, from_json=false, errp=0x5555565d9308 <error_fatal>)
at ../../home/alwillia/Work/qemu.git/qom/object_interfaces.c:79#13 0x0000555555cb3f5f in qemu_apply_machine_options (qdict=0x5555566fa5b0) at ../../home/alwillia/Work/qemu.git/softmmu/vl.c:1833 #14 0x0000555555cb8606 in qemu_init (argc=7, argv=0x7fffffffdae8, envp=0x7fffffffdb28) at ../../home/alwillia/Work/qemu.git/softmmu/vl.c:3634 #15 0x00005555558326d1 in main (argc=7, argv=0x7fffffffdae8, envp=0x7fffffffdb28) at ../../home/alwillia/Work/qemu.git/softmmu/main.c:49
Re: [PULL 36/40] vl: switch -M parsing to keyval
Quoted 63 lines · Alex Williamson
Quoted 25 lines · On Tue, 13 Jul 2021 13:43:47 -0600 Alex Williamson…
Quoted 22 lines · On Tue, 6 Jul 2021 12:01:37 +0200 Paolo Bonzini <[email protected]> wrote:
Switch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one
(quoted diff) +0
-2-M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soonas -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Paolo Bonzini <[email protected]>--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)This breaks the below long standing test VM. libvirt log and xml provided below. I'm using libvirt version 7.3.0.
A trivial reproducer:
qemu-system-x86_64 -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"pflash0-storage","auto-read-only":true,"discard":"unmap"}' -blockdev '{"node-name":"pflash0-format","read-only":true,"driver":"raw","file":"pflash0-storage"}' -machine pc,pflash0=pflash0-format
backtrace:
#0
error_setg_internal(errp=0x7fffffffd6c8, src=0x55555618bc10 "../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c", line=172, func=0x55555618bf20 <__func__.27> "qobject_input_get_object", fmt=0x55555618bc98 "Parameter '%s' is missing") at ../../home/alwillia/Work/qemu.git/util/error.c:93 #1 0x0000555555f8d255 in qobject_input_get_object (qiv=0x5555569c59b0, name=0x555556920ef0 "drive", consume=true, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:172 #2 0x0000555555f8d28b in qobject_input_get_keyval (qiv=0x5555569c59b0, name=0x555556920ef0 "drive", errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:184 #3 0x0000555555f8e3a9 in qobject_input_type_str_keyval (v=0x5555569c59b0, name=0x555556920ef0 "drive", obj=0x7fffffffd5a8, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:551 #4 0x0000555555f59e51 in visit_type_str (v=0x5555569c59b0, name=0x555556920ef0 "drive", obj=0x7fffffffd5a8, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qapi-visit-core.c:337 #5 0x00005555558c3b70 in set_drive_helper (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, iothread=false, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties-system.c:97 #6 0x00005555558c3e0b in set_drive (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties-system.c:171 #7 0x0000555555edb821 in field_prop_set (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties.c:86 #8 0x0000555555eb7f15 in object_property_set (obj=0x5555569208a0, name=0x555556920ef0 "drive", v=0x5555569c59b0, errp=0x7fffffffd768) at ../../home/alwillia/Work/qemu.git/qom/object.c:1402 #9 0x0000555555ebad9e in property_set_alias (obj=0x55555683dde0, v=0x5555569c59b0, name=0x5555566fc8a0 "pflash0", opaque=0x555556920ed0, errp=0x7fffffffd768) at ../../home/alwillia/Work/qemu.git/qom/object.c:2695 #10 0x0000555555eb7f15 in object_property_set (obj=0x55555683dde0, name=0x5555566fc8a0 "pflash0", v=0x5555569c59b0, errp=0x7fffffffd7b8) at ../../home/alwillia/Work/qemu.git/qom/object.c:1402 #11 0x0000555555eb3aa3 in object_set_properties_from_qdict (obj=0x55555683dde0, qdict=0x5555566fa5b0, v=0x5555569c59b0, errp=0x5555565d9308 <error_fatal>) at ../../home/alwillia/Work/qemu.git/qom/object_interfaces.c:55 #12 0x0000555555eb3bc3 in object_set_properties_from_keyval (obj=0x55555683dde0, qdict=0x5555566fa5b0, from_json=false, errp=0x5555565d9308 <error_fatal>) at ../../home/alwillia/Work/qemu.git/qom/object_interfaces.c:79
Quoted 3 lines
#13
0x0000555555cb3f5finqemu_apply_machine_options(qdict=0x5555566fa5b0) at../../home/alwillia/Work/qemu.git/softmmu/vl.c:1833#140x0000555555cb8606inqemu_init(argc=7, argv=0x7fffffffdae8, envp=0x7fffffffdb28) at../../home/alwillia/Work/qemu.git/softmmu/vl.c:3634#150x00005555558326d1in main (argc=7, argv=0x7fffffffdae8, envp=0x7fffffffdb28) at../../home/alwillia/Work/qemu.git/softmmu/main.c:49
Is this the same bug fixed by the proposed patch at https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg03324.html?
ATB,
Mark.
Re: [PULL 36/40] vl: switch -M parsing to keyval
Quoted 69 lines · On Wed, 14 Jul 2021 07:16:43 +0100 Mark Cave-Ayland…
Quoted 63 lines · Alex Williamson
Quoted 25 lines · On Tue, 13 Jul 2021 13:43:47 -0600 Alex Williamson…
Quoted 22 lines · On Tue, 6 Jul 2021 12:01:37 +0200 Paolo Bonzini <[email protected]> wrote:
Switch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one
(quoted diff) +0
-2-M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soonas -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Paolo Bonzini <[email protected]>--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)This breaks the below long standing test VM. libvirt log and xml provided below. I'm using libvirt version 7.3.0.
A trivial reproducer:
qemu-system-x86_64 -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"pflash0-storage","auto-read-only":true,"discard":"unmap"}' -blockdev '{"node-name":"pflash0-format","read-only":true,"driver":"raw","file":"pflash0-storage"}' -machine pc,pflash0=pflash0-format
backtrace:
#0
error_setg_internal(errp=0x7fffffffd6c8, src=0x55555618bc10 "../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c", line=172, func=0x55555618bf20 <__func__.27> "qobject_input_get_object", fmt=0x55555618bc98 "Parameter '%s' is missing") at ../../home/alwillia/Work/qemu.git/util/error.c:93 #1 0x0000555555f8d255 in qobject_input_get_object (qiv=0x5555569c59b0, name=0x555556920ef0 "drive", consume=true, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:172 #2 0x0000555555f8d28b in qobject_input_get_keyval (qiv=0x5555569c59b0, name=0x555556920ef0 "drive", errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:184 #3 0x0000555555f8e3a9 in qobject_input_type_str_keyval (v=0x5555569c59b0, name=0x555556920ef0 "drive", obj=0x7fffffffd5a8, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qobject-input-visitor.c:551 #4 0x0000555555f59e51 in visit_type_str (v=0x5555569c59b0, name=0x555556920ef0 "drive", obj=0x7fffffffd5a8, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/qapi/qapi-visit-core.c:337 #5 0x00005555558c3b70 in set_drive_helper (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, iothread=false, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties-system.c:97 #6 0x00005555558c3e0b in set_drive (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties-system.c:171 #7 0x0000555555edb821 in field_prop_set (obj=0x5555569208a0, v=0x5555569c59b0, name=0x555556920ef0 "drive", opaque=0x5555564c8300 <pflash_cfi01_properties>, errp=0x7fffffffd6c8) at ../../home/alwillia/Work/qemu.git/hw/core/qdev-properties.c:86 #8 0x0000555555eb7f15 in object_property_set (obj=0x5555569208a0, name=0x555556920ef0 "drive", v=0x5555569c59b0, errp=0x7fffffffd768) at ../../home/alwillia/Work/qemu.git/qom/object.c:1402 #9 0x0000555555ebad9e in property_set_alias (obj=0x55555683dde0, v=0x5555569c59b0, name=0x5555566fc8a0 "pflash0", opaque=0x555556920ed0, errp=0x7fffffffd768) at ../../home/alwillia/Work/qemu.git/qom/object.c:2695 #10 0x0000555555eb7f15 in object_property_set (obj=0x55555683dde0, name=0x5555566fc8a0 "pflash0", v=0x5555569c59b0, errp=0x7fffffffd7b8) at ../../home/alwillia/Work/qemu.git/qom/object.c:1402 #11 0x0000555555eb3aa3 in object_set_properties_from_qdict (obj=0x55555683dde0, qdict=0x5555566fa5b0, v=0x5555569c59b0, errp=0x5555565d9308 <error_fatal>) at ../../home/alwillia/Work/qemu.git/qom/object_interfaces.c:55 #12 0x0000555555eb3bc3 in object_set_properties_from_keyval (obj=0x55555683dde0, qdict=0x5555566fa5b0, from_json=false, errp=0x5555565d9308 <error_fatal>) at ../../home/alwillia/Work/qemu.git/qom/object_interfaces.c:79Quoted 3 lines
#13
0x0000555555cb3f5finqemu_apply_machine_options(qdict=0x5555566fa5b0) at../../home/alwillia/Work/qemu.git/softmmu/vl.c:1833#140x0000555555cb8606inqemu_init(argc=7, argv=0x7fffffffdae8, envp=0x7fffffffdb28) at../../home/alwillia/Work/qemu.git/softmmu/vl.c:3634#150x00005555558326d1in main (argc=7, argv=0x7fffffffdae8, envp=0x7fffffffdb28) at../../home/alwillia/Work/qemu.git/softmmu/main.c:49
Quoted 2 lines
Is this the same bug fixed by the proposed patch at
https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg03324.html?
Nope, doesn't fix it. Thanks,
Alex
Re: [PULL 36/40] vl: switch -M parsing to keyval
In reply to Paolo BonziniCC libvir-list
Quoted 22 lines · Paolo Bonzini
Switch from QemuOpts to keyval. This enables the introduction of non-scalar machine properties, and JSON syntax in the future.
For JSON syntax to be supported right now, we would have to consider what would happen if string-based dictionaries (produced by -M key=val) were to be merged with strongly-typed dictionaries (produced by -M {'key': 123}).
The simplest way out is to never enter the situation, and only allow one
(quoted diff) +0
-2-M option when JSON syntax is in use. However, we want options such as -smp to become syntactic sugar for -M, and this is a problem; as soonas -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' together with -smp. Therefore, allowing JSON syntax right now for -M would be a forward-compatibility nightmare and it would be impossible anyway to introduce -M incrementally in tools.
Instead, support for JSON syntax is delayed until after the main options are converted to QOM compound properties. These include -boot, -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON syntax is introduced, these options will _also_ be forbidden together with -M '{...}'.
Quoted 4 lines
Signed-off-by Paolo Bonzini <[email protected]>--- softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- 1 file changed, 146 insertions(+), 169 deletions(-)
This patch breaks detection of certain machine options features in libvirt which were being detected from 'query-command-line-options'.
I presume the change simply removed this from the output of query-command-line-options due to the historical cruft how the aforementioned command works.
Unfortunately I didn't find any suitable replacement from what we are querying.
The entries which we now lack detection are:
{ "machine", "mem-merge", QEMU_CAPS_MEM_MERGE },
{ "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP },
{ "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP },
{ "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },
{ "machine", "loadparm", QEMU_CAPS_LOADPARM },Note that the oldest supported qemu version in libvirt is 2.11 at this point and all the above flags are included in 2.11 and later.
This means we can theoretically remove the detection and always assume the flags in case when they are unlikely to be removed in the future.
Alternatively if you can suggest an option how to detect this it will be welcome.
Thanks
Peter
Re: [PULL 36/40] vl: switch -M parsing to keyval
Quoted 9 lines · Peter Krempa
This patch breaks detection of certain machine options features in libvirt which were being detected from 'query-command-line-options'.
I presume the change simply removed this from the output of query-command-line-options due to the historical cruft how the aforementioned command works.
Unfortunately I didn't find any suitable replacement from what we are querying.
Yep, there is already a patch queued for this.
Paolo
Re: [PULL 36/40] vl: switch -M parsing to keyval
Quoted 4 lines · Paolo Bonzini
Quoted 3 lines · Peter Krempa
This patch breaks detection of certain machine options features in libvirt which were being detected from 'query-command-line-options'.
Quoted 8 lines
Quoted 6 lines
I presume the change simply removed this from the output of query-command-line-options due to the historical cruft how the aforementioned command works.
Unfortunately I didn't find any suitable replacement from what we are querying.
Yep, there is already a patch queued for this.
So the desired state is that the properties stay in 'query-command-line-options'?
[PULL 40/40] config-host.mak: remove unused compiler-related lines
In reply to Paolo BonziniMost of the build is not done via Makefiles, therefore the toolchain variables are mostly unused. They are still used by tests/tcg and pc-bios/roms, but most of them are not needed there.
--- configure | 10 ---------- meson.build | 1 - 2 files changed, 11 deletions(-)
configure +0 -10
@@ -521,9 +521,6 @@ query_pkg_config() { pkg_config=query_pkg_config sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}" -# If the user hasn't specified ARFLAGS, default to 'rv', just as make does. -ARFLAGS="${ARFLAGS-rv}" - # default flags for all hosts # We use -fwrapv to tell the compiler that we require a C dialect where # left shift of signed integers is well defined and has the expected
@@ -4917,19 +4914,12 @@ echo "HOST_CC=$host_cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "CONFIG_IASL=$iasl" >> $config_host_mak fi -echo "CXX=$cxx" >> $config_host_mak -echo "OBJCC=$objcc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak -echo "ARFLAGS=$ARFLAGS" >> $config_host_mak echo "AS=$as" >> $config_host_mak echo "CCAS=$ccas" >> $config_host_mak echo "CPP=$cpp" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak -echo "RANLIB=$ranlib" >> $config_host_mak -echo "NM=$nm" >> $config_host_mak -echo "PKG_CONFIG=$pkg_config_exe" >> $config_host_mak -echo "WINDRES=$windres" >> $config_host_mak echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
meson.build +0 -1
@@ -2765,7 +2765,6 @@ if targetos == 'windows' summary_info += {'Windows SDK': config_host['WIN_SDK']} endif endif -summary_info += {'ARFLAGS': config_host['ARFLAGS']} summary_info += {'CFLAGS': ' '.join(get_option('c_args') + ['-O' + get_option('optimization')] + (get_option('debug') ? ['-g'] : []))}
Signature · 1 line
2.31.1
Peter Maydell
AppliedQuoted 13 lines · Paolo Bonzini
The following changes since commit
715167a36c2b152f6511cff690180c1254ae039f:Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210705a' into staging (2021-07-05 12:45:24 +0100)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to
7ca6f2ad375d32e81844788dbc2b05a04cc391b5:config-host.mak: remove unused compiler-related lines (2021-07-06 09:35:08 +0200)
Quoted 8 lines
----------------------------------------------------------------
* More Meson test conversions and configure cleanups
* Generalize XSAVE area offset so that it matches AMD processors on KVM
* Improvements for -display and deprecation of -no-quit
* Enable SMP configuration as a compound machine property ("-M smp.cpus=...")
* Haiku compilation fix
* Add icon on Darwin
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.
-- PMM