From nobody Sun Feb 8 15:29:03 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=1606245694; cv=none; d=zohomail.com; s=zohoarc; b=ZtKSsE3Sj34cIqwnmKYIDAnFv8Zho8ozZ/Vupzn/DjCZeAsUl0P/tR/RH3spUByI94ncaImEGvhYuTaPxmI+sV1+DeDyhDG5NDQWPtxx5oShmDOTQMfg467WXWciR+G5xHSVEJ/V8MaLId5WObb+RZxCBgJHhDg/+qXrKDL9Bd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606245694; 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=NUoyJGcFSt0CbW30XLqa6CWKjVk+7x+vSh/VgDV3QpA=; b=H34p2KWJNSeqKml5rTZwAKKqCE0C2RIQTtptRMNfLpA9qU7zTRb7bnmqEWbmO9nCUEdpgCMw/ykAdsFQyR6CNxf4NSouXluWyT/WiMtzswtGQRa7Q8LaT37zPdSUXg2m9MuXhON7HC29OZ1JuOqwRqgdUkTpt8acrv6EqZe8cFU= 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 1606245694482281.82453221936237; Tue, 24 Nov 2020 11:21:34 -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-59-bMnadd0ENlKZgJEGNLKV4g-1; Tue, 24 Nov 2020 14:21:31 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2A5B106F8EB; Tue, 24 Nov 2020 19:21:23 +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 7F7DE60C66; Tue, 24 Nov 2020 19:21:23 +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 47BEC1809CB8; Tue, 24 Nov 2020 19:21:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AOJLJsd004252 for ; Tue, 24 Nov 2020 14:21:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6E5EB110E983; Tue, 24 Nov 2020 19:21:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 698BB110E981 for ; Tue, 24 Nov 2020 19:21:17 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 1613D186E127 for ; Tue, 24 Nov 2020 19:21:17 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-6BwJnYkPNfumIme-2R4zMg-1; Tue, 24 Nov 2020 14:21:14 -0500 Received: by mail-qk1-f195.google.com with SMTP id u184so7545366qkf.3 for ; Tue, 24 Nov 2020 11:21:14 -0800 (PST) Received: from rekt.redhat.com ([2804:431:c7c7:d88a:482:7c39:5cca:96f6]) by smtp.gmail.com with ESMTPSA id l79sm88837qke.1.2020.11.24.11.21.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 11:21:13 -0800 (PST) X-MC-Unique: bMnadd0ENlKZgJEGNLKV4g-1 X-MC-Unique: 6BwJnYkPNfumIme-2R4zMg-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=NUoyJGcFSt0CbW30XLqa6CWKjVk+7x+vSh/VgDV3QpA=; b=oHmkhka38OYs6xJTNG5HQH4sXUQW2TM4Rz0e1RyJWwVwdrib1qpcIXMLi2/MrtKXbx zSq6O21LM0c2IM10BoJ1ykilczbNHHNlxwvX5KvwbX9WExfx+uLTvtOFWw6AnOPkcZ57 ZIYPgY+pLhmAqriN7OVPYUeYe6Iqifl+b7oHBA6kjl4aGPh0wa2spC5vAA7k+KCHdUKG Oc+LlXkbRG5Fbk3+fx4a150T7ZTUvhjdaZzU5UGF5DFg/SWPLI1UFFF98ZYBqmkZNSq0 8huOH3IaacPWHLE52+6V5GRHz9xrilwrI8heANOrMXuj8eUSZ0gqLVdk15wVC+BYdHEQ n8Lw== X-Gm-Message-State: AOAM531D1nq6txAJj0os5CkG3M3ms7gNLyWc524YIfCEK7bs6gQLIauZ /ZLwroER2O/f44OtvE8ZOlovszv2V60= X-Google-Smtp-Source: ABdhPJzwQcd4rUb/8B2AVKD3HBFq5oooDmQEB6WV5jnyR/hnIsTmp5kcjRxQzCOKIDKSawLLozyxdg== X-Received: by 2002:a37:ac19:: with SMTP id e25mr6209115qkm.344.1606245673844; Tue, 24 Nov 2020 11:21:13 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH 12/21] domain_conf.c: move smartcard address check to post parse Date: Tue, 24 Nov 2020 16:20:26 -0300 Message-Id: <20201124192035.2343063-13-danielhb413@gmail.com> In-Reply-To: <20201124192035.2343063-1-danielhb413@gmail.com> References: <20201124192035.2343063-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.3 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.12 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" This check is not related to XML parsing and can be moved to post parse time. Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6623abad73..09b284733a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5438,6 +5438,20 @@ virDomainMemoryDefPostParse(virDomainMemoryDefPtr me= m, } =20 =20 +static int +virDomainSmartcardDefPostParse(virDomainSmartcardDefPtr smartcard) +{ + if (smartcard->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + smartcard->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Controllers must use the 'ccid' address type")); + return -1; + } + + return 0; +} + + static int virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5486,6 +5500,10 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDef= Ptr dev, ret =3D virDomainMemoryDefPostParse(dev->data.memory, def); break; =20 + case VIR_DOMAIN_DEVICE_SMARTCARD: + ret =3D virDomainSmartcardDefPostParse(dev->data.smartcard); + break; + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -5494,7 +5512,6 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefP= tr dev, 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_SHMEM: @@ -13702,12 +13719,6 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPt= r xmlopt, =20 if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; - if (def->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - def->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Controllers must use the 'ccid' address type")); - goto error; - } =20 return def; =20 --=20 2.26.2