1. Patchew
  2. QEMU
  3. [PATCH v4 00/11] plugins: enable C++ plugins
  4. View patch

[PATCH v4 03/11] plugins: use complete filename for defining plugins sources

Pierrick Bouvier posted 11 patches 2 weeks, 2 days ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Alexandre Iooss <erdnaxe@crans.org>, Mahmoud Mandour <ma.mandourr@gmail.com>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Kostiantyn Kostiuk <kkostiuk@redhat.com>, Michael Roth <michael.roth@amd.com>
[PATCH v4 03/11] plugins: use complete filename for defining plugins sources
Posted by Pierrick Bouvier 2 weeks, 2 days ago 
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 contrib/plugins/meson.build   | 10 +++++-----
 tests/tcg/plugins/meson.build |  7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
index 6915ffa5fbc..3d2d7862e0c 100644
--- a/contrib/plugins/meson.build
+++ b/contrib/plugins/meson.build
@@ -1,15 +1,15 @@
-contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks',
-                   'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger',
-                   'traps', 'uftrace']
+contrib_plugins = ['bbv.c', 'cache.c', 'cflow.c', 'drcov.c', 'execlog.c',
+                   'hotblocks.c', 'hotpages.c', 'howvec.c', 'hwprofile.c',
+                   'ips.c', 'stoptrigger.c', 'traps.c', 'uftrace.c']
 if host_os != 'windows'
   # lockstep uses socket.h
-  contrib_plugins += 'lockstep'
+  contrib_plugins += 'lockstep.c'
 endif
 
 t = []
 if get_option('plugins')
   foreach i : contrib_plugins
