From nobody Sun Feb 8 23:32:09 2026 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 152466275689919.872333556508465; Wed, 25 Apr 2018 06:25:56 -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 C3FB930BEBD1; Wed, 25 Apr 2018 13:25:53 +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 4837410018F8; Wed, 25 Apr 2018 13:25:53 +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 E457E180BAD3; Wed, 25 Apr 2018 13:25:50 +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 w3PDPD2a002204 for ; Wed, 25 Apr 2018 09:25:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F69E83B84; Wed, 25 Apr 2018 13:25:13 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9966A7C41 for ; Wed, 25 Apr 2018 13:25:12 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.usersys.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 68CE6120078 for ; Wed, 25 Apr 2018 15:25:09 +0200 (CEST) From: Martin Kletzander To: libvir-list@redhat.com Date: Wed, 25 Apr 2018 15:24:51 +0200 Message-Id: <3b7a8df81dee8712bb357515280d53001f7a9b4d.1524661163.git.mkletzan@redhat.com> 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/30] qemu/: Remove 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.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.44]); Wed, 25 Apr 2018 13:25:56 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_capabilities.c | 20 +++++----- src/qemu/qemu_command.c | 18 ++++----- src/qemu/qemu_domain.c | 32 ++++++++-------- src/qemu/qemu_domain_address.c | 12 +++--- src/qemu/qemu_driver.c | 68 +++++++++++++++++----------------- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 8 ++-- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 4 +- src/qemu/qemu_parse_command.c | 6 +-- src/qemu/qemu_process.c | 10 ++--- 15 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 488a19d4a6d4..4df1bde458e5 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -220,7 +220,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool= *inProgress) if (virTimeBackOffStart(&timeout, 1, 3*1000 /* ms */) < 0) goto error; while (virTimeBackOffWait(&timeout)) { - ret =3D connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); + ret =3D connect(monfd, (struct sockaddr *)&addr, sizeof(addr)); =20 if (ret =3D=3D 0) break; @@ -2225,7 +2225,7 @@ qemuAgentSetUserPassword(qemuAgentPtr mon, virJSONValuePtr reply =3D NULL; char *password64 =3D NULL; =20 - if (!(password64 =3D virStringEncodeBase64((unsigned char *) password, + if (!(password64 =3D virStringEncodeBase64((unsigned char *)password, strlen(password)))) goto cleanup; =20 diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 95d1e0370a63..9b49f9c1e163 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -92,7 +92,7 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, if (chr->info.alias) return 0; =20 - switch ((virDomainChrDeviceType) chr->deviceType) { + switch ((virDomainChrDeviceType)chr->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: prefix =3D "parallel"; break; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index c0cf6a95ad8b..e648fb9625f1 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -987,7 +987,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourceP= tr src) int actualType =3D virStorageSourceGetActualType(src); virJSONValuePtr fileprops =3D NULL; =20 - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 833c75514c25..312984bac61e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2359,7 +2359,7 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps, for (i =3D 0; i < ARRAY_CARDINALITY(virQEMUCapsTPMModelsToCaps); i= ++) { const char *needle =3D virDomainTPMModelTypeToString( virQEMUCapsTPMModelsToCaps[i].type); - if (virStringListHasString((const char **) entries, needle)) + if (virStringListHasString((const char **)entries, needle)) virQEMUCapsSet(qemuCaps, virQEMUCapsTPMModelsToCaps[i].caps); } @@ -2373,7 +2373,7 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps, for (i =3D 0; i < ARRAY_CARDINALITY(virQEMUCapsTPMTypesToCaps); i+= +) { const char *needle =3D virDomainTPMBackendTypeToString( virQEMUCapsTPMTypesToCaps[i].type); - if (virStringListHasString((const char **) entries, needle)) + if (virStringListHasString((const char **)entries, needle)) virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps= ); } } @@ -3449,11 +3449,11 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) virBufferAdjustIndent(&buf, 2); =20 virBufferAsprintf(&buf, "%llu\n", - (long long) qemuCaps->ctime); + (long long)qemuCaps->ctime); virBufferAsprintf(&buf, "%llu\n", - (long long) qemuCaps->libvirtCtime); + (long long)qemuCaps->libvirtCtime); virBufferAsprintf(&buf, "%lu\n", - (unsigned long) qemuCaps->libvirtVersion); + (unsigned long)qemuCaps->libvirtVersion); =20 if (qemuCaps->usedQMP) virBufferAddLit(&buf, "\n"); @@ -3595,7 +3595,7 @@ virQEMUCapsIsValid(void *data, VIR_DEBUG("Outdated capabilities for '%s': QEMU binary changed " "(%lld vs %lld)", qemuCaps->binary, - (long long) sb.st_ctime, (long long) qemuCaps->ctime); + (long long)sb.st_ctime, (long long)qemuCaps->ctime); return false; } =20 @@ -3970,10 +3970,10 @@ virQEMUCapsInitQMPCommandAbort(virQEMUCapsInitQMPCo= mmandPtr cmd) if (cmd->pid !=3D 0) { char ebuf[1024]; =20 - VIR_DEBUG("Killing QMP caps process %lld", (long long) cmd->pid); + VIR_DEBUG("Killing QMP caps process %lld", (long long)cmd->pid); if (virProcessKill(cmd->pid, SIGKILL) < 0 && errno !=3D ESRCH) VIR_ERROR(_("Failed to kill process %lld: %s"), - (long long) cmd->pid, + (long long)cmd->pid, virStrerror(errno, ebuf, sizeof(ebuf))); =20 VIR_FREE(*cmd->qmperr); @@ -4451,7 +4451,7 @@ virQEMUCapsCompareArch(const void *payload, const void *name ATTRIBUTE_UNUSED, const void *opaque) { - struct virQEMUCapsSearchData *data =3D (struct virQEMUCapsSearchData *= ) opaque; + struct virQEMUCapsSearchData *data =3D (struct virQEMUCapsSearchData *= )opaque; const virQEMUCaps *qemuCaps =3D payload; =20 return qemuCaps->arch =3D=3D data->arch; @@ -4621,7 +4621,7 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps, cpus =3D qemuCaps->tcgCPUModels; =20 filtered =3D virDomainCapsCPUModelsFilter(cpus, - (const char **) models, + (const char **)models, blacklist); virStringListFree(models); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 418729b9881e..79beec48dadd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1035,7 +1035,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, if (virStorageSourceIsEmpty(src)) return 1; =20 - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: @@ -2618,7 +2618,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, =20 *devstr =3D NULL; =20 - switch ((virDomainControllerType) def->type) { + switch ((virDomainControllerType)def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: switch ((virDomainControllerModelSCSI) def->model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: @@ -3923,7 +3923,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, goto error; } =20 - switch ((virDomainInputType) dev->type) { + switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_MOUSE) || (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && @@ -4489,7 +4489,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, int backend =3D pcisrc->backend; =20 /* caller has to assign proper passthrough backend type */ - switch ((virDomainHostdevSubsysPCIBackendType) backend) { + switch ((virDomainHostdevSubsysPCIBackendType)backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM: virBufferAddLit(&buf, "pci-assign"); if (configfd && *configfd) @@ -6116,7 +6116,7 @@ qemuBuildClockCommandLine(virCommandPtr cmd, } =20 for (i =3D 0; i < def->clock.ntimers; i++) { - switch ((virDomainTimerNameType) def->clock.timers[i]->name) { + switch ((virDomainTimerNameType)def->clock.timers[i]->name) { case VIR_DOMAIN_TIMER_NAME_PLATFORM: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported timer type (name) '%s'"), @@ -8051,7 +8051,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, goto error; } =20 - switch ((virDomainChrType) net->data.vhostuser->type) { + switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: if (!(chardev =3D qemuBuildChrChardevStr(logManager, cmd, cfg, def, net->data.vhostuser, @@ -10126,7 +10126,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, char *addr =3D NULL; int port; =20 - switch ((virDomainChrChannelTargetType) chr->targetType) { + switch ((virDomainChrChannelTargetType)chr->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: =20 addr =3D virSocketAddrFormat(chr->target.addr); @@ -10164,7 +10164,7 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, { int ret =3D -1; =20 - switch ((virDomainChrConsoleTargetType) chr->targetType) { + switch ((virDomainChrConsoleTargetType)chr->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: if (!(*deviceStr =3D qemuBuildSclpDevStr(chr))) @@ -10204,7 +10204,7 @@ qemuBuildChrDeviceStr(char **deviceStr, { int ret =3D -1; =20 - switch ((virDomainChrDeviceType) chr->deviceType) { + switch ((virDomainChrDeviceType)chr->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: ret =3D qemuBuildSerialChrDeviceStr(deviceStr, vmdef, chr, qemuCap= s); break; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 326c939c85c0..f46b0ad89761 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2465,7 +2465,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, xmlNodePtr next; =20 for (next =3D node->children; next; next =3D next->next) { - int ns =3D qemuDomainNamespaceTypeFromString((const char *) ne= xt->name); + int ns =3D qemuDomainNamespaceTypeFromString((const char *)nex= t->name); =20 if (ns < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3657,7 +3657,7 @@ qemuDomainChrSourceDefValidate(const virDomainChrSour= ceDef *def) static int qemuDomainChrSerialTargetTypeToAddressType(int targetType) { - switch ((virDomainChrSerialTargetType) targetType) { + switch ((virDomainChrSerialTargetType)targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: @@ -3708,11 +3708,11 @@ qemuDomainChrTargetDefValidate(const virDomainChrDe= f *chr) { int expected; =20 - switch ((virDomainChrDeviceType) chr->deviceType) { + switch ((virDomainChrDeviceType)chr->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: =20 /* Validate target type */ - switch ((virDomainChrSerialTargetType) chr->targetType) { + switch ((virDomainChrSerialTargetType)chr->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI: @@ -4926,7 +4926,7 @@ qemuDomainDeviceDefValidateController(const virDomain= ControllerDef *controller, if (qemuDomainDeviceDefValidateControllerAttributes(controller) < 0) return -1; =20 - switch ((virDomainControllerType) controller->type) { + switch ((virDomainControllerType)controller->type) { case VIR_DOMAIN_CONTROLLER_TYPE_IDE: ret =3D qemuDomainDeviceDefValidateControllerIDE(controller, def); break; @@ -4994,7 +4994,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef = *dev, def->emulator))) return -1; =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_NET: ret =3D qemuDomainDeviceDefValidateNetwork(dev->data.net); break; @@ -5337,7 +5337,7 @@ qemuDomainControllerDefPostParse(virDomainControllerD= efPtr cont, */ if (cont->opts.pciopts.numaNode >=3D 0 && cont->opts.pciopts.numaNode >=3D - (int) virDomainNumaGetNodeCount(def->numa)) { + (int)virDomainNumaGetNodeCount(def->numa)) { virReportError(VIR_ERR_XML_ERROR, _("%s with index %d is " "configured for a NUMA node (%d) " @@ -5393,7 +5393,7 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, /* Set the default target model */ if (chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && chr->targetModel =3D=3D VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE) { - switch ((virDomainChrSerialTargetType) chr->targetType) { + switch ((virDomainChrSerialTargetType)chr->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: chr->targetModel =3D VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SE= RIAL; break; @@ -6334,7 +6334,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, * towards older libvirt versions works for such guests, we sw= itch * it back to the default here */ if (flags & VIR_DOMAIN_XML_MIGRATABLE) { - switch ((virDomainChrSerialTargetType) serial->targetType)= { + switch ((virDomainChrSerialTargetType)serial->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM: serial->targetType =3D VIR_DOMAIN_CHR_SERIAL_TARGET_TY= PE_NONE; @@ -9575,7 +9575,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, =20 switch ((virDomainHostdevMode) dev->mode) { case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: - switch ((virDomainHostdevSubsysType) dev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (pcisrc->backend =3D=3D VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO= ) { pci =3D virPCIDeviceNew(pcisrc->addr.domain, @@ -9617,7 +9617,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, if (!usb) goto cleanup; =20 - if (!(tmpPath =3D (char *) virUSBDeviceGetPath(usb))) + if (!(tmpPath =3D (char *)virUSBDeviceGetPath(usb))) goto cleanup; perm =3D VIR_CGROUP_DEVICE_RW; break; @@ -9642,7 +9642,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, if (!scsi) goto cleanup; =20 - if (!(tmpPath =3D (char *) virSCSIDeviceGetPath(scsi))) + if (!(tmpPath =3D (char *)virSCSIDeviceGetPath(scsi))) goto cleanup; perm =3D virSCSIDeviceGetReadonly(scsi) ? VIR_CGROUP_DEVICE_READ : VIR_CGROUP_DEVICE_RW; @@ -9655,7 +9655,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, if (!(host =3D virSCSIVHostDeviceNew(hostsrc->wwpn))) goto cleanup; =20 - if (!(tmpPath =3D (char *) virSCSIVHostDeviceGetPath(host)= )) + if (!(tmpPath =3D (char *)virSCSIVHostDeviceGetPath(host))) goto cleanup; perm =3D VIR_CGROUP_DEVICE_RW; } @@ -10077,7 +10077,7 @@ qemuDomainCreateDeviceRecursive(const char *device, } =20 if (tcon && - lsetfilecon_raw(devicePath, (VIR_SELINUX_CTX_CONST char *) tcon) <= 0) { + lsetfilecon_raw(devicePath, (VIR_SELINUX_CTX_CONST char *)tcon) < = 0) { VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR if (errno !=3D EOPNOTSUPP && errno !=3D ENOTSUP) { VIR_WARNINGS_RESET @@ -10332,7 +10332,7 @@ qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr c= fg ATTRIBUTE_UNUSED, if (virDomainChrDefForeach(vm->def, true, qemuDomainSetupChardev, - (void *) data) < 0) + (void *)data) < 0) return -1; =20 VIR_DEBUG("Setup all chardevs"); @@ -10848,7 +10848,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBU= TE_UNUSED, =20 # ifdef WITH_SELINUX if (data->tcon && - lsetfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *) data->t= con) < 0) { + lsetfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *)data->tc= on) < 0) { VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR if (errno !=3D EOPNOTSUPP && errno !=3D ENOTSUP) { VIR_WARNINGS_RESET diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 7fe9d5926c9f..ce2b0790c040 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -427,7 +427,7 @@ qemuDomainHasVirtioMMIODevicesCallback(virDomainDefPtr = def ATTRIBUTE_UNUSED, if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) { /* We can stop iterating as soon as we find the first * virtio-mmio device */ - *((bool *) opaque) =3D true; + *((bool *)opaque) =3D true; return -1; } =20 @@ -508,11 +508,11 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDev= iceDefPtr dev, virDomainPCIConnectFlags pciFlags =3D (VIR_PCI_CONNECT_TYPE_PCI_DEVICE= | VIR_PCI_CONNECT_HOTPLUGGABLE); =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_CONTROLLER: { virDomainControllerDefPtr cont =3D dev->data.controller; =20 - switch ((virDomainControllerType) cont->type) { + switch ((virDomainControllerType)cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_PCI: return virDomainPCIControllerModelToConnectType(cont->model); =20 @@ -786,7 +786,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDefPtr dev, break; =20 case VIR_DOMAIN_DEVICE_VIDEO: - switch ((virDomainVideoType) dev->data.video->type) { + switch ((virDomainVideoType)dev->data.video->type) { case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: return virtioFlags; =20 @@ -824,7 +824,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDefPtr dev, break; =20 case VIR_DOMAIN_DEVICE_CHR: - switch ((virDomainChrSerialTargetType) dev->data.chr->targetType) { + switch ((virDomainChrSerialTargetType)dev->data.chr->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI: return pciFlags; =20 @@ -2346,7 +2346,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, virDomainControllerDefPtr cont =3D def->controllers[i]; =20 if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { - if ((int) cont->idx > max_idx) + if ((int)cont->idx > max_idx) max_idx =3D cont->idx; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7484b00e23c3..016669ba81a9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -765,36 +765,36 @@ qemuStateInitialize(bool privileged, if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to use= r %d:%d"), - cfg->libDir, (int) cfg->user, - (int) cfg->group); + cfg->libDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->cacheDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - cfg->cacheDir, (int) cfg->user, - (int) cfg->group); + cfg->cacheDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->saveDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - cfg->saveDir, (int) cfg->user, - (int) cfg->group); + cfg->saveDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->snapshotDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - cfg->snapshotDir, (int) cfg->user, - (int) cfg->group); + cfg->snapshotDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->autoDumpPath, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - cfg->autoDumpPath, (int) cfg->user, - (int) cfg->group); + cfg->autoDumpPath, (int)cfg->user, + (int)cfg->group); goto error; } if (!(channeldir =3D mdir_name(cfg->channelTargetDir))) { @@ -804,8 +804,8 @@ qemuStateInitialize(bool privileged, if (chown(channeldir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - channeldir, (int) cfg->user, - (int) cfg->group); + channeldir, (int)cfg->user, + (int)cfg->group); VIR_FREE(channeldir); goto error; } @@ -813,22 +813,22 @@ qemuStateInitialize(bool privileged, if (chown(cfg->channelTargetDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - cfg->channelTargetDir, (int) cfg->user, - (int) cfg->group); + cfg->channelTargetDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->nvramDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - cfg->nvramDir, (int) cfg->user, - (int) cfg->group); + cfg->nvramDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->memoryBackingDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), - cfg->memoryBackingDir, (int) cfg->user, - (int) cfg->group); + cfg->memoryBackingDir, (int)cfg->user, + (int)cfg->group); goto error; } =20 @@ -1405,9 +1405,9 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *= lastCpu, long *vm_rss, /* 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/stat", (int) pid, tid= ); + ret =3D virAsprintf(&proc, "/proc/%d/task/%d/stat", (int)pid, tid); else - ret =3D virAsprintf(&proc, "/proc/%d/stat", (int) pid); + ret =3D virAsprintf(&proc, "/proc/%d/stat", (int)pid); if (ret < 0) return -1; =20 @@ -1444,7 +1444,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *= lastCpu, long *vm_rss, =20 =20 VIR_DEBUG("Got status for %d/%d user=3D%llu sys=3D%llu cpu=3D%d rss=3D= %ld", - (int) pid, tid, usertime, systime, cpu, rss); + (int)pid, tid, usertime, systime, cpu, rss); =20 VIR_FORCE_FCLOSE(pidinfo); =20 @@ -6558,7 +6558,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virQEMUSaveHeaderPtr header =3D &data->header; qemuDomainSaveCookiePtr cookie =3D NULL; =20 - if (virSaveCookieParseString(data->cookie, (virObjectPtr *) &cookie, + if (virSaveCookieParseString(data->cookie, (virObjectPtr *)&cookie, virDomainXMLOptionGetSaveCookie(driver->x= mlopt)) < 0) goto cleanup; =20 @@ -7599,7 +7599,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, int ret =3D -1; const char *alias =3D NULL; =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); ret =3D qemuDomainAttachDeviceDiskLive(driver, vm, dev); @@ -7765,7 +7765,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, { int ret =3D -1; =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: ret =3D qemuDomainDetachDeviceDiskLive(driver, vm, dev); break; @@ -7904,7 +7904,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, int ret =3D -1; int idx; =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); ret =3D qemuDomainChangeDiskLive(vm, dev, driver, force); @@ -7977,7 +7977,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainRedirdevDefPtr redirdev; virDomainShmemDefPtr shmem; =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk =3D dev->data.disk; if (virDomainDiskIndexByName(vmdef, disk->dst, true) >=3D 0) { @@ -8168,7 +8168,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainMemoryDefPtr mem; int idx; =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk =3D dev->data.disk; if (!(det_disk =3D virDomainDiskRemoveByName(vmdef, disk->dst))) { @@ -8346,7 +8346,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDef oldDev =3D { .type =3D dev->type }; int pos; =20 - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: newDisk =3D dev->data.disk; if ((pos =3D virDomainDiskIndexByName(vmdef, newDisk->dst, false))= < 0) { @@ -11671,7 +11671,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, goto endjob; =20 /* Read the memory file into buffer. */ - if (saferead(fd, buffer, size) =3D=3D (ssize_t) -1) { + if (saferead(fd, buffer, size) =3D=3D (ssize_t)-1) { virReportSystemError(errno, _("failed to read temporary file " "created with template %s"), tmp); @@ -14114,7 +14114,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDo= mainSnapshotDiskDefPtr snapdi int domDiskType =3D virStorageSourceGetActualType(domdisk->src); int snapDiskType =3D virStorageSourceGetActualType(snapdisk->src); =20 - switch ((virStorageType) domDiskType) { + switch ((virStorageType)domDiskType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: break; @@ -14153,7 +14153,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDo= mainSnapshotDiskDefPtr snapdi return -1; } =20 - switch ((virStorageType) snapDiskType) { + switch ((virStorageType)snapDiskType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: break; @@ -14189,7 +14189,7 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDoma= inSnapshotDiskDefPtr snapdisk return -1; } =20 - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: break; @@ -14307,7 +14307,7 @@ qemuDomainSnapshotPrepareDiskInternal(virDomainDisk= DefPtr disk, =20 actualType =3D virStorageSourceGetActualType(disk->src); =20 - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; @@ -17497,7 +17497,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *d= isk, const char *destxml, * overflow detection if this is a 32-bit server handling a * 64-bit client. */ if (STREQ(param->field, VIR_DOMAIN_BLOCK_COPY_BANDWIDTH)) { - if (sizeof(unsigned long) < sizeof(bandwidth) && + if (sizeof(unsigned long)< sizeof(bandwidth) && param->value.ul > ULONG_MAX * (1ULL << 20)) { virReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu bytes"), diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index afe445d4e737..d2b546043d24 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -205,7 +205,7 @@ qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostd= evDefPtr *hostdevs, if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP= E_PCI) continue; =20 - switch ((virDomainHostdevSubsysPCIBackendType) *backend) { + switch ((virDomainHostdevSubsysPCIBackendType)*backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: if (supportsPassthroughVFIO && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index df9e8aa71679..282916d3fc02 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1207,7 +1207,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, /* this could have been changed by qemuHostdevPreparePCIDevices */ backend =3D hostdev->source.subsys.u.pci.backend; =20 - switch ((virDomainHostdevSubsysPCIBackendType) backend) { + switch ((virDomainHostdevSubsysPCIBackendType)backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -4060,7 +4060,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, if (qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); =20 - switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: qemuDomainRemovePCIHostDevice(driver, vm, hostdev); /* QEMU might no longer need to lock as much memory, eg. we just @@ -4474,7 +4474,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, virDomainDeviceDefPtr dev) { int ret =3D -1; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: ret =3D qemuDomainRemoveDiskDevice(driver, vm, dev->data.disk); break; @@ -5411,7 +5411,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr dr= iver, (auth->expires && auth->validTo <=3D now)) { expire =3D "now"; } else if (auth->expires) { - if (virAsprintf(&validTo, "%lu", (unsigned long) auth->validTo) < = 0) + if (virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo) < 0) goto end_job; expire =3D validTo; } else { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 88b8253fa996..6a93b771aace 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -180,7 +180,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, =20 VIR_DEBUG("Precreate disk type=3D%s", virStorageTypeToString(disk->src= ->type)); =20 - switch ((virStorageType) disk->src->type) { + switch ((virStorageType)disk->src->type) { case VIR_STORAGE_TYPE_FILE: if (!virDomainDiskGetSource(disk)) { VIR_DEBUG("Dropping sourceless disk '%s'", diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f642d9a51ab6..8c3e881b29c2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -365,7 +365,7 @@ qemuMonitorOpenUnix(const char *monitor, if (virTimeBackOffStart(&timebackoff, 1, timeout * 1000) < 0) goto error; while (virTimeBackOffWait(&timebackoff)) { - ret =3D connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); + ret =3D connect(monfd, (struct sockaddr *)&addr, sizeof(addr)); =20 if (ret =3D=3D 0) break; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 24d37eb41dc1..180f4b2a3a40 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5325,7 +5325,7 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, =20 prop =3D machine_model->props + machine_model->nprops; =20 - switch ((virJSONType) virJSONValueGetType(value)) { + switch ((virJSONType)virJSONValueGetType(value)) { case VIR_JSON_TYPE_STRING: if (VIR_STRDUP(prop->value.string, virJSONValueGetString(value)) <= 0) return -1; @@ -6587,7 +6587,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, goto cleanup; } =20 - switch ((virDomainChrType) chr->type) { + switch ((virDomainChrType)chr->type) { case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: backend_type =3D "null"; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 0ce963222f9c..351425fedd15 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2820,7 +2820,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr ca= ps, =20 /* The parser requires /proc/pid, which only exists on platforms * like Linux where pid_t fits in int. */ - if ((int) pid !=3D pid || + if ((int)pid !=3D pid || qemuParseProcFileStrings(pid, "cmdline", &progargv) < 0 || qemuParseProcFileStrings(pid, "environ", &progenv) < 0) goto cleanup; @@ -2829,13 +2829,13 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr = caps, pidfile, monConfig, monJSON))) goto cleanup; =20 - if (virAsprintf(&exepath, "/proc/%d/exe", (int) pid) < 0) + if (virAsprintf(&exepath, "/proc/%d/exe", (int)pid) < 0) goto cleanup; =20 if (virFileResolveLink(exepath, &emulator) < 0) { virReportSystemError(errno, _("Unable to resolve %s for pid %u"), - exepath, (int) pid); + exepath, (int)pid); goto cleanup; } VIR_FREE(def->emulator); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6a5262ae46ab..c668546cc21f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2131,7 +2131,7 @@ qemuRefreshRTC(virQEMUDriverPtr driver, return; =20 thenbits.tm_isdst =3D -1; - if ((then =3D mktime(&thenbits)) =3D=3D (time_t) -1) { + if ((then =3D mktime(&thenbits)) =3D=3D (time_t)-1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to convert time")); return; @@ -3301,7 +3301,7 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver, if (qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) goto cleanup; =20 - qemuDevices =3D (const char **) priv->qemuDevices; + qemuDevices =3D (const char **)priv->qemuDevices; if ((tmp =3D old)) { while (*tmp) { if (!virStringListHasString(qemuDevices, *tmp) && @@ -6026,7 +6026,7 @@ qemuProcessLaunch(virConnectPtr conn, rv =3D -1; } VIR_DEBUG("QEMU vm=3D%p name=3D%s running with pid=3D%lld", - vm, vm->def->name, (long long) vm->pid); + vm, vm->def->name, (long long)vm->pid); } else { VIR_DEBUG("QEMU vm=3D%p name=3D%s failed to spawn", vm, vm->def->name); @@ -6435,7 +6435,7 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flag= s) =20 VIR_DEBUG("vm=3D%p name=3D%s pid=3D%lld flags=3D0x%x", vm, vm->def->name, - (long long) vm->pid, flags); + (long long)vm->pid, flags); =20 if (!(flags & VIR_QEMU_PROCESS_KILL_NOCHECK)) { if (!virDomainObjIsActive(vm)) { @@ -6516,7 +6516,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, VIR_DEBUG("Shutting down vm=3D%p name=3D%s id=3D%d pid=3D%lld, " "reason=3D%s, asyncJob=3D%s, flags=3D0x%x", vm, vm->def->name, vm->def->id, - (long long) vm->pid, + (long long)vm->pid, virDomainShutoffReasonTypeToString(reason), qemuDomainAsyncJobTypeToString(asyncJob), flags); --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list