From nobody Mon Feb 9 23:44:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 163848580299266.6322286783145; Thu, 2 Dec 2021 14:56:42 -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-21-j17x3aKIOw2DSosgkYlA3A-1; Thu, 02 Dec 2021 17:56:38 -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 88BE4192CC40; Thu, 2 Dec 2021 22:56:32 +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 0F477ADC5; 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 8023A1809C89; Thu, 2 Dec 2021 22:56:28 +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 1B2MuQH0015574 for ; Thu, 2 Dec 2021 17:56:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id D4A181402408; Thu, 2 Dec 2021 22:56:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D08C01402406 for ; Thu, 2 Dec 2021 22:56:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (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 B7194811E7A for ; Thu, 2 Dec 2021 22:56:26 +0000 (UTC) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by relay.mimecast.com with ESMTP id us-mta-333-QY0h2HlPPlO5ympk3ITF-g-1; Thu, 02 Dec 2021 17:56:24 -0500 Received: from prapal-ch2.oiwy50ateaxezb1sqsoezlib2f.xx.internal.cloudapp.net (unknown [20.80.162.67]) by linux.microsoft.com (Postfix) with ESMTPSA id 56F8E20E67B1; Thu, 2 Dec 2021 14:56:24 -0800 (PST) X-MC-Unique: j17x3aKIOw2DSosgkYlA3A-1 X-MC-Unique: QY0h2HlPPlO5ympk3ITF-g-1 DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 56F8E20E67B1 From: Praveen K Paladugu To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/17] ch_domain: fix indentation in ch_domain Date: Thu, 2 Dec 2021 22:56:00 +0000 Message-Id: <20211202225614.1118066-4-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 1B2MuQH0015574 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: 1638485803882100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Praveen K Paladugu --- src/ch/ch_domain.c | 130 ++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 66 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index dd4de9e1ea..44f7d26ca4 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -30,16 +30,12 @@ =20 VIR_ENUM_IMPL(virCHDomainJob, CH_JOB_LAST, - "none", - "query", - "destroy", - "modify", -); + "none", "query", "destroy", "modify",); =20 VIR_LOG_INIT("ch.ch_domain"); =20 static int -virCHDomainObjInitJob(virCHDomainObjPrivate *priv) +virCHDomainObjInitJob(virCHDomainObjPrivate * priv) { memset(&priv->job, 0, sizeof(priv->job)); =20 @@ -50,7 +46,7 @@ virCHDomainObjInitJob(virCHDomainObjPrivate *priv) } =20 static void -virCHDomainObjResetJob(virCHDomainObjPrivate *priv) +virCHDomainObjResetJob(virCHDomainObjPrivate * priv) { struct virCHDomainJobObj *job =3D &priv->job; =20 @@ -59,7 +55,7 @@ virCHDomainObjResetJob(virCHDomainObjPrivate *priv) } =20 static void -virCHDomainObjFreeJob(virCHDomainObjPrivate *priv) +virCHDomainObjFreeJob(virCHDomainObjPrivate * priv) { ignore_value(virCondDestroy(&priv->job.cond)); } @@ -74,7 +70,7 @@ virCHDomainObjFreeJob(virCHDomainObjPrivate *priv) * Successful calls must be followed by EndJob eventually. */ int -virCHDomainObjBeginJob(virDomainObj *obj, enum virCHDomainJob job) +virCHDomainObjBeginJob(virDomainObj * obj, enum virCHDomainJob job) { virCHDomainObjPrivate *priv =3D obj->privateData; unsigned long long now; @@ -121,13 +117,12 @@ virCHDomainObjBeginJob(virDomainObj *obj, enum virCHD= omainJob job) * earlier virCHDomainBeginJob() call */ void -virCHDomainObjEndJob(virDomainObj *obj) +virCHDomainObjEndJob(virDomainObj * obj) { virCHDomainObjPrivate *priv =3D obj->privateData; enum virCHDomainJob job =3D priv->job.active; =20 - VIR_DEBUG("Stopping job: %s", - virCHDomainJobTypeToString(job)); + VIR_DEBUG("Stopping job: %s", virCHDomainJobTypeToString(job)); =20 virCHDomainObjResetJob(priv); virCondSignal(&priv->job.cond); @@ -170,8 +165,7 @@ virDomainXMLPrivateDataCallbacks virCHDriverPrivateData= Callbacks =3D { }; =20 static int -virCHDomainDefPostParseBasic(virDomainDef *def, - void *opaque G_GNUC_UNUSED) +virCHDomainDefPostParseBasic(virDomainDef * def, void *opaque G_GNUC_UNUSE= D) { /* check for emulator and create a default one if needed */ if (!def->emulator) { @@ -186,71 +180,70 @@ virCHDomainDefPostParseBasic(virDomainDef *def, } =20 static int -virCHDomainDefPostParse(virDomainDef *def, +virCHDomainDefPostParse(virDomainDef * def, unsigned int parseFlags G_GNUC_UNUSED, - void *opaque, - void *parseOpaque G_GNUC_UNUSED) + void *opaque, void *parseOpaque G_GNUC_UNUSED) { virCHDriver *driver =3D opaque; + g_autoptr(virCaps) caps =3D virCHDriverGetCapabilities(driver, false); if (!caps) return -1; if (!virCapabilitiesDomainSupported(caps, def->os.type, - def->os.arch, - def->virtType)) + def->os.arch, def->virtType)) return -1; =20 return 0; } =20 static int -chValidateDomainDeviceDef(const virDomainDeviceDef *dev, - const virDomainDef *def G_GNUC_UNUSED, +chValidateDomainDeviceDef(const virDomainDeviceDef * dev, + const virDomainDef * def G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED, void *parseOpaque G_GNUC_UNUSED) { - switch ((virDomainDeviceType)dev->type) { - case VIR_DOMAIN_DEVICE_DISK: - case VIR_DOMAIN_DEVICE_NET: - case VIR_DOMAIN_DEVICE_MEMORY: - case VIR_DOMAIN_DEVICE_VSOCK: - case VIR_DOMAIN_DEVICE_CONTROLLER: - case VIR_DOMAIN_DEVICE_CHR: - break; - - case VIR_DOMAIN_DEVICE_LEASE: - case VIR_DOMAIN_DEVICE_FS: - case VIR_DOMAIN_DEVICE_INPUT: - case VIR_DOMAIN_DEVICE_SOUND: - case VIR_DOMAIN_DEVICE_VIDEO: - case VIR_DOMAIN_DEVICE_HOSTDEV: - case VIR_DOMAIN_DEVICE_WATCHDOG: - case VIR_DOMAIN_DEVICE_GRAPHICS: - case VIR_DOMAIN_DEVICE_HUB: - case VIR_DOMAIN_DEVICE_REDIRDEV: - case VIR_DOMAIN_DEVICE_SMARTCARD: - case VIR_DOMAIN_DEVICE_MEMBALLOON: - case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_RNG: - case VIR_DOMAIN_DEVICE_SHMEM: - case VIR_DOMAIN_DEVICE_TPM: - case VIR_DOMAIN_DEVICE_PANIC: - case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_AUDIO: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cloud-Hypervisor doesn't support '%s' device"), - virDomainDeviceTypeToString(dev->type)); - return -1; + switch ((virDomainDeviceType) dev->type) { + case VIR_DOMAIN_DEVICE_DISK: + case VIR_DOMAIN_DEVICE_NET: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_VSOCK: + case VIR_DOMAIN_DEVICE_CONTROLLER: + case VIR_DOMAIN_DEVICE_CHR: + break; + + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_VIDEO: + case VIR_DOMAIN_DEVICE_HOSTDEV: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_REDIRDEV: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_RNG: + case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_PANIC: + case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_AUDIO: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Cloud-Hypervisor doesn't support '%s' device= "), + virDomainDeviceTypeToString(dev->type)); + return -1; =20 - case VIR_DOMAIN_DEVICE_NONE: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unexpected VIR_DOMAIN_DEVICE_NONE")); - return -1; + case VIR_DOMAIN_DEVICE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected VIR_DOMAIN_DEVICE_NONE")); + return -1; =20 - case VIR_DOMAIN_DEVICE_LAST: - default: - virReportEnumRangeError(virDomainDeviceType, dev->type); - return -1; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportEnumRangeError(virDomainDeviceType, dev->type); + return -1; } =20 if ((def->nconsoles && @@ -258,25 +251,30 @@ chValidateDomainDeviceDef(const virDomainDeviceDef *d= ev, && (def->nserials && def->serials[0]->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_PTY))= { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only a single console or serial can be configure= d for this domain")); + _ + ("Only a single console or serial can be configured= for this domain")); return -1; } else if (def->nconsoles > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only a single console can be configured for this= domain")); + _ + ("Only a single console can be configured for this = domain")); return -1; } else if (def->nserials > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only a single serial can be configured for this = domain")); + _ + ("Only a single serial can be configured for this d= omain")); return -1; } =20 - if (def->nconsoles && def->consoles[0]->source->type !=3D VIR_DOMAIN_C= HR_TYPE_PTY) { + if (def->nconsoles + && def->consoles[0]->source->type !=3D VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Console can only be enabled for a PTY")); return -1; } =20 - if (def->nserials && def->serials[0]->source->type !=3D VIR_DOMAIN_CHR= _TYPE_PTY) { + if (def->nserials + && def->serials[0]->source->type !=3D VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Serial can only be enabled for a PTY")); return -1; --=20 2.27.0