From nobody Wed May 14 13:50: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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15244875463681.8353657811873063; Mon, 23 Apr 2018 05:45:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5351382B4; Mon, 23 Apr 2018 12:45:44 +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 2140F6FEC7; Mon, 23 Apr 2018 12:45:44 +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 C2CED4CAB8; Mon, 23 Apr 2018 12:45:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3NCjB4X011892 for ; Mon, 23 Apr 2018 08:45:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 514E083B90; Mon, 23 Apr 2018 12:45:11 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 109567C28 for ; Mon, 23 Apr 2018 12:45:10 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.usersys.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 15900120078 for ; Mon, 23 Apr 2018 14:45:08 +0200 (CEST) From: Martin Kletzander To: libvir-list@redhat.com Date: Mon, 23 Apr 2018 14:44:42 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/29] qemu: Add spaces after casts 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 23 Apr 2018 12:45:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/qemu/qemu_capabilities.c | 14 +++++++------- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_domain.c | 14 +++++++------- src/qemu/qemu_driver.c | 10 +++++----- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 10 +++++----- src/qemu/qemu_monitor_text.c | 6 +++--- src/qemu/qemu_process.c | 4 ++-- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 833c75514c25..441764baf742 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3115,7 +3115,7 @@ virQEMUCapsLoadCache(virArch hostArch, =20 ctxt->node =3D xmlDocGetRootElement(doc); =20 - if (STRNEQ((const char *)ctxt->node->name, "qemuCaps")) { + if (STRNEQ((const char *) ctxt->node->name, "qemuCaps")) { virReportError(VIR_ERR_XML_ERROR, _("unexpected root element <%s>, " "expecting "), @@ -3549,8 +3549,8 @@ virQEMUCapsSaveFile(void *data, =20 VIR_DEBUG("Saved caps '%s' for '%s' with (%lld, %lld)", filename, qemuCaps->binary, - (long long)qemuCaps->ctime, - (long long)qemuCaps->libvirtCtime); + (long long) qemuCaps->ctime, + (long long) qemuCaps->libvirtCtime); =20 ret =3D 0; cleanup: @@ -3576,10 +3576,10 @@ virQEMUCapsIsValid(void *data, VIR_DEBUG("Outdated capabilities for '%s': libvirt changed " "(%lld vs %lld, %lu vs %lu)", qemuCaps->binary, - (long long)qemuCaps->libvirtCtime, - (long long)virGetSelfLastChanged(), - (unsigned long)qemuCaps->libvirtVersion, - (unsigned long)LIBVIR_VERSION_NUMBER); + (long long) qemuCaps->libvirtCtime, + (long long) virGetSelfLastChanged(), + (unsigned long) qemuCaps->libvirtVersion, + (unsigned long) LIBVIR_VERSION_NUMBER); return false; } =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b666f3715f55..70e77def49a4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6848,7 +6848,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, if (cpu_flags && !cpu) { const char *default_model; =20 - switch ((int)def->os.arch) { + switch ((int) def->os.arch) { case VIR_ARCH_I686: default_model =3D "qemu32"; break; @@ -6894,7 +6894,7 @@ qemuBuildObsoleteAccelArg(virCommandPtr cmd, bool disableKVM =3D false; bool enableKVM =3D false; =20 - switch ((int)def->virtType) { + switch ((int) def->virtType) { case VIR_DOMAIN_VIRT_QEMU: if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) disableKVM =3D true; @@ -8273,7 +8273,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, /* For types whose implementations use a netdev on the host, add * an entry to nicindexes for passing on to systemd. */ - switch ((virDomainNetType)actualType) { + switch ((virDomainNetType) actualType) { case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 326c939c85c0..248ff3e55101 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3624,7 +3624,7 @@ qemuDomainChrSourceReconnectDefValidate(const virDoma= inChrSourceReconnectDef *de static int qemuDomainChrSourceDefValidate(const virDomainChrSourceDef *def) { - switch ((virDomainChrType)def->type) { + switch ((virDomainChrType) def->type) { case VIR_DOMAIN_CHR_TYPE_TCP: if (qemuDomainChrSourceReconnectDefValidate(&def->data.tcp.reconne= ct) < 0) return -1; @@ -5227,7 +5227,7 @@ qemuDomainControllerDefPostParse(virDomainControllerD= efPtr cont, virQEMUCapsPtr qemuCaps, unsigned int parseFlags) { - switch ((virDomainControllerType)cont->type) { + switch ((virDomainControllerType) cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: /* Set the default SCSI controller model if not already set */ if (qemuDomainSetSCSIControllerModel(def, cont, qemuCaps) < 0) @@ -6755,8 +6755,8 @@ ssize_t qemuDomainLogContextRead(qemuDomainLogContext= Ptr ctxt, { VIR_DEBUG("Context read %p manager=3D%p inode=3D%llu pos=3D%llu", ctxt, ctxt->manager, - (unsigned long long)ctxt->inode, - (unsigned long long)ctxt->pos); + (unsigned long long) ctxt->inode, + (unsigned long long) ctxt->pos); char *buf; size_t buflen; if (ctxt->manager) { @@ -11097,7 +11097,7 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr drive= r ATTRIBUTE_UNUSED, if (i =3D=3D ndevMountsPath) { if (virProcessRunInMountNamespace(vm->pid, qemuDomainDetachDeviceUnlink= Helper, - (void *)file) < 0) + (void *) file) < 0) goto cleanup; } } @@ -11264,7 +11264,7 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, if (qemuDomainGetHostdevPath(NULL, hostdev, false, &npaths, &paths, NU= LL) < 0) goto cleanup; =20 - if (qemuDomainNamespaceMknodPaths(vm, (const char **)paths, npaths) < = 0) + if (qemuDomainNamespaceMknodPaths(vm, (const char **) paths, npaths) <= 0) goto cleanup; =20 ret =3D 0; @@ -11292,7 +11292,7 @@ qemuDomainNamespaceTeardownHostdev(virDomainObjPtr = vm, goto cleanup; =20 if (npaths !=3D 0 && - qemuDomainNamespaceUnlinkPaths(vm, (const char **)paths, npaths) <= 0) + qemuDomainNamespaceUnlinkPaths(vm, (const char **) paths, npaths) = < 0) goto cleanup; =20 ret =3D 0; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7484b00e23c3..cc0da6bf29d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -439,7 +439,7 @@ static int qemuDomainSnapshotLoad(virDomainObjPtr vm, void *data) { - char *baseDir =3D (char *)data; + char *baseDir =3D (char *) data; char *snapDir =3D NULL; DIR *dir =3D NULL; struct dirent *entry; @@ -1331,9 +1331,9 @@ qemuGetSchedInfo(unsigned long long *cpuWait, /* In general, we cannot assume pid_t fits in int; but /proc parsing * is specific to Linux where int works fine. */ if (tid) - ret =3D virAsprintf(&proc, "/proc/%d/task/%d/sched", (int)pid, (in= t)tid); + ret =3D virAsprintf(&proc, "/proc/%d/task/%d/sched", (int) pid, (i= nt) tid); else - ret =3D virAsprintf(&proc, "/proc/%d/sched", (int)pid); + ret =3D virAsprintf(&proc, "/proc/%d/sched", (int) pid); if (ret < 0) goto cleanup; ret =3D -1; @@ -1376,7 +1376,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, goto cleanup; } =20 - *cpuWait =3D (unsigned long long)(val * 1000000); + *cpuWait =3D (unsigned long long) (val * 1000000); break; } } @@ -1435,7 +1435,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *= lastCpu, long *vm_rss, */ if (cpuTime) *cpuTime =3D 1000ull * 1000ull * 1000ull * (usertime + systime) - / (unsigned long long)sysconf(_SC_CLK_TCK); + / (unsigned long long) sysconf(_SC_CLK_TCK); if (lastCpu) *lastCpu =3D cpu; =20 diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index eca1b74d63bc..5c710da85966 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -160,7 +160,7 @@ qemuDomainExtractTLSSubject(const char *certdir) goto error; } =20 - pemdatum.data =3D (unsigned char *)pemdata; + pemdatum.data =3D (unsigned char *) pemdata; pemdatum.size =3D strlen(pemdata); =20 ret =3D gnutls_x509_crt_import(cert, &pemdatum, GNUTLS_X509_FMT_PEM); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f642d9a51ab6..c17bc1f45a07 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -431,11 +431,11 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) # if DEBUG_RAW_IO char *str1 =3D qemuMonitorEscapeNonPrintable(msg ? msg->txBuffer : ""); char *str2 =3D qemuMonitorEscapeNonPrintable(mon->buffer); - VIR_ERROR(_("Process %d %p %p [[[[%s]]][[[%s]]]"), (int)mon->bufferOff= set, mon->msg, msg, str1, str2); + VIR_ERROR(_("Process %d %p %p [[[[%s]]][[[%s]]]"), (int) mon->bufferOf= fset, mon->msg, msg, str1, str2); VIR_FREE(str1); VIR_FREE(str2); # else - VIR_DEBUG("Process %d", (int)mon->bufferOffset); + VIR_DEBUG("Process %d", (int) mon->bufferOffset); # endif #endif =20 @@ -465,7 +465,7 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) mon->bufferOffset =3D mon->bufferLength =3D 0; } #if DEBUG_IO - VIR_DEBUG("Process done %d used %d", (int)mon->bufferOffset, len); + VIR_DEBUG("Process done %d used %d", (int) mon->bufferOffset, len); #endif if (msg && msg->finished) virCondBroadcast(&mon->notify); @@ -489,7 +489,7 @@ qemuMonitorIOWriteWithFD(qemuMonitorPtr mon, memset(&msg, 0, sizeof(msg)); memset(control, 0, sizeof(control)); =20 - iov[0].iov_base =3D (void *)data; + iov[0].iov_base =3D (void *) data; iov[0].iov_len =3D len; =20 msg.msg_iov =3D iov; @@ -617,7 +617,7 @@ qemuMonitorIORead(qemuMonitorPtr mon) } =20 #if DEBUG_IO - VIR_DEBUG("Now read %d bytes of data", (int)mon->bufferOffset); + VIR_DEBUG("Now read %d bytes of data", (int) mon->bufferOffset); #endif =20 return ret; diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 7c34ca5b07e2..69b0b3685427 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -104,7 +104,7 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBU= TE_UNUSED, /* Don't print raw data in debug because its full of control chars */ /*VIR_DEBUG("Process data %d byts of data [%s]", len - used, data + us= ed);*/ #if DEBUG_IO - VIR_DEBUG("Process data %d byts of data", (int)(len - used)); + VIR_DEBUG("Process data %d byts of data", (int) (len - used)); #endif =20 /* Look for a non-zero reply followed by prompt */ @@ -763,7 +763,7 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, p =3D reply; =20 while (*p) { - p =3D (char *)qemuAliasDiskDriveSkipPrefix(p); + p =3D (char *) qemuAliasDiskDriveSkipPrefix(p); =20 eol =3D strchr(p, '\n'); if (!eol) @@ -1039,7 +1039,7 @@ int qemuMonitorTextSetVNCPassword(qemuMonitorPtr mon, =20 if (qemuMonitorTextCommandWithHandler(mon, "change vnc password", qemuMonitorSendVNCPassphrase, - (char *)password, + (char *) password, -1, &info) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("setting VNC password failed")); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6a5262ae46ab..93001d0c9c36 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5371,8 +5371,8 @@ static int qemuProcessVcpusSortOrder(const void *a, const void *b) { - virDomainVcpuDefPtr vcpua =3D *((virDomainVcpuDefPtr *)a); - virDomainVcpuDefPtr vcpub =3D *((virDomainVcpuDefPtr *)b); + virDomainVcpuDefPtr vcpua =3D *((virDomainVcpuDefPtr *) a); + virDomainVcpuDefPtr vcpub =3D *((virDomainVcpuDefPtr *) b); =20 return vcpua->order - vcpub->order; } --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list