From nobody Tue May 13 15:46:28 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 1538727132326416.37745273490725; Fri, 5 Oct 2018 01:12:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7D0A88303; Fri, 5 Oct 2018 08:12:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 999A0104C53C; Fri, 5 Oct 2018 08:12:09 +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 CA27A3D381; Fri, 5 Oct 2018 08:12:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w958C7V0009394 for ; Fri, 5 Oct 2018 04:12:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id B0DD016D31; Fri, 5 Oct 2018 08:12:07 +0000 (UTC) Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A532F2E020 for ; Fri, 5 Oct 2018 08:12:05 +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 42F8883F51 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--.62652S5; Fri, 05 Oct 2018 16:12:00 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Fri, 5 Oct 2018 16:11:26 +0800 Message-Id: <20181005081145.29901-4-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--.62652S5 X-Coremail-Antispam: 1Uf129KBjvJXoW3GFyrZF1ktw1rKryrWFW8Crg_yoWxJr4rpF 48JFn3JrWkKF45ZFZxAa1UuF1DXr90gFyrGrWF939aqa17Ww1DJF43tFW5u345Zr4kJa13 tF9xtFZ5ua1UGaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRQdbUUUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbifBDWT1rpNuEgugABsK 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.27]); Fri, 05 Oct 2018 08:12:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 05 Oct 2018 08:12:04 +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.27 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/22] bhyve: Fix misaligned arguments and misaligned conditions 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 05 Oct 2018 08:12:10 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch fixes misaligned arguments and misaligned conditions. Signed-off-by: Shi Lei --- src/bhyve/bhyve_capabilities.c | 7 +++---- src/bhyve/bhyve_command.c | 6 +++--- src/bhyve/bhyve_driver.c | 10 +++++----- src/bhyve/bhyve_monitor.c | 4 ++-- src/bhyve/bhyve_parse_command.c | 16 ++++++++-------- src/bhyve/bhyve_process.c | 6 +++--- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 6feaded..1984c85 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -139,12 +139,11 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, if (virDirOpenIfExists(&dir, firmware_dir) > 0) { while ((virDirRead(dir, &entry, firmware_dir)) > 0) { if (VIR_RESIZE_N(firmwares->values, - firmwares_alloc, firmwares->nvalues, 1) < 0) + firmwares_alloc, firmwares->nvalues, 1) < 0) goto cleanup; =20 - if (virAsprintf( - &firmwares->values[firmwares->nvalues], - "%s/%s", firmware_dir, entry->d_name) < 0) + if (virAsprintf(&firmwares->values[firmwares->nvalues], + "%s/%s", firmware_dir, entry->d_name) < 0) goto cleanup; =20 firmwares->nvalues++; diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 6149c93..7f2d2f5 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -293,8 +293,8 @@ bhyveBuildUSBControllerArgStr(const virDomainDef *def, =20 static int bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, - virDomainDiskDefPtr disk, - virCommandPtr cmd) + virDomainDiskDefPtr disk, + virCommandPtr cmd) { const char *disk_source; =20 @@ -516,7 +516,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support " - "UTC clock")); + "UTC clock")); goto error; } break; diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4d4f85f..06c7012 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -727,12 +727,12 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_LPC_BOOTROM) =3D=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support " - "bootrom")); + "bootrom")); goto cleanup; } } else { if (!(loadcmd =3D virBhyveProcessBuildLoadCmd(conn, def, "", - NULL))) + NULL))) goto cleanup; =20 virBufferAdd(&buf, virCommandToString(loadcmd), -1); @@ -1107,9 +1107,9 @@ bhyveDomainSetMetadata(virDomainPtr dom, =20 static char * bhyveDomainGetMetadata(virDomainPtr dom, - int type, - const char *uri, - unsigned int flags) + int type, + const char *uri, + unsigned int flags) { virDomainObjPtr vm; char *ret =3D NULL; diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index 4d5262c..ba1879d 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -79,8 +79,8 @@ bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UN= USED, void *opaque) if (kev.filter =3D=3D EVFILT_PROC && (kev.fflags & NOTE_EXIT) !=3D 0) { if ((pid_t)kev.ident !=3D vm->pid) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("event from unexpected proc %ju!=3D%ju"), - (uintmax_t)vm->pid, (uintmax_t)kev.ident); + _("event from unexpected proc %ju!=3D%ju"), + (uintmax_t)vm->pid, (uintmax_t)kev.ident); return; } =20 diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 14137d1..5424d97 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -63,7 +63,7 @@ bhyveParseCommandLineUnescape(const char *command) /* Iterate over characters in the command, skipping "\\\n", "\\\r" as = well * as "\\\r\n". */ for (curr_src =3D (char*) command, curr_dst =3D unescaped; *curr_src != =3D '\0'; - curr_src++, curr_dst++) { + curr_src++, curr_dst++) { if (*curr_src =3D=3D '\\') { switch (*(curr_src + 1)) { case '\n': /* \LF */ @@ -122,10 +122,10 @@ bhyveParseMemsize(const char *arg, size_t *ret_memsiz= e) */ static int bhyveCommandLineToArgv(const char *nativeConfig, - int *loader_argc, - char ***loader_argv, - int *bhyve_argc, - char ***bhyve_argv) + int *loader_argc, + char ***loader_argv, + int *bhyve_argc, + char ***bhyve_argv) { const char *curr =3D NULL; char *nativeConfig_unescaped =3D NULL; @@ -663,7 +663,7 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, goto error; =20 while ((c =3D _getopt_internal_r(argc, argv, optstr, - NULL, NULL, 0, parser, 0)) !=3D -1) { + NULL, NULL, 0, parser, 0)) !=3D -1) { switch (c) { case 'A': def->features[VIR_DOMAIN_FEATURE_ACPI] =3D VIR_TRISTATE_SWITCH= _ON; @@ -700,7 +700,7 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, } if (def->mem.cur_balloon !=3D 0 && def->mem.cur_balloon !=3D m= emory) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Failed to parse memory: size mismatch")); + _("Failed to parse memory: size mismatch")); goto error; } def->mem.cur_balloon =3D memory; @@ -778,7 +778,7 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, goto error; =20 while ((c =3D _getopt_internal_r(argc, argv, optstr, - NULL, NULL, 0, parser, 0)) !=3D -1) { + NULL, NULL, 0, parser, 0)) !=3D -1) { switch (c) { case 'd': arguments |=3D 1; diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 4dab6e5..089f4ae 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -77,9 +77,9 @@ bhyveNetCleanup(virDomainObjPtr vm) =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE) { if (net->ifname) { - ignore_value(virNetDevBridgeRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); + const char *brname =3D virDomainNetGetActualBridgeName(net= ); + ignore_value(virNetDevBridgeRemovePort(brname, + net->ifname)); ignore_value(virNetDevTapDelete(net->ifname, NULL)); } } --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list