Commit a5ee7bd4 authored by Wenchao Xia's avatar Wenchao Xia Committed by Luiz Capitulino
Browse files

qapi event: convert DEVICE_TRAY_MOVED 



Signed-off-by: default avatarWenchao Xia <wenchaoqemu@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 24b699fb

block.c

+7 −14
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "block/qapi.h"

#include "qmp-commands.h"

#include "qemu/timer.h"

#include "qapi-event.h"



#ifdef CONFIG_BSD

#include <sys/types.h>
@@ -2162,17 +2163,6 @@ void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv, 
    qobject_decref(data);

}



static void bdrv_emit_qmp_eject_event(BlockDriverState *bs, bool ejected)

{

    QObject *data;



    data = qobject_from_jsonf("{ 'device': %s, 'tray-open': %i }",

                              bdrv_get_device_name(bs), ejected);

    monitor_protocol_event(QEVENT_DEVICE_TRAY_MOVED, data);



    qobject_decref(data);

}



static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load)

{

    if (bs->dev_ops && bs->dev_ops->change_media_cb) {
@@ -2180,11 +2170,13 @@ static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load) 
        bs->dev_ops->change_media_cb(bs->dev_opaque, load);

        if (tray_was_closed) {

            /* tray open */

            bdrv_emit_qmp_eject_event(bs, true);

            qapi_event_send_device_tray_moved(bdrv_get_device_name(bs),

                                              true, &error_abort);

        }

        if (load) {

            /* tray close */

            bdrv_emit_qmp_eject_event(bs, false);

            qapi_event_send_device_tray_moved(bdrv_get_device_name(bs),

                                              false, &error_abort);

        }

    }

}
@@ -5217,7 +5209,8 @@ void bdrv_eject(BlockDriverState *bs, bool eject_flag) 
    }



    if (bs->device_name[0] != '\0') {

        bdrv_emit_qmp_eject_event(bs, eject_flag);

        qapi_event_send_device_tray_moved(bdrv_get_device_name(bs),

                                          eject_flag, &error_abort);

    }

}

docs/qmp/qmp-events.txt

+0 −18
Original line number Diff line number Diff line
@@ -168,24 +168,6 @@ Example: 
Note: The "ready to complete" status is always reset by a BLOCK_JOB_ERROR

event.



DEVICE_TRAY_MOVED

-----------------



It's emitted whenever the tray of a removable device is moved by the guest

or by HMP/QMP commands.



Data:



- "device": device name (json-string)

- "tray-open": true if the tray has been opened or false if it has been closed

               (json-bool)



{ "event": "DEVICE_TRAY_MOVED",

  "data": { "device": "ide1-cd0",

            "tray-open": true

  },

  "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }



GUEST_PANICKED

--------------

qapi/block.json

+14 −0
Original line number Diff line number Diff line
@@ -164,3 +164,17 @@ 
##

{ 'command': 'nbd-server-stop' }



##

# @DEVICE_TRAY_MOVED

#

# Emitted whenever the tray of a removable device is moved by the guest or by

# HMP/QMP commands

#

# @device: device name

#

# @tray-open: true if the tray has been opened or false if it has been closed

#

# Since: 1.1

##

{ 'event': 'DEVICE_TRAY_MOVED',

  'data': { 'device': 'str', 'tray-open': 'bool' } }