From nobody Mon Dec 15 23:14:01 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 1502895583070950.4552518688122; Wed, 16 Aug 2017 07:59:43 -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 F21CC2C85; Wed, 16 Aug 2017 14:59:40 +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 C19B26EE25; Wed, 16 Aug 2017 14:59:40 +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 84ED53FAD4; Wed, 16 Aug 2017 14:59:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7GEw6Ai008013 for ; Wed, 16 Aug 2017 10:58:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5AA5D6EE34; Wed, 16 Aug 2017 14:58:06 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3C4E6FA84; Wed, 16 Aug 2017 14:58:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F21CC2C85 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 16 Aug 2017 16:57:55 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 06/12] conf: Return any non-zero value from virDomainDeviceInfoIterateInternal callback 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.27]); Wed, 16 Aug 2017 14:59:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Post parse callbacks will need to be able to signal that they failed non-fatally. This means that we need to return the value returned by the callback without modification. --- src/conf/domain_conf.c | 93 +++++++++++++++++++++++++---------------------= ---- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 298fe9b4e..f94317e52 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3570,146 +3570,147 @@ virDomainDeviceInfoIterateInternal(virDomainDefPt= r def, void *opaque) { size_t i; + int ret; virDomainDeviceDef device; device.type =3D VIR_DOMAIN_DEVICE_DISK; for (i =3D 0; i < def->ndisks; i++) { device.data.disk =3D def->disks[i]; - if (cb(def, &device, &def->disks[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->disks[i]->info, opaque)) !=3D = 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_NET; for (i =3D 0; i < def->nnets; i++) { device.data.net =3D def->nets[i]; - if (cb(def, &device, &def->nets[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->nets[i]->info, opaque)) !=3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_SOUND; for (i =3D 0; i < def->nsounds; i++) { device.data.sound =3D def->sounds[i]; - if (cb(def, &device, &def->sounds[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->sounds[i]->info, opaque)) !=3D= 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_HOSTDEV; for (i =3D 0; i < def->nhostdevs; i++) { device.data.hostdev =3D def->hostdevs[i]; - if (cb(def, &device, def->hostdevs[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, def->hostdevs[i]->info, opaque)) != =3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_VIDEO; for (i =3D 0; i < def->nvideos; i++) { device.data.video =3D def->videos[i]; - if (cb(def, &device, &def->videos[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->videos[i]->info, opaque)) !=3D= 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_CONTROLLER; for (i =3D 0; i < def->ncontrollers; i++) { device.data.controller =3D def->controllers[i]; - if (cb(def, &device, &def->controllers[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->controllers[i]->info, opaque))= !=3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_SMARTCARD; for (i =3D 0; i < def->nsmartcards; i++) { device.data.smartcard =3D def->smartcards[i]; - if (cb(def, &device, &def->smartcards[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->smartcards[i]->info, opaque)) = !=3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_CHR; for (i =3D 0; i < def->nserials; i++) { device.data.chr =3D def->serials[i]; - if (cb(def, &device, &def->serials[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->serials[i]->info, opaque)) != =3D 0) + return ret; } for (i =3D 0; i < def->nparallels; i++) { device.data.chr =3D def->parallels[i]; - if (cb(def, &device, &def->parallels[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->parallels[i]->info, opaque)) != =3D 0) + return ret; } for (i =3D 0; i < def->nchannels; i++) { device.data.chr =3D def->channels[i]; - if (cb(def, &device, &def->channels[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->channels[i]->info, opaque)) != =3D 0) + return ret; } for (i =3D 0; i < def->nconsoles; i++) { if (virDomainSkipBackcompatConsole(def, i, all)) continue; device.data.chr =3D def->consoles[i]; - if (cb(def, &device, &def->consoles[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->consoles[i]->info, opaque)) != =3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_INPUT; for (i =3D 0; i < def->ninputs; i++) { device.data.input =3D def->inputs[i]; - if (cb(def, &device, &def->inputs[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->inputs[i]->info, opaque)) !=3D= 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_FS; for (i =3D 0; i < def->nfss; i++) { device.data.fs =3D def->fss[i]; - if (cb(def, &device, &def->fss[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->fss[i]->info, opaque)) !=3D 0) + return ret; } if (def->watchdog) { device.type =3D VIR_DOMAIN_DEVICE_WATCHDOG; device.data.watchdog =3D def->watchdog; - if (cb(def, &device, &def->watchdog->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->watchdog->info, opaque)) !=3D = 0) + return ret; } if (def->memballoon) { device.type =3D VIR_DOMAIN_DEVICE_MEMBALLOON; device.data.memballoon =3D def->memballoon; - if (cb(def, &device, &def->memballoon->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->memballoon->info, opaque)) != =3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_RNG; for (i =3D 0; i < def->nrngs; i++) { device.data.rng =3D def->rngs[i]; - if (cb(def, &device, &def->rngs[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->rngs[i]->info, opaque)) !=3D 0) + return ret; } if (def->nvram) { device.type =3D VIR_DOMAIN_DEVICE_NVRAM; device.data.nvram =3D def->nvram; - if (cb(def, &device, &def->nvram->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->nvram->info, opaque)) !=3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_HUB; for (i =3D 0; i < def->nhubs; i++) { device.data.hub =3D def->hubs[i]; - if (cb(def, &device, &def->hubs[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->hubs[i]->info, opaque)) !=3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_SHMEM; for (i =3D 0; i < def->nshmems; i++) { device.data.shmem =3D def->shmems[i]; - if (cb(def, &device, &def->shmems[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->shmems[i]->info, opaque)) !=3D= 0) + return ret; } if (def->tpm) { device.type =3D VIR_DOMAIN_DEVICE_TPM; device.data.tpm =3D def->tpm; - if (cb(def, &device, &def->tpm->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->tpm->info, opaque)) !=3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_PANIC; for (i =3D 0; i < def->npanics; i++) { device.data.panic =3D def->panics[i]; - if (cb(def, &device, &def->panics[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->panics[i]->info, opaque)) !=3D= 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_MEMORY; for (i =3D 0; i < def->nmems; i++) { device.data.memory =3D def->mems[i]; - if (cb(def, &device, &def->mems[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->mems[i]->info, opaque)) !=3D 0) + return ret; } device.type =3D VIR_DOMAIN_DEVICE_REDIRDEV; for (i =3D 0; i < def->nredirdevs; i++) { device.data.redirdev =3D def->redirdevs[i]; - if (cb(def, &device, &def->redirdevs[i]->info, opaque) < 0) - return -1; + if ((ret =3D cb(def, &device, &def->redirdevs[i]->info, opaque)) != =3D 0) + return ret; } /* Coverity is not very happy with this - all dead_error_condition */ --=20 2.14.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list