meson: remove dead code

[PATCH] meson: remove dead code

Posted by Paolo Bonzini 3 years, 5 months ago

Found with "muon analyze".

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build                 |  2 --
 pc-bios/keymaps/meson.build |  1 -
 qapi/meson.build            | 15 ---------------
 target/riscv/meson.build    |  2 --
 4 files changed, 20 deletions(-)

diff --git a/meson.build b/meson.build
index 30a380752c..8e927fc457 100644
--- a/meson.build
+++ b/meson.build
@@ -3405,7 +3405,6 @@ foreach target : target_dirs
     target_inc += include_directories('linux-headers', is_system: true)
   endif
   if target.endswith('-softmmu')
-    qemu_target_name = 'qemu-system-' + target_name
     target_type='system'
     t = target_softmmu_arch[target_base_arch].apply(config_target, strict: false)
     arch_srcs += t.sources()
@@ -3422,7 +3421,6 @@ foreach target : target_dirs
     abi = config_target['TARGET_ABI_DIR']
     target_type='user'
     target_inc += common_user_inc
-    qemu_target_name = 'qemu-' + target_name
     if target_base_arch in target_user_arch
       t = target_user_arch[target_base_arch].apply(config_target, strict: false)
       arch_srcs += t.sources()
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
index 2837eb34f4..06c75e646b 100644
--- a/pc-bios/keymaps/meson.build
+++ b/pc-bios/keymaps/meson.build
@@ -38,7 +38,6 @@ if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in config_host
 else
   native_qemu_keymap = qemu_keymap
 endif
-cp = find_program('cp')
 
 if native_qemu_keymap.found()
   t = []
diff --git a/qapi/meson.build b/qapi/meson.build
index fd5c93d643..840f1b0e19 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -68,21 +68,6 @@ if have_system or have_tools
   ]
 endif
 
-qapi_storage_daemon_modules = [
-  'block-core',
-  'block-export',
-  'char',
-  'common',
-  'control',
-  'crypto',
-  'introspect',
-  'job',
-  'qom',
-  'sockets',
-  'pragma',
-  'transaction',
-]
-
 qapi_nonmodule_outputs = [
   'qapi-introspect.c', 'qapi-introspect.h',
   'qapi-types.c', 'qapi-types.h',
diff --git a/target/riscv/meson.build b/target/riscv/meson.build
index 2c1975e72c..6b9435d69a 100644
--- a/target/riscv/meson.build
+++ b/target/riscv/meson.build
@@ -1,6 +1,4 @@
 # FIXME extra_args should accept files()
-dir = meson.current_source_dir()
-
 gen = [
   decodetree.process('insn16.decode', extra_args: ['--static-decode=decode_insn16', '--insnwidth=16']),
   decodetree.process('insn32.decode', extra_args: '--static-decode=decode_insn32'),
-- 
2.37.1

Re: [PATCH] meson: remove dead code

Posted by Marc-André Lureau 3 years, 5 months ago

On Thu, Aug 18, 2022 at 1:31 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Found with "muon analyze".
>

nice
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  meson.build                 |  2 --
>  pc-bios/keymaps/meson.build |  1 -
>  qapi/meson.build            | 15 ---------------
>  target/riscv/meson.build    |  2 --
>  4 files changed, 20 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 30a380752c..8e927fc457 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3405,7 +3405,6 @@ foreach target : target_dirs
>      target_inc += include_directories('linux-headers', is_system: true)
>    endif
>    if target.endswith('-softmmu')
> -    qemu_target_name = 'qemu-system-' + target_name
>      target_type='system'
>      t = target_softmmu_arch[target_base_arch].apply(config_target,
> strict: false)
>      arch_srcs += t.sources()
> @@ -3422,7 +3421,6 @@ foreach target : target_dirs
>      abi = config_target['TARGET_ABI_DIR']
>      target_type='user'
>      target_inc += common_user_inc
> -    qemu_target_name = 'qemu-' + target_name
>      if target_base_arch in target_user_arch
>        t = target_user_arch[target_base_arch].apply(config_target, strict:
> false)
>        arch_srcs += t.sources()
> diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
> index 2837eb34f4..06c75e646b 100644
> --- a/pc-bios/keymaps/meson.build
> +++ b/pc-bios/keymaps/meson.build
> @@ -38,7 +38,6 @@ if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in
> config_host
>  else
>    native_qemu_keymap = qemu_keymap
>  endif
> -cp = find_program('cp')
>
>  if native_qemu_keymap.found()
>    t = []
> diff --git a/qapi/meson.build b/qapi/meson.build
> index fd5c93d643..840f1b0e19 100644
> --- a/qapi/meson.build
> +++ b/qapi/meson.build
> @@ -68,21 +68,6 @@ if have_system or have_tools
>    ]
>  endif
>
> -qapi_storage_daemon_modules = [
> -  'block-core',
> -  'block-export',
> -  'char',
> -  'common',
> -  'control',
> -  'crypto',
> -  'introspect',
> -  'job',
> -  'qom',
> -  'sockets',
> -  'pragma',
> -  'transaction',
> -]
> -
>  qapi_nonmodule_outputs = [
>    'qapi-introspect.c', 'qapi-introspect.h',
>    'qapi-types.c', 'qapi-types.h',
> diff --git a/target/riscv/meson.build b/target/riscv/meson.build
> index 2c1975e72c..6b9435d69a 100644
> --- a/target/riscv/meson.build
> +++ b/target/riscv/meson.build
> @@ -1,6 +1,4 @@
>  # FIXME extra_args should accept files()
> -dir = meson.current_source_dir()
> -
>  gen = [
>    decodetree.process('insn16.decode', extra_args:
> ['--static-decode=decode_insn16', '--insnwidth=16']),
>    decodetree.process('insn32.decode', extra_args:
> '--static-decode=decode_insn32'),
> --
> 2.37.1
>
>
>

-- 
Marc-André Lureau