| Message ID | 1378069165-10581-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Accepted |
| Headers | show |
Am 01.09.2013 um 22:59 hat Stefan Weil geschrieben: > QEMU failed to open host devices like \\.\PhysicalDrive0 (first hard disk) > since some time (commit 8a79380b8ef1b02d2abd705dd026a18863b09020?). > > 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. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Kevin Wolf <kwolf@redhat.com> > --- > > This bug was reported by David Brenner. > It should be fixed in QEMU 1.6 as well. Cc: qemu-stable@nongnu.org (Ideally you'd also put this Cc line in your commit message.) Kevin
On Sun, Sep 01, 2013 at 10:59:25PM +0200, Stefan Weil wrote: > QEMU failed to open host devices like \\.\PhysicalDrive0 (first hard disk) > since some time (commit 8a79380b8ef1b02d2abd705dd026a18863b09020?). > > 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. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > > This bug was reported by David Brenner. > It should be fixed in QEMU 1.6 as well. > > Stefan > > block/raw-win32.c | 36 +++++++++++++++++++++++++++++------- > 1 file changed, 29 insertions(+), 7 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
Am 03.09.2013 10:51, schrieb Kevin Wolf: > Am 01.09.2013 um 22:59 hat Stefan Weil geschrieben: >> QEMU failed to open host devices like \\.\PhysicalDrive0 (first hard disk) >> since some time (commit 8a79380b8ef1b02d2abd705dd026a18863b09020?). >> >> 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. >> >> Signed-off-by: Stefan Weil <sw@weilnetz.de> > > Reviewed-by: Kevin Wolf <kwolf@redhat.com> > >> --- >> >> This bug was reported by David Brenner. >> It should be fixed in QEMU 1.6 as well. > > Cc: qemu-stable@nongnu.org > > (Ideally you'd also put this Cc line in your commit message.) ...and put the attribution as: Reported-by: David Brenner <david.brenner3@gmail.com> Maybe Stefan H. can still add that along with the Cc. Andreas
diff --git a/block/raw-win32.c b/block/raw-win32.c index 9b5b2af..d2d2d9f 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -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; + } + goto done; } - return 0; + +done: + qemu_opts_del(opts); + return ret; } static BlockDriver bdrv_host_device = {
QEMU failed to open host devices like \\.\PhysicalDrive0 (first hard disk) since some time (commit 8a79380b8ef1b02d2abd705dd026a18863b09020?). 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. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- This bug was reported by David Brenner. It should be fixed in QEMU 1.6 as well. Stefan block/raw-win32.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-)