From patchwork Mon Jul 15 00:03:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 168973 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3688609ilk; Sun, 14 Jul 2019 17:04:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxoMrZA1DRrHHJfCJYXmmv0nBIV8oBMPZWp/hvLaHVzUDKOfT7vaBqC73MmLL86Y91YOF+s X-Received: by 2002:a05:620a:247:: with SMTP id q7mr15407027qkn.265.1563149066983; Sun, 14 Jul 2019 17:04:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563149066; cv=none; d=google.com; s=arc-20160816; b=em1RymHUjkxA9ZSlBLgBlzj51poZXr19UdmN6sHmSFi3oyqPDYiDi5RwrnD8M9bcJt 7WLxls9hCMyNiUEPKYMVvdceKVXr3hcxhNcWO9JB5RzO4QqrrhSCNPTBAWjLaw6f1wzs ycigWg9Rx69E//hwSFJQ7i7wh/r46kfJUWfjv6SebYEt5HfPxpfJ7zVBRJr4r0vx4cbH VKOUb3sSiD0paVa4nVWWgibvrh9abVkFtZCEOgvbZOfYcDjoMw9uR/sWOj4SQGAbob07 mBruBi1A3FzcM2GwLWUpLlR+GO2KhGpiOuhibpkVHPA7ZyKa0+ZkT9yqkfKmcFxompp2 CNzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:delivered-to; bh=Ud4iuwOOd+el/q2tqVB6XxySGT0g+Ig00knG8KqehAI=; b=bRPIx0Umdarv3upkaqxs/oiqS3e7Nn7c+1dTUJB4zGea+cNLEiX9vg1bvTe0+qhcNz OqZ+q3Cubmx1xOPzWscpYNfT0LJqV4IwpV8cewGsIIqiSulPZIqPRGSsy65p6dVMuI+K 9DPcOUWEt0AauB9b/axR7SWq0YiB98mRi+GK8TMC87a022a3/acyGWuCN9ZKJtOaHHKS OSiHnhd5u33Me68TH7LYHLyy2w5kX7qq8dRWdAqMEezfyyE9knqkVpUrSISajZq39x3W YNiOgUnPJzwmyhOQtzsNTSEJ8Vda1z6gexVV0YrLw6jgRtG7qD+RhV79PnumJT6ndE65 9Fkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id b9si10759621qvh.196.2019.07.14.17.04.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jul 2019 17:04:26 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7804785362; Mon, 15 Jul 2019 00:04:24 +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 A93F93CC6; Mon, 15 Jul 2019 00:04: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 364C841F53; Mon, 15 Jul 2019 00:04:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6F04G8a030288 for ; Sun, 14 Jul 2019 20:04:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 62C2960C44; Mon, 15 Jul 2019 00:04:16 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-121-2.rdu2.redhat.com [10.10.121.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDE5160BFB; Mon, 15 Jul 2019 00:04:13 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Sun, 14 Jul 2019 20:03:56 -0400 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 0/5] network: xmlns dnsmasq option passthrough 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 15 Jul 2019 00:04:26 +0000 (UTC) There's several unresolved RFEs for the bridge driver that are essentially requests to add XML wrappers for underlying dnsmasq options. This series adds a dnsmasq xmlns namespace for XML that allows passing option strings directly to the generated dnsmasq config file. It will allow motivated users to work around libvirt until those types of RFEs are properly implemented. Cole Robinson (5): conf: Add virNetworkXMLOption conf: Add network xmlopt argument conf: Add virNetworkXMLNamespace network: wire up dnsmasq option xmlns docs: formatnetwork: Document xmlns:dnsmasq docs/formatnetwork.html.in | 22 +++ docs/schemas/network.rng | 11 ++ src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 91 +++++++-- src/conf/network_conf.h | 51 ++++- src/conf/virnetworkobj.c | 50 +++-- src/conf/virnetworkobj.h | 13 +- src/esx/esx_network_driver.c | 4 +- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 182 ++++++++++++++++-- src/network/bridge_driver.h | 12 ++ src/network/bridge_driver_platform.h | 2 + src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 11 +- src/vbox/vbox_network.c | 4 +- tests/Makefile.am | 14 +- .../networkxml2confdata/dnsmasq-options.conf | 18 ++ tests/networkxml2confdata/dnsmasq-options.xml | 15 ++ tests/networkxml2conftest.c | 8 +- tests/networkxml2firewalltest.c | 2 +- tests/networkxml2xmlin/dnsmasq-options.xml | 15 ++ tests/networkxml2xmlout/dnsmasq-options.xml | 17 ++ tests/networkxml2xmltest.c | 11 +- tests/networkxml2xmlupdatetest.c | 4 +- 24 files changed, 478 insertions(+), 84 deletions(-) create mode 100644 tests/networkxml2confdata/dnsmasq-options.conf create mode 100644 tests/networkxml2confdata/dnsmasq-options.xml create mode 100644 tests/networkxml2xmlin/dnsmasq-options.xml create mode 100644 tests/networkxml2xmlout/dnsmasq-options.xml -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Laine Stump