From nobody Mon Feb 9 20:30:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.microsoft.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638485804178689.9563381562554; Thu, 2 Dec 2021 14:56:44 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-402-PvwfJRv7OiGCkV0AsGeTQQ-1; Thu, 02 Dec 2021 17:56:41 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 347BF1023F4D; Thu, 2 Dec 2021 22:56:33 +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 C29E6ADD5; Thu, 2 Dec 2021 22:56:32 +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 AE2054BB7C; Thu, 2 Dec 2021 22:56:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B2MuSaE015594 for ; Thu, 2 Dec 2021 17:56:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0EC401402408; Thu, 2 Dec 2021 22:56:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A2BE1402406 for ; Thu, 2 Dec 2021 22:56:28 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E20F1805B9A for ; Thu, 2 Dec 2021 22:56:27 +0000 (UTC) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by relay.mimecast.com with ESMTP id us-mta-364-0R7RT7J7OgyabwOynhLYhA-1; Thu, 02 Dec 2021 17:56:26 -0500 Received: from prapal-ch2.oiwy50ateaxezb1sqsoezlib2f.xx.internal.cloudapp.net (unknown [20.80.162.67]) by linux.microsoft.com (Postfix) with ESMTPSA id DC81C20E67C8; Thu, 2 Dec 2021 14:56:24 -0800 (PST) X-MC-Unique: PvwfJRv7OiGCkV0AsGeTQQ-1 X-MC-Unique: 0R7RT7J7OgyabwOynhLYhA-1 DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com DC81C20E67C8 From: Praveen K Paladugu To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/17] ch_monitor: fix indentation in ch_monitor.c Date: Thu, 2 Dec 2021 22:56:06 +0000 Message-Id: <20211202225614.1118066-10-prapal@linux.microsoft.com> In-Reply-To: <20211202225614.1118066-1-prapal@linux.microsoft.com> References: <20211202225614.1118066-1-prapal@linux.microsoft.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1B2MuSaE015594 X-loop: libvir-list@redhat.com Cc: william.douglas@intel.com, viremana@linux.microsoft.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1638485806044100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Praveen K Paladugu --- src/ch/ch_monitor.c | 301 +++++++++++++++++++++++--------------------- 1 file changed, 161 insertions(+), 140 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 12c10da874..68fa5b30aa 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -42,7 +42,8 @@ VIR_LOG_INIT("ch.ch_monitor"); static virClass *virCHMonitorClass; static void virCHMonitorDispose(void *obj); =20 -static int virCHMonitorOnceInit(void) +static int +virCHMonitorOnceInit(void) { if (!VIR_CLASS_NEW(virCHMonitor, virClassForObjectLockable())) return -1; @@ -52,11 +53,11 @@ static int virCHMonitorOnceInit(void) =20 VIR_ONCE_GLOBAL_INIT(virCHMonitor); =20 -int virCHMonitorShutdownVMM(virCHMonitor *mon); -int virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint); +int virCHMonitorShutdownVMM(virCHMonitor * mon); +int virCHMonitorPutNoContent(virCHMonitor * mon, const char *endpoint); =20 static int -virCHMonitorBuildCPUJson(virJSONValue *content, virDomainDef *vmdef) +virCHMonitorBuildCPUJson(virJSONValue * content, virDomainDef * vmdef) { g_autoptr(virJSONValue) cpus =3D NULL; unsigned int maxvcpus =3D 0; @@ -64,7 +65,7 @@ virCHMonitorBuildCPUJson(virJSONValue *content, virDomain= Def *vmdef) virDomainVcpuDef *vcpu; size_t i; =20 - /* count maximum allowed number vcpus and enabled vcpus when boot.*/ + /* count maximum allowed number vcpus and enabled vcpus when boot. */ maxvcpus =3D virDomainDefGetVcpusMax(vmdef); for (i =3D 0; i < maxvcpus; i++) { vcpu =3D virDomainDefGetVcpu(vmdef, i); @@ -76,7 +77,8 @@ virCHMonitorBuildCPUJson(virJSONValue *content, virDomain= Def *vmdef) cpus =3D virJSONValueNewObject(); if (virJSONValueObjectAppendNumberInt(cpus, "boot_vcpus", nvcpus) = < 0) return -1; - if (virJSONValueObjectAppendNumberInt(cpus, "max_vcpus", vmdef->ma= xvcpus) < 0) + if (virJSONValueObjectAppendNumberInt + (cpus, "max_vcpus", vmdef->maxvcpus) < 0) return -1; if (virJSONValueObjectAppend(content, "cpus", &cpus) < 0) return -1; @@ -86,7 +88,7 @@ virCHMonitorBuildCPUJson(virJSONValue *content, virDomain= Def *vmdef) } =20 static int -virCHMonitorBuildPTYJson(virJSONValue *content, virDomainDef *vmdef) +virCHMonitorBuildPTYJson(virJSONValue * content, virDomainDef * vmdef) { if (vmdef->nconsoles) { g_autoptr(virJSONValue) pty =3D virJSONValueNewObject(); @@ -108,7 +110,7 @@ virCHMonitorBuildPTYJson(virJSONValue *content, virDoma= inDef *vmdef) } =20 static int -virCHMonitorBuildKernelRelatedJson(virJSONValue *content, virDomainDef *vm= def) +virCHMonitorBuildKernelRelatedJson(virJSONValue * content, virDomainDef * = vmdef) { g_autoptr(virJSONValue) kernel =3D virJSONValueNewObject(); g_autoptr(virJSONValue) cmdline =3D virJSONValueNewObject(); @@ -119,21 +121,24 @@ virCHMonitorBuildKernelRelatedJson(virJSONValue *cont= ent, virDomainDef *vmdef) _("Kernel image path in this domain is not defined"= )); return -1; } else { - if (virJSONValueObjectAppendString(kernel, "path", vmdef->os.kerne= l) < 0) + if (virJSONValueObjectAppendString(kernel, "path", vmdef->os.kerne= l) < + 0) return -1; if (virJSONValueObjectAppend(content, "kernel", &kernel) < 0) return -1; } =20 if (vmdef->os.cmdline) { - if (virJSONValueObjectAppendString(cmdline, "args", vmdef->os.cmdl= ine) < 0) + if (virJSONValueObjectAppendString(cmdline, "args", vmdef->os.cmdl= ine) < + 0) return -1; if (virJSONValueObjectAppend(content, "cmdline", &cmdline) < 0) return -1; } =20 if (vmdef->os.initrd !=3D NULL) { - if (virJSONValueObjectAppendString(initramfs, "path", vmdef->os.in= itrd) < 0) + if (virJSONValueObjectAppendString(initramfs, "path", vmdef->os.in= itrd) + < 0) return -1; if (virJSONValueObjectAppend(content, "initramfs", &initramfs) < 0) return -1; @@ -143,14 +148,16 @@ virCHMonitorBuildKernelRelatedJson(virJSONValue *cont= ent, virDomainDef *vmdef) } =20 static int -virCHMonitorBuildMemoryJson(virJSONValue *content, virDomainDef *vmdef) +virCHMonitorBuildMemoryJson(virJSONValue * content, virDomainDef * vmdef) { - unsigned long long total_memory =3D virDomainDefGetMemoryInitial(vmdef= ) * 1024; + unsigned long long total_memory =3D + virDomainDefGetMemoryInitial(vmdef) * 1024; =20 if (total_memory !=3D 0) { g_autoptr(virJSONValue) memory =3D virJSONValueNewObject(); =20 - if (virJSONValueObjectAppendNumberUlong(memory, "size", total_memo= ry) < 0) + if (virJSONValueObjectAppendNumberUlong(memory, "size", total_memo= ry) < + 0) return -1; =20 if (virJSONValueObjectAppend(content, "memory", &memory) < 0) @@ -161,7 +168,7 @@ virCHMonitorBuildMemoryJson(virJSONValue *content, virD= omainDef *vmdef) } =20 static int -virCHMonitorBuildDiskJson(virJSONValue *disks, virDomainDiskDef *diskdef) +virCHMonitorBuildDiskJson(virJSONValue * disks, virDomainDiskDef * diskdef) { g_autoptr(virJSONValue) disk =3D virJSONValueNewObject(); =20 @@ -169,44 +176,47 @@ virCHMonitorBuildDiskJson(virJSONValue *disks, virDom= ainDiskDef *diskdef) return -1; =20 switch (diskdef->src->type) { - case VIR_STORAGE_TYPE_FILE: - if (!diskdef->src->path) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Missing disk file path in domain")); - return -1; - } - if (diskdef->bus !=3D VIR_DOMAIN_DISK_BUS_VIRTIO) { - virReportError(VIR_ERR_INVALID_ARG, - _("Only virtio bus types are supported for '%s'= "), diskdef->src->path); - return -1; - } - if (virJSONValueObjectAppendString(disk, "path", diskdef->src->pat= h) < 0) - return -1; - if (diskdef->src->readonly) { - if (virJSONValueObjectAppendBoolean(disk, "readonly", true) < = 0) + case VIR_STORAGE_TYPE_FILE: + if (!diskdef->src->path) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Missing disk file path in domain")); + return -1; + } + if (diskdef->bus !=3D VIR_DOMAIN_DISK_BUS_VIRTIO) { + virReportError(VIR_ERR_INVALID_ARG, + _ + ("Only virtio bus types are supported for '= %s'"), + diskdef->src->path); + return -1; + } + if (virJSONValueObjectAppendString(disk, "path", diskdef->src-= >path) + < 0) + return -1; + if (diskdef->src->readonly) { + if (virJSONValueObjectAppendBoolean(disk, "readonly", true= ) < 0) + return -1; + } + if (virJSONValueArrayAppend(disks, &disk) < 0) return -1; - } - if (virJSONValueArrayAppend(disks, &disk) < 0) - return -1; =20 - break; - case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_BLOCK: - case VIR_STORAGE_TYPE_DIR: - case VIR_STORAGE_TYPE_NETWORK: - case VIR_STORAGE_TYPE_VOLUME: - case VIR_STORAGE_TYPE_NVME: - case VIR_STORAGE_TYPE_VHOST_USER: - default: - virReportEnumRangeError(virStorageType, diskdef->src->type); - return -1; + break; + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_BLOCK: + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_NETWORK: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: + case VIR_STORAGE_TYPE_VHOST_USER: + default: + virReportEnumRangeError(virStorageType, diskdef->src->type); + return -1; } =20 return 0; } =20 static int -virCHMonitorBuildDisksJson(virJSONValue *content, virDomainDef *vmdef) +virCHMonitorBuildDisksJson(virJSONValue * content, virDomainDef * vmdef) { g_autoptr(virJSONValue) disks =3D NULL; size_t i; @@ -226,76 +236,86 @@ virCHMonitorBuildDisksJson(virJSONValue *content, vir= DomainDef *vmdef) } =20 static int -virCHMonitorBuildNetJson(virJSONValue *nets, virDomainNetDef *netdef) +virCHMonitorBuildNetJson(virJSONValue * nets, virDomainNetDef * netdef) { virDomainNetType netType =3D virDomainNetGetActualType(netdef); char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virJSONValue) net =3D NULL; =20 // check net type at first net =3D virJSONValueNewObject(); =20 switch (netType) { - case VIR_DOMAIN_NET_TYPE_ETHERNET: - if (netdef->guestIP.nips =3D=3D 1) { - const virNetDevIPAddr *ip =3D netdef->guestIP.ips[0]; - g_autofree char *addr =3D NULL; - virSocketAddr netmask; - g_autofree char *netmaskStr =3D NULL; - if (!(addr =3D virSocketAddrFormat(&ip->address))) - return -1; - if (virJSONValueObjectAppendString(net, "ip", addr) < 0) - return -1; - - if (virSocketAddrPrefixToNetmask(ip->prefix, &netmask, AF_INET= ) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to translate net prefix %d to net= mask"), - ip->prefix); - return -1; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (netdef->guestIP.nips =3D=3D 1) { + const virNetDevIPAddr *ip =3D netdef->guestIP.ips[0]; + g_autofree char *addr =3D NULL; + virSocketAddr netmask; + g_autofree char *netmaskStr =3D NULL; + + if (!(addr =3D virSocketAddrFormat(&ip->address))) + return -1; + if (virJSONValueObjectAppendString(net, "ip", addr) < 0) + return -1; + + if (virSocketAddrPrefixToNetmask(ip->prefix, &netmask, AF_= INET) + < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _ + ("Failed to translate net prefix %d to = netmask"), + ip->prefix); + return -1; + } + if (!(netmaskStr =3D virSocketAddrFormat(&netmask))) + return -1; + if (virJSONValueObjectAppendString(net, "mask", netmaskStr= ) < 0) + return -1; + } else if (netdef->guestIP.nips > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("ethernet type supports a single guest ip= ")); } - if (!(netmaskStr =3D virSocketAddrFormat(&netmask))) - return -1; - if (virJSONValueObjectAppendString(net, "mask", netmaskStr) < = 0) + break; + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + if ((virDomainChrType) netdef->data.vhostuser->type !=3D + VIR_DOMAIN_CHR_TYPE_UNIX) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _ + ("vhost_user type support UNIX socket in th= is CH")); return -1; - } else if (netdef->guestIP.nips > 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("ethernet type supports a single guest ip")); - } - break; - case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - if ((virDomainChrType)netdef->data.vhostuser->type !=3D VIR_DOMAIN= _CHR_TYPE_UNIX) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vhost_user type support UNIX socket in this = CH")); + } else { + if (virJSONValueObjectAppendString + (net, "vhost_socket", + netdef->data.vhostuser->data.nix.path) < 0) + return -1; + if (virJSONValueObjectAppendBoolean(net, "vhost_user", tru= e) < + 0) + return -1; + } + break; + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_LAST: + default: + virReportEnumRangeError(virDomainNetType, netType); return -1; - } else { - if (virJSONValueObjectAppendString(net, "vhost_socket", netdef= ->data.vhostuser->data.nix.path) < 0) - return -1; - if (virJSONValueObjectAppendBoolean(net, "vhost_user", true) <= 0) - return -1; - } - break; - case VIR_DOMAIN_NET_TYPE_BRIDGE: - case VIR_DOMAIN_NET_TYPE_NETWORK: - case VIR_DOMAIN_NET_TYPE_DIRECT: - case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_SERVER: - case VIR_DOMAIN_NET_TYPE_CLIENT: - case VIR_DOMAIN_NET_TYPE_MCAST: - case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_HOSTDEV: - case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_LAST: - default: - virReportEnumRangeError(virDomainNetType, netType); - return -1; } =20 if (netdef->ifname !=3D NULL) { if (virJSONValueObjectAppendString(net, "tap", netdef->ifname) < 0) return -1; } - if (virJSONValueObjectAppendString(net, "mac", virMacAddrFormat(&netde= f->mac, macaddr)) < 0) + if (virJSONValueObjectAppendString + (net, "mac", virMacAddrFormat(&netdef->mac, macaddr)) < 0) return -1; =20 =20 @@ -306,19 +326,24 @@ virCHMonitorBuildNetJson(virJSONValue *nets, virDomai= nNetDef *netdef) } } if (netdef->driver.virtio.queues) { - if (virJSONValueObjectAppendNumberInt(net, "num_queues", netdef->d= river.virtio.queues) < 0) + if (virJSONValueObjectAppendNumberInt + (net, "num_queues", netdef->driver.virtio.queues) < 0) return -1; } =20 - if (netdef->driver.virtio.rx_queue_size || netdef->driver.virtio.tx_qu= eue_size) { - if (netdef->driver.virtio.rx_queue_size !=3D netdef->driver.virtio= .tx_queue_size) { + if (netdef->driver.virtio.rx_queue_size + || netdef->driver.virtio.tx_queue_size) { + if (netdef->driver.virtio.rx_queue_size !=3D + netdef->driver.virtio.tx_queue_size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtio rx_queue_size option %d is not same with tx_queue= _size %d"), - netdef->driver.virtio.rx_queue_size, - netdef->driver.virtio.tx_queue_size); + _ + ("virtio rx_queue_size option %d is not same wi= th tx_queue_size %d"), + netdef->driver.virtio.rx_queue_size, + netdef->driver.virtio.tx_queue_size); return -1; } - if (virJSONValueObjectAppendNumberInt(net, "queue_size", netdef->d= river.virtio.rx_queue_size) < 0) + if (virJSONValueObjectAppendNumberInt + (net, "queue_size", netdef->driver.virtio.rx_queue_size) < 0) return -1; } =20 @@ -329,7 +354,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, virDomainN= etDef *netdef) } =20 static int -virCHMonitorBuildNetsJson(virJSONValue *content, virDomainDef *vmdef) +virCHMonitorBuildNetsJson(virJSONValue * content, virDomainDef * vmdef) { g_autoptr(virJSONValue) nets =3D NULL; size_t i; @@ -349,13 +374,12 @@ virCHMonitorBuildNetsJson(virJSONValue *content, virD= omainDef *vmdef) } =20 static int -virCHMonitorBuildVMJson(virDomainDef *vmdef, char **jsonstr) +virCHMonitorBuildVMJson(virDomainDef * vmdef, char **jsonstr) { g_autoptr(virJSONValue) content =3D virJSONValueNewObject(); =20 if (vmdef =3D=3D NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("VM is not defined")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("VM is not defined"= )); return -1; } =20 @@ -391,8 +415,7 @@ chMonitorCreateSocket(const char *socket_path) int fd; =20 if ((fd =3D socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - virReportSystemError(errno, "%s", - _("Unable to create UNIX socket")); + virReportSystemError(errno, "%s", _("Unable to create UNIX socket"= )); goto error; } =20 @@ -400,19 +423,16 @@ chMonitorCreateSocket(const char *socket_path) addr.sun_family =3D AF_UNIX; if (virStrcpyStatic(addr.sun_path, socket_path) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("UNIX socket path '%s' too long"), - socket_path); + _("UNIX socket path '%s' too long"), socket_path); goto error; } =20 if (unlink(socket_path) < 0 && errno !=3D ENOENT) { - virReportSystemError(errno, - _("Unable to unlink %s"), - socket_path); + virReportSystemError(errno, _("Unable to unlink %s"), socket_path); goto error; } =20 - if (bind(fd, (struct sockaddr *)&addr, addrlen) < 0) { + if (bind(fd, (struct sockaddr *) &addr, addrlen) < 0) { virReportSystemError(errno, _("Unable to bind to UNIX socket path '%s'"), socket_path); @@ -440,7 +460,7 @@ chMonitorCreateSocket(const char *socket_path) } =20 virCHMonitor * -virCHMonitorNew(virDomainObj *vm, const char *socketdir) +virCHMonitorNew(virDomainObj * vm, const char *socketdir) { g_autoptr(virCHMonitor) mon =3D NULL; g_autoptr(virCommand) cmd =3D NULL; @@ -453,8 +473,7 @@ virCHMonitorNew(virDomainObj *vm, const char *socketdir) return NULL; =20 if (!vm->def) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("VM is not defined")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("VM is not defined"= )); return NULL; } =20 @@ -472,8 +491,7 @@ virCHMonitorNew(virDomainObj *vm, const char *socketdir) socket_fd =3D chMonitorCreateSocket(mon->socketpath); if (socket_fd < 0) { virReportSystemError(errno, - _("Cannot create socket '%s'"), - mon->socketpath); + _("Cannot create socket '%s'"), mon->socketpa= th); return NULL; } =20 @@ -494,7 +512,8 @@ virCHMonitorNew(virDomainObj *vm, const char *socketdir) return g_steal_pointer(&mon); } =20 -static void virCHMonitorDispose(void *opaque) +static void +virCHMonitorDispose(void *opaque) { virCHMonitor *mon =3D opaque; =20 @@ -502,7 +521,8 @@ static void virCHMonitorDispose(void *opaque) virObjectUnref(mon->vm); } =20 -void virCHMonitorClose(virCHMonitor *mon) +void +virCHMonitorClose(virCHMonitor * mon) { if (!mon) return; @@ -518,8 +538,7 @@ void virCHMonitorClose(virCHMonitor *mon) =20 if (mon->socketpath) { if (virFileRemove(mon->socketpath, -1, -1) < 0) { - VIR_WARN("Unable to remove CH socket file '%s'", - mon->socketpath); + VIR_WARN("Unable to remove CH socket file '%s'", mon->socketpa= th); } g_free(mon->socketpath); } @@ -528,7 +547,7 @@ void virCHMonitorClose(virCHMonitor *mon) } =20 static int -virCHMonitorCurlPerform(CURL *handle) +virCHMonitorCurlPerform(CURL * handle) { CURLcode errorCode; long responseCode =3D 0; @@ -547,8 +566,9 @@ virCHMonitorCurlPerform(CURL *handle) =20 if (errorCode !=3D CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) return= ed an " - "error: %s (%d)"), curl_easy_strerror(errorCode), + _ + ("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returne= d an " + "error: %s (%d)"), curl_easy_strerror(errorCode), errorCode); return -1; } @@ -564,7 +584,7 @@ virCHMonitorCurlPerform(CURL *handle) } =20 int -virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint) +virCHMonitorPutNoContent(virCHMonitor * mon, const char *endpoint) { g_autofree char *url =3D NULL; int responseCode =3D 0; @@ -615,13 +635,14 @@ curl_callback(void *contents, size_t size, size_t nme= mb, void *userp) } =20 static int -virCHMonitorGet(virCHMonitor *mon, const char *endpoint, virJSONValue **re= sponse) +virCHMonitorGet(virCHMonitor * mon, const char *endpoint, + virJSONValue ** response) { g_autofree char *url =3D NULL; int responseCode =3D 0; int ret =3D -1; struct curl_slist *headers =3D NULL; - struct curl_data data =3D {0}; + struct curl_data data =3D { 0 }; =20 url =3D g_strdup_printf("%s/%s", URL_ROOT, endpoint); =20 @@ -638,7 +659,7 @@ virCHMonitorGet(virCHMonitor *mon, const char *endpoint= , virJSONValue **response headers =3D curl_slist_append(headers, "Content-Type: application/= json"); curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(mon->handle, CURLOPT_WRITEFUNCTION, curl_callback= ); - curl_easy_setopt(mon->handle, CURLOPT_WRITEDATA, (void *)&data); + curl_easy_setopt(mon->handle, CURLOPT_WRITEDATA, (void *) &data); } =20 responseCode =3D virCHMonitorCurlPerform(mon->handle); @@ -665,13 +686,13 @@ virCHMonitorGet(virCHMonitor *mon, const char *endpoi= nt, virJSONValue **response } =20 int -virCHMonitorShutdownVMM(virCHMonitor *mon) +virCHMonitorShutdownVMM(virCHMonitor * mon) { return virCHMonitorPutNoContent(mon, URL_VMM_SHUTDOWN); } =20 int -virCHMonitorCreateVM(virCHMonitor *mon) +virCHMonitorCreateVM(virCHMonitor * mon) { g_autofree char *url =3D NULL; int responseCode =3D 0; @@ -709,31 +730,31 @@ virCHMonitorCreateVM(virCHMonitor *mon) } =20 int -virCHMonitorBootVM(virCHMonitor *mon) +virCHMonitorBootVM(virCHMonitor * mon) { return virCHMonitorPutNoContent(mon, URL_VM_BOOT); } =20 int -virCHMonitorShutdownVM(virCHMonitor *mon) +virCHMonitorShutdownVM(virCHMonitor * mon) { return virCHMonitorPutNoContent(mon, URL_VM_SHUTDOWN); } =20 int -virCHMonitorRebootVM(virCHMonitor *mon) +virCHMonitorRebootVM(virCHMonitor * mon) { return virCHMonitorPutNoContent(mon, URL_VM_REBOOT); } =20 int -virCHMonitorSuspendVM(virCHMonitor *mon) +virCHMonitorSuspendVM(virCHMonitor * mon) { return virCHMonitorPutNoContent(mon, URL_VM_Suspend); } =20 int -virCHMonitorResumeVM(virCHMonitor *mon) +virCHMonitorResumeVM(virCHMonitor * mon) { return virCHMonitorPutNoContent(mon, URL_VM_RESUME); } @@ -748,7 +769,7 @@ virCHMonitorResumeVM(virCHMonitor *mon) * Returns 0 on success. */ int -virCHMonitorGetInfo(virCHMonitor *mon, virJSONValue **info) +virCHMonitorGetInfo(virCHMonitor * mon, virJSONValue ** info) { return virCHMonitorGet(mon, URL_VM_INFO, info); } --=20 2.27.0