diff mbox series

qapi: Remove QMP events and commands from user-mode builds

Message ID 20210224171642.3242293-1-philmd@redhat.com (mailing list archive)
State New, archived
Headers show
Series qapi: Remove QMP events and commands from user-mode builds | expand

Commit Message

Philippe Mathieu-Daudé Feb. 24, 2021, 5:16 p.m. UTC
We removed the QMP loop in user-mode builds in commit 1935e0e4e09
("qapi/meson: Remove QMP from user-mode emulation"), now commands
and events code is unreachable.

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

Comments

Paolo Bonzini Feb. 24, 2021, 5:35 p.m. UTC | #1
On 24/02/21 18:16, Philippe Mathieu-Daudé wrote:
> We removed the QMP loop in user-mode builds in commit 1935e0e4e09
> ("qapi/meson: Remove QMP from user-mode emulation"), now commands
> and events code is unreachable.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   qapi/meson.build | 12 ++++++++----
>   1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/qapi/meson.build b/qapi/meson.build
> index 0652569bc43..fcb15a78f15 100644
> --- a/qapi/meson.build
> +++ b/qapi/meson.build
> @@ -102,11 +102,15 @@
>       'qapi-types-@0@.h'.format(module),
>       'qapi-visit-@0@.c'.format(module),
>       'qapi-visit-@0@.h'.format(module),
> -    'qapi-events-@0@.c'.format(module),
> -    'qapi-events-@0@.h'.format(module),
> -    'qapi-commands-@0@.c'.format(module),
> -    'qapi-commands-@0@.h'.format(module),
>     ]
> +  if have_system or have_tools
> +    qapi_module_outputs += [
> +      'qapi-events-@0@.c'.format(module),
> +      'qapi-events-@0@.h'.format(module),
> +      'qapi-commands-@0@.c'.format(module),
> +      'qapi-commands-@0@.h'.format(module),
> +    ]
> +  endif
>     if module.endswith('-target')
>       qapi_specific_outputs += qapi_module_outputs
>     else
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Markus Armbruster Feb. 25, 2021, 9:41 a.m. UTC | #2
Paolo Bonzini <pbonzini@redhat.com> writes:

> On 24/02/21 18:16, Philippe Mathieu-Daudé wrote:
>> We removed the QMP loop in user-mode builds in commit 1935e0e4e09
>> ("qapi/meson: Remove QMP from user-mode emulation"), now commands
>> and events code is unreachable.
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>   qapi/meson.build | 12 ++++++++----
>>   1 file changed, 8 insertions(+), 4 deletions(-)
>> diff --git a/qapi/meson.build b/qapi/meson.build
>> index 0652569bc43..fcb15a78f15 100644
>> --- a/qapi/meson.build
>> +++ b/qapi/meson.build
>> @@ -102,11 +102,15 @@
>>       'qapi-types-@0@.h'.format(module),
>>       'qapi-visit-@0@.c'.format(module),
>>       'qapi-visit-@0@.h'.format(module),
>> -    'qapi-events-@0@.c'.format(module),
>> -    'qapi-events-@0@.h'.format(module),
>> -    'qapi-commands-@0@.c'.format(module),
>> -    'qapi-commands-@0@.h'.format(module),
>>     ]
>> +  if have_system or have_tools
>> +    qapi_module_outputs += [
>> +      'qapi-events-@0@.c'.format(module),
>> +      'qapi-events-@0@.h'.format(module),
>> +      'qapi-commands-@0@.c'.format(module),
>> +      'qapi-commands-@0@.h'.format(module),
>> +    ]
>> +  endif
>>     if module.endswith('-target')
>>       qapi_specific_outputs += qapi_module_outputs
>>     else
>> 
>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>

I'm taking this as "Markus, care to take this through your tree?"

Queued, thanks!
diff mbox series

Patch

diff --git a/qapi/meson.build b/qapi/meson.build
index 0652569bc43..fcb15a78f15 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -102,11 +102,15 @@ 
     'qapi-types-@0@.h'.format(module),
     'qapi-visit-@0@.c'.format(module),
     'qapi-visit-@0@.h'.format(module),
-    'qapi-events-@0@.c'.format(module),
-    'qapi-events-@0@.h'.format(module),
-    'qapi-commands-@0@.c'.format(module),
-    'qapi-commands-@0@.h'.format(module),
   ]
+  if have_system or have_tools
+    qapi_module_outputs += [
+      'qapi-events-@0@.c'.format(module),
+      'qapi-events-@0@.h'.format(module),
+      'qapi-commands-@0@.c'.format(module),
+      'qapi-commands-@0@.h'.format(module),
+    ]
+  endif
   if module.endswith('-target')
     qapi_specific_outputs += qapi_module_outputs
   else