[03/13] qapi: move MonitorEvent define

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
 include/monitor/monitor.h |   38 +-------------------------
 include/qapi/qmp/qevent.h |   66 +++++++++++++++++++++++++++++++++++++++++++++
 include/qapi/qmp/types.h  |    1 +
 3 files changed, 68 insertions(+), 37 deletions(-)
 create mode 100644 include/qapi/qmp/qevent.h

Il 18/10/2013 03:11, Wenchao Xia ha scritto:
> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
> ---
>  include/monitor/monitor.h |   38 +-------------------------
>  include/qapi/qmp/qevent.h |   66 +++++++++++++++++++++++++++++++++++++++++++++
>  include/qapi/qmp/types.h  |    1 +
>  3 files changed, 68 insertions(+), 37 deletions(-)
>  create mode 100644 include/qapi/qmp/qevent.h
> 
> diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
> index 10fa0e3..686c0eb 100644
> --- a/include/monitor/monitor.h
> +++ b/include/monitor/monitor.h
> @@ -4,6 +4,7 @@
>  #include "qemu-common.h"
>  #include "qapi/qmp/qerror.h"
>  #include "qapi/qmp/qdict.h"
> +#include "qapi/qmp/qevent.h"
>  #include "block/block.h"
>  #include "monitor/readline.h"
>  
> @@ -19,43 +20,6 @@ extern Monitor *default_mon;
>  /* flags for monitor commands */
>  #define MONITOR_CMD_ASYNC       0x0001
>  
> -/* QMP events */
> -typedef enum MonitorEvent {
> -    QEVENT_SHUTDOWN,
> -    QEVENT_RESET,
> -    QEVENT_POWERDOWN,
> -    QEVENT_STOP,
> -    QEVENT_RESUME,
> -    QEVENT_VNC_CONNECTED,
> -    QEVENT_VNC_INITIALIZED,
> -    QEVENT_VNC_DISCONNECTED,
> -    QEVENT_BLOCK_IO_ERROR,
> -    QEVENT_RTC_CHANGE,
> -    QEVENT_WATCHDOG,
> -    QEVENT_SPICE_CONNECTED,
> -    QEVENT_SPICE_INITIALIZED,
> -    QEVENT_SPICE_DISCONNECTED,
> -    QEVENT_BLOCK_JOB_COMPLETED,
> -    QEVENT_BLOCK_JOB_CANCELLED,
> -    QEVENT_BLOCK_JOB_ERROR,
> -    QEVENT_BLOCK_JOB_READY,
> -    QEVENT_DEVICE_DELETED,
> -    QEVENT_DEVICE_TRAY_MOVED,
> -    QEVENT_NIC_RX_FILTER_CHANGED,
> -    QEVENT_SUSPEND,
> -    QEVENT_SUSPEND_DISK,
> -    QEVENT_WAKEUP,
> -    QEVENT_BALLOON_CHANGE,
> -    QEVENT_SPICE_MIGRATE_COMPLETED,
> -    QEVENT_GUEST_PANICKED,
> -    QEVENT_BLOCK_IMAGE_CORRUPTED,
> -
> -    /* Add to 'monitor_event_names' array in monitor.c when
> -     * defining new events here */
> -
> -    QEVENT_MAX,
> -} MonitorEvent;
> -
>  int monitor_cur_is_qmp(void);
>  
>  void monitor_protocol_event(MonitorEvent event, QObject *data);
> diff --git a/include/qapi/qmp/qevent.h b/include/qapi/qmp/qevent.h
> new file mode 100644
> index 0000000..e6d09fc
> --- /dev/null
> +++ b/include/qapi/qmp/qevent.h
> @@ -0,0 +1,66 @@
> +/*
> + * QEvent related defines and functions
> + *
> + * Copyright (c) 2003-2004 Fabrice Bellard
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +
> +#ifndef QEVENT_H
> +#define QEVENT_H
> +
> +/* QMP events */
> +typedef enum MonitorEvent {
> +    QEVENT_SHUTDOWN,
> +    QEVENT_RESET,
> +    QEVENT_POWERDOWN,
> +    QEVENT_STOP,
> +    QEVENT_RESUME,
> +    QEVENT_VNC_CONNECTED,
> +    QEVENT_VNC_INITIALIZED,
> +    QEVENT_VNC_DISCONNECTED,
> +    QEVENT_BLOCK_IO_ERROR,
> +    QEVENT_RTC_CHANGE,
> +    QEVENT_WATCHDOG,
> +    QEVENT_SPICE_CONNECTED,
> +    QEVENT_SPICE_INITIALIZED,
> +    QEVENT_SPICE_DISCONNECTED,
> +    QEVENT_BLOCK_JOB_COMPLETED,
> +    QEVENT_BLOCK_JOB_CANCELLED,
> +    QEVENT_BLOCK_JOB_ERROR,
> +    QEVENT_BLOCK_JOB_READY,
> +    QEVENT_DEVICE_DELETED,
> +    QEVENT_DEVICE_TRAY_MOVED,
> +    QEVENT_NIC_RX_FILTER_CHANGED,
> +    QEVENT_SUSPEND,
> +    QEVENT_SUSPEND_DISK,
> +    QEVENT_WAKEUP,
> +    QEVENT_BALLOON_CHANGE,
> +    QEVENT_SPICE_MIGRATE_COMPLETED,
> +    QEVENT_GUEST_PANICKED,
> +    QEVENT_BLOCK_IMAGE_CORRUPTED,
> +
> +    /* Add to 'monitor_event_names' array in monitor.c when
> +     * defining new events here */
> +
> +    QEVENT_MAX,
> +} MonitorEvent;
> +
> +#endif
> diff --git a/include/qapi/qmp/types.h b/include/qapi/qmp/types.h
> index 7782ec5..ba317bf 100644
> --- a/include/qapi/qmp/types.h
> +++ b/include/qapi/qmp/types.h
> @@ -21,5 +21,6 @@
>  #include "qapi/qmp/qdict.h"
>  #include "qapi/qmp/qlist.h"
>  #include "qapi/qmp/qjson.h"
> +#include "qapi/qmp/qevent.h"
>  
>  #endif /* QEMU_OBJECTS_H */
> 

Please move it qemu-schema.json instead.

Paolo

On 10/18/2013 03:36 AM, Paolo Bonzini wrote:
> Il 18/10/2013 03:11, Wenchao Xia ha scritto:
>> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
>> ---
>>  include/monitor/monitor.h |   38 +-------------------------
>>  include/qapi/qmp/qevent.h |   66 +++++++++++++++++++++++++++++++++++++++++++++
>>  include/qapi/qmp/types.h  |    1 +
>>  3 files changed, 68 insertions(+), 37 deletions(-)
>>  create mode 100644 include/qapi/qmp/qevent.h

>>
> 
> Please move it qemu-schema.json instead.

qapi-schema.json, but yes, I agree that declaring it as a qapi enum and
letting the code generator create the constants, rather than moving the
hand-maintained constants into a new header, is smarter.

于 2013/10/18 20:38, Eric Blake 写道:
> On 10/18/2013 03:36 AM, Paolo Bonzini wrote:
>> Il 18/10/2013 03:11, Wenchao Xia ha scritto:
>>> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
>>> ---
>>>   include/monitor/monitor.h |   38 +-------------------------
>>>   include/qapi/qmp/qevent.h |   66 +++++++++++++++++++++++++++++++++++++++++++++
>>>   include/qapi/qmp/types.h  |    1 +
>>>   3 files changed, 68 insertions(+), 37 deletions(-)
>>>   create mode 100644 include/qapi/qmp/qevent.h
>> Please move it qemu-schema.json instead.
> qapi-schema.json, but yes, I agree that declaring it as a qapi enum and
> letting the code generator create the constants, rather than moving the
> hand-maintained constants into a new header, is smarter.
>
    I will try use qapi-schema.json in next version.