-    t += shared_module(i, files(i + '.c'),
+    t += shared_module(fs.stem(i), files(i),
                        dependencies: plugins_deps)
   endforeach
 endif
diff --git a/tests/tcg/plugins/meson.build b/tests/tcg/plugins/meson.build
index d7823704616..303f97f9679 100644
--- a/tests/tcg/plugins/meson.build
+++ b/tests/tcg/plugins/meson.build
@@ -1,7 +1,10 @@
+test_plugins = ['bb.c', 'discons.c', 'empty.c', 'inline.c', 'insn.c', 'mem.c',
+                'reset.c', 'syscall.c', 'patch.c']
+
 t = []
 if get_option('plugins')
-  foreach i : ['bb', 'discons', 'empty', 'inline', 'insn', 'mem', 'reset', 'syscall', 'patch']
-    t += shared_module(i, files(i + '.c'),
+  foreach i : test_plugins
+    t += shared_module(fs.stem(i), files(i),
                        dependencies: plugins_deps)
   endforeach
 endif
-- 
2.47.3
Re: [PATCH v4 03/11] plugins: use complete filename for defining plugins sources
Posted by Alex Bennée 1 week, 5 days ago 
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:

> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>  contrib/plugins/meson.build   | 10 +++++-----
>  tests/tcg/plugins/meson.build |  7 +++++--
>  2 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
> index 6915ffa5fbc..3d2d7862e0c 100644
> --- a/contrib/plugins/meson.build
> +++ b/contrib/plugins/meson.build
> @@ -1,15 +1,15 @@
> -contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks',
> -                   'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger',
> -                   'traps', 'uftrace']
> +contrib_plugins = ['bbv.c', 'cache.c', 'cflow.c', 'drcov.c', 'execlog.c',
> +                   'hotblocks.c', 'hotpages.c', 'howvec.c', 'hwprofile.c',
> +                   'ips.c', 'stoptrigger.c', 'traps.c', 'uftrace.c']

Argh this keeps conflicting with other changes. Maybe we should make
this a dumb list:

  contrib_plugins = [ ]
  contrib_plugins += 'bbv.c'
  contrib_plugins += 'cache.c'

etc?

>  if host_os != 'windows'
>    # lockstep uses socket.h
> -  contrib_plugins += 'lockstep'
> +  contrib_plugins += 'lockstep.c'
>  endif
>  
>  t = []
>  if get_option('plugins')
>    foreach i : contrib_plugins
> -    t += shared_module(i, files(i + '.c'),
> +    t += shared_module(fs.stem(i), files(i),
>                         dependencies: plugins_deps)
>    endforeach
>  endif
> diff --git a/tests/tcg/plugins/meson.build b/tests/tcg/plugins/meson.build
> index d7823704616..303f97f9679 100644
> --- a/tests/tcg/plugins/meson.build
> +++ b/tests/tcg/plugins/meson.build
> @@ -1,7 +1,10 @@
> +test_plugins = ['bb.c', 'discons.c', 'empty.c', 'inline.c', 'insn.c', 'mem.c',
> +                'reset.c', 'syscall.c', 'patch.c']
> +
>  t = []
>  if get_option('plugins')
> -  foreach i : ['bb', 'discons', 'empty', 'inline', 'insn', 'mem', 'reset', 'syscall', 'patch']
> -    t += shared_module(i, files(i + '.c'),
> +  foreach i : test_plugins
> +    t += shared_module(fs.stem(i), files(i),
>                         dependencies: plugins_deps)
>    endforeach
>  endif

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH v4 03/11] plugins: use complete filename for defining plugins sources
Posted by Philippe Mathieu-Daudé 1 week, 5 days ago 
On 28/1/26 12:11, Alex Bennée wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> 
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>>   contrib/plugins/meson.build   | 10 +++++-----
>>   tests/tcg/plugins/meson.build |  7 +++++--
>>   2 files changed, 10 insertions(+), 7 deletions(-)
>>
>> diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
>> index 6915ffa5fbc..3d2d7862e0c 100644
>> --- a/contrib/plugins/meson.build
>> +++ b/contrib/plugins/meson.build
>> @@ -1,15 +1,15 @@
>> -contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks',
>> -                   'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger',
>> -                   'traps', 'uftrace']
>> +contrib_plugins = ['bbv.c', 'cache.c', 'cflow.c', 'drcov.c', 'execlog.c',
>> +                   'hotblocks.c', 'hotpages.c', 'howvec.c', 'hwprofile.c',
>> +                   'ips.c', 'stoptrigger.c', 'traps.c', 'uftrace.c']
> 
> Argh this keeps conflicting with other changes. Maybe we should make
> this a dumb list:
> 
>    contrib_plugins = [ ]
>    contrib_plugins += 'bbv.c'
>    contrib_plugins += 'cache.c'
> 
> etc?

This applies fine as of commit 9ad7f544c69, on what are you based?
Re: [PATCH v4 03/11] plugins: use complete filename for defining plugins sources
Posted by Alex Bennée 1 week, 5 days ago 
Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> On 28/1/26 12:11, Alex Bennée wrote:
>> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>> 
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>> ---
>>>   contrib/plugins/meson.build   | 10 +++++-----
>>>   tests/tcg/plugins/meson.build |  7 +++++--
>>>   2 files changed, 10 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
>>> index 6915ffa5fbc..3d2d7862e0c 100644
>>> --- a/contrib/plugins/meson.build
>>> +++ b/contrib/plugins/meson.build
>>> @@ -1,15 +1,15 @@
>>> -contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks',
>>> -                   'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger',
>>> -                   'traps', 'uftrace']
>>> +contrib_plugins = ['bbv.c', 'cache.c', 'cflow.c', 'drcov.c', 'execlog.c',
>>> +                   'hotblocks.c', 'hotpages.c', 'howvec.c', 'hwprofile.c',
>>> +                   'ips.c', 'stoptrigger.c', 'traps.c', 'uftrace.c']
>> Argh this keeps conflicting with other changes. Maybe we should make
>> this a dumb list:
>>    contrib_plugins = [ ]
>>    contrib_plugins += 'bbv.c'
>>    contrib_plugins += 'cache.c'
>> etc?
>
> This applies fine as of commit 9ad7f544c69, on what are you based?

plugins/next ;-)

