On 06/09/2015 05:13 PM, Dmitry Guryanov wrote:

This patch fixes several formatting errors, which I missed before pushing previous patches. Mostly because of missing cppi package.

Signed-off-by: Dmitry Guryanov <dguryanov@parallels.com> --- src/parallels/parallels_driver.c | 8 ++++---- src/parallels/parallels_sdk.c | 4 ++-- src/parallels/parallels_utils.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index fdba0db..706229d 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1252,13 +1252,13 @@ parallelsDomainBlockStats(virDomainPtr domain, const char *path, if (prlsdkGetBlockStats(dom, dom->def->disks[i], &s) < 0) goto cleanup;

-#define PARALLELS_SUM_STATS(VAR, TYPE, NAME) \ - if (s.VAR != -1) \ - stats->VAR += s.VAR; +#define PARALLELS_SUM_STATS(VAR, TYPE, NAME) \ + if (s.VAR != -1) \ + stats->VAR += s.VAR;

PARALLELS_BLOCK_STATS_FOREACH(PARALLELS_SUM_STATS)

-#undef PARALLELS_SUM_STATS +#undef PARALLELS_SUM_STATS } } stats->errs = -1; diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index 4d5099c..104c905 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -501,9 +501,9 @@ prlsdkGetDiskInfo(PRL_HANDLE prldisk, goto cleanup;

/* Let physical devices added to CT look like SATA disks */ - if (isCt) + if (isCt) { ifType = PMS_SATA_DEVICE; - else { + } else { pret = PrlVmDev_GetIfaceType(prldisk, &ifType); prlsdkCheckRetGoto(pret, cleanup); } diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h index 84bef24..5db65bd 100644 --- a/src/parallels/parallels_utils.h +++ b/src/parallels/parallels_utils.h @@ -119,10 +119,10 @@ virStorageVolPtr parallelsStorageVolLookupByPathLocked(virConnectPtr conn, int parallelsStorageVolDefRemove(virStoragePoolObjPtr privpool, virStorageVolDefPtr privvol);

-#define PARALLELS_BLOCK_STATS_FOREACH(OP) \ - OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ - OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \ - OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \ - OP(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, "write_total") +# define PARALLELS_BLOCK_STATS_FOREACH(OP) \ + OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ + OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \ + OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \ + OP(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, "write_total")

#endif