After the previous two patches, there is nothing else that is target
specific.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/dirtyrate.c | 2 --
 migration/meson.build | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index 76c8b96ab4..f814745bf7 100644
--- a/migration/dirtyrate.c
+++ b/migration/dirtyrate.c
@@ -14,9 +14,7 @@
 #include "qemu/error-report.h"
 #include <zlib.h>
 #include "qapi/error.h"
-#include "cpu.h"
 #include "exec/ramblock.h"
-#include "exec/ram_addr.h"
 #include "exec/target_page.h"
 #include "qemu/rcu_queue.h"
 #include "qemu/main-loop.h"
diff --git a/migration/meson.build b/migration/meson.build
index eb41b77db9..da437b4a27 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -40,8 +40,7 @@ if get_option('live_block_migration').allowed()
   softmmu_ss.add(files('block.c'))
 endif
 softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
-
+softmmu_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c'))
 specific_ss.add(when: 'CONFIG_SOFTMMU',
-                if_true: files('dirtyrate.c',
-                               'ram.c',
+                if_true: files('ram.c',
                                'target.c'))
-- 
2.40.1

On 5/11/23 10:22, Juan Quintela wrote:
> After the previous two patches, there is nothing else that is target
> specific.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>   migration/dirtyrate.c | 2 --
>   migration/meson.build | 5 ++---
>   2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
> index 76c8b96ab4..f814745bf7 100644
> --- a/migration/dirtyrate.c
> +++ b/migration/dirtyrate.c
> @@ -14,9 +14,7 @@
>   #include "qemu/error-report.h"
>   #include <zlib.h>
>   #include "qapi/error.h"
> -#include "cpu.h"
>   #include "exec/ramblock.h"
> -#include "exec/ram_addr.h"
>   #include "exec/target_page.h"
>   #include "qemu/rcu_queue.h"
>   #include "qemu/main-loop.h"
> diff --git a/migration/meson.build b/migration/meson.build
> index eb41b77db9..da437b4a27 100644
> --- a/migration/meson.build
> +++ b/migration/meson.build
> @@ -40,8 +40,7 @@ if get_option('live_block_migration').allowed()
>     softmmu_ss.add(files('block.c'))
>   endif
>   softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
> -
> +softmmu_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c'))

This becomes

softmmu_ss.add(files('dirtyrate.c'))

the when: is redundant with 'softmmu_ss'.

Otherwise,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Richard Henderson <richard.henderson@linaro.org> wrote:
> On 5/11/23 10:22, Juan Quintela wrote:
>> After the previous two patches, there is nothing else that is target
>> specific.
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>>   migration/dirtyrate.c | 2 --
>>   migration/meson.build | 5 ++---
>>   2 files changed, 2 insertions(+), 5 deletions(-)
>> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
>> index 76c8b96ab4..f814745bf7 100644
>> --- a/migration/dirtyrate.c
>> +++ b/migration/dirtyrate.c
>> @@ -14,9 +14,7 @@
>>   #include "qemu/error-report.h"
>>   #include <zlib.h>
>>   #include "qapi/error.h"
>> -#include "cpu.h"
>>   #include "exec/ramblock.h"
>> -#include "exec/ram_addr.h"
>>   #include "exec/target_page.h"
>>   #include "qemu/rcu_queue.h"
>>   #include "qemu/main-loop.h"
>> diff --git a/migration/meson.build b/migration/meson.build
>> index eb41b77db9..da437b4a27 100644
>> --- a/migration/meson.build
>> +++ b/migration/meson.build
>> @@ -40,8 +40,7 @@ if get_option('live_block_migration').allowed()
>>     softmmu_ss.add(files('block.c'))
>>   endif
>>   softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
>> -
>> +softmmu_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c'))
>
> This becomes
>
> softmmu_ss.add(files('dirtyrate.c'))
>
> the when: is redundant with 'softmmu_ss'.

It looked weird, but I didn't understand this stuff well enough, so I
just copyed what was there O:-)

Is there any documentation about this?  Because what I usually do is
search for a file that does (more or less) the same that I need and just
add it to that list.

> Otherwise,
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Thanks.

On 5/11/23 12:46, Juan Quintela wrote:
>>> +softmmu_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c'))
>>
>> This becomes
>>
>> softmmu_ss.add(files('dirtyrate.c'))
>>
>> the when: is redundant with 'softmmu_ss'.
> 
> It looked weird, but I didn't understand this stuff well enough, so I
> just copyed what was there O:-)
> 
> Is there any documentation about this?  Because what I usually do is
> search for a file that does (more or less) the same that I need and just
> add it to that list.

It's just top-level make^H^H^H^Hmeson.build related.

We have

common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss])

so everything in softmmu_ss is already protected by CONFIG_SOFTMMU.


r~