External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

maint: clean up _virDomainBlockStats

Browse Source 
Clean up all _virDomainBlockStats.

Signed-off-by: James <james.wangyufei@huawei.com>
Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Wang Yufei 2014-09-16 21:19:46 +08:00 committed by Eric Blake
parent ac64cc1016
commit 744d0f3de0
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver.h
View File

@ -505,7 +505,7 @@ typedef int
typedef int typedef int
(*virDrvDomainBlockStats)(virDomainPtr domain, (*virDrvDomainBlockStats)(virDomainPtr domain,
const char *path, const char *path,
struct _virDomainBlockStats *stats); virDomainBlockStatsPtr stats);
typedef int typedef int
(*virDrvDomainBlockStatsFlags)(virDomainPtr domain, (*virDrvDomainBlockStatsFlags)(virDomainPtr domain,

2
src/libvirt.c
View File

@ -7908,7 +7908,7 @@ virDomainBlockStats(virDomainPtr dom, const char *disk,
virDomainBlockStatsPtr stats, size_t size) virDomainBlockStatsPtr stats, size_t size)
{ {
virConnectPtr conn; virConnectPtr conn;
struct _virDomainBlockStats stats2 = { -1, -1, -1, -1, -1 }; virDomainBlockStatsStruct stats2 = { -1, -1, -1, -1, -1 };
VIR_DOMAIN_DEBUG(dom, "disk=%s, stats=%p, size=%zi", disk, stats, size); VIR_DOMAIN_DEBUG(dom, "disk=%s, stats=%p, size=%zi", disk, stats, size);

2
src/lxc/lxc_driver.c
View File

@ -2301,7 +2301,7 @@ lxcDomainMergeBlkioDevice(virBlkioDevicePtr *dest_array,
static int static int
lxcDomainBlockStats(virDomainPtr dom, lxcDomainBlockStats(virDomainPtr dom,
const char *path, const char *path,
struct _virDomainBlockStats *stats) virDomainBlockStatsPtr stats)
{ {
int ret = -1, idx; int ret = -1, idx;
virDomainObjPtr vm; virDomainObjPtr vm;

2
src/qemu/qemu_driver.c
View File

@ -9603,7 +9603,7 @@ qemuDomainBlockResize(virDomainPtr dom,
static int static int
qemuDomainBlockStats(virDomainPtr dom, qemuDomainBlockStats(virDomainPtr dom,
const char *path, const char *path,
struct _virDomainBlockStats *stats) virDomainBlockStatsPtr stats)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int idx; int idx;

2
src/test/test_driver.c
View File

@ -3369,7 +3369,7 @@ testDomainSetSchedulerParameters(virDomainPtr domain,
static int testDomainBlockStats(virDomainPtr domain, static int testDomainBlockStats(virDomainPtr domain,
const char *path, const char *path,
struct _virDomainBlockStats *stats) virDomainBlockStatsPtr stats)
{ {
testConnPtr privconn = domain->conn->privateData; testConnPtr privconn = domain->conn->privateData;
virDomainObjPtr privdom; virDomainObjPtr privdom;

4
src/xen/block_stats.c
View File

@ -152,7 +152,7 @@ check_bd_connected(xenUnifiedPrivatePtr priv, int device, int domid)
static int static int
read_bd_stats(xenUnifiedPrivatePtr priv, read_bd_stats(xenUnifiedPrivatePtr priv,
int device, int domid, struct _virDomainBlockStats *stats) int device, int domid, virDomainBlockStatsPtr stats)
{ {
stats->rd_req = read_bd_stat(device, domid, "rd_req"); stats->rd_req = read_bd_stat(device, domid, "rd_req");
stats->rd_bytes = read_bd_stat(device, domid, "rd_sect"); stats->rd_bytes = read_bd_stat(device, domid, "rd_sect");
@ -343,7 +343,7 @@ int
xenLinuxDomainBlockStats(xenUnifiedPrivatePtr priv, xenLinuxDomainBlockStats(xenUnifiedPrivatePtr priv,
virDomainDefPtr def, virDomainDefPtr def,
const char *path, const char *path,
struct _virDomainBlockStats *stats) virDomainBlockStatsPtr stats)
{ {
int device = xenLinuxDomainDeviceID(def->id, path); int device = xenLinuxDomainDeviceID(def->id, path);

2
src/xen/block_stats.h
View File

@ -29,7 +29,7 @@
extern int xenLinuxDomainBlockStats (xenUnifiedPrivatePtr priv, extern int xenLinuxDomainBlockStats (xenUnifiedPrivatePtr priv,
virDomainDefPtr def, const char *path, virDomainDefPtr def, const char *path,
struct _virDomainBlockStats *stats); virDomainBlockStatsPtr stats);
extern int xenLinuxDomainDeviceID(int domid, const char *dev); extern int xenLinuxDomainDeviceID(int domid, const char *dev);

2
src/xen/xen_driver.c
View File

@ -2222,7 +2222,7 @@ xenUnifiedDomainSetSchedulerParameters(virDomainPtr dom,
static int static int
xenUnifiedDomainBlockStats(virDomainPtr dom, const char *path, xenUnifiedDomainBlockStats(virDomainPtr dom, const char *path,
struct _virDomainBlockStats *stats) virDomainBlockStatsPtr stats)
{ {
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
int ret = -1; int ret = -1;

2
src/xen/xen_hypervisor.c
View File

@ -1423,7 +1423,7 @@ int
xenHypervisorDomainBlockStats(virConnectPtr conn, xenHypervisorDomainBlockStats(virConnectPtr conn,
virDomainDefPtr def, virDomainDefPtr def,
const char *path, const char *path,
struct _virDomainBlockStats *stats) virDomainBlockStatsPtr stats)
{ {
#ifdef __linux__ #ifdef __linux__
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;

2
src/xen/xen_hypervisor.h
View File

@ -125,7 +125,7 @@ int xenHypervisorSetSchedulerParameters(virConnectPtr conn,
int xenHypervisorDomainBlockStats (virConnectPtr conn, int xenHypervisorDomainBlockStats (virConnectPtr conn,
virDomainDefPtr def, virDomainDefPtr def,
const char *path, const char *path,
struct _virDomainBlockStats *stats) virDomainBlockStatsPtr stats)
ATTRIBUTE_NONNULL (1); ATTRIBUTE_NONNULL (1);
int xenHypervisorDomainInterfaceStats (virDomainDefPtr def, int xenHypervisorDomainInterfaceStats (virDomainDefPtr def,
const char *path, const char *path,

2
tools/virsh-domain-monitor.c
View File

@ -899,7 +899,7 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainPtr dom; virDomainPtr dom;
const char *name = NULL, *device = NULL; const char *name = NULL, *device = NULL;
struct _virDomainBlockStats stats; virDomainBlockStatsStruct stats;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
virTypedParameterPtr par = NULL; virTypedParameterPtr par = NULL;
char *value = NULL; char *value = NULL;