From nobody Sat Feb 7 10:50:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607709969; cv=none; d=zohomail.com; s=zohoarc; b=eu6w1vdTv9hobtYn8jw0spiLmFdQZqIlglPxwHko/qKlymI2hg7O52XCU91RzRvUAI7u8qqrTjV1BjPXwmgpfp6sdOMN8v+UoamUY2Wylk6a6MEbmATOEczXJugVZ4dOfYWoCdplT6OE81pTKQe4rD4Zb4Fhnz8TF3L/yy5DJpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607709969; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1hhPR0JiD10kLuIATCXApFf8IlHi9LJH3n+jOMTo44Q=; b=RgsnpoRFzALmsxO9XB2C1SdRBI/9AODVu5B9iy0XkV3ZRiBKtlbYeXBWN6FUdxaz60zSVpFLUoE5cRwwg0oRYXRwea5IpYAni5Sa9IVTDO8kpRPPqrsWAC8glS8xexhODg/r4gC6/ZBp44BDixbvlRA/OpalQcFMe5aOBQqjlSM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1607709969478105.36134200478364; Fri, 11 Dec 2020 10:06:09 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-594-pv_LT3tIO_SyZGZjpRSPKg-1; Fri, 11 Dec 2020 13:06:04 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45F5E80362F; Fri, 11 Dec 2020 18:05:57 +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 22C6E5F9D0; Fri, 11 Dec 2020 18:05:57 +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 E41585002E; Fri, 11 Dec 2020 18:05:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BBI5pSa027626 for ; Fri, 11 Dec 2020 13:05:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 87BDF2026D12; Fri, 11 Dec 2020 18:05:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 831222026D11 for ; Fri, 11 Dec 2020 18:05:51 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6ACA8858287 for ; Fri, 11 Dec 2020 18:05:51 +0000 (UTC) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-iVkSQqmtMVS47ormtiJmkg-1; Fri, 11 Dec 2020 13:05:48 -0500 Received: by mail-qt1-f172.google.com with SMTP id z3so7072483qtw.9 for ; Fri, 11 Dec 2020 10:05:48 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:9e32:a7fb:6602:e8c2:3c0f]) by smtp.gmail.com with ESMTPSA id y6sm7585703qkj.60.2020.12.11.10.05.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 10:05:44 -0800 (PST) X-MC-Unique: pv_LT3tIO_SyZGZjpRSPKg-1 X-MC-Unique: iVkSQqmtMVS47ormtiJmkg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1hhPR0JiD10kLuIATCXApFf8IlHi9LJH3n+jOMTo44Q=; b=CUNKUOzhrY/mMMzWoweAT98nXm6yA2pf5eo6tLnb2o7PNWH6OCe1DbkNw6uGFBCEQm 2bJ6e59HP84J/pVWANxvreVTzAoedgwTnioSRS2NPsxZ0vtFL/Onf6otO5dxj2xf3gqM VVmsXQkzJgZD77KdSFOcBdCnCBPLqzcqOCoOcAbp9bRn1XxvLUt0TpUeGMB5iP3M1UeW rYZDvD+Dvln+mMUTDhezudI/FYplnxiQr3LjAWvvUORhIURoQ+1wFi7Xr+L50GVMdhPw j47auiCByoFhTjCY9o3tBo+T+cbIq8mSOP/I5+lT5zPVCpTr34IJEgVNS/c2UKkYTnPj 45ww== X-Gm-Message-State: AOAM530iKXgM/rZ6N/H7H2FnWGAazPBBG1PKQCIDEhugLzB+tvWU0LJx 6nNc11QY6FdqW7C+wRcdjJGavDjEv7q43g== X-Google-Smtp-Source: ABdhPJyqh8srcMsSvIhGypnBwX+DHgDF+s+WImKobC40kaK3c1D4s7O3t3dRawWgmp32u5mlXi+tIQ== X-Received: by 2002:a05:622a:207:: with SMTP id b7mr17077201qtx.117.1607709944554; Fri, 11 Dec 2020 10:05:44 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH 09/12] domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c Date: Fri, 11 Dec 2020 15:05:13 -0300 Message-Id: <20201211180516.1952683-10-danielhb413@gmail.com> In-Reply-To: <20201211180516.1952683-1-danielhb413@gmail.com> References: <20201211180516.1952683-1-danielhb413@gmail.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.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.16 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 88 -------------------------------------- src/conf/domain_conf.h | 6 +-- src/conf/domain_validate.c | 88 ++++++++++++++++++++++++++++++++++++++ src/conf/domain_validate.h | 5 +++ 4 files changed, 94 insertions(+), 93 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ebe895948f..26c48ef38c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6022,94 +6022,6 @@ virDomainDefHasUSB(const virDomainDef *def) } =20 =20 -static int -virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, - const virDomainDef *def) -{ - switch ((virDomainDeviceType) dev->type) { - case VIR_DOMAIN_DEVICE_DISK: - return virDomainDiskDefValidate(def, dev->data.disk); - - case VIR_DOMAIN_DEVICE_REDIRDEV: - return virDomainRedirdevDefValidate(def, dev->data.redirdev); - - case VIR_DOMAIN_DEVICE_NET: - return virDomainNetDefValidate(dev->data.net); - - case VIR_DOMAIN_DEVICE_CONTROLLER: - return virDomainControllerDefValidate(dev->data.controller); - - case VIR_DOMAIN_DEVICE_CHR: - return virDomainChrDefValidate(dev->data.chr, def); - - case VIR_DOMAIN_DEVICE_SMARTCARD: - return virDomainSmartcardDefValidate(dev->data.smartcard, def); - - case VIR_DOMAIN_DEVICE_RNG: - return virDomainRNGDefValidate(dev->data.rng, def); - - case VIR_DOMAIN_DEVICE_HOSTDEV: - return virDomainHostdevDefValidate(dev->data.hostdev); - - case VIR_DOMAIN_DEVICE_VIDEO: - return virDomainVideoDefValidate(dev->data.video, def); - - case VIR_DOMAIN_DEVICE_MEMORY: - return virDomainMemoryDefValidate(dev->data.memory, def); - - case VIR_DOMAIN_DEVICE_VSOCK: - return virDomainVsockDefValidate(dev->data.vsock); - - case VIR_DOMAIN_DEVICE_INPUT: - return virDomainInputDefValidate(dev->data.input); - - case VIR_DOMAIN_DEVICE_SHMEM: - return virDomainShmemDefValidate(dev->data.shmem); - - case VIR_DOMAIN_DEVICE_AUDIO: - /* TODO: validate? */ - case VIR_DOMAIN_DEVICE_LEASE: - case VIR_DOMAIN_DEVICE_FS: - case VIR_DOMAIN_DEVICE_SOUND: - case VIR_DOMAIN_DEVICE_WATCHDOG: - case VIR_DOMAIN_DEVICE_GRAPHICS: - case VIR_DOMAIN_DEVICE_HUB: - case VIR_DOMAIN_DEVICE_MEMBALLOON: - case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_TPM: - case VIR_DOMAIN_DEVICE_PANIC: - case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_NONE: - case VIR_DOMAIN_DEVICE_LAST: - break; - } - - return 0; -} - - -int -virDomainDeviceDefValidate(const virDomainDeviceDef *dev, - const virDomainDef *def, - unsigned int parseFlags, - virDomainXMLOptionPtr xmlopt, - void *parseOpaque) -{ - /* validate configuration only in certain places */ - if (parseFlags & VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE) - return 0; - - if (xmlopt->config.deviceValidateCallback && - xmlopt->config.deviceValidateCallback(dev, def, xmlopt->config.pri= v, parseOpaque)) - return -1; - - if (virDomainDeviceDefValidateInternal(dev, def) < 0) - return -1; - - return 0; -} - - bool virDomainDefLifecycleActionAllowed(virDomainLifecycle type, virDomainLifecycleAction action) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e35c4206df..ce8ed48a04 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3122,11 +3122,7 @@ void virDomainRedirdevDefFree(virDomainRedirdevDefPt= r def); void virDomainRedirFilterDefFree(virDomainRedirFilterDefPtr def); void virDomainShmemDefFree(virDomainShmemDefPtr def); void virDomainDeviceDefFree(virDomainDeviceDefPtr def); -int virDomainDeviceDefValidate(const virDomainDeviceDef *dev, - const virDomainDef *def, - unsigned int parseFlags, - virDomainXMLOptionPtr xmlopt, - void *parseOpaque); + G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainDeviceDef, virDomainDeviceDefFree); virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomainDeviceDefPtr src, const virDomainDef *def, diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index ec955daf66..8acb7c1044 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1471,3 +1471,91 @@ virDomainShmemDefValidate(const virDomainShmemDef *s= hmem) =20 return 0; } + + +static int +virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, + const virDomainDef *def) +{ + switch ((virDomainDeviceType) dev->type) { + case VIR_DOMAIN_DEVICE_DISK: + return virDomainDiskDefValidate(def, dev->data.disk); + + case VIR_DOMAIN_DEVICE_REDIRDEV: + return virDomainRedirdevDefValidate(def, dev->data.redirdev); + + case VIR_DOMAIN_DEVICE_NET: + return virDomainNetDefValidate(dev->data.net); + + case VIR_DOMAIN_DEVICE_CONTROLLER: + return virDomainControllerDefValidate(dev->data.controller); + + case VIR_DOMAIN_DEVICE_CHR: + return virDomainChrDefValidate(dev->data.chr, def); + + case VIR_DOMAIN_DEVICE_SMARTCARD: + return virDomainSmartcardDefValidate(dev->data.smartcard, def); + + case VIR_DOMAIN_DEVICE_RNG: + return virDomainRNGDefValidate(dev->data.rng, def); + + case VIR_DOMAIN_DEVICE_HOSTDEV: + return virDomainHostdevDefValidate(dev->data.hostdev); + + case VIR_DOMAIN_DEVICE_VIDEO: + return virDomainVideoDefValidate(dev->data.video, def); + + case VIR_DOMAIN_DEVICE_MEMORY: + return virDomainMemoryDefValidate(dev->data.memory, def); + + case VIR_DOMAIN_DEVICE_VSOCK: + return virDomainVsockDefValidate(dev->data.vsock); + + case VIR_DOMAIN_DEVICE_INPUT: + return virDomainInputDefValidate(dev->data.input); + + case VIR_DOMAIN_DEVICE_SHMEM: + return virDomainShmemDefValidate(dev->data.shmem); + + case VIR_DOMAIN_DEVICE_AUDIO: + /* TODO: validate? */ + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_PANIC: + case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_NONE: + case VIR_DOMAIN_DEVICE_LAST: + break; + } + + return 0; +} + + +int +virDomainDeviceDefValidate(const virDomainDeviceDef *dev, + const virDomainDef *def, + unsigned int parseFlags, + virDomainXMLOptionPtr xmlopt, + void *parseOpaque) +{ + /* validate configuration only in certain places */ + if (parseFlags & VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE) + return 0; + + if (xmlopt->config.deviceValidateCallback && + xmlopt->config.deviceValidateCallback(dev, def, xmlopt->config.pri= v, parseOpaque)) + return -1; + + if (virDomainDeviceDefValidateInternal(dev, def) < 0) + return -1; + + return 0; +} diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index e04ecab065..710515a6ff 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -57,3 +57,8 @@ int virDomainMemoryDefValidate(const virDomainMemoryDef *= mem, int virDomainVsockDefValidate(const virDomainVsockDef *vsock); int virDomainInputDefValidate(const virDomainInputDef *input); int virDomainShmemDefValidate(const virDomainShmemDef *shmem); +int virDomainDeviceDefValidate(const virDomainDeviceDef *dev, + const virDomainDef *def, + unsigned int parseFlags, + virDomainXMLOptionPtr xmlopt, + void *parseOpaque); --=20 2.26.2