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

qapi event: convert other BLOCK_JOB events 



Since BLOCK_JOB_COMPLETED, BLOCK_JOB_CANCELLED, BLOCK_JOB_READY are
related, convert them in one patch. The block_job_event_* functions
are used to keep encapsulation of BlockJob structure.

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 c120f0fa

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void coroutine_fn mirror_run(void *opaque) 
                 */

                s->common.offset = end * BDRV_SECTOR_SIZE;

                if (!s->synced) {

                    block_job_ready(&s->common);

                    block_job_event_ready(&s->common);

                    s->synced = true;

                }

blockdev.c

+5 −7
Original line number Diff line number Diff line
@@ -1847,23 +1847,21 @@ void qmp_block_resize(bool has_device, const char *device, 
static void block_job_cb(void *opaque, int ret)

{

    BlockDriverState *bs = opaque;

    QObject *obj;

    const char *msg = NULL;



    trace_block_job_cb(bs, bs->job, ret);



    assert(bs->job);

    obj = qobject_from_block_job(bs->job);



    if (ret < 0) {

        QDict *dict = qobject_to_qdict(obj);

        qdict_put(dict, "error", qstring_from_str(strerror(-ret)));

        msg = strerror(-ret);

    }



    if (block_job_is_cancelled(bs->job)) {

        monitor_protocol_event(QEVENT_BLOCK_JOB_CANCELLED, obj);

        block_job_event_cancelled(bs->job);

    } else {

        monitor_protocol_event(QEVENT_BLOCK_JOB_COMPLETED, obj);

        block_job_event_completed(bs->job, msg);

    }

    qobject_decref(obj);



    bdrv_put_ref_bh_schedule(bs);

}

blockjob.c

+20 −16
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "config-host.h"

#include "qemu-common.h"

#include "trace.h"

#include "monitor/monitor.h"

#include "block/block.h"

#include "block/blockjob.h"

#include "block/block_int.h"
@@ -233,26 +232,31 @@ static void block_job_iostatus_set_err(BlockJob *job, int error) 
    }

}



void block_job_event_cancelled(BlockJob *job)

{

    qapi_event_send_block_job_cancelled(job->driver->job_type,

                                        bdrv_get_device_name(job->bs),

                                        job->len,

                                        job->offset,

                                        job->speed,

                                        &error_abort);

}



QObject *qobject_from_block_job(BlockJob *job)

void block_job_event_completed(BlockJob *job, const char *msg)

{

    return qobject_from_jsonf("{ 'type': %s,"

                              "'device': %s,"

                              "'len': %" PRId64 ","

                              "'offset': %" PRId64 ","

                              "'speed': %" PRId64 " }",

                              BlockJobType_lookup[job->driver->job_type],

    qapi_event_send_block_job_completed(job->driver->job_type,

                                        bdrv_get_device_name(job->bs),

                                        job->len,

                                        job->offset,

                              job->speed);

                                        job->speed,

                                        !!msg,

                                        msg,

                                        &error_abort);

}



void block_job_ready(BlockJob *job)

void block_job_event_ready(BlockJob *job)

{

    QObject *data = qobject_from_block_job(job);

    monitor_protocol_event(QEVENT_BLOCK_JOB_READY, data);

    qobject_decref(data);

    qapi_event_send_block_job_ready(bdrv_get_device_name(job->bs), &error_abort);

}



BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,

docs/qmp/qmp-events.txt

+0 −71
Original line number Diff line number Diff line
@@ -28,77 +28,6 @@ Example: 
    "data": { "actual": 944766976 },

    "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }



BLOCK_JOB_CANCELLED

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



Emitted when a block job has been cancelled.



Data:



- "type":     Job type (json-string; "stream" for image streaming

                                     "commit" for block commit)

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

- "len":      Maximum progress value (json-int)

- "offset":   Current progress value (json-int)

              On success this is equal to len.

              On failure this is less than len.

- "speed":    Rate limit, bytes per second (json-int)



Example:



{ "event": "BLOCK_JOB_CANCELLED",

     "data": { "type": "stream", "device": "virtio-disk0",

               "len": 10737418240, "offset": 134217728,

               "speed": 0 },

     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }



BLOCK_JOB_COMPLETED

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



Emitted when a block job has completed.



Data:



- "type":     Job type (json-string; "stream" for image streaming

                                     "commit" for block commit)

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

- "len":      Maximum progress value (json-int)

- "offset":   Current progress value (json-int)

              On success this is equal to len.

              On failure this is less than len.

- "speed":    Rate limit, bytes per second (json-int)

- "error":    Error message (json-string, optional)

              Only present on failure.  This field contains a human-readable

              error message.  There are no semantics other than that streaming

              has failed and clients should not try to interpret the error

              string.



Example:



{ "event": "BLOCK_JOB_COMPLETED",

     "data": { "type": "stream", "device": "virtio-disk0",

               "len": 10737418240, "offset": 10737418240,

               "speed": 0 },

     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }



BLOCK_JOB_READY

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



Emitted when a block job is ready to complete.



Data:



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



Example:



{ "event": "BLOCK_JOB_READY",

    "data": { "device": "ide0-hd1" },

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



Note: The "ready to complete" status is always reset by a BLOCK_JOB_ERROR

event.



GUEST_PANICKED

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

include/block/blockjob.h

+13 −4
Original line number Diff line number Diff line
@@ -217,12 +217,21 @@ void block_job_pause(BlockJob *job); 
void block_job_resume(BlockJob *job);



/**

 * qobject_from_block_job:

 * block_job_event_cancle:

 * @job: The job whose information is requested.

 *

 * Return a QDict corresponding to @job's query-block-jobs entry.

 * Send a BLOCK_JOB_CANCELLED event for the specified job.

 */

QObject *qobject_from_block_job(BlockJob *job);

void block_job_event_cancelled(BlockJob *job);



/**

 * block_job_ready:

 * @job: The job which is now ready to complete.

 * @msg: Error message. Only present on failure.

 *

 * Send a BLOCK_JOB_COMPLETED event for the specified job.

 */

void block_job_event_completed(BlockJob *job, const char *msg);



/**

 * block_job_ready:
@@ -230,7 +239,7 @@ QObject *qobject_from_block_job(BlockJob *job); 
 *

 * Send a BLOCK_JOB_READY event for the specified job.

 */

void block_job_ready(BlockJob *job);

void block_job_event_ready(BlockJob *job);



/**

 * block_job_is_paused: