Commit 133fe774 authored by Edgar E. Iglesias's avatar Edgar E. Iglesias
Browse files

Merge remote branch 'luiz/queue/qmp' into qmpq 



* luiz/queue/qmp:
  migration: qmp_migrate(): keep working after syntax error
  qerror: Remove assert_no_error()
  qemu-option: Remove qemu_opts_create_nofail
  target-i386: Remove assert_no_error usage
  hw: Remove assert_no_error usages
  qdev: Delete dead code
  error: Add error_abort
  monitor: add object-add (QMP) and object_add (HMP) command
  monitor: add object-del (QMP) and object_del (HMP) command
  qom: catch errors in object_property_add_child
  qom: fix leak for objects created with -object
  rng: initialize file descriptor to -1
  qemu-monitor: HMP cpu-add wrapper
  vl: add missing transition debug->finish_migrate

Message-Id: 1389045795-18706-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parents 73c69456 c9501142

backends/rng-random.c

+2 −2
Original line number Diff line number Diff line
@@ -123,15 +123,15 @@ static void rng_random_init(Object *obj) 
                            NULL);



    s->filename = g_strdup("/dev/random");

    s->fd = -1;

}



static void rng_random_finalize(Object *obj)

{

    RndRandom *s = RNG_RANDOM(obj);



    qemu_set_fd_handler(s->fd, NULL, NULL, NULL);



    if (s->fd != -1) {

        qemu_set_fd_handler(s->fd, NULL, NULL, NULL);

        qemu_close(s->fd);

    }

block/blkdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    const char *filename, *config;

    int ret;



    opts = qemu_opts_create_nofail(&runtime_opts);

    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

block/blkverify.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, 
    const char *filename, *raw;

    int ret;



    opts = qemu_opts_create_nofail(&runtime_opts);

    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

block/curl.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, 
        return -EROFS;

    }



    opts = qemu_opts_create_nofail(&runtime_opts);

    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        qerror_report_err(local_err);

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, 
    Error *local_err = NULL;

    const char *filename;



    opts = qemu_opts_create_nofail(&runtime_opts);

    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        qerror_report_err(local_err);