Eric Blake writes:
> On 06/09/2016 11:34 AM, Lluís Vilanova wrote:
>> Signed-off-by: Lluís Vilanova <vilan...@ac.upc.edu>
>> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
>> ---
>> monitor.c | 4 +-
>> qapi/trace.json | 20 ++++++--
>> qmp-commands.hx | 18 ++++++-
>> trace/qmp.c | 143
>> ++++++++++++++++++++++++++++++++++++++++++++-----------
>> 4 files changed, 147 insertions(+), 38 deletions(-)
>>
>> +++ b/qapi/trace.json
>> @@ -1,6 +1,6 @@
>> # -*- mode: python -*-
>> #
>> -# Copyright (C) 2011-2014 Lluís Vilanova <vilan...@ac.upc.edu>
>> +# Copyright (C) 2011-2016 Lluís Vilanova <vilan...@ac.upc.edu>
>> #
>> # This work is licensed under the terms of the GNU GPL, version 2 or later.
>> # See the COPYING file in the top-level directory.
>> @@ -29,11 +29,12 @@
>> #
>> # @name: Event name.
>> # @state: Tracing state.
>> +# @vcpu: Whether this is a per-vCPU event (since 2.6).
> s/2.6/2.7/
>> #
>> # Since 2.2
>> ##
>> { 'struct': 'TraceEventInfo',
>> - 'data': {'name': 'str', 'state': 'TraceEventState'} }
>> + 'data': {'name': 'str', 'state': 'TraceEventState', 'vcpu': 'bool'} }
>>
>> ##
>> # @trace-event-get-state:
>> @@ -41,13 +42,18 @@
>> # Query the state of events.
>> #
>> # @name: Event name pattern (case-sensitive glob).
>> +# @vcpu: #optional The vCPU to check (any by default; since 2.6).
> and again
>> #
>> # Returns: a list of @TraceEventInfo for the matching events
>> #
>> +# For any event without the "vcpu" property:
>> +# - If @name is a pattern and @vcpu is set, events are ignored.
>> +# - If @name is not a pattern and @vcpu is set, an error is raised.
>> +#
>> # Since 2.2
>> ##
>> { 'command': 'trace-event-get-state',
>> - 'data': {'name': 'str'},
>> + 'data': {'name': 'str', '*vcpu': 'int'},
>> 'returns': ['TraceEventInfo'] }
>>
>> ##
>> @@ -58,8 +64,14 @@
>> # @name: Event name pattern (case-sensitive glob).
>> # @enable: Whether to enable tracing.
>> # @ignore-unavailable: #optional Do not match unavailable events with @name.
>> +# @vcpu: #optional The vCPU to act upon (all by default; since 2.6).
> and again
>> +#
>> +# For any event without the "vcpu" property:
>> +# - If @name is a pattern and @vcpu is set, events are ignored.
>> +# - If @name is not a pattern and @vcpu is set, an error is raised.
>> #
>> # Since 2.2
>> ##
>> { 'command': 'trace-event-set-state',
>> - 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool'} }
>> + 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool',
>> + '*vcpu': 'int'} }
>> diff --git a/qmp-commands.hx b/qmp-commands.hx
>> index 28801a2..ae1e533 100644
>> --- a/qmp-commands.hx
>> @@ -4773,7 +4786,6 @@ Move mouse pointer to absolute coordinates (20000,
>> 400).
>> { "type": "abs", "data" : { "axis": "x", "value" : 20000 } },
>> { "type": "abs", "data" : { "axis": "y", "value" : 400 } } ] } }
>> <- { "return": {} }
>> -
>> EQMP
> Spurious hunk.
Doh, thanks. I always miss updating the version references, I'm really sorry
about that.
Cheers,
Lluis
