Commit bdd03cdf authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block/raw-posix: Use raw_normalize_devicepath() 



The filename given to qemu_open() in block/raw-posix.c should generally
have been processed by raw_normalize_devicepath(); unless we are only
probing (in which case the caller often checks whether the file is a
block device or not, and this property will be changed by
raw_normalize_devicepath() on NetBSD) or it is about a deprecated device
(i.e. floppy).

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 137a905f

block/raw-posix.c

+17 −5
Original line number Diff line number Diff line
@@ -670,13 +670,19 @@ static int raw_reopen_prepare(BDRVReopenState *state, 


    /* If we cannot use fcntl, or fcntl failed, fall back to qemu_open() */

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

        const char *normalized_filename = state->bs->filename;

        ret = raw_normalize_devicepath(&normalized_filename);

        if (ret < 0) {

            error_setg_errno(errp, -ret, "Could not normalize device path");

        } else {

            assert(!(raw_s->open_flags & O_CREAT));

        raw_s->fd = qemu_open(state->bs->filename, raw_s->open_flags);

            raw_s->fd = qemu_open(normalized_filename, raw_s->open_flags);

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

                error_setg_errno(errp, errno, "Could not reopen file");

                ret = -1;

            }

        }

    }



    /* Fail already reopen_prepare() if we can't get a working O_DIRECT

     * alignment with the new fd. */
@@ -2314,6 +2320,12 @@ static int hdev_create(const char *filename, QemuOpts *opts, 


    (void)has_prefix;



    ret = raw_normalize_devicepath(&filename);

    if (ret < 0) {

        error_setg_errno(errp, -ret, "Could not normalize device path");

        return ret;

    }



    /* Read out options */

    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                          BDRV_SECTOR_SIZE);