[RFC 09/29] conf: Replace virNetworkDNSTxtDef(hardcoded) with namesake(generated)

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


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

diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 6045322..4d23c8f 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -281,6 +281,9 @@
                 </element>
               </zeroOrMore>
               <zeroOrMore>
+                <!-- VIRT:DIRECTIVE {
+                  "structure": {"output": "src/conf/network_conf"}
+                } -->
                 <element name="txt">
                   <attribute name="name"><ref name="dnsName"/></attribute>
                   <attribute name="value"><text/></attribute>
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index db7243e..4e6cf72 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -37,6 +37,7 @@
 #include "virmacmap.h"
 #include "virenum.h"
 #include "virxml.h"
+#include "network_conf.generated.h"
 
 struct _virNetworkXMLOption {
     virObject parent;
@@ -103,13 +104,6 @@ struct _virNetworkDHCPHostDef {
     virSocketAddr ip;
 };
 
-typedef struct _virNetworkDNSTxtDef virNetworkDNSTxtDef;
-typedef virNetworkDNSTxtDef *virNetworkDNSTxtDefPtr;
-struct _virNetworkDNSTxtDef {
-    char *name;
-    char *value;
-};
-
 typedef struct _virNetworkDNSSrvDef virNetworkDNSSrvDef;
 typedef virNetworkDNSSrvDef *virNetworkDNSSrvDefPtr;
 struct _virNetworkDNSSrvDef {
-- 
2.17.1






More information about the libvir-list mailing list