From nobody Wed May 8 02:10:44 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=1629982643; cv=none; d=zohomail.com; s=zohoarc; b=OfZ5ReBeVoLjGCA6AKkDpzsg+mYUEnWr4ZCfuSjoB01DRm7OVFgr/fCXUHJSSbzJNIO0RcQnms1059CcmLAt2HOi1qoI63rahT+yas98yQ4wWXFTzvF3qIkL6olJns66sJ3dKfy1CJ35teq8f04his+wer8uez6Xx4J+YdKP+rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629982643; 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=y9pwQZSNkUoS19ivbCNwkCaz+rueI8c3eHw6RgyxOpo=; b=EQFx0U1UUAYkGEKnnX3nw1F5XeqRT2OW/AsRPYvDGY8c9PuZ3pWlyNDZ8cViudxqdOcJAHL9lFqKykzPMLehn+3W+p60wxvTKLDh+hAWRO8sn26uUuti7x4dfB9foyjhMoWrs298FSiZN9zShzHONyGf1702s0PtFo3orfdtnwo= 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 1629982643006489.90699945089125; Thu, 26 Aug 2021 05:57:23 -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-525-8bIlixV1NO2avdyzs2CXIA-1; Thu, 26 Aug 2021 08:57:20 -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 8617E87D546; Thu, 26 Aug 2021 12:57:15 +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 5D59D5D9C6; Thu, 26 Aug 2021 12:57:15 +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 63D57181A866; Thu, 26 Aug 2021 12:57:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17QCWkPV017310 for ; Thu, 26 Aug 2021 08:32:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 02E7260936; Thu, 26 Aug 2021 12:32:46 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 816DE60877 for ; Thu, 26 Aug 2021 12:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629982642; 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=y9pwQZSNkUoS19ivbCNwkCaz+rueI8c3eHw6RgyxOpo=; b=Rn8XYdubHR/Z57CREGub9VXJ95PzkdlpGspmkMOtGtDC8/ZOBBrSCGJh4bgsN9Sl4/KEw2 1Gwh974ZvEvkNGPhcrs+27rhfqa7vl0t/mMFmbeITL37WYP7m7GS7HdwdQa0Df55aoRern 0EGN7yxYR21BIlNZyw0sIsyWAdjk6mk= X-MC-Unique: 8bIlixV1NO2avdyzs2CXIA-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 1/4] api: add virNWFilterBindingCreateFlags Date: Thu, 26 Aug 2021 14:32:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1629982645077100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova --- include/libvirt/libvirt-nwfilter.h | 5 +++++ src/libvirt-nwfilter.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-nwfilter.h b/include/libvirt/libvirt-n= wfilter.h index 9897df6df6..4e28801006 100644 --- a/include/libvirt/libvirt-nwfilter.h +++ b/include/libvirt/libvirt-nwfilter.h @@ -107,6 +107,11 @@ int virNWFilterFree (virNW= FilterPtr nwfilter); /* * NWFilter information */ + +typedef enum { + VIR_NWFILTER_BINDING_CREATE_VALIDATE =3D 1 << 0, /* Validate the XML d= ocument against schema */ +} virNWFilterBindingCreateFlags; + const char* virNWFilterGetName (virNWFilterPtr nwfilter); int virNWFilterGetUUID (virNWFilterPtr nwfilter, unsigned char *uuid); diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index 8d09270296..73b061152e 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -718,7 +718,7 @@ virNWFilterBindingGetFilterName(virNWFilterBindingPtr b= inding) * virNWFilterBindingCreateXML: * @conn: pointer to the hypervisor connection * @xml: an XML description of the binding - * @flags: currently unused, pass 0 + * @flags: bitwise-OR of virNWFilterBindingCreateFlags * * Define a new network filter, based on an XML description * similar to the one returned by virNWFilterGetXMLDesc(). This --=20 2.31.1 From nobody Wed May 8 02:10:44 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=1629982649; cv=none; d=zohomail.com; s=zohoarc; b=HB+CniwCs1Srq+IQNI7JGZIDAOZeyRq51AZ9X4t6HdN8e1FeTXqvfwUPOT4kpqEC9+HsyU5tPCrzX27bO0vZvHflJULRbTyGigWeccyr3HJJfk6fh+LXeeJ+6/LLLfXv9nrmCI0WGjn+a8M7MlWtK3Ib0DzKOHcsLRLAneKkwjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629982649; 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=80MmfnhUEgjs8ej8jUn5wckgZQBqYkXRAKla+cpfRpo=; b=nhPk4l4290KSUty9sWO0v7KzDgsGwCtkZ7g/7xscU2KI7sFVrkaUT5Y1sxf10FkBcQrHduh6W1qIR/rN8YIP1d3xjgd8kWx1fBPrElx4EdHrzWOjCaiZe6ll2eEGUOMG2vkzP1jq9XU58om3Fn9RwnzOwdhTlaaWRawjVw7zV5c= 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 1629982649259192.55345033096887; Thu, 26 Aug 2021 05:57:29 -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-305-fSSIH0MAMled_1yOd8iSRg-1; Thu, 26 Aug 2021 08:57:26 -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 80B3F760C5; Thu, 26 Aug 2021 12:57:21 +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 954E560C5F; Thu, 26 Aug 2021 12:57:20 +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 5F1DD181A877; Thu, 26 Aug 2021 12:57:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17QCWk5t017316 for ; Thu, 26 Aug 2021 08:32:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5F4A60D31; Thu, 26 Aug 2021 12:32:46 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50F3F60877 for ; Thu, 26 Aug 2021 12:32:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629982648; 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=80MmfnhUEgjs8ej8jUn5wckgZQBqYkXRAKla+cpfRpo=; b=bfPg+6qMhAzN3dCP68HAMdq8zCHT1M5JS6DDS8pRp4AhuOpAlSMAjm0YtrHRcV6uRl6DEa drokg7EiPbCCQxtwALlL/MfpSo1dI3xxUTndPaPBCbq5AAz1kxCx3l/fQwcsSZJD3JvOfF /fcD2piN0mwvqqsmAvLrYwhstz0SA7k= X-MC-Unique: fSSIH0MAMled_1yOd8iSRg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 2/4] conf: virnwfilterbindingdef: add validation against schema in create Date: Thu, 26 Aug 2021 14:32:33 +0200 Message-Id: <6a21c134cd19a6c3adb755e038153f8db98c1ad2.1629981057.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1629982649787100001 Content-Type: text/plain; charset="utf-8" We need to validate the XML against schema if option '--validate' was passed to the virsh command. This patch also includes propagation of flags into the virNWFilterBindingDefParse(). Signed-off-by: Kristina Hanicova --- src/conf/virnwfilterbindingdef.c | 14 +++++++++----- src/conf/virnwfilterbindingdef.h | 3 ++- src/nwfilter/nwfilter_driver.c | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 5f671030bb..488fdbceab 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -178,12 +178,15 @@ virNWFilterBindingDefParseNode(xmlDocPtr xml, =20 static virNWFilterBindingDef * virNWFilterBindingDefParse(const char *xmlStr, - const char *filename) + const char *filename, + unsigned int flags) { virNWFilterBindingDef *def =3D NULL; g_autoptr(xmlDoc) xml =3D NULL; =20 - if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilterbinding_definit= ion)"), NULL, false))) { + if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilterbinding_definit= ion)"), + "nwfilterbinding.rng", + flags & VIR_NWFILTER_BINDING_CREATE_VALIDATE)))= { def =3D virNWFilterBindingDefParseNode(xml, xmlDocGetRootElement(x= ml)); } =20 @@ -192,16 +195,17 @@ virNWFilterBindingDefParse(const char *xmlStr, =20 =20 virNWFilterBindingDef * -virNWFilterBindingDefParseString(const char *xmlStr) +virNWFilterBindingDefParseString(const char *xmlStr, + unsigned int flags) { - return virNWFilterBindingDefParse(xmlStr, NULL); + return virNWFilterBindingDefParse(xmlStr, NULL, flags); } =20 =20 virNWFilterBindingDef * virNWFilterBindingDefParseFile(const char *filename) { - return virNWFilterBindingDefParse(NULL, filename); + return virNWFilterBindingDefParse(NULL, filename, 0); } =20 =20 diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbinding= def.h index 68d531b75d..4bf0f252f8 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -51,7 +51,8 @@ virNWFilterBindingDefParseNode(xmlDocPtr xml, xmlNodePtr root); =20 virNWFilterBindingDef * -virNWFilterBindingDefParseString(const char *xml); +virNWFilterBindingDefParseString(const char *xml, + unsigned int flags); =20 virNWFilterBindingDef * virNWFilterBindingDefParseFile(const char *filename); diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2712baa73f..1d4567855e 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -745,7 +745,7 @@ nwfilterBindingCreateXML(virConnectPtr conn, return NULL; } =20 - def =3D virNWFilterBindingDefParseString(xml); + def =3D virNWFilterBindingDefParseString(xml, 0); if (!def) return NULL; =20 --=20 2.31.1 From nobody Wed May 8 02:10:44 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=1629982683; cv=none; d=zohomail.com; s=zohoarc; b=dNHfEk/e4UxhRwmuRxb6Ixs5mlwUj3Wqqw/fF2FFeXqSI8TtuCeKV1Op503aycfs+6THcjt0poGlOp0HkN67A6J4XWwfuByqKRgfSdD3UA8/fmAj2dmCHYxa+h0WCCWqQHUle/2I3eRMnfDbCxVlBMqJHsYn4+jL3ZlSlwO/0SY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629982683; 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=5y89uNzJjNLK8RrbVnIsXM8L9CFFWm4bI7iG7m2adSk=; b=ksknN0APooXzMTx0uiqE1a9a1bxZF1yyTSX3nxQ+w4EjGziw9a7DgV9jCwX2fozQ8eeQ5V/xUXOt9usSfo12bh8FMTJgZkbNA02uaNwxm6pIZtOxkuc/jwCwsZcPhA10nCVlM4jGwBAQcd+4sfEsNwwDf1Fj4qM7r9WexoaGyPk= 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 1629982683657855.5848276314973; Thu, 26 Aug 2021 05:58:03 -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-305--cQhMtlVNnCrOcUyzsg2RQ-1; Thu, 26 Aug 2021 08:57:26 -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 952BF800EB8; Thu, 26 Aug 2021 12:57:21 +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 751AB10023B0; Thu, 26 Aug 2021 12:57:21 +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 5F8A14A706; Thu, 26 Aug 2021 12:57:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17QCWlvB017321 for ; Thu, 26 Aug 2021 08:32:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9426060936; Thu, 26 Aug 2021 12:32:47 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E8E260877 for ; Thu, 26 Aug 2021 12:32:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629982682; 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=5y89uNzJjNLK8RrbVnIsXM8L9CFFWm4bI7iG7m2adSk=; b=h4JNSd5pyhDnx2TxQXwq1i8MkuCqiC//DorBrP8lTlAnTXoUtVGq7gOjr4F/Q+ohuZ+TvP 0gcNNEFKH8YkirIADoDeTMuEZkNy19IGBmKQ2LBPXct2m5IPP62fG0Jt+ckwS7ZR1TRxMA b9JXSm7CoAMeA3xX7k+QDaweXYMi0p0= X-MC-Unique: -cQhMtlVNnCrOcUyzsg2RQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 3/4] nwfilter_driver: allow VIR_NWFILTER_BINDING_CREATE_VALIDATE flag Date: Thu, 26 Aug 2021 14:32:34 +0200 Message-Id: <2342cd32179c629ff82060b9c85d0b57e2b02b86.1629981057.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1629982685218100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova --- src/nwfilter/nwfilter_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 1d4567855e..200451d6b1 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -737,7 +737,7 @@ nwfilterBindingCreateXML(virConnectPtr conn, virNWFilterBindingObj *obj =3D NULL; virNWFilterBindingPtr ret =3D NULL; =20 - virCheckFlags(0, NULL); + virCheckFlags(VIR_NWFILTER_BINDING_CREATE_VALIDATE, NULL); =20 if (!driver->privileged) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -745,7 +745,7 @@ nwfilterBindingCreateXML(virConnectPtr conn, return NULL; } =20 - def =3D virNWFilterBindingDefParseString(xml, 0); + def =3D virNWFilterBindingDefParseString(xml, flags); if (!def) return NULL; =20 --=20 2.31.1 From nobody Wed May 8 02:10:44 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=1629982650; cv=none; d=zohomail.com; s=zohoarc; b=n91vto+lSLmGTlMC7wb3KSXrRxNDNkGkiKZASi2do8X/yI+qHTe6IasRdVPA3FX68oHr8fU7/R9wEllPiCiFRqL3dU4nEM3ysc+sunAnxVHiVC3Wbp3K2cv6nWL9sbWDRYSKK0jlOzr6NJ8mnLocaqRQFW8SvmYO21QUvTJEI2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629982650; 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=gt4aGbLk086Pd2im0jjspOBwAVHJ9Df+XZHXGCbaw20=; b=ODoCDTDPdHCpw2plHFGItcyadMlgTYVnX0y31v5N7uH07vhwo47ZOZussSpVe0BHE9Op/l+lY9/2EG/6WjCctR4a+CzW/YPzlRtZQJje2AYIyillZhZmFeDS72/9dHgDqkuyYgWnvltCa6Mu8LrPLLc0L5DQWeT3OUndo8SoaD0= 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 1629982650649708.7882548190261; Thu, 26 Aug 2021 05:57:30 -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-551-xJRoBbGlMgGM4UjlwasCLQ-1; Thu, 26 Aug 2021 08:57:28 -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 4D784760CC; Thu, 26 Aug 2021 12:57:23 +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 2E5BF295E5; Thu, 26 Aug 2021 12:57: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 F0DE84A707; Thu, 26 Aug 2021 12:57:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17QCWm6Z017326 for ; Thu, 26 Aug 2021 08:32:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 619E160936; Thu, 26 Aug 2021 12:32:48 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0A5560877 for ; Thu, 26 Aug 2021 12:32:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629982649; 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=gt4aGbLk086Pd2im0jjspOBwAVHJ9Df+XZHXGCbaw20=; b=Qk+FncBHIW7OxcKCRdFjyOLPoSlN7Ps1fkzy60A6ln/x1iCh1y5OJQMHLZ7YcPoUv9HKkZ kjT3vqp4vtNXOGEmTKZwKHUGV47OdeAQuhO8UE/JpDbfq4IWFK+LiPUS8KBZnk6P6NguQl uNJCALcHnRECymZqOL4XXRAjadLfrYc= X-MC-Unique: xJRoBbGlMgGM4UjlwasCLQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 4/4] virsh: add support for '--validate' option in create nwfilter-binding Date: Thu, 26 Aug 2021 14:32:35 +0200 Message-Id: <62eadfe2ad699e58bbc802c37020699e0daa71bd.1629981057.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1629982652186100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova --- docs/manpages/virsh.rst | 5 ++++- tools/virsh-nwfilter.c | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 2204bed3bb..15ac75d487 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -7586,7 +7586,7 @@ nwfilter-binding-create =20 :: =20 - nwfilter-binding-create xmlfile + nwfilter-binding-create xmlfile [--validate] =20 Associate a network port with a network filter. The network filter backend will immediately attempt to instantiate the filter rules on the port. This @@ -7597,6 +7597,9 @@ command to define a filter for a network port and the= n starting the guest afterwards may prevent the guest from starting if it attempts to use the network port and finds a filter already defined. =20 +Optionally, the format of the input XML file can be validated against an +internal RNG schema with *--validate*. + =20 nwfilter-binding-delete ----------------------- diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index e062aa1649..77f211d031 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -503,6 +503,10 @@ static const vshCmdInfo info_nwfilter_binding_create[]= =3D { static const vshCmdOptDef opts_nwfilter_binding_create[] =3D { VIRSH_COMMON_OPT_FILE(N_("file containing an XML network " "filter binding description")), + {.name =3D "validate", + .type =3D VSH_OT_BOOL, + .help =3D N_("validate the XML against the schema") + }, {.name =3D NULL} }; =20 @@ -513,15 +517,19 @@ cmdNWFilterBindingCreate(vshControl *ctl, const vshCm= d *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_NWFILTER_BINDING_CREATE_VALIDATE; + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; =20 - binding =3D virNWFilterBindingCreateXML(priv->conn, buffer, 0); + binding =3D virNWFilterBindingCreateXML(priv->conn, buffer, flags); VIR_FREE(buffer); =20 if (binding !=3D NULL) { --=20 2.31.1