Commit 68dc0364 authored by Stefan Weil's avatar Stefan Weil Committed by Stefan Hajnoczi
Browse files

w32: Fix access to host devices (regression) 



QEMU failed to open host devices like \\.\PhysicalDrive0 (first hard disk)
since some time (commit 8a79380b?).

Those devices use hdev_open which did not use the latest API for options.
This resulted in a fatal runtime error:

  Block protocol 'host_device' doesn't support the option 'filename'

Duplicate code from raw_open to fix this.

Cc: qemu-stable@nongnu.org
Reported-by: default avatarDavid Brenner <david.brenner3@gmail.com>
Signed-off-by: default avatarStefan Weil <sw@weilnetz.de>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent b2e10493

block/raw-win32.c

+29 −7
Original line number Diff line number Diff line
@@ -535,13 +535,29 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags) 
{

    BDRVRawState *s = bs->opaque;

    int access_flags, create_flags;

    int ret = 0;

    DWORD overlapped;

    char device_name[64];

    const char *filename = qdict_get_str(options, "filename");



    Error *local_err = NULL;

    const char *filename;



    QemuOpts *opts = qemu_opts_create_nofail(&raw_runtime_opts);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        qerror_report_err(local_err);

        error_free(local_err);

        ret = -EINVAL;

        goto done;

    }



    filename = qemu_opt_get(opts, "filename");



    if (strstart(filename, "/dev/cdrom", NULL)) {

        if (find_cdrom(device_name, sizeof(device_name)) < 0)

            return -ENOENT;

        if (find_cdrom(device_name, sizeof(device_name)) < 0) {

            ret = -ENOENT;

            goto done;

        }

        filename = device_name;

    } else {

        /* transform drive letters into device name */
@@ -564,11 +580,17 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags) 
    if (s->hfile == INVALID_HANDLE_VALUE) {

        int err = GetLastError();



        if (err == ERROR_ACCESS_DENIED)

            return -EACCES;

        return -1;

        if (err == ERROR_ACCESS_DENIED) {

            ret = -EACCES;

        } else {

            ret = -1;

        }

    return 0;

        goto done;

    }



done:

    qemu_opts_del(opts);

    return ret;

}



static BlockDriver bdrv_host_device = {