From nobody Wed Nov 5 14:08:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498222643534752.8037301706098; Fri, 23 Jun 2017 05:57:23 -0700 (PDT) Received: from localhost ([::1]:35415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOO9K-0000Zk-0T for importer@patchew.org; Fri, 23 Jun 2017 08:57:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOO0r-0001lO-Pu for qemu-devel@nongnu.org; Fri, 23 Jun 2017 08:48:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOO0p-0004Ur-81 for qemu-devel@nongnu.org; Fri, 23 Jun 2017 08:48:37 -0400 Received: from smtp1.ntua.gr ([2001:648:2000:de::183]:23051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOO0h-0004F5-1Q; Fri, 23 Jun 2017 08:48:27 -0400 Received: from mail.ntua.gr (ppp141255063244.access.hol.gr [141.255.63.244]) (authenticated bits=0) by smtp1.ntua.gr (8.15.2/8.15.2) with ESMTPSA id v5NClixU058486 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Jun 2017 15:47:44 +0300 (EEST) (envelope-from el13635@mail.ntua.gr) X-Authentication-Warning: smtp1.ntua.gr: Host ppp141255063244.access.hol.gr [141.255.63.244] claimed to be mail.ntua.gr From: Manos Pitsidianakis To: qemu-devel Date: Fri, 23 Jun 2017 15:46:55 +0300 Message-Id: <20170623124700.1389-4-el13635@mail.ntua.gr> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170623124700.1389-1-el13635@mail.ntua.gr> References: <20170623124700.1389-1-el13635@mail.ntua.gr> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:648:2000:de::183 Subject: [Qemu-devel] [PATCH RFC v3 3/8] block: add throttle block filter driver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , Stefan Hajnoczi , qemu-block Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" block/throttle.c uses existing I/O throttle infrastructure inside a block filter driver. I/O operations are intercepted in the filter's read/write coroutines, and referred to block/throttle-groups.c The driver can be used with the command -drive driver=3Dthrottle,file.filename=3Dfoo.qcow2,iops-total=3D... The configuration flags and semantics are identical to the hardcoded throttling ones. Signed-off-by: Manos Pitsidianakis --- block/Makefile.objs | 1 + block/throttle.c | 427 ++++++++++++++++++++++++++++++++++++= ++++ include/qemu/throttle-options.h | 60 ++++-- 3 files changed, 469 insertions(+), 19 deletions(-) create mode 100644 block/throttle.c diff --git a/block/Makefile.objs b/block/Makefile.objs index ea955302c8..bb811a4d01 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -25,6 +25,7 @@ block-obj-y +=3D accounting.o dirty-bitmap.o block-obj-y +=3D write-threshold.o block-obj-y +=3D backup.o block-obj-$(CONFIG_REPLICATION) +=3D replication.o +block-obj-y +=3D throttle.o =20 block-obj-y +=3D crypto.o =20 diff --git a/block/throttle.c b/block/throttle.c new file mode 100644 index 0000000000..0c17051161 --- /dev/null +++ b/block/throttle.c @@ -0,0 +1,427 @@ +/* + * QEMU block throttling filter driver infrastructure + * + * Copyright (c) 2017 Manos Pitsidianakis + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 or + * (at your option) version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include "qemu/osdep.h" +#include "block/throttle-groups.h" +#include "qemu/throttle-options.h" +#include "qapi/error.h" + + +static QemuOptsList throttle_opts =3D { + .name =3D "throttle", + .head =3D QTAILQ_HEAD_INITIALIZER(throttle_opts.head), + .desc =3D { + { + .name =3D QEMU_OPT_IOPS_TOTAL, + .type =3D QEMU_OPT_NUMBER, + .help =3D "limit total I/O operations per second", + },{ + .name =3D QEMU_OPT_IOPS_READ, + .type =3D QEMU_OPT_NUMBER, + .help =3D "limit read operations per second", + },{ + .name =3D QEMU_OPT_IOPS_WRITE, + .type =3D QEMU_OPT_NUMBER, + .help =3D "limit write operations per second", + },{ + .name =3D QEMU_OPT_BPS_TOTAL, + .type =3D QEMU_OPT_NUMBER, + .help =3D "limit total bytes per second", + },{ + .name =3D QEMU_OPT_BPS_READ, + .type =3D QEMU_OPT_NUMBER, + .help =3D "limit read bytes per second", + },{ + .name =3D QEMU_OPT_BPS_WRITE, + .type =3D QEMU_OPT_NUMBER, + .help =3D "limit write bytes per second", + },{ + .name =3D QEMU_OPT_IOPS_TOTAL_MAX, + .type =3D QEMU_OPT_NUMBER, + .help =3D "I/O operations burst", + },{ + .name =3D QEMU_OPT_IOPS_READ_MAX, + .type =3D QEMU_OPT_NUMBER, + .help =3D "I/O operations read burst", + },{ + .name =3D QEMU_OPT_IOPS_WRITE_MAX, + .type =3D QEMU_OPT_NUMBER, + .help =3D "I/O operations write burst", + },{ + .name =3D QEMU_OPT_BPS_TOTAL_MAX, + .type =3D QEMU_OPT_NUMBER, + .help =3D "total bytes burst", + },{ + .name =3D QEMU_OPT_BPS_READ_MAX, + .type =3D QEMU_OPT_NUMBER, + .help =3D "total bytes read burst", + },{ + .name =3D QEMU_OPT_BPS_WRITE_MAX, + .type =3D QEMU_OPT_NUMBER, + .help =3D "total bytes write burst", + },{ + .name =3D QEMU_OPT_IOPS_TOTAL_MAX_LENGTH, + .type =3D QEMU_OPT_NUMBER, + .help =3D "length of the iopstotalmax burst period, in seconds= ", + },{ + .name =3D QEMU_OPT_IOPS_READ_MAX_LENGTH, + .type =3D QEMU_OPT_NUMBER, + .help =3D "length of the iopsreadmax burst period, in seconds", + },{ + .name =3D QEMU_OPT_IOPS_WRITE_MAX_LENGTH, + .type =3D QEMU_OPT_NUMBER, + .help =3D "length of the iopswritemax burst period, in seconds= ", + },{ + .name =3D QEMU_OPT_BPS_TOTAL_MAX_LENGTH, + .type =3D QEMU_OPT_NUMBER, + .help =3D "length of the bpstotalmax burst period, in seconds", + },{ + .name =3D QEMU_OPT_BPS_READ_MAX_LENGTH, + .type =3D QEMU_OPT_NUMBER, + .help =3D "length of the bpsreadmax burst period, in seconds", + },{ + .name =3D QEMU_OPT_BPS_WRITE_MAX_LENGTH, + .type =3D QEMU_OPT_NUMBER, + .help =3D "length of the bpswritemax burst period, in seconds", + },{ + .name =3D QEMU_OPT_IOPS_SIZE, + .type =3D QEMU_OPT_NUMBER, + .help =3D "when limiting by iops max size of an I/O in bytes", + }, + { + .name =3D QEMU_OPT_THROTTLE_GROUP_NAME, + .type =3D QEMU_OPT_STRING, + .help =3D "throttle group name", + }, + { /* end of list */ } + }, +}; + +/* Extract ThrottleConfig options. Assumes cfg is initialized and will be + * checked for validity. + */ + +static void throttle_extract_options(QemuOpts *opts, ThrottleConfig *cfg) +{ + if (qemu_opt_get(opts, QEMU_OPT_BPS_TOTAL)) { + cfg->buckets[THROTTLE_BPS_TOTAL].avg =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_TOTAL, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_READ)) { + cfg->buckets[THROTTLE_BPS_READ].avg =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_READ, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_WRITE)) { + cfg->buckets[THROTTLE_BPS_WRITE].avg =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_WRITE, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_TOTAL)) { + cfg->buckets[THROTTLE_OPS_TOTAL].avg =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_TOTAL, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_READ)) { + cfg->buckets[THROTTLE_OPS_READ].avg =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_READ, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_WRITE)) { + cfg->buckets[THROTTLE_OPS_WRITE].avg =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_WRITE, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_TOTAL_MAX)) { + cfg->buckets[THROTTLE_BPS_TOTAL].max =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_TOTAL_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_READ_MAX)) { + cfg->buckets[THROTTLE_BPS_READ].max =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_READ_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_WRITE_MAX)) { + cfg->buckets[THROTTLE_BPS_WRITE].max =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_WRITE_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_TOTAL_MAX)) { + cfg->buckets[THROTTLE_OPS_TOTAL].max =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_TOTAL_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_READ_MAX)) { + cfg->buckets[THROTTLE_OPS_READ].max =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_READ_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_WRITE_MAX)) { + cfg->buckets[THROTTLE_OPS_WRITE].max =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_WRITE_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_TOTAL_MAX_LENGTH)) { + cfg->buckets[THROTTLE_BPS_TOTAL].burst_length =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_TOTAL_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_READ_MAX_LENGTH)) { + cfg->buckets[THROTTLE_BPS_READ].burst_length =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_READ_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_WRITE_MAX_LENGTH)) { + cfg->buckets[THROTTLE_BPS_WRITE].burst_length =3D + qemu_opt_get_number(opts, QEMU_OPT_BPS_WRITE_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_TOTAL_MAX_LENGTH)) { + cfg->buckets[THROTTLE_OPS_TOTAL].burst_length =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_TOTAL_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_READ_MAX_LENGTH)) { + cfg->buckets[THROTTLE_OPS_READ].burst_length =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_READ_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_WRITE_MAX_LENGTH)) { + cfg->buckets[THROTTLE_OPS_WRITE].burst_length =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_WRITE_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_SIZE)) { + cfg->op_size =3D + qemu_opt_get_number(opts, QEMU_OPT_IOPS_SIZE, 0); + } +} + +static int throttle_configure_tgm(BlockDriverState *bs, ThrottleGroupMembe= r *tgm, + QDict *options, Error = **errp) +{ + int ret =3D 0; + ThrottleState *ts; + ThrottleTimers *tt; + ThrottleConfig cfg; + QemuOpts *opts =3D NULL; + const char *group_name =3D NULL; + Error *local_err =3D NULL; + + opts =3D qemu_opts_create(&throttle_opts, NULL, 0, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + qemu_opts_absorb_qdict(opts, options, &local_err); + if (local_err) { + goto err; + } + + group_name =3D qemu_opt_get(opts, QEMU_OPT_THROTTLE_GROUP_NAME); + if (!group_name) { + group_name =3D bdrv_get_device_or_node_name(bs); + if (!strlen(group_name)) { + error_setg(&local_err, + "A group name must be specified for this device."); + goto err; + } + } + + tgm->aio_context =3D bdrv_get_aio_context(bs); + /* Register membership to group with name group_name */ + throttle_group_register_tgm(tgm, group_name); + + ts =3D tgm->throttle_state; + /* Copy previous configuration */ + throttle_get_config(ts, &cfg); + + /* Change limits if user has specified them */ + throttle_extract_options(opts, &cfg); + if (!throttle_is_valid(&cfg, &local_err)) { + throttle_group_unregister_tgm(tgm); + goto err; + } + tt =3D &tgm->throttle_timers; + /* Update group configuration */ + throttle_config(ts, tt, &cfg); + + qemu_co_queue_init(&tgm->throttled_reqs[0]); + qemu_co_queue_init(&tgm->throttled_reqs[1]); + + goto fin; + +err: + error_propagate(errp, local_err); + ret =3D -EINVAL; +fin: + qemu_opts_del(opts); + return ret; +} + +static int throttle_open(BlockDriverState *bs, QDict *options, + int flags, Error **errp) +{ + ThrottleGroupMember *tgm =3D bs->opaque; + Error *local_err =3D NULL; + + bs->open_flags =3D flags; + bs->file =3D bdrv_open_child(NULL, options, "file", + bs, &child_file, false, &local_err); + + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + + qdict_flatten(options); + return throttle_configure_tgm(bs, tgm, options, errp); +} + +static void throttle_close(BlockDriverState *bs) +{ + ThrottleGroupMember *tgm =3D bs->opaque; + bdrv_drained_begin(bs); + throttle_group_unregister_tgm(tgm); + bdrv_drained_end(bs); + return; +} + + +static int64_t throttle_getlength(BlockDriverState *bs) +{ + return bdrv_getlength(bs->file->bs); +} + + +static int coroutine_fn throttle_co_preadv(BlockDriverState *bs, uint64_t = offset, + uint64_t bytes, QEMUIOVector *= qiov, + int flags) +{ + + ThrottleGroupMember *tgm =3D bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, false); + + return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags); +} + +static int coroutine_fn throttle_co_pwritev(BlockDriverState *bs, uint64_t= offset, + uint64_t bytes, QEMUIOVector *= qiov, + int flags) +{ + ThrottleGroupMember *tgm =3D bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, true); + + return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags); +} + +static int coroutine_fn throttle_co_pwrite_zeroes(BlockDriverState *bs, + int64_t offset, int bytes, BdrvRequestFlags flags) +{ + ThrottleGroupMember *tgm =3D bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, true); + + return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags); +} + +static int coroutine_fn throttle_co_pdiscard(BlockDriverState *bs, + int64_t offset, int bytes) +{ + ThrottleGroupMember *tgm =3D bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, true); + + return bdrv_co_pdiscard(bs->file->bs, offset, bytes); +} + +static int throttle_co_flush(BlockDriverState *bs) +{ + return bdrv_co_flush(bs->file->bs); +} + +static void throttle_detach_aio_context(BlockDriverState *bs) +{ + ThrottleGroupMember *tgm =3D bs->opaque; + throttle_timers_detach_aio_context(&tgm->throttle_timers); +} + +static void throttle_attach_aio_context(BlockDriverState *bs, + AioContext *new_context) +{ + ThrottleGroupMember *tgm =3D bs->opaque; + throttle_timers_attach_aio_context(&tgm->throttle_timers, new_context); +} + +static int throttle_reopen_prepare(BDRVReopenState *reopen_state, + BlockReopenQueue *queue, Error **err= p) +{ + ThrottleGroupMember *tgm =3D NULL; + + assert(reopen_state !=3D NULL); + assert(reopen_state->bs !=3D NULL); + + reopen_state->opaque =3D g_new0(ThrottleGroupMember, 1); + tgm =3D reopen_state->opaque; + + return throttle_configure_tgm(reopen_state->bs, tgm, reopen_state->opt= ions, + errp); +} + +static void throttle_reopen_commit(BDRVReopenState *state) +{ + ThrottleGroupMember *tgm =3D state->bs->opaque; + BlockDriverState *bs =3D state->bs; + + bdrv_drained_begin(bs); + throttle_group_unregister_tgm(tgm); + g_free(state->bs->opaque); + state->bs->opaque =3D state->opaque; + bdrv_drained_end(bs); + + state->opaque =3D NULL; +} + +static void throttle_reopen_abort(BDRVReopenState *state) +{ + ThrottleGroupMember *tgm =3D state->opaque; + throttle_group_unregister_tgm(tgm); + g_free(state->opaque); + state->opaque =3D NULL; +} + +static BlockDriver bdrv_throttle =3D { + .format_name =3D "throttle", + .protocol_name =3D "throttle", + .instance_size =3D sizeof(ThrottleGroupMember), + + .bdrv_file_open =3D throttle_open, + .bdrv_close =3D throttle_close, + .bdrv_co_flush =3D throttle_co_flush, + + .bdrv_child_perm =3D bdrv_filter_default_perms, + + .bdrv_getlength =3D throttle_getlength, + + .bdrv_co_preadv =3D throttle_co_preadv, + .bdrv_co_pwritev =3D throttle_co_pwritev, + + .bdrv_co_pwrite_zeroes =3D throttle_co_pwrite_zeroes, + .bdrv_co_pdiscard =3D throttle_co_pdiscard, + + .bdrv_recurse_is_first_non_filter =3D bdrv_recurse_is_first_non_fi= lter, + + .bdrv_attach_aio_context =3D throttle_attach_aio_context, + .bdrv_detach_aio_context =3D throttle_detach_aio_context, + + .bdrv_reopen_prepare =3D throttle_reopen_prepare, + .bdrv_reopen_commit =3D throttle_reopen_commit, + .bdrv_reopen_abort =3D throttle_reopen_abort, + + .is_filter =3D true, +}; + +static void bdrv_throttle_init(void) +{ + bdrv_register(&bdrv_throttle); +} + +block_init(bdrv_throttle_init); diff --git a/include/qemu/throttle-options.h b/include/qemu/throttle-option= s.h index 3133d1ca40..508ee72625 100644 --- a/include/qemu/throttle-options.h +++ b/include/qemu/throttle-options.h @@ -10,81 +10,103 @@ #ifndef THROTTLE_OPTIONS_H #define THROTTLE_OPTIONS_H =20 +#define QEMU_OPT_IOPS_TOTAL "iops-total" +#define QEMU_OPT_IOPS_TOTAL_MAX "iops-total-max" +#define QEMU_OPT_IOPS_TOTAL_MAX_LENGTH "iops-total-max-length" +#define QEMU_OPT_IOPS_READ "iops-read" +#define QEMU_OPT_IOPS_READ_MAX "iops-read-max" +#define QEMU_OPT_IOPS_READ_MAX_LENGTH "iops-read-max-length" +#define QEMU_OPT_IOPS_WRITE "iops-write" +#define QEMU_OPT_IOPS_WRITE_MAX "iops-write-max" +#define QEMU_OPT_IOPS_WRITE_MAX_LENGTH "iops-write-max-length" +#define QEMU_OPT_BPS_TOTAL "bps-total" +#define QEMU_OPT_BPS_TOTAL_MAX "bps-total-max" +#define QEMU_OPT_BPS_TOTAL_MAX_LENGTH "bps-total-max-length" +#define QEMU_OPT_BPS_READ "bps-read" +#define QEMU_OPT_BPS_READ_MAX "bps-read-max" +#define QEMU_OPT_BPS_READ_MAX_LENGTH "bps-read-max-length" +#define QEMU_OPT_BPS_WRITE "bps-write" +#define QEMU_OPT_BPS_WRITE_MAX "bps-write-max" +#define QEMU_OPT_BPS_WRITE_MAX_LENGTH "bps-write-max-length" +#define QEMU_OPT_IOPS_SIZE "iops-size" +#define QEMU_OPT_THROTTLE_GROUP_NAME "throttling-group" + +#define THROTTLE_OPT_PREFIX "throttling." #define THROTTLE_OPTS \ { \ - .name =3D "throttling.iops-total",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_TOTAL,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "limit total I/O operations per second",\ },{ \ - .name =3D "throttling.iops-read",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_READ,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "limit read operations per second",\ },{ \ - .name =3D "throttling.iops-write",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_WRITE,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "limit write operations per second",\ },{ \ - .name =3D "throttling.bps-total",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_TOTAL,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "limit total bytes per second",\ },{ \ - .name =3D "throttling.bps-read",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_READ,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "limit read bytes per second",\ },{ \ - .name =3D "throttling.bps-write",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_WRITE,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "limit write bytes per second",\ },{ \ - .name =3D "throttling.iops-total-max",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_TOTAL_MAX,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "I/O operations burst",\ },{ \ - .name =3D "throttling.iops-read-max",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_READ_MAX,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "I/O operations read burst",\ },{ \ - .name =3D "throttling.iops-write-max",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_WRITE_MAX,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "I/O operations write burst",\ },{ \ - .name =3D "throttling.bps-total-max",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_TOTAL_MAX,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "total bytes burst",\ },{ \ - .name =3D "throttling.bps-read-max",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_READ_MAX,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "total bytes read burst",\ },{ \ - .name =3D "throttling.bps-write-max",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_WRITE_MAX,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "total bytes write burst",\ },{ \ - .name =3D "throttling.iops-total-max-length",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_TOTAL_MAX_LENGTH,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "length of the iops-total-max burst period, in secon= ds",\ },{ \ - .name =3D "throttling.iops-read-max-length",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_READ_MAX_LENGTH,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "length of the iops-read-max burst period, in second= s",\ },{ \ - .name =3D "throttling.iops-write-max-length",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_WRITE_MAX_LENGTH,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "length of the iops-write-max burst period, in secon= ds",\ },{ \ - .name =3D "throttling.bps-total-max-length",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_TOTAL_MAX_LENGTH,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "length of the bps-total-max burst period, in second= s",\ },{ \ - .name =3D "throttling.bps-read-max-length",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_READ_MAX_LENGTH,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "length of the bps-read-max burst period, in seconds= ",\ },{ \ - .name =3D "throttling.bps-write-max-length",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_BPS_WRITE_MAX_LENGTH,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "length of the bps-write-max burst period, in second= s",\ },{ \ - .name =3D "throttling.iops-size",\ + .name =3D THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_SIZE,\ .type =3D QEMU_OPT_NUMBER,\ .help =3D "when limiting by iops max size of an I/O in bytes",\ } --=20 2.11.0