[RFC 12/29] conf: Replace virNetworkDNSForwarder(hardcoded) with namesake(generated)

Shi Lei shi_lei at massclouds.com
Wed Mar 25 07:11:52 UTC 2020


Signed-off-by: Shi Lei <shi_lei at massclouds.com>
---
 docs/schemas/network.rng | 4 ++++
 src/conf/network_conf.h  | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index c83a796..0034c4f 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -270,6 +270,10 @@
             </optional>
             <interleave>
               <zeroOrMore>
+                <!-- VIRT:DIRECTIVE {
+                  "name": "virNetworkDNSForwarder",
+                  "structure": {"output": "src/conf/network_conf"}
+                } -->
                 <element name="forwarder">
                   <optional>
                     <attribute name="addr"><ref name="ipAddr"/></attribute>
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index d4d3c01..1f96999 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -104,13 +104,6 @@ struct _virNetworkDHCPHostDef {
     virSocketAddr ip;
 };
 
-typedef struct _virNetworkDNSForwarder virNetworkDNSForwarder;
-typedef virNetworkDNSForwarder *virNetworkDNSForwarderPtr;
-struct _virNetworkDNSForwarder {
-    virSocketAddr addr;
-    char *domain;
-};
-
 typedef struct _virNetworkDNSDef virNetworkDNSDef;
 typedef virNetworkDNSDef *virNetworkDNSDefPtr;
 struct _virNetworkDNSDef {
-- 
2.17.1






More information about the libvir-list mailing list