From nobody Sat May 4 07:00:46 2024 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=1628259921; cv=none; d=zohomail.com; s=zohoarc; b=Chprglxuv8vdrBfBUEZA22YoMsfsX6LqsachuHR0pc6aevh7tUlEg3WhG/9cPTBFS5h5cLCZbnEweKTO14wEpR8WfmDIK4nhUwE+X720BhwjmnARFYMeyIUv3giC6oZbESkkLkz+jNK6LS6HoP9FCsCruHFwFbE+vrhZ++rGGkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628259921; 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=dwQPcLnesfAYHDPlahTLjLut3vsiO+vWn42EjRpopMs=; b=gsNUz1DPVp+/aD6WbVk0z2jFP0Iv2NY+s30uDKcj7GzDvTmItXGlDC58D6uIih913CK/MsBlIz5R2Lc447yIG8RGQU31pAPXtfXP90uJLKF4uie73isKGhoDfISs4CnIFJbRUNAnocTCkuPF/hBQzaj64pf7+3rHYCQrzD+l4L8= 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) 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 1628259921028758.8323131798604; Fri, 6 Aug 2021 07:25:21 -0700 (PDT) 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-53-dmjGW8EjMF2bJ76VQKjtrw-1; Fri, 06 Aug 2021 10:25:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CAFE11008060; Fri, 6 Aug 2021 14:25:11 +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 A4ABF5D9D5; Fri, 6 Aug 2021 14:25:11 +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 5024D4BB7C; Fri, 6 Aug 2021 14:25:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 176EOBgq010846 for ; Fri, 6 Aug 2021 10:24:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3A8475D9D5; Fri, 6 Aug 2021 14:24:11 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 915FF5DA61 for ; Fri, 6 Aug 2021 14:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628259920; 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=dwQPcLnesfAYHDPlahTLjLut3vsiO+vWn42EjRpopMs=; b=OWEnLZ+k+3UxNVrBx0puG5jdH0xAD7loozY1lZeM3zWD2JOef6tFOD2bb5X4RLQwZA4zqa rFU5/leJSc5jAdczDyeoKZfxlI0mc1RkNJF7nC4wYgqvcebOZ7VoiToNDn6k1S7gdmBCTE 6Qik00znhcMoIvz88slrxCyvb42Wmu0= X-MC-Unique: dmjGW8EjMF2bJ76VQKjtrw-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 1/4] conf: propagate xmlDocPtr and flags into virInterfaceDefParseXML() Date: Fri, 6 Aug 2021 16:23:50 +0200 Message-Id: <3242670306b88f215738656804c2b678ae816db7.1628259199.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.79 on 10.5.11.14 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) X-ZM-MESSAGEID: 1628259922245100001 Content-Type: text/plain; charset="utf-8" We need to know if validation flag is present in order to validate given XML against schema in virInterfaceDefParseXML(). Signed-off-by: Kristina Hanicova --- src/conf/interface_conf.c | 29 +++++++++++++++---------- src/conf/interface_conf.h | 6 +++-- src/conf/virinterfaceobj.c | 2 +- src/interface/interface_backend_netcf.c | 4 ++-- src/test/test_driver.c | 4 ++-- tests/interfacexml2xmltest.c | 2 +- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index d84ec66def..7b0cfa6562 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -38,7 +38,8 @@ VIR_ENUM_IMPL(virInterface, ); =20 static virInterfaceDef * -virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType); +virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType, + xmlDocPtr xml, unsigned int flags); =20 static int virInterfaceDefDevFormat(virBuffer *buf, const virInterfaceDef *def, @@ -521,7 +522,7 @@ virInterfaceDefParseBridge(virInterfaceDef *def, =20 for (i =3D 0; i < nbItf; i++) { ctxt->node =3D interfaces[i]; - itf =3D virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_BRIDG= E); + itf =3D virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_BRIDG= E, NULL, 0); if (itf =3D=3D NULL) { ret =3D -1; def->data.bridge.nbItf =3D i; @@ -565,7 +566,7 @@ virInterfaceDefParseBondItfs(virInterfaceDef *def, =20 for (i =3D 0; i < nbItf; i++) { ctxt->node =3D interfaces[i]; - itf =3D virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_BOND); + itf =3D virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_BOND, NUL= L, 0); if (itf =3D=3D NULL) { def->data.bond.nbItf =3D i; goto cleanup; @@ -677,7 +678,9 @@ virInterfaceDefParseVlan(virInterfaceDef *def, =20 static virInterfaceDef * virInterfaceDefParseXML(xmlXPathContextPtr ctxt, - int parentIfType) + int parentIfType, + xmlDocPtr xml G_GNUC_UNUSED, + unsigned int flags) { virInterfaceDef *def; int type; @@ -685,6 +688,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; =20 + virCheckFlags(0, NULL); =20 /* check @type */ tmp =3D virXPathString("string(./@type)", ctxt); @@ -797,7 +801,8 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, =20 virInterfaceDef * virInterfaceDefParseNode(xmlDocPtr xml, - xmlNodePtr root) + xmlNodePtr root, + unsigned int flags) { g_autoptr(xmlXPathContext) ctxt =3D NULL; =20 @@ -813,19 +818,20 @@ virInterfaceDefParseNode(xmlDocPtr xml, return NULL; =20 ctxt->node =3D root; - return virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_LAST); + return virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_LAST, xml, fla= gs); } =20 =20 static virInterfaceDef * virInterfaceDefParse(const char *xmlStr, - const char *filename) + const char *filename, + unsigned int flags) { xmlDocPtr xml; virInterfaceDef *def =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(interface_definition)")= ))) { - def =3D virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml)); + def =3D virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml), f= lags); xmlFreeDoc(xml); } =20 @@ -834,16 +840,17 @@ virInterfaceDefParse(const char *xmlStr, =20 =20 virInterfaceDef * -virInterfaceDefParseString(const char *xmlStr) +virInterfaceDefParseString(const char *xmlStr, + unsigned int flags) { - return virInterfaceDefParse(xmlStr, NULL); + return virInterfaceDefParse(xmlStr, NULL, flags); } =20 =20 virInterfaceDef * virInterfaceDefParseFile(const char *filename) { - return virInterfaceDefParse(NULL, filename); + return virInterfaceDefParse(NULL, filename, 0); } =20 =20 diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index f5e802736b..15819b000f 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -155,14 +155,16 @@ void virInterfaceDefFree(virInterfaceDef *def); =20 virInterfaceDef * -virInterfaceDefParseString(const char *xmlStr); +virInterfaceDefParseString(const char *xmlStr, + unsigned int flags); =20 virInterfaceDef * virInterfaceDefParseFile(const char *filename); =20 virInterfaceDef * virInterfaceDefParseNode(xmlDocPtr xml, - xmlNodePtr root); + xmlNodePtr root, + unsigned int flags); =20 char * virInterfaceDefFormat(const virInterfaceDef *def); diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index a73208f1fc..9439bb3d0b 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -373,7 +373,7 @@ virInterfaceObjListCloneCb(void *payload, if (!(xml =3D virInterfaceDefFormat(srcObj->def))) goto error; =20 - if (!(backup =3D virInterfaceDefParseString(xml))) + if (!(backup =3D virInterfaceDefParseString(xml, 0))) goto error; VIR_FREE(xml); =20 diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index 416e0af36f..9f93cdd657 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -862,7 +862,7 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr i= finfo, goto cleanup; } =20 - ifacedef =3D virInterfaceDefParseString(xmlstr); + ifacedef =3D virInterfaceDefParseString(xmlstr, 0); if (!ifacedef) { /* error was already reported */ goto cleanup; @@ -898,7 +898,7 @@ static virInterfacePtr netcfInterfaceDefineXML(virConne= ctPtr conn, =20 virObjectLock(driver); =20 - ifacedef =3D virInterfaceDefParseString(xml); + ifacedef =3D virInterfaceDefParseString(xml, 0); if (!ifacedef) { /* error was already reported */ goto cleanup; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 16d70d9025..149d1afdad 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1113,7 +1113,7 @@ testParseInterfaces(testDriver *privconn, if (!node) return -1; =20 - def =3D virInterfaceDefParseNode(ctxt->doc, node); + def =3D virInterfaceDefParseNode(ctxt->doc, node, 0); if (!def) return -1; =20 @@ -6074,7 +6074,7 @@ testInterfaceDefineXML(virConnectPtr conn, virCheckFlags(0, NULL); =20 virObjectLock(privconn); - if ((def =3D virInterfaceDefParseString(xmlStr)) =3D=3D NULL) + if ((def =3D virInterfaceDefParseString(xmlStr, flags)) =3D=3D NULL) goto cleanup; =20 if ((obj =3D virInterfaceObjListAssignDef(privconn->ifaces, def)) =3D= =3D NULL) diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 07d179e3a3..3785467f84 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -24,7 +24,7 @@ testCompareXMLToXMLFiles(const char *xml) if (virTestLoadFile(xml, &xmlData) < 0) goto fail; =20 - if (!(dev =3D virInterfaceDefParseString(xmlData))) + if (!(dev =3D virInterfaceDefParseString(xmlData, 0))) goto fail; =20 if (!(actual =3D virInterfaceDefFormat(dev))) --=20 2.31.1 From nobody Sat May 4 07:00:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1628259906; cv=none; d=zohomail.com; s=zohoarc; b=bAJKy3Vvi40Qu6txrbWQw/+KTfFgcsjnSy05FVFxOpm1H8WGmwC6f3EbIQMTj70ExWiDiAEvqO1gn3/r0jqv1vKszA3ermKR+Xn5gTVfhYq6N8CqH3pb6Kkgyv+qZ/iAoSj3PI0K0+SODNrpSWVXRZrsZKG003tPPp5rkN0EzvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628259906; 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=pR/gp8YkFwaukXgypFOYHZU6Mej1iA6nYUOJWQTdKJU=; b=LMzsuUHcie8wqvspzyYb1fzJWN2tPyDgL6UMM/b7sl5FIg68kPyecJEp0jSHZ/f9t5ZV49v7YidOcLsjbNnWnKej1qtDPBwL27n4Jqw+FdxwTHEMx9S4bO1hSGaFGeuextQBLnXTPvZAHLMRjONK2rc8IA5XwdnbmuAMhFtPwK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1628259906075259.4793370251955; Fri, 6 Aug 2021 07:25:06 -0700 (PDT) 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-448-REbc5lQAMgKWcZncvSezzg-1; Fri, 06 Aug 2021 10:25:03 -0400 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 D00471008063; Fri, 6 Aug 2021 14:24:57 +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 265B160C13; Fri, 6 Aug 2021 14:24: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 0AAFF180BAB2; Fri, 6 Aug 2021 14:24:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 176EOClR010856 for ; Fri, 6 Aug 2021 10:24:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0AA5E5DA61; Fri, 6 Aug 2021 14:24:12 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 879A05D9D5 for ; Fri, 6 Aug 2021 14:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628259905; 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=pR/gp8YkFwaukXgypFOYHZU6Mej1iA6nYUOJWQTdKJU=; b=ccUzvMkDX79qoy+ba7AydsjZY6vwPp49vD55YKLz+89XqoN2ASRExFlg2g4lGh8dUswRbj awUbLW68zKfNMdX+259o1JzP+O4pplNrwMxIZNViwMpdmqSlKxivMwFKgUzuRVY2EWZK0E InHtgbHB7WOQOG1xJqjRXVJVBDxvmvk= X-MC-Unique: REbc5lQAMgKWcZncvSezzg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/4] api: add virInterfaceDefineFlags Date: Fri, 6 Aug 2021 16:23:51 +0200 Message-Id: <74a842484cdcb74f2376550467bee35c428461eb.1628259199.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.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 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628259906674100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova --- include/libvirt/libvirt-interface.h | 4 ++++ src/libvirt-interface.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-interface.h b/include/libvirt/libvirt-= interface.h index 7591c6c7fb..803cb33ffe 100644 --- a/include/libvirt/libvirt-interface.h +++ b/include/libvirt/libvirt-interface.h @@ -79,6 +79,10 @@ typedef enum { VIR_INTERFACE_XML_INACTIVE =3D 1 << 0 /* dump inactive interface infor= mation */ } virInterfaceXMLFlags; =20 +typedef enum { + VIR_INTERFACE_DEFINE_VALIDATE =3D 1 << 0, /* Validate the XML document= against schema */ +} virInterfaceDefineFlags; + char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index 5eb5980483..2af86291d3 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -437,7 +437,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned = int flags) * virInterfaceDefineXML: * @conn: pointer to the hypervisor connection * @xml: the XML description for the interface, preferably in UTF-8 - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virInterfaceDefineFlags * * Define an inactive persistent physical host interface or modify an exis= ting * persistent one from the XML description. --=20 2.31.1 From nobody Sat May 4 07:00:46 2024 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=1628259924; cv=none; d=zohomail.com; s=zohoarc; b=K4XSUN49b++9Nh6sr1oa+ahXBHBU6ko4kbxL6ORGC1rVuV8g+b1RNssz3DajpFXPqxc5KjTVtY1KrnDNz9AeeuluaPrSp1Zra1pWkOkUDhQtJgAcXybK9S1sBhR5M5++hbu6h6lM58zv50W7msFvlcy9jL7Sf6omsE0AkZ0FWaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628259924; 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=OhUAMAl+MWswUtCuiAU3P5CBjVtFqnUvZ8GwkvaVNZM=; b=UbyX4Sj13jszUO/eNhK8x0SJrVnqLEHMeO/oztthqtwFzZxKKYOABWXEqPbnV8hqk7KmehgBnB/6tT1zgjMXKNh+nrEMKfdBPpcu8W9q3CCRvkrLglTITxl7T0JuZ5Lb2zit+c8wFKiqsk2V7KqQJZAJLd51bSb0k5I6n3cbUJ0= 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) 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 1628259924610284.72611716600113; Fri, 6 Aug 2021 07:25:24 -0700 (PDT) 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-521-GOo--GNNOZKyuq2GR27wGQ-1; Fri, 06 Aug 2021 10:25:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3355F193F565; Fri, 6 Aug 2021 14:25:16 +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 178921346F; Fri, 6 Aug 2021 14:25:16 +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 D7A2E18005A2; Fri, 6 Aug 2021 14:25:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 176EOCtt010861 for ; Fri, 6 Aug 2021 10:24:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id CE74A5DA61; Fri, 6 Aug 2021 14:24:12 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57E155D9D5 for ; Fri, 6 Aug 2021 14:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628259923; 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=OhUAMAl+MWswUtCuiAU3P5CBjVtFqnUvZ8GwkvaVNZM=; b=MaEyW6no9MuQ3bHPin2qqIXZpT9dUZDKIw/Q0Y2DMs6hdAcTAIzlnqPW+sdRoAGDlEhJC1 aT19QD1Ag3XJLMB1X+S6/fLwFlxDQE96Z7JFjyiS4GwkaOJcRriAXEKumsVEgkd1gsQBdl C6Jk2jiCHAmEM/o8ACwED9Hhz1W5Nvg= X-MC-Unique: GOo--GNNOZKyuq2GR27wGQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 3/4] virsh: add support for '--validate' option in define interface Date: Fri, 6 Aug 2021 16:23:52 +0200 Message-Id: <84010f551222574a330fd6359522f56d54446649.1628259199.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.79 on 10.5.11.11 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) X-ZM-MESSAGEID: 1628259926598100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova --- docs/manpages/virsh.rst | 5 +++-- tools/virsh-interface.c | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 20936994ce..2efb15fc1c 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5531,10 +5531,11 @@ iface-define =20 :: =20 - iface-define file + iface-define file [--validate] =20 Define an inactive persistent physical host interface or modify an existing -persistent one from the XML *file*. +persistent one from the XML *file*. Optionally, the format of the input XML +file can be validated against an internal RNG schema with *--validate*. =20 =20 iface-destroy diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 41acae5dcb..f72d40baab 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -525,6 +525,10 @@ static const vshCmdInfo info_interface_define[] =3D { =20 static const vshCmdOptDef opts_interface_define[] =3D { VIRSH_COMMON_OPT_FILE(N_("file containing an XML interface description= ")), + {.name =3D "validate", + .type =3D VSH_OT_BOOL, + .help =3D N_("validate the XML against the schema") + }, {.name =3D NULL} }; =20 @@ -535,15 +539,19 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) const char *from =3D NULL; bool ret =3D true; char *buffer; + unsigned int flags =3D 0; virshControl *priv =3D ctl->privData; =20 if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) return false; =20 + if (vshCommandOptBool(cmd, "validate")) + flags |=3D VIR_INTERFACE_DEFINE_VALIDATE; + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; =20 - iface =3D virInterfaceDefineXML(priv->conn, buffer, 0); + iface =3D virInterfaceDefineXML(priv->conn, buffer, flags); VIR_FREE(buffer); =20 if (iface !=3D NULL) { --=20 2.31.1 From nobody Sat May 4 07:00:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1628259906; cv=none; d=zohomail.com; s=zohoarc; b=b9+6R7huICKFbAg+6jIeyOFQ2DeazFFXAJn2PAUKn9KYrQKJVVviRXe7JFurPv9dW11U9+ugJq8RLuF6G8adqJIpx7i4CzKwm4RsPrxniOYWG2ecHipcM/9ylIchCKDA27xNIKJn2r3UX/5NPmmBRg2kc6iB1iLuiRFERn+DiAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628259906; 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=ppvPZ+Z5tVNIf/VulRW7O5+A8FTxvBxWJCITQj5l3vs=; b=Ui0GLC9EFbc2tgHiKKtk7q/0Sle0fqq7ACpRwaRjxGAJ226Wr0Tc0c3oArwdfRYzPvLTmUPD+GTDAeoQZ65k4EvaKUg3pnfociEw/1tB5qVl+0Wdd6lh5ITOTMoZOofxcuJmG5DtfZDPRYuZvtnXFLKVRv0xQj1QGy6jpUMHovM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1628259906179891.3151261702196; Fri, 6 Aug 2021 07:25:06 -0700 (PDT) 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-574-2hu3TGvJNfaOwAsCrzU6JA-1; Fri, 06 Aug 2021 10:25:03 -0400 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 B0DF292505; Fri, 6 Aug 2021 14:24:57 +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 2C22510016F4; Fri, 6 Aug 2021 14:24: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 4E4EC180BAB3; Fri, 6 Aug 2021 14:24:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 176EODjj010866 for ; Fri, 6 Aug 2021 10:24:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E2255DA61; Fri, 6 Aug 2021 14:24:13 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 277945D9D5 for ; Fri, 6 Aug 2021 14:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628259905; 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=ppvPZ+Z5tVNIf/VulRW7O5+A8FTxvBxWJCITQj5l3vs=; b=V7NUtXMHi14f2xPHp81OFp3NlcD2iG22tvPCl9OeYiY6ZdH4OCtfc5r5/hFdMt3Y57zH1+ t2k42jpNfVqs1tUizMmUBC/2oIrI/LvZQPX3AI39Y9DBVUCWoqRTCEwN47sAM3n+3bIwoT pNrwillKN7mJporgQ+T1X8Bi1cQHJa4= X-MC-Unique: 2hu3TGvJNfaOwAsCrzU6JA-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 4/4] interface_conf: add validation against schema in define Date: Fri, 6 Aug 2021 16:23:53 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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) X-ZM-MESSAGEID: 1628259906675100003 Content-Type: text/plain; charset="utf-8" We need to validate the XML against schema if option '--validate' was passed to the virsh 'iface-define' command. Signed-off-by: Kristina Hanicova --- src/conf/interface_conf.c | 11 ++++++++++- src/interface/interface_backend_netcf.c | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 7b0cfa6562..ddecd96c8b 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -29,6 +29,8 @@ #include "viruuid.h" #include "virbuffer.h" #include "virstring.h" +#include "virfile.h" +#include "configmake.h" =20 #define VIR_FROM_THIS VIR_FROM_INTERFACE =20 @@ -688,7 +690,14 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; =20 - virCheckFlags(0, NULL); + if (flags & VIR_INTERFACE_DEFINE_VALIDATE) { + g_autofree char *schema =3D virFileFindResource("interface.rng", + abs_top_srcdir "/doc= s/schemas", + PKGDATADIR "/schemas= "); + if (!schema || + virXMLValidateAgainstSchema(schema, xml) < 0) + return NULL; + } =20 /* check @type */ tmp =3D virXPathString("string(./@type)", ctxt); diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index 9f93cdd657..78fd4f9bc7 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -894,11 +894,11 @@ static virInterfacePtr netcfInterfaceDefineXML(virCon= nectPtr conn, virInterfaceDef *ifacedef =3D NULL; virInterfacePtr ret =3D NULL; =20 - virCheckFlags(0, NULL); + virCheckFlags(VIR_INTERFACE_DEFINE_VALIDATE, NULL); =20 virObjectLock(driver); =20 - ifacedef =3D virInterfaceDefParseString(xml, 0); + ifacedef =3D virInterfaceDefParseString(xml, flags); if (!ifacedef) { /* error was already reported */ goto cleanup; --=20 2.31.1