From nobody Tue May 13 16:00:18 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 1538727146223610.2747978645699; 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 CF7E481DEC; Fri, 5 Oct 2018 08:12:23 +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 9ABAA183EC; Fri, 5 Oct 2018 08:12:23 +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 0EFD118005B5; Fri, 5 Oct 2018 08:12:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w958C9cG009429 for ; Fri, 5 Oct 2018 04:12:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2D56F6246B; Fri, 5 Oct 2018 08:12:09 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 24ED05EDEF 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 B9F9936A5EE for ; Fri, 5 Oct 2018 08:12:05 +0000 (UTC) Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp9 (Coremail) with SMTP id u+CowAB3p3_PHLdb0blTAg--.62652S18; Fri, 05 Oct 2018 16:12:03 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Fri, 5 Oct 2018 16:11:39 +0800 Message-Id: <20181005081145.29901-17-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--.62652S18 X-Coremail-Antispam: 1Uf129KBjvJXoWxAFykCF43XF45uryfJw1UKFg_yoW5Ar1xpF W3J39xGayrtF43KF40ga4rG3W5XFsrtr48Ars7W3yvqw1fW3WS9w4fXr1Fkry5trnFq3yr ZFW8JFWjv3Z7taUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piqg43UUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbifhPWT1rpNbHTcQAAsh 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.29]); Fri, 05 Oct 2018 08:12:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); 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.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/22] vmx: 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.25]); Fri, 05 Oct 2018 08:12:24 +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/vmx/vmx.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 937bf0c..3016f4f 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -803,8 +803,8 @@ virVMXGetConfigLong(virConfPtr conf, const char *name, = long long *number, *number =3D -1; } else if (virStrToLong_ll(string, NULL, 10, number) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Config entry '%s' must represent an integer value"), - name); + _("Config entry '%s' must represent an integer valu= e"), + name); goto cleanup; } =20 @@ -1183,9 +1183,8 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDo= mainDefPtr def, =20 if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SCSI && disk->info.addr.drive.controller =3D=3D controller->id= x) { - if (ctx->autodetectSCSIControllerModel - (disk, &autodetectedModels[count], - ctx->opaque) < 0) { + if (ctx->autodetectSCSIControllerModel( + disk, &autodetectedModels[count], ctx->opaque)= < 0) { goto cleanup; } =20 @@ -1667,8 +1666,8 @@ virVMXParseConfig(virVMXContext *ctx, } =20 if (virVMXParseDisk(ctx, xmlopt, conf, VIR_DOMAIN_DISK_DEVICE_= CDROM, - VIR_DOMAIN_DISK_BUS_SCSI, controller, uni= t, - &def->disks[def->ndisks], def) < 0) { + VIR_DOMAIN_DISK_BUS_SCSI, controller, unit, + &def->disks[def->ndisks], def) < 0) { goto cleanup; } =20 @@ -1904,7 +1903,7 @@ virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefP= tr *def) =20 if (port < 0) { VIR_WARN("VNC is enabled but VMX entry 'RemoteDisplay.vnc.port' " - "is missing, the VNC port is unknown"); + "is missing, the VNC port is unknown"); =20 (*def)->data.vnc.port =3D 0; (*def)->data.vnc.autoport =3D true; @@ -3316,8 +3315,8 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tionPtr xmlopt, virDomainDe =20 if (scsi_virtualDev[i] !=3D -1) { virBufferAsprintf(&buffer, "scsi%zu.virtualDev =3D \"%s\"\= n", i, - virVMXControllerModelSCSITypeToString - (scsi_virtualDev[i])); + virVMXControllerModelSCSITypeToString( + scsi_virtualDev[i])); } } } @@ -3461,7 +3460,7 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBuffe= rPtr buffer) =20 if (def->data.vnc.autoport) { VIR_WARN("VNC autoport is enabled, but the automatically assigned " - "VNC port cannot be read back"); + "VNC port cannot be read back"); } else { if (def->data.vnc.port < 5900 || def->data.vnc.port > 5964) { VIR_WARN("VNC port %d it out of [5900..5964] range", @@ -3918,7 +3917,7 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDe= fPtr def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported character device TCP protocol '%= s'"), virDomainChrTcpProtocolTypeToString( - def->source->data.tcp.protocol)); + def->source->data.tcp.protocol)); return -1; } =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list