riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

blockdev: Convert drive_new() to Error 

Calling error_report() from within a function that takes an Error **
argument is suspicious.  drive_new() calls error_report() even though
it can run within drive_init_func(), which takes an Error ** argument.
drive_init_func()'s caller main(), via qemu_opts_foreach(), is fine
with it, but clean it up anyway:

* Convert drive_new() to Error

* Update add_init_drive() to report the error received from
  drive_new()

* Make main() pass &error_fatal through qemu_opts_foreach(),
  drive_init_func() to drive_new()

* Make default_drive() pass &error_abort through qemu_opts_foreach(),
  drive_init_func() to drive_new()

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181017082702.5581-34-armbru@redhat.com>
pull/76/head
Markus Armbruster 8 years ago
parent
f881ca19f1
commit
c4f26c9f37
4 changed files with 24 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      blockdev.c
  2. 5
      device-hotplug.c
  3. 3
      include/sysemu/blockdev.h
  4. 8
      vl.c

27
blockdev.c
View File

@ -759,7 +759,8 @@ QemuOptsList qemu_legacy_drive_opts = {
}, },
}; };
DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type,
Error **errp)
{ {
const char *value; const char *value;
BlockBackend *blk; BlockBackend *blk;
@ -808,7 +809,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
qemu_opt_rename(all_opts, opt_renames[i].from, opt_renames[i].to, qemu_opt_rename(all_opts, opt_renames[i].from, opt_renames[i].to,
&local_err); &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_propagate(errp, local_err);
return NULL; return NULL;
} }
} }
@ -819,7 +820,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
bool writethrough; bool writethrough;
if (bdrv_parse_cache_mode(value, &flags, &writethrough) != 0) { if (bdrv_parse_cache_mode(value, &flags, &writethrough) != 0) {
error_report("invalid cache option"); error_setg(errp, "invalid cache option");
return NULL; return NULL;
} }
@ -847,7 +848,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
&error_abort); &error_abort);
qemu_opts_absorb_qdict(legacy_opts, bs_opts, &local_err); qemu_opts_absorb_qdict(legacy_opts, bs_opts, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_propagate(errp, local_err);
goto fail; goto fail;
} }
@ -860,7 +861,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
media = MEDIA_CDROM; media = MEDIA_CDROM;
read_only = true; read_only = true;
} else { } else {
error_report("'%s' invalid media", value); error_setg(errp, "'%s' invalid media", value);
goto fail; goto fail;
} }
} }
@ -885,7 +886,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
type++) { type++) {
} }
if (type == IF_COUNT) { if (type == IF_COUNT) {
error_report("unsupported bus type '%s'", value); error_setg(errp, "unsupported bus type '%s'", value);
goto fail; goto fail;
} }
} else { } else {
@ -902,7 +903,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
if (index != -1) { if (index != -1) {
if (bus_id != 0 || unit_id != -1) { if (bus_id != 0 || unit_id != -1) {
error_report("index cannot be used with bus and unit"); error_setg(errp, "index cannot be used with bus and unit");
goto fail; goto fail;
} }
bus_id = drive_index_to_bus_id(type, index); bus_id = drive_index_to_bus_id(type, index);
@ -921,13 +922,13 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
} }
if (max_devs && unit_id >= max_devs) { if (max_devs && unit_id >= max_devs) {
error_report("unit %d too big (max is %d)", unit_id, max_devs - 1); error_setg(errp, "unit %d too big (max is %d)", unit_id, max_devs - 1);
goto fail; goto fail;
} }
if (drive_get(type, bus_id, unit_id) != NULL) { if (drive_get(type, bus_id, unit_id) != NULL) {
error_report("drive with bus=%d, unit=%d (index=%d) exists", error_setg(errp, "drive with bus=%d, unit=%d (index=%d) exists",
bus_id, unit_id, index); bus_id, unit_id, index);
goto fail; goto fail;
} }
@ -970,7 +971,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
if (werror != NULL) { if (werror != NULL) {
if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO &&
type != IF_NONE) { type != IF_NONE) {
error_report("werror is not supported by this bus type"); error_setg(errp, "werror is not supported by this bus type");
goto fail; goto fail;
} }
qdict_put_str(bs_opts, "werror", werror); qdict_put_str(bs_opts, "werror", werror);
@ -980,7 +981,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
if (rerror != NULL) { if (rerror != NULL) {
if (type != IF_IDE && type != IF_VIRTIO && type != IF_SCSI && if (type != IF_IDE && type != IF_VIRTIO && type != IF_SCSI &&
type != IF_NONE) { type != IF_NONE) {
error_report("rerror is not supported by this bus type"); error_setg(errp, "rerror is not supported by this bus type");
goto fail; goto fail;
} }
qdict_put_str(bs_opts, "rerror", rerror); qdict_put_str(bs_opts, "rerror", rerror);
@ -991,7 +992,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
bs_opts = NULL; bs_opts = NULL;
if (!blk) { if (!blk) {
if (local_err) { if (local_err) {
error_report_err(local_err); error_propagate(errp, local_err);
} }
goto fail; goto fail;
} else { } else {

5
device-hotplug.c
View File

@ -28,6 +28,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/error.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
@ -36,6 +37,7 @@
static DriveInfo *add_init_drive(const char *optstr) static DriveInfo *add_init_drive(const char *optstr)
{ {
Error *err = NULL;
DriveInfo *dinfo; DriveInfo *dinfo;
QemuOpts *opts; QemuOpts *opts;
MachineClass *mc; MachineClass *mc;
@ -45,8 +47,9 @@ static DriveInfo *add_init_drive(const char *optstr)
return NULL; return NULL;
mc = MACHINE_GET_CLASS(current_machine); mc = MACHINE_GET_CLASS(current_machine);
dinfo = drive_new(opts, mc->block_default_type); dinfo = drive_new(opts, mc->block_default_type, &err);
if (!dinfo) { if (!dinfo) {
error_report_err(err);
qemu_opts_del(opts); qemu_opts_del(opts);
return NULL; return NULL;
} }

3
include/sysemu/blockdev.h
View File

@ -54,7 +54,8 @@ DriveInfo *drive_get_next(BlockInterfaceType type);
QemuOpts *drive_def(const char *optstr); QemuOpts *drive_def(const char *optstr);
QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file, QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,
const char *optstr); const char *optstr);
DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type); DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type,
Error **errp);
/* device-hotplug */ /* device-hotplug */

8
vl.c
View File

@ -1129,7 +1129,7 @@ static int drive_init_func(void *opaque, QemuOpts *opts, Error **errp)
{ {
BlockInterfaceType *block_default_type = opaque; BlockInterfaceType *block_default_type = opaque;
return drive_new(opts, *block_default_type) == NULL; return drive_new(opts, *block_default_type, errp) == NULL;
} }
static int drive_enable_snapshot(void *opaque, QemuOpts *opts, Error **errp) static int drive_enable_snapshot(void *opaque, QemuOpts *opts, Error **errp)
@ -1155,8 +1155,7 @@ static void default_drive(int enable, int snapshot, BlockInterfaceType type,
drive_enable_snapshot(NULL, opts, NULL); drive_enable_snapshot(NULL, opts, NULL);
} }
dinfo = drive_new(opts, type); dinfo = drive_new(opts, type, &error_abort);
assert(dinfo);
dinfo->is_default = true; dinfo->is_default = true;
} }
@ -4397,7 +4396,8 @@ int main(int argc, char **argv, char **envp)
NULL, NULL); NULL, NULL);
} }
if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func, if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,
&machine_class->block_default_type, NULL)) { &machine_class->block_default_type, &error_fatal)) {
/* We printed help */
exit(1); exit(1);
} }

Write Preview
Loading…
Cancel
Save