Pierrick is going to deal with the pain now in his first PR!

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH v4 03/11] plugins: use complete filename for defining plugins sources
Posted by Pierrick Bouvier 1 week, 5 days ago 
On 1/28/26 9:25 AM, Alex Bennée wrote:
> Philippe Mathieu-Daudé <philmd@linaro.org> writes:
> 
>> On 28/1/26 12:11, Alex Bennée wrote:
>>> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>>>
>>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>>> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
>>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>>> ---
>>>>    contrib/plugins/meson.build   | 10 +++++-----
>>>>    tests/tcg/plugins/meson.build |  7 +++++--
>>>>    2 files changed, 10 insertions(+), 7 deletions(-)
>>>>
>>>> diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
>>>> index 6915ffa5fbc..3d2d7862e0c 100644
>>>> --- a/contrib/plugins/meson.build
>>>> +++ b/contrib/plugins/meson.build
>>>> @@ -1,15 +1,15 @@
>>>> -contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks',
>>>> -                   'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger',
>>>> -                   'traps', 'uftrace']
>>>> +contrib_plugins = ['bbv.c', 'cache.c', 'cflow.c', 'drcov.c', 'execlog.c',
>>>> +                   'hotblocks.c', 'hotpages.c', 'howvec.c', 'hwprofile.c',
>>>> +                   'ips.c', 'stoptrigger.c', 'traps.c', 'uftrace.c']
>>> Argh this keeps conflicting with other changes. Maybe we should make
>>> this a dumb list:
>>>     contrib_plugins = [ ]
>>>     contrib_plugins += 'bbv.c'
>>>     contrib_plugins += 'cache.c'
>>> etc?
>>
>> This applies fine as of commit 9ad7f544c69, on what are you based?
> 
> plugins/next ;-)
> 
> Pierrick is going to deal with the pain now in his first PR!
> 

Enjoying the rebase process now :)

We agreed with Alex I won't do the array change to not delay further 
series in flight, since this additional commit won't be reviewed and 
need to be sent to the maili
Re: [PATCH v4 03/11] plugins: use complete filename for defining plugins sources
Posted by Pierrick Bouvier 1 week, 5 days ago 
On 1/28/26 3:11 AM, Alex Bennée wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> 
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>>   contrib/plugins/meson.build   | 10 +++++-----
>>   tests/tcg/plugins/meson.build |  7 +++++--
>>   2 files changed, 10 insertions(+), 7 deletions(-)
>>
>> diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
>> index 6915ffa5fbc..3d2d7862e0c 100644
>> --- a/contrib/plugins/meson.build
>> +++ b/contrib/plugins/meson.build
>> @@ -1,15 +1,15 @@
>> -contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks',
>> -                   'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger',
>> -                   'traps', 'uftrace']
>> +contrib_plugins = ['bbv.c', 'cache.c', 'cflow.c', 'drcov.c', 'execlog.c',
>> +                   'hotblocks.c', 'hotpages.c', 'howvec.c', 'hwprofile.c',
>> +                   'ips.c', 'stoptrigger.c', 'traps.c', 'uftrace.c']
> 
> Argh this keeps conflicting with other changes. Maybe we should make
> this a dumb list:
> 
>    contrib_plugins = [ ]
>    contrib_plugins += 'bbv.c'
>    contrib_plugins += 'cache.c'
> 
> etc?
>

Ok.

>>   if host_os != 'windows'
>>     # lockstep uses socket.h
>> -  contrib_plugins += 'lockstep'
>> +  contrib_plugins += 'lockstep.c'
>>   endif
>>   
>>   t = []
>>   if get_option('plugins')
>>     foreach i : contrib_plugins
>> -    t += shared_module(i, files(i + '.c'),
>> +    t += shared_module(fs.stem(i), files(i),
>>                          dependencies: plugins_deps)
>>     endforeach
>>   endif
>> diff --git a/tests/tcg/plugins/meson.build b/tests/tcg/plugins/meson.build
>> index d7823704616..303f97f9679 100644
>> --- a/tests/tcg/plugins/meson.build
>> +++ b/tests/tcg/plugins/meson.build
>> @@ -1,7 +1,10 @@
>> +test_plugins = ['bb.c', 'discons.c', 'empty.c', 'inline.c', 'insn.c', 'mem.c',
>> +                'reset.c', 'syscall.c', 'patch.c']
>> +
>>   t = []
>>   if get_option('plugins')
>> -  foreach i : ['bb', 'discons', 'empty', 'inline', 'insn', 'mem', 'reset', 'syscall', 'patch']
>> -    t += shared_module(i, files(i + '.c'),
>> +  foreach i : test_plugins
>> +    t += shared_module(fs.stem(i), files(i),
>>                          dependencies: plugins_deps)
>>     endforeach
>>   endif
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.