openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fsdev: Add return value to fsdev_throttle_parse_opts() 

It is more convenient to use the return value of the function to notify
errors, rather than to be tied up setting up the &local_err boilerplate.

Signed-off-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
Greg Kurz 2019-10-10 11:36:05 +02:00
parent c0da0cb761
commit ea52cdd443
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fsdev/qemu-fsdev-throttle.c
View File

@ -31,7 +31,7 @@ static void fsdev_throttle_write_timer_cb(void *opaque)
qemu_co_enter_next(&fst->throttled_reqs[true], NULL); qemu_co_enter_next(&fst->throttled_reqs[true], NULL);
} }
void fsdev_throttle_parse_opts(QemuOpts *opts, FsThrottle *fst, Error **errp) int fsdev_throttle_parse_opts(QemuOpts *opts, FsThrottle *fst, Error **errp)
{ {
throttle_config_init(&fst->cfg); throttle_config_init(&fst->cfg);
fst->cfg.buckets[THROTTLE_BPS_TOTAL].avg = fst->cfg.buckets[THROTTLE_BPS_TOTAL].avg =
@ -75,7 +75,7 @@ void fsdev_throttle_parse_opts(QemuOpts *opts, FsThrottle *fst, Error **errp)
fst->cfg.op_size = fst->cfg.op_size =
qemu_opt_get_number(opts, "throttling.iops-size", 0); qemu_opt_get_number(opts, "throttling.iops-size", 0);
throttle_is_valid(&fst->cfg, errp); return throttle_is_valid(&fst->cfg, errp) ? 0 : -1;
} }
void fsdev_throttle_init(FsThrottle *fst) void fsdev_throttle_init(FsThrottle *fst)

2
fsdev/qemu-fsdev-throttle.h
View File

@ -26,7 +26,7 @@ typedef struct FsThrottle {
CoQueue throttled_reqs[2]; CoQueue throttled_reqs[2];
} FsThrottle; } FsThrottle;
void fsdev_throttle_parse_opts(QemuOpts *, FsThrottle *, Error **); int fsdev_throttle_parse_opts(QemuOpts *, FsThrottle *, Error **);
void fsdev_throttle_init(FsThrottle *); void fsdev_throttle_init(FsThrottle *);

3
hw/9pfs/9p-local.c
View File

@ -1511,8 +1511,7 @@ static int local_parse_opts(QemuOpts *opts, FsDriverEntry *fse, Error **errp)
return -1; return -1;
} }
fsdev_throttle_parse_opts(opts, &fse->fst, &local_err); if (fsdev_throttle_parse_opts(opts, &fse->fst, &local_err)) {
if (local_err) {
error_propagate_prepend(errp, local_err, error_propagate_prepend(errp, local_err,
"invalid throttle configuration: "); "invalid throttle configuration: ");
return -1; return -1;