[PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Philippe Mathieu-Daudé]

In this series we deselect a bunch of features when they
not required, so less objects are built.

While this reduce pressure on CI and slow systems, this is
particularly helpful for developers regularly testing multiple
build configurations.

All CI tests pass:
https://gitlab.com/philmd/qemu/-/pipelines/245654160

Supersedes: <20210120151916.1167448-1-philmd@redhat.com>

Philippe Mathieu-Daudé (12):
  configure: Only check for audio drivers if system-mode is selected
  tests/meson: Only build softfloat objects if TCG is selected
  pc-bios/meson: Only install EDK2 blob firmwares with system emulation
  meson: Do not build optional libraries by default
  meson: Restrict block subsystem processing
  meson: Merge trace_events_subdirs array
  meson: Restrict some trace event directories to user/system emulation
  meson: Restrict emulation code
  qapi/meson: Restrict qdev code to system-mode emulation
  qapi/meson: Remove QMP from user-mode emulation
  qapi/meson: Restrict system-mode specific modules
  qapi/meson: Restrict UI module to system emulation and tools

 configure           |  6 +++++
 meson.build         | 55 ++++++++++++++++++++++++++-------------------
 stubs/qdev.c        | 23 +++++++++++++++++++
 MAINTAINERS         |  1 +
 pc-bios/meson.build |  1 +
 qapi/meson.build    | 34 +++++++++++++++++++---------
 stubs/meson.build   |  2 ++
 tests/meson.build   | 11 +++++++--
 8 files changed, 97 insertions(+), 36 deletions(-)
 create mode 100644 stubs/qdev.c

-- 
2.26.2

[PATCH v2 01/12] configure: Only check for audio drivers if system-mode is selected

[Philippe Mathieu-Daudé]

Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 configure | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure b/configure
index 6f6a319c2f6..a4476d457e0 100755
--- a/configure
+++ b/configure
@@ -2324,6 +2324,12 @@ if test -z "$want_tools"; then
     fi
 fi
 
+##########################################
+# Disable features only meaningful for system-mode emulation
+if test "$softmmu" = "no"; then
+    audio_drv_list=""
+fi
+
 ##########################################
 # Some versions of Mac OS X incorrectly define SIZE_MAX
 cat > $TMPC << EOF
-- 
2.26.2

Re: [PATCH v2 01/12] configure: Only check for audio drivers if system-mode is selected

[Alex Bennée]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  configure | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/configure b/configure
> index 6f6a319c2f6..a4476d457e0 100755
> --- a/configure
> +++ b/configure
> @@ -2324,6 +2324,12 @@ if test -z "$want_tools"; then
>      fi
>  fi
>  
> +##########################################
> +# Disable features only meaningful for system-mode emulation
> +if test "$softmmu" = "no"; then
> +    audio_drv_list=""
> +fi
> +
>  ##########################################
>  # Some versions of Mac OS X incorrectly define SIZE_MAX
>  cat > $TMPC << EOF


-- 
Alex Bennée

[PATCH v2 02/12] tests/meson: Only build softfloat objects if TCG is selected

[Philippe Mathieu-Daudé]

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Alex Bennée <alex.bennee@linaro.org>
Cc: Emilio G. Cota <cota@braap.org>
---
 tests/meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/meson.build b/tests/meson.build
index 29ebaba48d2..6f1ff926d26 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -276,7 +276,9 @@
      workdir: meson.current_source_dir() / 'decode',
      suite: 'decodetree')
 
-subdir('fp')
+if 'CONFIG_TCG' in config_all
+  subdir('fp')
+endif
 
 if not get_option('tcg').disabled()
   if 'CONFIG_PLUGIN' in config_host
-- 
2.26.2

Re: [PATCH v2 02/12] tests/meson: Only build softfloat objects if TCG is selected

[Claudio Fontana]

On 1/22/21 9:44 PM, Philippe Mathieu-Daudé wrote:
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Emilio G. Cota <cota@braap.org>
> ---
>  tests/meson.build | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index 29ebaba48d2..6f1ff926d26 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -276,7 +276,9 @@
>       workdir: meson.current_source_dir() / 'decode',
>       suite: 'decodetree')
>  
> -subdir('fp')
> +if 'CONFIG_TCG' in config_all
> +  subdir('fp')
> +endif
>  
>  if not get_option('tcg').disabled()
>    if 'CONFIG_PLUGIN' in config_host
> 

Hi Philippe,

just looking at the context of this hunk,
is there a reason why we have different ways to say "tcg disabled",

ie CONFIG_TCG
and "get_option('tcg').disabled()"?

otherwise appears ok,
I am just thinking about what the next steps should be,
ie how to encompass everything tcg-related in a loadable module,

but it's still too early I guess to worry about that.

Thanks,

Claudio

Re: [PATCH v2 02/12] tests/meson: Only build softfloat objects if TCG is selected

