[libvirt] [PATCH 08/22] src:libvirt*.c: Fix misaligned arguments
Shi Lei
shi_lei at massclouds.com
Fri Oct 5 08:11:31 UTC 2018
This patch fixes misaligned arguments.
Signed-off-by: Shi Lei <shi_lei at massclouds.com>
---
src/libvirt-domain.c | 14 +++++++-------
src/libvirt-host.c | 4 ++--
src/libvirt-lxc.c | 5 ++---
src/libvirt-network.c | 2 +-
src/libvirt-nodedev.c | 4 ++--
src/libvirt-storage.c | 13 ++++++-------
src/libvirt.c | 4 ++--
7 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 7690339..23f4889 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -3626,7 +3626,7 @@ virDomainMigrate(virDomainPtr domain,
} else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_V2) &&
VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn,
- VIR_DRV_FEATURE_MIGRATION_V2)) {
+ VIR_DRV_FEATURE_MIGRATION_V2)) {
VIR_DEBUG("Using migration protocol 2");
ddomain = virDomainMigrateVersion2(domain, dconn, flags,
dname, uri, bandwidth);
@@ -3778,7 +3778,7 @@ virDomainMigrate2(virDomainPtr domain,
} else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_V2) &&
VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn,
- VIR_DRV_FEATURE_MIGRATION_V2)) {
+ VIR_DRV_FEATURE_MIGRATION_V2)) {
VIR_DEBUG("Using migration protocol 2");
if (dxml) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
@@ -3967,7 +3967,7 @@ virDomainMigrate3(virDomainPtr domain,
} else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_V2) &&
VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn,
- VIR_DRV_FEATURE_MIGRATION_V2)) {
+ VIR_DRV_FEATURE_MIGRATION_V2)) {
VIR_DEBUG("Using migration protocol 2");
if (dxml) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
@@ -11051,8 +11051,8 @@ virDomainFSFreeze(virDomainPtr dom,
virCheckNullArgGoto(mountpoints, error);
if (dom->conn->driver->domainFSFreeze) {
- int ret = dom->conn->driver->domainFSFreeze(
- dom, mountpoints, nmountpoints, flags);
+ int ret = dom->conn->driver->domainFSFreeze(dom, mountpoints,
+ nmountpoints, flags);
if (ret < 0)
goto error;
return ret;
@@ -11096,8 +11096,8 @@ virDomainFSThaw(virDomainPtr dom,
virCheckNullArgGoto(mountpoints, error);
if (dom->conn->driver->domainFSThaw) {
- int ret = dom->conn->driver->domainFSThaw(
- dom, mountpoints, nmountpoints, flags);
+ int ret = dom->conn->driver->domainFSThaw(dom, mountpoints,
+ nmountpoints, flags);
if (ret < 0)
goto error;
return ret;
diff --git a/src/libvirt-host.c b/src/libvirt-host.c
index e20d6ee..a044924 100644
--- a/src/libvirt-host.c
+++ b/src/libvirt-host.c
@@ -784,7 +784,7 @@ virNodeSetMemoryParameters(virConnectPtr conn,
if (conn->driver->nodeSetMemoryParameters) {
int ret;
ret = conn->driver->nodeSetMemoryParameters(conn, params,
- nparams, flags);
+ nparams, flags);
if (ret < 0)
goto error;
return ret;
@@ -857,7 +857,7 @@ virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems,
int startCell, int maxCells)
{
VIR_DEBUG("conn=%p, freeMems=%p, startCell=%d, maxCells=%d",
- conn, freeMems, startCell, maxCells);
+ conn, freeMems, startCell, maxCells);
virResetLastError();
diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
index 9bf0174..380d008 100644
--- a/src/libvirt-lxc.c
+++ b/src/libvirt-lxc.c
@@ -235,9 +235,8 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model,
}
if (setexeccon(label->label) < 0) {
- virReportSystemError(errno,
- _("Cannot set context %s"),
- label->label);
+ virReportSystemError(errno, _("Cannot set context %s"),
+ label->label);
goto error;
}
#else
diff --git a/src/libvirt-network.c b/src/libvirt-network.c
index 9f9e0dd..42e2b3b 100644
--- a/src/libvirt-network.c
+++ b/src/libvirt-network.c
@@ -1200,7 +1200,7 @@ virNetworkGetDHCPLeases(virNetworkPtr network,
{
virConnectPtr conn;
VIR_DEBUG("network=%p, mac='%s' leases=%p, flags=0x%x",
- network, NULLSTR(mac), leases, flags);
+ network, NULLSTR(mac), leases, flags);
virResetLastError();
diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c
index 10050b1..5a27a10 100644
--- a/src/libvirt-nodedev.c
+++ b/src/libvirt-nodedev.c
@@ -258,7 +258,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
conn->nodeDeviceDriver->nodeDeviceLookupSCSIHostByWWN) {
virNodeDevicePtr ret;
ret = conn->nodeDeviceDriver->nodeDeviceLookupSCSIHostByWWN(conn, wwnn,
- wwpn, flags);
+ wwpn, flags);
if (!ret)
goto error;
return ret;
@@ -410,7 +410,7 @@ virNodeDeviceListCaps(virNodeDevicePtr dev,
int maxnames)
{
VIR_DEBUG("dev=%p, conn=%p, names=%p, maxnames=%d",
- dev, dev ? dev->conn : NULL, names, maxnames);
+ dev, dev ? dev->conn : NULL, names, maxnames);
virResetLastError();
diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c
index 2ea3e94..e65eee5 100644
--- a/src/libvirt-storage.c
+++ b/src/libvirt-storage.c
@@ -1561,8 +1561,10 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool,
if (pool->conn->storageDriver &&
pool->conn->storageDriver->storageVolCreateXMLFrom) {
virStorageVolPtr ret;
- ret = pool->conn->storageDriver->storageVolCreateXMLFrom(pool, xmlDesc,
- clonevol, flags);
+ ret = pool->conn->storageDriver->storageVolCreateXMLFrom(pool,
+ xmlDesc,
+ clonevol,
+ flags);
if (!ret)
goto error;
return ret;
@@ -1709,11 +1711,8 @@ virStorageVolUpload(virStorageVolPtr vol,
if (vol->conn->storageDriver &&
vol->conn->storageDriver->storageVolUpload) {
int ret;
- ret = vol->conn->storageDriver->storageVolUpload(vol,
- stream,
- offset,
- length,
- flags);
+ ret = vol->conn->storageDriver->storageVolUpload(vol, stream, offset,
+ length, flags);
if (ret < 0)
goto error;
return ret;
diff --git a/src/libvirt.c b/src/libvirt.c
index 0a738ae..93d433f 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -581,7 +581,7 @@ virRegisterConnectDriver(virConnectDriverPtr driver,
}
VIR_DEBUG("registering %s as driver %d",
- driver->hypervisorDriver->name, virConnectDriverTabCount);
+ driver->hypervisorDriver->name, virConnectDriverTabCount);
if (setSharedDrivers) {
if (driver->interfaceDriver == NULL)
@@ -1046,7 +1046,7 @@ virConnectOpenInternal(const char *name,
i, virConnectDriverTab[i]->hypervisorDriver->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
- (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
+ (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_SUCCESS) {
break;
--
2.17.1
More information about the libvir-list
mailing list