throttle: factor out duplicate code
This patch removes the redundant throttle code that was present in block and fsdev device files. Now the common code is moved to a single file. Signed-off-by: Pradeep Jagadeesh <pradeep.jagadeesh@huawei.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> (fix indent nit, Greg Kurz) Signed-off-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
Pradeep Jagadeesh
Greg Kurz
parent
b8bbdb886e
commit
a2a7862ca9
83
blockdev.c
83
blockdev.c
|
|
@ -52,6 +52,7 @@
|
|||
#include "sysemu/arch_init.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/help_option.h"
|
||||
#include "qemu/throttle-options.h"
|
||||
|
||||
static QTAILQ_HEAD(, BlockDriverState) monitor_bdrv_states =
|
||||
QTAILQ_HEAD_INITIALIZER(monitor_bdrv_states);
|
||||
|
|
@ -4007,83 +4008,11 @@ QemuOptsList qemu_common_drive_opts = {
|
|||
.name = BDRV_OPT_READ_ONLY,
|
||||
.type = QEMU_OPT_BOOL,
|
||||
.help = "open drive file as read-only",
|
||||
},{
|
||||
.name = "throttling.iops-total",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit total I/O operations per second",
|
||||
},{
|
||||
.name = "throttling.iops-read",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit read operations per second",
|
||||
},{
|
||||
.name = "throttling.iops-write",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit write operations per second",
|
||||
},{
|
||||
.name = "throttling.bps-total",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit total bytes per second",
|
||||
},{
|
||||
.name = "throttling.bps-read",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit read bytes per second",
|
||||
},{
|
||||
.name = "throttling.bps-write",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit write bytes per second",
|
||||
},{
|
||||
.name = "throttling.iops-total-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "I/O operations burst",
|
||||
},{
|
||||
.name = "throttling.iops-read-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "I/O operations read burst",
|
||||
},{
|
||||
.name = "throttling.iops-write-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "I/O operations write burst",
|
||||
},{
|
||||
.name = "throttling.bps-total-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "total bytes burst",
|
||||
},{
|
||||
.name = "throttling.bps-read-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "total bytes read burst",
|
||||
},{
|
||||
.name = "throttling.bps-write-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "total bytes write burst",
|
||||
},{
|
||||
.name = "throttling.iops-total-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the iops-total-max burst period, in seconds",
|
||||
},{
|
||||
.name = "throttling.iops-read-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the iops-read-max burst period, in seconds",
|
||||
},{
|
||||
.name = "throttling.iops-write-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the iops-write-max burst period, in seconds",
|
||||
},{
|
||||
.name = "throttling.bps-total-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the bps-total-max burst period, in seconds",
|
||||
},{
|
||||
.name = "throttling.bps-read-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the bps-read-max burst period, in seconds",
|
||||
},{
|
||||
.name = "throttling.bps-write-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the bps-write-max burst period, in seconds",
|
||||
},{
|
||||
.name = "throttling.iops-size",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "when limiting by iops max size of an I/O in bytes",
|
||||
},{
|
||||
},
|
||||
|
||||
THROTTLE_OPTS,
|
||||
|
||||
{
|
||||
.name = "throttling.group",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.help = "name of the block throttling group",
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#include "qemu/config-file.h"
|
||||
#include "qemu/option.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/throttle-options.h"
|
||||
|
||||
static QemuOptsList qemu_fsdev_opts = {
|
||||
.name = "fsdev",
|
||||
|
|
@ -37,83 +38,10 @@ static QemuOptsList qemu_fsdev_opts = {
|
|||
}, {
|
||||
.name = "sock_fd",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
}, {
|
||||
.name = "throttling.iops-total",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit total I/O operations per second",
|
||||
}, {
|
||||
.name = "throttling.iops-read",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit read operations per second",
|
||||
}, {
|
||||
.name = "throttling.iops-write",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit write operations per second",
|
||||
}, {
|
||||
.name = "throttling.bps-total",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit total bytes per second",
|
||||
}, {
|
||||
.name = "throttling.bps-read",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit read bytes per second",
|
||||
}, {
|
||||
.name = "throttling.bps-write",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "limit write bytes per second",
|
||||
}, {
|
||||
.name = "throttling.iops-total-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "I/O operations burst",
|
||||
}, {
|
||||
.name = "throttling.iops-read-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "I/O operations read burst",
|
||||
}, {
|
||||
.name = "throttling.iops-write-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "I/O operations write burst",
|
||||
}, {
|
||||
.name = "throttling.bps-total-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "total bytes burst",
|
||||
}, {
|
||||
.name = "throttling.bps-read-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "total bytes read burst",
|
||||
}, {
|
||||
.name = "throttling.bps-write-max",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "total bytes write burst",
|
||||
}, {
|
||||
.name = "throttling.iops-total-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the iops-total-max burst period, in seconds",
|
||||
}, {
|
||||
.name = "throttling.iops-read-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the iops-read-max burst period, in seconds",
|
||||
}, {
|
||||
.name = "throttling.iops-write-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the iops-write-max burst period, in seconds",
|
||||
}, {
|
||||
.name = "throttling.bps-total-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the bps-total-max burst period, in seconds",
|
||||
}, {
|
||||
.name = "throttling.bps-read-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the bps-read-max burst period, in seconds",
|
||||
}, {
|
||||
.name = "throttling.bps-write-max-length",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "length of the bps-write-max burst period, in seconds",
|
||||
}, {
|
||||
.name = "throttling.iops-size",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "when limiting by iops max size of an I/O in bytes",
|
||||
},
|
||||
|
||||
THROTTLE_OPTS,
|
||||
|
||||
{ /*End of list */ }
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,92 @@
|
|||
/*
|
||||
* QEMU throttling command line options
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2 or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* See the COPYING file in the top-level directory for details.
|
||||
*
|
||||
*/
|
||||
#ifndef THROTTLE_OPTIONS_H
|
||||
#define THROTTLE_OPTIONS_H
|
||||
|
||||
#define THROTTLE_OPTS \
|
||||
{ \
|
||||
.name = "throttling.iops-total",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "limit total I/O operations per second",\
|
||||
},{ \
|
||||
.name = "throttling.iops-read",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "limit read operations per second",\
|
||||
},{ \
|
||||
.name = "throttling.iops-write",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "limit write operations per second",\
|
||||
},{ \
|
||||
.name = "throttling.bps-total",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "limit total bytes per second",\
|
||||
},{ \
|
||||
.name = "throttling.bps-read",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "limit read bytes per second",\
|
||||
},{ \
|
||||
.name = "throttling.bps-write",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "limit write bytes per second",\
|
||||
},{ \
|
||||
.name = "throttling.iops-total-max",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "I/O operations burst",\
|
||||
},{ \
|
||||
.name = "throttling.iops-read-max",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "I/O operations read burst",\
|
||||
},{ \
|
||||
.name = "throttling.iops-write-max",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "I/O operations write burst",\
|
||||
},{ \
|
||||
.name = "throttling.bps-total-max",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "total bytes burst",\
|
||||
},{ \
|
||||
.name = "throttling.bps-read-max",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "total bytes read burst",\
|
||||
},{ \
|
||||
.name = "throttling.bps-write-max",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "total bytes write burst",\
|
||||
},{ \
|
||||
.name = "throttling.iops-total-max-length",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "length of the iops-total-max burst period, in seconds",\
|
||||
},{ \
|
||||
.name = "throttling.iops-read-max-length",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "length of the iops-read-max burst period, in seconds",\
|
||||
},{ \
|
||||
.name = "throttling.iops-write-max-length",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "length of the iops-write-max burst period, in seconds",\
|
||||
},{ \
|
||||
.name = "throttling.bps-total-max-length",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "length of the bps-total-max burst period, in seconds",\
|
||||
},{ \
|
||||
.name = "throttling.bps-read-max-length",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "length of the bps-read-max burst period, in seconds",\
|
||||
},{ \
|
||||
.name = "throttling.bps-write-max-length",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "length of the bps-write-max burst period, in seconds",\
|
||||
},{ \
|
||||
.name = "throttling.iops-size",\
|
||||
.type = QEMU_OPT_NUMBER,\
|
||||
.help = "when limiting by iops max size of an I/O in bytes",\
|
||||
}
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue