Commit 21a885a7 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'luiz/queue/qmp' into staging 



# By Luiz Capitulino
# Via Luiz Capitulino
* luiz/queue/qmp:
  qerror: drop QERR_OPEN_FILE_FAILED macro
  block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED
  savevm: qmp_xen_save_devices_state(): use error_setg_file_open()
  dump: qmp_dump_guest_memory(): use error_setg_file_open()
  cpus: use error_setg_file_open()
  blockdev: use error_setg_file_open()
  block: mirror_complete(): use error_setg_file_open()
  rng-random: use error_setg_file_open()
  error: add error_setg_file_open() helper

Message-id: 1371484631-29510-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 128dc2d1 dbfbc637

backends/rng-random.c

+1 −2
Original line number Diff line number Diff line
@@ -78,9 +78,8 @@ static void rng_random_opened(RngBackend *b, Error **errp) 
                  "filename", "a valid filename");

    } else {

        s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);



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

            error_set(errp, QERR_OPEN_FILE_FAILED, s->filename);

            error_setg_file_open(errp, errno, s->filename);

        }

    }

}

block.c

+2 −2
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, 
            if (local_err != NULL) {

                error_propagate(errp, local_err);

            } else {

                error_set(errp, QERR_OPEN_FILE_FAILED,

                error_setg(errp, "failed while preparing to reopen image '%s'",

                           reopen_state->bs->filename);

            }

            goto error;

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static void mirror_complete(BlockJob *job, Error **errp) 
        char backing_filename[PATH_MAX];

        bdrv_get_full_backing_filename(s->target, backing_filename,

                                       sizeof(backing_filename));

        error_set(errp, QERR_OPEN_FILE_FAILED, backing_filename);

        error_setg_file_open(errp, -ret, backing_filename);

        return;

    }

    if (!s->synced) {

blockdev.c

+7 −4
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ static void external_snapshot_prepare(BlkTransactionStates *common, 
    ret = bdrv_open(states->new_bs, new_image_file, NULL,

                    flags | BDRV_O_NO_BACKING, drv);

    if (ret != 0) {

        error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);

        error_setg_file_open(errp, -ret, new_image_file);

    }

}
@@ -1062,8 +1062,11 @@ static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename, 
                                    int bdrv_flags, BlockDriver *drv,

                                    const char *password, Error **errp)

{

    if (bdrv_open(bs, filename, NULL, bdrv_flags, drv) < 0) {

        error_set(errp, QERR_OPEN_FILE_FAILED, filename);

    int ret;



    ret = bdrv_open(bs, filename, NULL, bdrv_flags, drv);

    if (ret < 0) {

        error_setg_file_open(errp, -ret, filename);

        return;

    }
@@ -1483,7 +1486,7 @@ void qmp_drive_mirror(const char *device, const char *target, 


    if (ret < 0) {

        bdrv_delete(target_bs);

        error_set(errp, QERR_OPEN_FILE_FAILED, target);

        error_setg_file_open(errp, -ret, target);

        return;

    }

cpus.c

+2 −2
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename, 


    f = fopen(filename, "wb");

    if (!f) {

        error_set(errp, QERR_OPEN_FILE_FAILED, filename);

        error_setg_file_open(errp, errno, filename);

        return;

    }
@@ -1308,7 +1308,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, 


    f = fopen(filename, "wb");

    if (!f) {

        error_set(errp, QERR_OPEN_FILE_FAILED, filename);

        error_setg_file_open(errp, errno, filename);

        return;

    }