Re: [PATCH 0/4] docs: improve -smp documentation

[Eduardo Habkost]

On Fri, Jul 09, 2021 at 04:48:57PM -0400, Eduardo Habkost wrote:
> On Mon, Jun 28, 2021 at 12:30:43PM +0100, Daniel P. Berrangé wrote:
> > This is a spin off from this thread:
> > 
> >   https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg06135.html
> > 
> > to improve the documentation of the current behaviour of -smp
> > arg. In that thread it is suggested that we change the behaviour
> > to prefer use of cores over sockets, when topology is omitted. This
> > documentation update explicitly notes that default topology is liable
> > to change, to allow for this enhancement.
> 
> Queued, thanks!

I had to remove it due to build failures:
https://gitlab.com/ehabkost/qemu/-/jobs/1413791527#L1139


FAILED: libqemu-microblazeel-softmmu.fa.p/softmmu_vl.c.o
cc -Ilibqemu-microblazeel-softmmu.fa.p -I. -I.. -Itarget/microblaze 
-I../target/microblaze -I../capstone/include/capstone -Iqapi -Itrace -Iui 
-Iui/shader -I/usr/include/pixman-1 -I/usr/include/glib-2.0 
-I/usr/lib/glib-2.0/include -fdiagnostics-color=auto -pipe -Wall -Winvalid-pch 
-Werror -std=gnu11 -O2 -g -isystem /builds/ehabkost/qemu/linux-headers -isystem 
linux-headers -iquote . -iquote /builds/ehabkost/qemu -iquote 
/builds/ehabkost/qemu/include -iquote /builds/ehabkost/qemu/disas/libvixl 
-iquote /builds/ehabkost/qemu/tcg/i386 -pthread -U_FORTIFY_SOURCE 
-D_FORTIFY_SOURCE=2 -m32 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 
-D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef 
-Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv 
-m32 -Wold-style-declaration -Wold-style-definition -Wtype-limits 
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body 
-Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 
-Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi 
-fstack-protector-strong -fPIC -isystem../linux-headers -isystemlinux-headers 
-DNEED_CPU_H '-DCONFIG_TARGET="microblazeel-softmmu-config-target.h"' 
'-DCONFIG_DEVICES="microblazeel-softmmu-config-devices.h"' -MD -MQ 
libqemu-microblazeel-softmmu.fa.p/softmmu_vl.c.o -MF 
libqemu-microblazeel-softmmu.fa.p/softmmu_vl.c.o.d -o 
libqemu-microblazeel-softmmu.fa.p/softmmu_vl.c.o -c ../softmmu/vl.c
./qemu-options.def: In function 'help':
./qemu-options.def:52:1: error: expected ')' before 'QEMU_ARCH_ALL'
   52 | QEMU_ARCH_ALL)
      | ^~~~~~~~~~~~~
../softmmu/vl.c:809:10: note: in definition of macro 'DEF'
  809 |     if ((arch_mask) & arch_type)                               \
      |          ^~~~~~~~~
../softmmu/vl.c:809:9: note: to match this '('
  809 |     if ((arch_mask) & arch_type)                               \
      |         ^
./qemu-options.def:43:1: note: in expansion of macro 'DEF'
   43 | DEF("smp", HAS_ARG, QEMU_OPTION_smp,
      | ^~~
../softmmu/vl.c:809:21: error: invalid operands to binary & (have 'const char 
*' and 'uint32_t' {aka 'const unsigned int'})
  809 |     if ((arch_mask) & arch_type)                               \
      |         ~           ^
      |         |
      |         const char *
./qemu-options.def:43:1: note: in expansion of macro 'DEF'
   43 | DEF("smp", HAS_ARG, QEMU_OPTION_smp,
      | ^~~
./qemu-options.def: At top level:
./qemu-options.def:49:1: error: initialization of 'unsigned int' from 'const 
char *' makes integer from pointer without a cast [-Werror=int-conversion]
   49 | "                dies= number of CPU dies on one socket (for PC only)\n"
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../softmmu/vl.c:845:34: note: in definition of macro 'DEF'
  845 |     { option, opt_arg, opt_enum, arch_mask },
      |                                  ^~~~~~~~~
./qemu-options.def:49:1: note: (near initialization for 
'qemu_options[7].arch_mask')
   49 | "                dies= number of CPU dies on one socket (for PC only)\n"
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../softmmu/vl.c:845:34: note: in definition of macro 'DEF'
  845 |     { option, opt_arg, opt_enum, arch_mask },
      |                                  ^~~~~~~~~
./qemu-options.def:52:1: error: expected '}' before 'QEMU_ARCH_ALL'
   52 | QEMU_ARCH_ALL)
      | ^~~~~~~~~~~~~
../softmmu/vl.c:845:34: note: in definition of macro 'DEF'
  845 |     { option, opt_arg, opt_enum, arch_mask },
      |                                  ^~~~~~~~~
../softmmu/vl.c:845:5: note: to match this '{'
  845 |     { option, opt_arg, opt_enum, arch_mask },
      |     ^
./qemu-options.def:43:1: note: in expansion of macro 'DEF'
   43 | DEF("smp", HAS_ARG, QEMU_OPTION_smp,
      | ^~~
cc1: all warnings being treated as errors
[663/5259] Compiling C object 
libqemu-microblazeel-softmmu.fa.p/accel_tcg_tcg-accel-ops-icount.c.o
ninja: build stopped: subcommand failed.
make: *** [Makefile:154: run-ninja] Error 1

-- 
Eduardo