From nobody Mon Dec 15 03:08:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1538727146648950.7581306224002; Fri, 5 Oct 2018 01:12:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49D0A9D433; Fri, 5 Oct 2018 08:12:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 101A717F53; Fri, 5 Oct 2018 08:12:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B3E2A180BAD1; Fri, 5 Oct 2018 08:12:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w958C9kR009432 for ; Fri, 5 Oct 2018 04:12:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 37A0A2010D0C; Fri, 5 Oct 2018 08:12:09 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C4AA2010D5F for ; Fri, 5 Oct 2018 08:12:09 +0000 (UTC) Received: from m97138.mail.qiye.163.com (m97138.mail.qiye.163.com [220.181.97.138]) by mx1.redhat.com (Postfix) with ESMTP id A930288303 for ; Fri, 5 Oct 2018 08:12:02 +0000 (UTC) Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp9 (Coremail) with SMTP id u+CowAB3p3_PHLdb0blTAg--.62652S10; Fri, 05 Oct 2018 16:12:01 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Fri, 5 Oct 2018 16:11:31 +0800 Message-Id: <20181005081145.29901-9-shi_lei@massclouds.com> In-Reply-To: <20181005081145.29901-1-shi_lei@massclouds.com> References: <20181005081145.29901-1-shi_lei@massclouds.com> X-CM-TRANSID: u+CowAB3p3_PHLdb0blTAg--.62652S10 X-Coremail-Antispam: 1Uf129KBjvJXoWxuFyfXr1kCF1rXryxtrWxCrg_yoWxZFy5pa 1kJFsakrW8Xrs5JF4DGa13ZF1DArWkXF1UKrs5u3Z8Za1SkFn8Gw4SqFy5ZFW5Jr1DA3W2 vF15WFZ8uF1IgF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pR8-B_UUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbigRHWT1sfmGbD+wAAsL X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 214 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 05 Oct 2018 08:12:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 05 Oct 2018 08:12:08 +0000 (UTC) for IP:'220.181.97.138' DOMAIN:'m97138.mail.qiye.163.com' HELO:'m97138.mail.qiye.163.com' FROM:'shi_lei@massclouds.com' RCPT:'' X-RedHat-Spam-Score: -0.01 (RCVD_IN_DNSWL_NONE) 220.181.97.138 m97138.mail.qiye.163.com 220.181.97.138 m97138.mail.qiye.163.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/22] src:libvirt*.c: Fix misaligned arguments X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 05 Oct 2018 08:12:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch fixes misaligned arguments. Signed-off-by: Shi Lei --- 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 =3D 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); =20 if (dom->conn->driver->domainFSFreeze) { - int ret =3D dom->conn->driver->domainFSFreeze( - dom, mountpoints, nmountpoints, flags); + int ret =3D 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); =20 if (dom->conn->driver->domainFSThaw) { - int ret =3D dom->conn->driver->domainFSThaw( - dom, mountpoints, nmountpoints, flags); + int ret =3D 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 =3D 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=3D%p, freeMems=3D%p, startCell=3D%d, maxCells=3D%d", - conn, freeMems, startCell, maxCells); + conn, freeMems, startCell, maxCells); =20 virResetLastError(); =20 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 mode= l, } =20 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=3D%p, mac=3D'%s' leases=3D%p, flags=3D0x%x", - network, NULLSTR(mac), leases, flags); + network, NULLSTR(mac), leases, flags); =20 virResetLastError(); =20 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 =3D 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=3D%p, conn=3D%p, names=3D%p, maxnames=3D%d", - dev, dev ? dev->conn : NULL, names, maxnames); + dev, dev ? dev->conn : NULL, names, maxnames); =20 virResetLastError(); =20 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 =3D pool->conn->storageDriver->storageVolCreateXMLFrom(pool, x= mlDesc, - clonevol, flags); + ret =3D 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 =3D vol->conn->storageDriver->storageVolUpload(vol, - stream, - offset, - length, - flags); + ret =3D vol->conn->storageDriver->storageVolUpload(vol, stream, of= fset, + 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, } =20 VIR_DEBUG("registering %s as driver %d", - driver->hypervisorDriver->name, virConnectDriverTabCount); + driver->hypervisorDriver->name, virConnectDriverTabCount); =20 if (setSharedDrivers) { if (driver->interfaceDriver =3D=3D NULL) @@ -1046,7 +1046,7 @@ virConnectOpenInternal(const char *name, i, virConnectDriverTab[i]->hypervisorDriver->name, res =3D=3D VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res =3D=3D VIR_DRV_OPEN_DECLINED ? "DECLINED" : - (res =3D=3D VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown stat= us"))); + (res =3D=3D VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown sta= tus"))); =20 if (res =3D=3D VIR_DRV_OPEN_SUCCESS) { break; --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list