From nobody Mon Feb 9 14:55:21 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605512650; cv=none; d=zohomail.com; s=zohoarc; b=TJQrqfDv2zfMZkxbybwmciK5chbcC7+MFfyUQdChILhAKH9hyWX+KtB1aX97P7yFSlJuFLfxTT/sq/26kWRckylj//J/PwFkvUV6MsUjZ4KKhGgh5+f4CwxNXcNN2IJy3tt9Ug4BFQj7SmjR9DegYM3giEvOXvVUYk1km+lXddM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605512650; h=Content-Type:Content-Transfer-Encoding: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=3JnXrua1zASBQ6tXQwAdGuDIPtSHs+5cFuPwncz583o=; b=KyMYJWPmy7iiHhuDWfILxErErW3Sqxaj2HUL+LodEH7jVtwq2zWm27bx2c8RTABRIWZYQRJQ3sgdAcqvp8l2JmMLqMZwAAYLBqLK5Ez7NVz6lCqJ06qAM9d6hU3tqd/ToqivCLx3If9/U7Z7QeX+jZsHCtWevrFPq1re8mPKndw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1605512650449671.6472994442515; Sun, 15 Nov 2020 23:44:10 -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-459-Q3g73KiEPvaOr4wvLHeOjg-1; Mon, 16 Nov 2020 02:44:07 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07898809DD9; Mon, 16 Nov 2020 07:44:01 +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 D763B1002C0D; Mon, 16 Nov 2020 07:44:00 +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 9D6D058121; Mon, 16 Nov 2020 07:44:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AG7hqdJ032560 for ; Mon, 16 Nov 2020 02:43:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 470D05B4BB; Mon, 16 Nov 2020 07:43:52 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA0245B4A9 for ; Mon, 16 Nov 2020 07:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605512649; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3JnXrua1zASBQ6tXQwAdGuDIPtSHs+5cFuPwncz583o=; b=AfA5PSE9NeVpKC0oIzrjjSTRP20uhyonpmW3vShpinPJzvdgueWq75j2IUxtvmAqli1lAH aFTMLIkd8ThXbSMutDLElkqqB/vTt6e+chLdz/ZTz1mY+FqHpxpQ8OxgW1fJKXI4SRWn9l U2NV3R2HyoweRTU8jMrg3xJeghLBd0w= X-MC-Unique: Q3g73KiEPvaOr4wvLHeOjg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/5] conf: Drop virDomainCapsDeviceDefValidate() Date: Mon, 16 Nov 2020 08:43:42 +0100 Message-Id: <0789877e74682589d11135285c50478098b521ff.1605512572.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.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.84 on 10.5.11.22 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that nothing uses virDomainCapsDeviceDefValidate() it can be removed. Signed-off-by: Michal Privoznik --- src/conf/domain_capabilities.c | 55 ---------------------------------- src/conf/domain_capabilities.h | 4 --- src/libvirt_private.syms | 1 - src/qemu/qemu_validate.c | 10 ------- 4 files changed, 70 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 0e0e6d1600..8a690a57a3 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -628,58 +628,3 @@ virDomainCapsFormat(const virDomainCaps *caps) =20 return virBufferContentAndReset(&buf); } - - -#define ENUM_VALUE_MISSING(capsEnum, value) !(capsEnum.values & (1 << valu= e)) - -#define ENUM_VALUE_ERROR(valueLabel, valueString) \ - do { \ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ - _("domain configuration does not support '%s' value= '%s'"), \ - valueLabel, valueString); \ - } while (0) - - -int -virDomainCapsDeviceDefValidate(const virDomainCaps *caps G_GNUC_UNUSED, - const virDomainDeviceDef *dev, - const virDomainDef *def G_GNUC_UNUSED) -{ - int ret =3D 0; - - switch ((virDomainDeviceType) dev->type) { - case VIR_DOMAIN_DEVICE_VIDEO: - case VIR_DOMAIN_DEVICE_AUDIO: - /* TODO: add validation */ - break; - - case VIR_DOMAIN_DEVICE_DISK: - case VIR_DOMAIN_DEVICE_REDIRDEV: - case VIR_DOMAIN_DEVICE_NET: - case VIR_DOMAIN_DEVICE_CONTROLLER: - case VIR_DOMAIN_DEVICE_CHR: - case VIR_DOMAIN_DEVICE_SMARTCARD: - case VIR_DOMAIN_DEVICE_HOSTDEV: - case VIR_DOMAIN_DEVICE_MEMORY: - case VIR_DOMAIN_DEVICE_VSOCK: - case VIR_DOMAIN_DEVICE_INPUT: - case VIR_DOMAIN_DEVICE_SHMEM: - 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_RNG: - 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 ret; -} diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 685d5e2a44..4ae6f0fbb1 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -232,10 +232,6 @@ void virDomainCapsEnumClear(virDomainCapsEnumPtr capsE= num); =20 char * virDomainCapsFormat(const virDomainCaps *caps); =20 -int virDomainCapsDeviceDefValidate(const virDomainCaps *caps, - const virDomainDeviceDef *dev, - const virDomainDef *def); - void virSEVCapabilitiesFree(virSEVCapability *capabilities); =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 491bd5bd87..1d98f01334 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -212,7 +212,6 @@ virDomainCapsCPUModelsGet; virDomainCapsCPUModelsNew; virDomainCapsCPUUsableTypeFromString; virDomainCapsCPUUsableTypeToString; -virDomainCapsDeviceDefValidate; virDomainCapsEnumClear; virDomainCapsEnumSet; virDomainCapsFormat; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 4defdb02cf..09cdcb20c2 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4682,24 +4682,14 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDe= f *dev, int ret =3D 0; virQEMUDriverPtr driver =3D opaque; g_autoptr(virQEMUCaps) qemuCaps =3D NULL; - g_autoptr(virDomainCaps) domCaps =3D NULL; =20 if (!(qemuCaps =3D virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) return -1; =20 - if (!(domCaps =3D virQEMUDriverGetDomainCapabilities(driver, qemuCaps, - def->os.machine, - def->os.arch, - def->virtType))) - return -1; - if ((ret =3D qemuValidateDomainDeviceDefAddress(dev, qemuCaps)) < 0) return ret; =20 - if ((ret =3D virDomainCapsDeviceDefValidate(domCaps, dev, def)) < 0) - return ret; - switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_NET: ret =3D qemuValidateDomainDeviceDefNetwork(dev->data.net, qemuCaps= ); --=20 2.26.2