From nobody Sat Feb 7 10:50:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1607709976; cv=none; d=zohomail.com; s=zohoarc; b=SmPIHHOc00MX5MJ0xarn1/iJN9wRW6LtVZdTXIE2l9zeqI6lEEQZPKRyydmYF8/OaN0iWUjWbu0fYcwF7R4k8x8lPPLw9OA37ehxKEFhTMh3XERS6io4lvlKbbfyqk6bgco97MHQBy606Fz8V9jtwOROhPErYvVshVOmvKt+TT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607709976; 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=zdQnRlbmwbP4J9NM1Br9t8AqFYILsqP78q9WQtgbFRA=; b=PLQVgvx78DvTHOjEwrEqAfo4GYc+CYMZ73Yxj/EA+Cwk6o5RgcQNSSZOLeSJsVzOvl9WJVOczsTFmf+/EhqZY6yTzPce6UDSxrRBONj7SFQXbeIzGKAxmZgNfK1icoaSaFgYroar2n/C48Fp7vp3ucEZyB9FHeLA4LPP9Gy35Hs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1607709976746973.0034330536301; Fri, 11 Dec 2020 10:06:16 -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-567-oRpPSBLEOQ-q2Lge5uRbgA-1; Fri, 11 Dec 2020 13:06:11 -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 D3E1C8030BC; Fri, 11 Dec 2020 18:05:58 +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 ACE5E57; Fri, 11 Dec 2020 18:05:58 +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 7C03850038; Fri, 11 Dec 2020 18:05:58 +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 0BBI5u8v027648 for ; Fri, 11 Dec 2020 13:05:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1327BF3D28; Fri, 11 Dec 2020 18:05:56 +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 0CA82F3D25 for ; Fri, 11 Dec 2020 18:05:53 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 B4AB8858284 for ; Fri, 11 Dec 2020 18:05:53 +0000 (UTC) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-234-4d_z55RvMxa7067idclvbw-1; Fri, 11 Dec 2020 13:05:49 -0500 Received: by mail-qt1-f182.google.com with SMTP id h19so7048216qtq.13 for ; Fri, 11 Dec 2020 10:05:49 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 10:05:48 -0800 (PST) X-MC-Unique: oRpPSBLEOQ-q2Lge5uRbgA-1 X-MC-Unique: 4d_z55RvMxa7067idclvbw-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=zdQnRlbmwbP4J9NM1Br9t8AqFYILsqP78q9WQtgbFRA=; b=RBee93dwOQDoulGK6YTJE4nhstGcal0bjqdvfrQvCp2xb/SYAfAM/t9RRPUHnF9pLN W06LOotWZL8jI5RDx0NKgRY6FxogFSz4NvYZWquhv9N9yP0XMwRNhAlej7dMNDc6RId0 YXyQonqoHodupjWIuj+X5UKu53fYlGTYVuAKIZ5IIGEGhJzLffr9zqTTW5etrusWBPzJ 4KNqhOYUsG6lhwEEPAC9nk0gCm9M02P8bUvA/8Gq4fMG+VGncf6KSD0YmIjK+ULQveaW zB6mWCBoIDhmthX8DfKG8gX5tADkEDOdBaQ4z0EYQyd1nBbT60Ma5G96ImLE0IQqY5Bf gBeQ== X-Gm-Message-State: AOAM531zUGoiLLDghS6iObyHbGBBru58yxL5oQTBQcghc2XNEZbGR7yN S8BV5pHA4+UU7QggftyKLZi17SMgcdZ5rQ== X-Google-Smtp-Source: ABdhPJwea0O1rjqmabRrSFni0E6XcyF0XrZAlVvJBx0/Dqe4Vf/uFQHXAJMCQOPuOSVAWZclKZryZQ== X-Received: by 2002:ac8:7a95:: with SMTP id x21mr17780364qtr.307.1607709949159; Fri, 11 Dec 2020 10:05:49 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH 10/12] domain_validate.c: make virDomainDeviceDefValidateInternal() helpers static Date: Fri, 11 Dec 2020 15:05:14 -0300 Message-Id: <20201211180516.1952683-11-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.79 on 10.11.54.5 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" After the move from the previous patch, these functions are now all used in domain_validate.c and doesn't need to be public. Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_validate.c | 27 ++++++++++++++------------- src/conf/domain_validate.h | 20 -------------------- 2 files changed, 14 insertions(+), 33 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 8acb7c1044..2a881f1f06 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -76,7 +76,7 @@ virDomainDefVideoValidate(const virDomainDef *def) } =20 =20 -int +static int virDomainVideoDefValidate(const virDomainVideoDef *video, const virDomainDef *def) { @@ -229,7 +229,7 @@ virSecurityDeviceLabelDefValidate(virSecurityDeviceLabe= lDefPtr *seclabels, #define VENDOR_LEN 8 #define PRODUCT_LEN 16 =20 -int +static int virDomainDiskDefValidate(const virDomainDef *def, const virDomainDiskDef *disk) { @@ -446,7 +446,7 @@ virDomainChrSourceDefValidate(const virDomainChrSourceD= ef *src_def, } =20 =20 -int +static int virDomainRedirdevDefValidate(const virDomainDef *def, const virDomainRedirdevDef *redirdev) { @@ -462,7 +462,7 @@ virDomainRedirdevDefValidate(const virDomainDef *def, } =20 =20 -int +static int virDomainChrDefValidate(const virDomainChrDef *chr, const virDomainDef *def) { @@ -470,7 +470,7 @@ virDomainChrDefValidate(const virDomainChrDef *chr, } =20 =20 -int +static int virDomainRNGDefValidate(const virDomainRNGDef *rng, const virDomainDef *def) { @@ -481,7 +481,7 @@ virDomainRNGDefValidate(const virDomainRNGDef *rng, } =20 =20 -int +static int virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard, const virDomainDef *def) { @@ -520,7 +520,7 @@ virDomainDefTunablesValidate(const virDomainDef *def) } =20 =20 -int +static int virDomainControllerDefValidate(const virDomainControllerDef *controller) { if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { @@ -1273,7 +1273,7 @@ virDomainActualNetDefValidate(const virDomainNetDef *= net) } =20 =20 -int +static int virDomainNetDefValidate(const virDomainNetDef *net) { char macstr[VIR_MAC_STRING_BUFLEN]; @@ -1323,7 +1323,7 @@ virDomainNetDefValidate(const virDomainNetDef *net) } =20 =20 -int +static int virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev) { if (hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { @@ -1374,7 +1374,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef= *hostdev) } =20 =20 -int +static int virDomainMemoryDefValidate(const virDomainMemoryDef *mem, const virDomainDef *def) { @@ -1402,7 +1402,7 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *= mem, } =20 =20 -int +static int virDomainVsockDefValidate(const virDomainVsockDef *vsock) { if (vsock->guest_cid > 0 && vsock->guest_cid <=3D 2) { @@ -1414,7 +1414,8 @@ virDomainVsockDefValidate(const virDomainVsockDef *vs= ock) return 0; } =20 -int + +static int virDomainInputDefValidate(const virDomainInputDef *input) { switch ((virDomainInputType) input->type) { @@ -1448,7 +1449,7 @@ virDomainInputDefValidate(const virDomainInputDef *in= put) } =20 =20 -int +static int virDomainShmemDefValidate(const virDomainShmemDef *shmem) { if (strchr(shmem->name, '/')) { diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index 710515a6ff..addffc3819 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -25,23 +25,10 @@ #include "domain_conf.h" #include "virconftypes.h" =20 -int virDomainVideoDefValidate(const virDomainVideoDef *video, - const virDomainDef *def); int virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclab= els, size_t nseclabels, virSecurityLabelDefPtr *vmSeclabels, size_t nvmSeclabels); -int virDomainDiskDefValidate(const virDomainDef *def, - const virDomainDiskDef *disk); -int virDomainRedirdevDefValidate(const virDomainDef *def, - const virDomainRedirdevDef *redirdev); -int virDomainChrDefValidate(const virDomainChrDef *chr, - const virDomainDef *def); -int virDomainRNGDefValidate(const virDomainRNGDef *rng, - const virDomainDef *def); -int virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard, - const virDomainDef *def); -int virDomainControllerDefValidate(const virDomainControllerDef *controlle= r); int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm, virDomainDeviceDefPtr dev, unsigned int flags); @@ -50,13 +37,6 @@ int virDomainDefValidate(virDomainDefPtr def, virDomainXMLOptionPtr xmlopt, void *parseOpaque); int virDomainActualNetDefValidate(const virDomainNetDef *net); -int virDomainNetDefValidate(const virDomainNetDef *net); -int virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev); -int virDomainMemoryDefValidate(const virDomainMemoryDef *mem, - const virDomainDef *def); -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, --=20 2.26.2