Commit 850a8242 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-08-28' into staging 



QAPI patches for 2018-08-28

# gpg: Signature made Tue 28 Aug 2018 17:23:32 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2018-08-28:
  qapi: Add comments to aid debugging generated introspection
  qapi: Minor introspect.py cleanups
  qapi: Update docs for generator changes since commit 9ee86b85
  qapi: Emit a blank line before dummy declaration
  qapi: Drop qapi_event_send_FOO()'s Error ** argument
  qapi: Fix build_params() for empty parameter list

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 19b599f7 8c643361

block/block-backend.c

+3 −5
Original line number Diff line number Diff line
@@ -980,8 +980,7 @@ void blk_dev_change_media_cb(BlockBackend *blk, bool load, Error **errp) 


        if (tray_was_open != tray_is_open) {

            char *id = blk_get_attached_dev_id(blk);

            qapi_event_send_device_tray_moved(blk_name(blk), id, tray_is_open,

                                              &error_abort);

            qapi_event_send_device_tray_moved(blk_name(blk), id, tray_is_open);

            g_free(id);

        }

    }
@@ -1665,8 +1664,7 @@ static void send_qmp_error_event(BlockBackend *blk, 
    qapi_event_send_block_io_error(blk_name(blk), !!bs,

                                   bs ? bdrv_get_node_name(bs) : NULL, optype,

                                   action, blk_iostatus_is_enabled(blk),

                                   error == ENOSPC, strerror(error),

                                   &error_abort);

                                   error == ENOSPC, strerror(error));

}



/* This is done by device models because, while the block layer knows
@@ -1782,7 +1780,7 @@ void blk_eject(BlockBackend *blk, bool eject_flag) 
     * the frontend experienced a tray event. */

    id = blk_get_attached_dev_id(blk);

    qapi_event_send_device_tray_moved(blk_name(blk), id,

                                      eject_flag, &error_abort);

                                      eject_flag);

    g_free(id);

}

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -4659,7 +4659,7 @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset, 
                                          *node_name != '\0', node_name,

                                          message, offset >= 0, offset,

                                          size >= 0, size,

                                          fatal, &error_abort);

                                          fatal);

    g_free(message);



    if (fatal) {

block/quorum.c

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void quorum_report_bad(QuorumOpType type, uint64_t offset, 
    }



    qapi_event_send_quorum_report_bad(type, !!msg, msg, node_name, start_sector,

                                      end_sector - start_sector, &error_abort);

                                      end_sector - start_sector);

}



static void quorum_report_failure(QuorumAIOCB *acb)
@@ -210,7 +210,7 @@ static void quorum_report_failure(QuorumAIOCB *acb) 
                                      BDRV_SECTOR_SIZE);



    qapi_event_send_quorum_failure(reference, start_sector,

                                   end_sector - start_sector, &error_abort);

                                   end_sector - start_sector);

}



static int quorum_vote_error(QuorumAIOCB *acb);

block/write-threshold.c

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ static int coroutine_fn before_write_notify(NotifierWithReturn *notifier, 
        qapi_event_send_block_write_threshold(

            bs->node_name,

            amount,

            bs->write_threshold_offset,

            &error_abort);

            bs->write_threshold_offset);



        /* autodisable to avoid flooding the monitor */

        write_threshold_disable(bs);

blockjob.c

+5 −8
Original line number Diff line number Diff line
@@ -315,8 +315,7 @@ static void block_job_event_cancelled(Notifier *n, void *opaque) 
                                        job->job.id,

                                        job->job.progress_total,

                                        job->job.progress_current,

                                        job->speed,

                                        &error_abort);

                                        job->speed);

}



static void block_job_event_completed(Notifier *n, void *opaque)
@@ -338,8 +337,7 @@ static void block_job_event_completed(Notifier *n, void *opaque) 
                                        job->job.progress_current,

                                        job->speed,

                                        !!msg,

                                        msg,

                                        &error_abort);

                                        msg);

}



static void block_job_event_pending(Notifier *n, void *opaque)
@@ -351,8 +349,7 @@ static void block_job_event_pending(Notifier *n, void *opaque) 
    }



    qapi_event_send_block_job_pending(job_type(&job->job),

                                      job->job.id,

                                      &error_abort);

                                      job->job.id);

}



static void block_job_event_ready(Notifier *n, void *opaque)
@@ -367,7 +364,7 @@ static void block_job_event_ready(Notifier *n, void *opaque) 
                                    job->job.id,

                                    job->job.progress_total,

                                    job->job.progress_current,

                                    job->speed, &error_abort);

                                    job->speed);

}
@@ -494,7 +491,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err, 
        qapi_event_send_block_job_error(job->job.id,

                                        is_read ? IO_OPERATION_TYPE_READ :

                                        IO_OPERATION_TYPE_WRITE,

                                        action, &error_abort);

                                        action);

    }

    if (action == BLOCK_ERROR_ACTION_STOP) {

        job_pause(&job->job);