[Alex Bennée]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Emilio G. Cota <cota@braap.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée

[PATCH v2 03/12] pc-bios/meson: Only install EDK2 blob firmwares with system emulation

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 pc-bios/meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index fab323af84e..68705d405ce 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -16,6 +16,7 @@
 
   foreach f : fds
     custom_target(f,
+                  build_by_default: have_system,
                   output: f,
                   input: '@0@.bz2'.format(f),
                   capture: true,
-- 
2.26.2

[PATCH v2 04/12] meson: Do not build optional libraries by default

[Philippe Mathieu-Daudé]

The following libraries will be selected if a feature requires it:

- capstone
- fdt
- SLiRP

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meson.build b/meson.build
index a1e1eb318a5..61cbb89cd44 100644
--- a/meson.build
+++ b/meson.build
@@ -1446,6 +1446,7 @@
   ]
 
   libcapstone = static_library('capstone',
+                               build_by_default: false,
                                sources: capstone_files,
                                c_args: capstone_cargs,
                                include_directories: 'capstone/include')
@@ -1523,6 +1524,7 @@
 
     slirp_inc = include_directories('slirp', 'slirp/src')
     libslirp = static_library('slirp',
+                              build_by_default: false,
                               sources: slirp_files,
                               c_args: slirp_cargs,
                               include_directories: slirp_inc)
@@ -1568,6 +1570,7 @@
 
     fdt_inc = include_directories('dtc/libfdt')
     libfdt = static_library('fdt',
+                            build_by_default: false,
                             sources: fdt_files,
                             include_directories: fdt_inc)
     fdt = declare_dependency(link_with: libfdt,
-- 
2.26.2

[PATCH v2 05/12] meson: Restrict block subsystem processing

[Philippe Mathieu-Daudé]

Avoid generating module_block.h and block-gen.c if we are
not going to use them.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: qemu-block@nongnu.org
---
 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 61cbb89cd44..181f8795f5a 100644
--- a/meson.build
+++ b/meson.build
@@ -1829,7 +1829,9 @@
 
 subdir('nbd')
 subdir('scsi')
-subdir('block')
+if have_block
+  subdir('block')
+endif
 
 blockdev_ss.add(files(
   'blockdev.c',
-- 
2.26.2

Re: [PATCH v2 05/12] meson: Restrict block subsystem processing

[Kevin Wolf]

Am 22.01.2021 um 21:44 hat Philippe Mathieu-Daudé geschrieben:
> Avoid generating module_block.h and block-gen.c if we are
> not going to use them.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: qemu-block@nongnu.org
> ---
>  meson.build | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 61cbb89cd44..181f8795f5a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1829,7 +1829,9 @@
>  
>  subdir('nbd')
>  subdir('scsi')
> -subdir('block')
> +if have_block
> +  subdir('block')
> +endif
>  
>  blockdev_ss.add(files(
>    'blockdev.c',

It feels odd to have a random have_block check in the middle of a whole
bunch of lines that all deal with block layer functionality, especially
when unconditional ones depend on the conditional one. (nbd, scsi and
blockdev.c present in the context here certainly all can't work without
block)

So should this if block become a bit longer and include all block layer
related things nearby?

If not, at least a comment explaining why we're doing this would be
nice.

Kevin

Re: [PATCH v2 05/12] meson: Restrict block subsystem processing

[Paolo Bonzini]

[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]

Another possibility is to place the if in block/meson.build, using
subdir_done() to stop the processing of the directory.

Paolo

Il lun 25 gen 2021, 13:15 Kevin Wolf <kwolf@redhat.com> ha scritto:

> Am 22.01.2021 um 21:44 hat Philippe Mathieu-Daudé geschrieben:
> > Avoid generating module_block.h and block-gen.c if we are
> > not going to use them.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> > Cc: qemu-block@nongnu.org
> > ---
> >  meson.build | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 61cbb89cd44..181f8795f5a 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1829,7 +1829,9 @@
> >
> >  subdir('nbd')
> >  subdir('scsi')
> > -subdir('block')
> > +if have_block
> > +  subdir('block')
> > +endif
> >
> >  blockdev_ss.add(files(
> >    'blockdev.c',
>
> It feels odd to have a random have_block check in the middle of a whole
> bunch of lines that all deal with block layer functionality, especially
> when unconditional ones depend on the conditional one. (nbd, scsi and
> blockdev.c present in the context here certainly all can't work without
> block)
>
> So should this if block become a bit longer and include all block layer
> related things nearby?
>
> If not, at least a comment explaining why we're doing this would be
> nice.
>
> Kevin
>
>

[-- Attachment #2: Type: text/html, Size: 2097 bytes --]

[PATCH v2 06/12] meson: Merge trace_events_subdirs array

[Philippe Mathieu-Daudé]

The trace_events_subdirs array is split in two different
locations, merge it as one.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Stefan Hajnoczi <stefanha@redhat.com>
---
 meson.build | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index 181f8795f5a..c43538a1523 100644
--- a/meson.build
+++ b/meson.build
@@ -1686,7 +1686,20 @@
   'accel/kvm',
   'accel/tcg',
   'crypto',
+  'hw/core',
+  'qapi',
+  'qom',
   'monitor',
+  'target/arm',
+  'target/hppa',
+  'target/i386',
+  'target/i386/kvm',
+  'target/mips',
+  'target/ppc',
+  'target/riscv',
+  'target/s390x',
+  'target/sparc',
+  'util',
 ]
 if have_user
   trace_events_subdirs += [ 'linux-user' ]
@@ -1759,21 +1772,6 @@
     'ui',
   ]
 endif
-trace_events_subdirs += [
-  'hw/core',
-  'qapi',
-  'qom',
-  'target/arm',
-  'target/hppa',
-  'target/i386',
-  'target/i386/kvm',
-  'target/mips',
-  'target/ppc',
-  'target/riscv',
-  'target/s390x',
-  'target/sparc',
-  'util',
-]
 
 vhost_user = not_found
 if 'CONFIG_VHOST_USER' in config_host
-- 
2.26.2

Re: [PATCH v2 06/12] meson: Merge trace_events_subdirs array

[Claudio Fontana]

On 1/22/21 9:44 PM, Philippe Mathieu-Daudé wrote:
> The trace_events_subdirs array is split in two different
> locations, merge it as one.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  meson.build | 28 +++++++++++++---------------
>  1 file changed, 13 insertions(+), 15 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 181f8795f5a..c43538a1523 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1686,7 +1686,20 @@
>    'accel/kvm',
>    'accel/tcg',
>    'crypto',
> +  'hw/core',
> +  'qapi',
> +  'qom',
>    'monitor',
> +  'target/arm',
> +  'target/hppa',
> +  'target/i386',
> +  'target/i386/kvm',
> +  'target/mips',
> +  'target/ppc',
> +  'target/riscv',
> +  'target/s390x',
> +  'target/sparc',
> +  'util',
>  ]
>  if have_user
>    trace_events_subdirs += [ 'linux-user' ]
> @@ -1759,21 +1772,6 @@
>      'ui',
>    ]
>  endif
> -trace_events_subdirs += [
> -  'hw/core',
> -  'qapi',
> -  'qom',
> -  'target/arm',
> -  'target/hppa',
> -  'target/i386',
> -  'target/i386/kvm',
> -  'target/mips',
> -  'target/ppc',
> -  'target/riscv',
> -  'target/s390x',
> -  'target/sparc',
> -  'util',
> -]
>  
>  vhost_user = not_found
>  if 'CONFIG_VHOST_USER' in config_host
> 

Reviewed-by: Claudio Fontana <cfontana@suse.de>

[PATCH v2 07/12] meson: Restrict some trace event directories to user/system emulation

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Stefan Hajnoczi <stefanha@redhat.com>
---
 meson.build | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/meson.build b/meson.build
index c43538a1523..396ea3aa19b 100644
--- a/meson.build
+++ b/meson.build
@@ -1683,22 +1683,10 @@
 # TODO: add each directory to the subdirs from its own meson.build, once
 # we have those
 trace_events_subdirs = [
-  'accel/kvm',
-  'accel/tcg',
   'crypto',
-  'hw/core',
   'qapi',
   'qom',
   'monitor',
-  'target/arm',
-  'target/hppa',
-  'target/i386',
-  'target/i386/kvm',
-  'target/mips',
-  'target/ppc',
-  'target/riscv',
-  'target/s390x',
-  'target/sparc',
   'util',
 ]
 if have_user
@@ -1715,6 +1703,7 @@
 endif
 if have_system
   trace_events_subdirs += [
+    'accel/kvm',
     'audio',
     'backends',
     'backends/tpm',
@@ -1772,6 +1761,21 @@
     'ui',
   ]
 endif
+if have_system or have_user
+  trace_events_subdirs += [
+    'accel/tcg',
+    'hw/core',
+    'target/arm',
+    'target/hppa',
+    'target/i386',
+    'target/i386/kvm',
+    'target/mips',
+    'target/ppc',
+    'target/riscv',
+    'target/s390x',
+    'target/sparc',
+  ]
+endif
 
 vhost_user = not_found
 if 'CONFIG_VHOST_USER' in config_host
-- 
2.26.2

[PATCH v2 08/12] meson: Restrict emulation code

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Richard Henderson <richard.henderson@linaro.org>
---
 meson.build | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 396ea3aa19b..b5afa2923b3 100644
--- a/meson.build
+++ b/meson.build
@@ -1809,16 +1809,18 @@
 qemuutil = declare_dependency(link_with: libqemuutil,
                               sources: genh + version_res)
 
-decodetree = generator(find_program('scripts/decodetree.py'),
-                       output: 'decode-@BASENAME@.c.inc',
-                       arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@'])
+if have_system or have_user
+  decodetree = generator(find_program('scripts/decodetree.py'),
+                         output: 'decode-@BASENAME@.c.inc',
+                         arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@'])
+  subdir('libdecnumber')
+  subdir('target')
+endif
 
 subdir('audio')
 subdir('io')
 subdir('chardev')
 subdir('fsdev')
-subdir('libdecnumber')
-subdir('target')
 subdir('dump')
 
 block_ss.add(files(
-- 
2.26.2

Re: [PATCH v2 08/12] meson: Restrict emulation code

[Philippe Mathieu-Daudé]

On 1/22/21 9:44 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Richard Henderson <richard.henderson@linaro.org>
> ---
>  meson.build | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 396ea3aa19b..b5afa2923b3 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1809,16 +1809,18 @@
>  qemuutil = declare_dependency(link_with: libqemuutil,
>                                sources: genh + version_res)
>  
> -decodetree = generator(find_program('scripts/decodetree.py'),
> -                       output: 'decode-@BASENAME@.c.inc',
> -                       arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@'])
> +if have_system or have_user

Maybe better as:

   if not get_option('tcg').disabled()

And even clearer as:

   if get_option('tcg').enabled()

assuming enabled would be "auto" or "yes".

> +  decodetree = generator(find_program('scripts/decodetree.py'),
> +                         output: 'decode-@BASENAME@.c.inc',
> +                         arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@'])
> +  subdir('libdecnumber')
> +  subdir('target')
> +endif
>  
>  subdir('audio')
>  subdir('io')
>  subdir('chardev')
>  subdir('fsdev')
> -subdir('libdecnumber')
> -subdir('target')
>  subdir('dump')
>  
>  block_ss.add(files(
> 

Re: [PATCH v2 08/12] meson: Restrict emulation code

[Philippe Mathieu-Daudé]

On 1/25/21 4:09 PM, Philippe Mathieu-Daudé wrote:
> On 1/22/21 9:44 PM, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> Cc: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>  meson.build | 12 +++++++-----
>>  1 file changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 396ea3aa19b..b5afa2923b3 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -1809,16 +1809,18 @@
>>  qemuutil = declare_dependency(link_with: libqemuutil,
>>                                sources: genh + version_res)
>>  
>> -decodetree = generator(find_program('scripts/decodetree.py'),
>> -                       output: 'decode-@BASENAME@.c.inc',
>> -                       arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@'])
>> +if have_system or have_user
> 
> Maybe better as:
> 
>    if not get_option('tcg').disabled()
> 
> And even clearer as:
> 
>    if get_option('tcg').enabled()
> 
> assuming enabled would be "auto" or "yes".

^ this comment is only for the decodetree generator, not for
the target/ directory ;)

> 
>> +  decodetree = generator(find_program('scripts/decodetree.py'),
>> +                         output: 'decode-@BASENAME@.c.inc',
>> +                         arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@'])
>> +  subdir('libdecnumber')
>> +  subdir('target')
>> +endif
>>  
>>  subdir('audio')
>>  subdir('io')
>>  subdir('chardev')
>>  subdir('fsdev')
>> -subdir('libdecnumber')
>> -subdir('target')
>>  subdir('dump')
>>  
>>  block_ss.add(files(
>>
> 

[PATCH v2 09/12] qapi/meson: Restrict qdev code to system-mode emulation

[Philippe Mathieu-Daudé]

Beside a CPU device, user-mode emulation doesn't access
anything else from qdev subsystem.

Tools don't need anything from qdev.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: Eduardo Habkost <ehabkost@redhat.com>
---
 stubs/qdev.c      | 23 +++++++++++++++++++++++
 MAINTAINERS       |  1 +
 qapi/meson.build  |  6 +++++-
 stubs/meson.build |  2 ++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 stubs/qdev.c

diff --git a/stubs/qdev.c b/stubs/qdev.c
new file mode 100644
index 00000000000..92e61431344
--- /dev/null
+++ b/stubs/qdev.c
@@ -0,0 +1,23 @@
+/*
+ * QOM stubs
+ *
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * Author:
+ *   Philippe Mathieu-Daudé <philmd@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/qapi-events-qdev.h"
+
+void qapi_event_send_device_deleted(bool has_device,
+                                    const char *device,
+                                    const char *path)
+{
+    /* Nothing to do. */
+}
diff --git a/MAINTAINERS b/MAINTAINERS
index 34359a99b8e..d2dd7c24228 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2523,6 +2523,7 @@ F: qapi/qom.json
 F: qapi/qdev.json
 F: scripts/coccinelle/qom-parent-type.cocci
 F: softmmu/qdev-monitor.c
+F: stubs/qdev.c
 F: qom/
 F: tests/check-qom-interface.c
 F: tests/check-qom-proplist.c
diff --git a/qapi/meson.build b/qapi/meson.build
index ab68e7900e4..2839871b478 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -35,7 +35,6 @@
   'misc-target',
   'net',
   'pragma',
-  'qdev',
   'pci',
   'qom',
   'rdma',
@@ -49,6 +48,11 @@
   'ui',
   'yank',
 ]
+if have_system
+  qapi_all_modules += [
+    'qdev',
+  ]
+endif
 
 qapi_storage_daemon_modules = [
   'block-core',
diff --git a/stubs/meson.build b/stubs/meson.build
index 1a656cd0704..a054d5877fb 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -53,4 +53,6 @@
 if have_system
   stub_ss.add(files('semihost.c'))
   stub_ss.add(files('xen-hw-stub.c'))
+else
+  stub_ss.add(files('qdev.c'))
 endif
-- 
2.26.2

Re: [PATCH v2 09/12] qapi/meson: Restrict qdev code to system-mode emulation

[Paolo Bonzini]

On 22/01/21 21:44, Philippe Mathieu-Daudé wrote:
> Beside a CPU device, user-mode emulation doesn't access
> anything else from qdev subsystem.
> 
> Tools don't need anything from qdev.

I prefer to avoid stubs.  So if this patch can simply be dropped with no 
effects on 10-12, that's nicer for me.

Paolo

> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Laurent Vivier <laurent@vivier.eu>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> ---
>   stubs/qdev.c      | 23 +++++++++++++++++++++++
>   MAINTAINERS       |  1 +
>   qapi/meson.build  |  6 +++++-
>   stubs/meson.build |  2 ++
>   4 files changed, 31 insertions(+), 1 deletion(-)
>   create mode 100644 stubs/qdev.c
> 
> diff --git a/stubs/qdev.c b/stubs/qdev.c
> new file mode 100644
> index 00000000000..92e61431344
> --- /dev/null
> +++ b/stubs/qdev.c
> @@ -0,0 +1,23 @@
> +/*
> + * QOM stubs
> + *
> + * Copyright (c) 2021 Red Hat, Inc.
> + *
> + * Author:
> + *   Philippe Mathieu-Daudé <philmd@redhat.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/qapi-events-qdev.h"
> +
> +void qapi_event_send_device_deleted(bool has_device,
> +                                    const char *device,
> +                                    const char *path)
> +{
> +    /* Nothing to do. */
> +}
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 34359a99b8e..d2dd7c24228 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2523,6 +2523,7 @@ F: qapi/qom.json
>   F: qapi/qdev.json
>   F: scripts/coccinelle/qom-parent-type.cocci
>   F: softmmu/qdev-monitor.c
> +F: stubs/qdev.c
>   F: qom/
>   F: tests/check-qom-interface.c
>   F: tests/check-qom-proplist.c
> diff --git a/qapi/meson.build b/qapi/meson.build
> index ab68e7900e4..2839871b478 100644
> --- a/qapi/meson.build
> +++ b/qapi/meson.build
> @@ -35,7 +35,6 @@
>     'misc-target',
>     'net',
>     'pragma',
> -  'qdev',
>     'pci',
>     'qom',
>     'rdma',
> @@ -49,6 +48,11 @@
>     'ui',
>     'yank',
>   ]
> +if have_system
> +  qapi_all_modules += [
> +    'qdev',
> +  ]
> +endif
>   
>   qapi_storage_daemon_modules = [
>     'block-core',
> diff --git a/stubs/meson.build b/stubs/meson.build
> index 1a656cd0704..a054d5877fb 100644
> --- a/stubs/meson.build
> +++ b/stubs/meson.build
> @@ -53,4 +53,6 @@
>   if have_system
>     stub_ss.add(files('semihost.c'))
>     stub_ss.add(files('xen-hw-stub.c'))
> +else
> +  stub_ss.add(files('qdev.c'))
>   endif
> 

Re: [PATCH v2 09/12] qapi/meson: Restrict qdev code to system-mode emulation

[Philippe Mathieu-Daudé]

On 1/23/21 7:10 PM, Paolo Bonzini wrote:
> On 22/01/21 21:44, Philippe Mathieu-Daudé wrote:
>> Beside a CPU device, user-mode emulation doesn't access
>> anything else from qdev subsystem.
>>
>> Tools don't need anything from qdev.
> 
> I prefer to avoid stubs.  So if this patch can simply be dropped with no
> effects on 10-12, that's nicer for me.

The alternative is ugly:

-- >8 --
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index cefc5eaa0a9..d09f32e38d6 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -950,7 +950,9 @@ static void device_finalize(Object *obj)
     if (dev->pending_deleted_event) {
         g_assert(dev->canonical_path);

+#ifdef CONFIG_USER_ONLY
         qapi_event_send_device_deleted(!!dev->id, dev->id,
dev->canonical_path);
+#endif
         g_free(dev->canonical_path);
         dev->canonical_path = NULL;
     }
---

Maybe wrapping it in an inlined function?

Re: [PATCH v2 09/12] qapi/meson: Restrict qdev code to system-mode emulation

[Paolo Bonzini]

On 24/01/21 01:32, Philippe Mathieu-Daudé wrote:
> 
> The alternative is ugly:
> 
> -- >8 --
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index cefc5eaa0a9..d09f32e38d6 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -950,7 +950,9 @@ static void device_finalize(Object *obj)
>      if (dev->pending_deleted_event) {
>          g_assert(dev->canonical_path);
> 
> +#ifdef CONFIG_USER_ONLY
>          qapi_event_send_device_deleted(!!dev->id, dev->id,
> dev->canonical_path);
> +#endif
>          g_free(dev->canonical_path);
>          dev->canonical_path = NULL;
>      }
> ---

Well, the alternative is also to not do anything.  There's already a 
stub for qapi_event_emit, does it really hurt to have the 
not-stubbed-out code for qapi_event_send_device_deleted?

Paolo

[PATCH v2 10/12] qapi/meson: Remove QMP from user-mode emulation

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Laurent Vivier <laurent@vivier.eu>
---
 qapi/meson.build  | 10 +++++++---
 tests/meson.build |  7 ++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/qapi/meson.build b/qapi/meson.build
index 2839871b478..b301a46f04a 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -4,14 +4,18 @@
   'qapi-dealloc-visitor.c',
   'qapi-util.c',
   'qapi-visit-core.c',
-  'qmp-dispatch.c',
-  'qmp-event.c',
-  'qmp-registry.c',
   'qobject-input-visitor.c',
   'qobject-output-visitor.c',
   'string-input-visitor.c',
   'string-output-visitor.c',
 ))
+if have_system or have_tools
+  util_ss.add(files(
+    'qmp-dispatch.c',
+    'qmp-event.c',
+    'qmp-registry.c',
+  ))
+endif
 
 qapi_all_modules = [
   'acpi',
diff --git a/tests/meson.build b/tests/meson.build
index 6f1ff926d26..7d7da6a6364 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -86,7 +86,6 @@
   'test-qobject-input-visitor': [testqapi],
   'test-string-input-visitor': [testqapi],
   'test-string-output-visitor': [testqapi],
-  'test-qmp-event': [testqapi],
   'test-opts-visitor': [testqapi],
   'test-visitor-serialization': [testqapi],
   'test-bitmap': [],
@@ -117,6 +116,12 @@
   'test-qapi-util': [],
 }
 
+if have_system or have_tools
+  tests += {
+    'test-qmp-event': [testqapi],
+  }
+endif
+
 test_deps = {
   'test-qht-par': qht_bench,
 }
-- 
2.26.2

[PATCH v2 11/12] qapi/meson: Restrict system-mode specific modules

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 qapi/meson.build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qapi/meson.build b/qapi/meson.build
index b301a46f04a..7aca8d50484 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -18,8 +18,6 @@
 endif
 
 qapi_all_modules = [
-  'acpi',
-  'audio',
   'authz',
   'block',
   'block-core',
@@ -39,14 +37,10 @@
   'misc-target',
   'net',
   'pragma',
-  'pci',
   'qom',
-  'rdma',
   'replay',
-  'rocker',
   'run-state',
   'sockets',
-  'tpm',
   'trace',
   'transaction',
   'ui',
@@ -54,7 +48,13 @@
 ]
 if have_system
   qapi_all_modules += [
+    'acpi',
+    'audio',
     'qdev',
+    'pci',
+    'rdma',
+    'rocker',
+    'tpm',
   ]
 endif
 
-- 
2.26.2

[PATCH v2 12/12] qapi/meson: Restrict UI module to system emulation and tools

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
 qapi/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qapi/meson.build b/qapi/meson.build
index 7aca8d50484..0652569bc43 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -43,7 +43,6 @@
   'sockets',
   'trace',
   'transaction',
-  'ui',
   'yank',
 ]
 if have_system
@@ -57,6 +56,11 @@
     'tpm',
   ]
 endif
+if have_system or have_tools
+  qapi_all_modules += [
+    'ui',
+  ]
+endif
 
 qapi_storage_daemon_modules = [
   'block-core',
-- 
2.26.2

Re: [PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Paolo Bonzini]

On 22/01/21 21:44, Philippe Mathieu-Daudé wrote:
> In this series we deselect a bunch of features when they
> not required, so less objects are built.
> 
> While this reduce pressure on CI and slow systems, this is
> particularly helpful for developers regularly testing multiple
> build configurations.
> 
> All CI tests pass:
> https://gitlab.com/philmd/qemu/-/pipelines/245654160
> 
> Supersedes: <20210120151916.1167448-1-philmd@redhat.com>
> 
> Philippe Mathieu-Daudé (12):
>    configure: Only check for audio drivers if system-mode is selected
>    tests/meson: Only build softfloat objects if TCG is selected
>    pc-bios/meson: Only install EDK2 blob firmwares with system emulation
>    meson: Do not build optional libraries by default
>    meson: Restrict block subsystem processing
>    meson: Merge trace_events_subdirs array
>    meson: Restrict some trace event directories to user/system emulation
>    meson: Restrict emulation code
>    qapi/meson: Restrict qdev code to system-mode emulation
>    qapi/meson: Remove QMP from user-mode emulation
>    qapi/meson: Restrict system-mode specific modules
>    qapi/meson: Restrict UI module to system emulation and tools
> 
>   configure           |  6 +++++
>   meson.build         | 55 ++++++++++++++++++++++++++-------------------
>   stubs/qdev.c        | 23 +++++++++++++++++++
>   MAINTAINERS         |  1 +
>   pc-bios/meson.build |  1 +
>   qapi/meson.build    | 34 +++++++++++++++++++---------
>   stubs/meson.build   |  2 ++
>   tests/meson.build   | 11 +++++++--
>   8 files changed, 97 insertions(+), 36 deletions(-)
>   create mode 100644 stubs/qdev.c
> 

Except for patch 8,

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Re: [PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Alex Bennée]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> In this series we deselect a bunch of features when they
> not required, so less objects are built.
>
> While this reduce pressure on CI and slow systems, this is
> particularly helpful for developers regularly testing multiple
> build configurations.
>
> All CI tests pass:
> https://gitlab.com/philmd/qemu/-/pipelines/245654160
>
> Supersedes: <20210120151916.1167448-1-philmd@redhat.com>

Series looks good to me but I guess you need some sub-system feedback.
I've sent a few more patches that might be worth rolling in to better
handle check-tcg/softfloat.

>
> Philippe Mathieu-Daudé (12):
>   configure: Only check for audio drivers if system-mode is selected
>   tests/meson: Only build softfloat objects if TCG is selected
>   pc-bios/meson: Only install EDK2 blob firmwares with system emulation
>   meson: Do not build optional libraries by default
>   meson: Restrict block subsystem processing
>   meson: Merge trace_events_subdirs array
>   meson: Restrict some trace event directories to user/system emulation
>   meson: Restrict emulation code
>   qapi/meson: Restrict qdev code to system-mode emulation
>   qapi/meson: Remove QMP from user-mode emulation
>   qapi/meson: Restrict system-mode specific modules
>   qapi/meson: Restrict UI module to system emulation and tools
>
>  configure           |  6 +++++
>  meson.build         | 55 ++++++++++++++++++++++++++-------------------
>  stubs/qdev.c        | 23 +++++++++++++++++++
>  MAINTAINERS         |  1 +
>  pc-bios/meson.build |  1 +
>  qapi/meson.build    | 34 +++++++++++++++++++---------
>  stubs/meson.build   |  2 ++
>  tests/meson.build   | 11 +++++++--
>  8 files changed, 97 insertions(+), 36 deletions(-)
>  create mode 100644 stubs/qdev.c


-- 
Alex Bennée

Re: [PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Philippe Mathieu-Daudé]

On 1/26/21 3:57 PM, Alex Bennée wrote:
> 
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 
>> In this series we deselect a bunch of features when they
>> not required, so less objects are built.
>>
>> While this reduce pressure on CI and slow systems, this is
>> particularly helpful for developers regularly testing multiple
>> build configurations.
>>
>> All CI tests pass:
>> https://gitlab.com/philmd/qemu/-/pipelines/245654160
>>
>> Supersedes: <20210120151916.1167448-1-philmd@redhat.com>
> 
> Series looks good to me but I guess you need some sub-system feedback.

Yeah, I will wait for Markus feedback on qapi/ before respining (with
target/ fix), ...

> I've sent a few more patches that might be worth rolling in to better
> handle check-tcg/softfloat.

... including your patches if they aren't merged before.

Thanks for having a look,

Phil.

Re: [PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Markus Armbruster]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 1/26/21 3:57 PM, Alex Bennée wrote:
>> 
>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>> 
>>> In this series we deselect a bunch of features when they
>>> not required, so less objects are built.
>>>
>>> While this reduce pressure on CI and slow systems, this is
>>> particularly helpful for developers regularly testing multiple
>>> build configurations.
>>>
>>> All CI tests pass:
>>> https://gitlab.com/philmd/qemu/-/pipelines/245654160
>>>
>>> Supersedes: <20210120151916.1167448-1-philmd@redhat.com>
>> 
>> Series looks good to me but I guess you need some sub-system feedback.
>
> Yeah, I will wait for Markus feedback on qapi/ before respining (with
> target/ fix), ...

Maybe I'm naive today, but to me this looks like a case of "if it still
builds, it's fine".

Anything in particular you want my feedback for?

>> I've sent a few more patches that might be worth rolling in to better
>> handle check-tcg/softfloat.
>
> ... including your patches if they aren't merged before.
>
> Thanks for having a look,
>
> Phil.

Re: [PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Philippe Mathieu-Daudé]

On 1/26/21 5:09 PM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 
>> On 1/26/21 3:57 PM, Alex Bennée wrote:
>>>
>>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>>
>>>> In this series we deselect a bunch of features when they
>>>> not required, so less objects are built.
>>>>
>>>> While this reduce pressure on CI and slow systems, this is
>>>> particularly helpful for developers regularly testing multiple
>>>> build configurations.
>>>>
>>>> All CI tests pass:
>>>> https://gitlab.com/philmd/qemu/-/pipelines/245654160
>>>>
>>>> Supersedes: <20210120151916.1167448-1-philmd@redhat.com>
>>>
>>> Series looks good to me but I guess you need some sub-system feedback.
>>
>> Yeah, I will wait for Markus feedback on qapi/ before respining (with
>> target/ fix), ...
> 
> Maybe I'm naive today, but to me this looks like a case of "if it still
> builds, it's fine".
> 
> Anything in particular you want my feedback for?

You are listed as qapi/ maintainer with Michael :)

QAPI
M: Markus Armbruster <armbru@redhat.com>
M: Michael Roth <michael.roth@amd.com>
S: Supported
F: qapi/

If it is fine to you, then I'll respin addressing Paolo's comments.

Thanks :)

Phil.

Re: [PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Markus Armbruster]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 1/26/21 5:09 PM, Markus Armbruster wrote:
>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>> 
>>> On 1/26/21 3:57 PM, Alex Bennée wrote:
>>>>
>>>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>>>
>>>>> In this series we deselect a bunch of features when they
>>>>> not required, so less objects are built.
>>>>>
>>>>> While this reduce pressure on CI and slow systems, this is
>>>>> particularly helpful for developers regularly testing multiple
>>>>> build configurations.
>>>>>
>>>>> All CI tests pass:
>>>>> https://gitlab.com/philmd/qemu/-/pipelines/245654160
>>>>>
>>>>> Supersedes: <20210120151916.1167448-1-philmd@redhat.com>
>>>>
>>>> Series looks good to me but I guess you need some sub-system feedback.
>>>
>>> Yeah, I will wait for Markus feedback on qapi/ before respining (with
>>> target/ fix), ...
>> 
>> Maybe I'm naive today, but to me this looks like a case of "if it still
>> builds, it's fine".
>> 
>> Anything in particular you want my feedback for?
>
> You are listed as qapi/ maintainer with Michael :)
>
> QAPI
> M: Markus Armbruster <armbru@redhat.com>
> M: Michael Roth <michael.roth@amd.com>
> S: Supported
> F: qapi/
>
> If it is fine to you, then I'll respin addressing Paolo's comments.
>
> Thanks :)
>
> Phil.

Go right ahead!

Re: [PATCH v2 00/12] buildsys: Do not build various objects if not necessary

[Paolo Bonzini]

On 22/01/21 21:44, Philippe Mathieu-Daudé wrote:
> In this series we deselect a bunch of features when they
> not required, so less objects are built.
> 
> While this reduce pressure on CI and slow systems, this is
> particularly helpful for developers regularly testing multiple
> build configurations.
> 
> All CI tests pass:
> https://gitlab.com/philmd/qemu/-/pipelines/245654160
> 
> Supersedes: <20210120151916.1167448-1-philmd@redhat.com>
> 
> Philippe Mathieu-Daudé (12):
>    configure: Only check for audio drivers if system-mode is selected
>    tests/meson: Only build softfloat objects if TCG is selected
>    pc-bios/meson: Only install EDK2 blob firmwares with system emulation
>    meson: Do not build optional libraries by default
>    meson: Restrict block subsystem processing
>    meson: Merge trace_events_subdirs array
>    meson: Restrict some trace event directories to user/system emulation
>    meson: Restrict emulation code
>    qapi/meson: Restrict qdev code to system-mode emulation
>    qapi/meson: Remove QMP from user-mode emulation
>    qapi/meson: Restrict system-mode specific modules
>    qapi/meson: Restrict UI module to system emulation and tools
> 
>   configure           |  6 +++++
>   meson.build         | 55 ++++++++++++++++++++++++++-------------------
>   stubs/qdev.c        | 23 +++++++++++++++++++
>   MAINTAINERS         |  1 +
>   pc-bios/meson.build |  1 +
>   qapi/meson.build    | 34 +++++++++++++++++++---------
>   stubs/meson.build   |  2 ++
>   tests/meson.build   | 11 +++++++--
>   8 files changed, 97 insertions(+), 36 deletions(-)
>   create mode 100644 stubs/qdev.c
> 

Queued, thanks.

Paolo