Commit ea52cdd4 authored by Greg Kurz's avatar Greg Kurz
Browse files

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: default avatarGreg Kurz <groug@kaod.org>
parent c0da0cb7

fsdev/qemu-fsdev-throttle.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void fsdev_throttle_write_timer_cb(void *opaque) 
    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);

    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 =

        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)

fsdev/qemu-fsdev-throttle.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ typedef struct FsThrottle { 
    CoQueue      throttled_reqs[2];

} FsThrottle;



void fsdev_throttle_parse_opts(QemuOpts *, FsThrottle *, Error **);

int fsdev_throttle_parse_opts(QemuOpts *, FsThrottle *, Error **);



void fsdev_throttle_init(FsThrottle *);

hw/9pfs/9p-local.c

+1 −2
Original line number Diff line number Diff line
@@ -1511,8 +1511,7 @@ static int local_parse_opts(QemuOpts *opts, FsDriverEntry *fse, Error **errp) 
        return -1;

    }



    fsdev_throttle_parse_opts(opts, &fse->fst, &local_err);

    if (local_err) {

    if (fsdev_throttle_parse_opts(opts, &fse->fst, &local_err)) {

        error_propagate_prepend(errp, local_err,

                                "invalid throttle configuration: ");

        return -1;