[RFC 10/29] conf: Replace virNetworkDNSSrvDef(hardcoded) with namesake(generated)

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


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

diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 4d23c8f..1747fc2 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -290,6 +290,9 @@
                 </element>
               </zeroOrMore>
               <zeroOrMore>
+                <!-- VIRT:DIRECTIVE {
+                  "structure": {"output": "src/conf/network_conf"}
+                } -->
                 <element name="srv">
                   <attribute name="service"><text/></attribute>
                   <attribute name="protocol">
diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng
index ad3f590..35bcbd8 100644
--- a/docs/schemas/networkcommon.rng
+++ b/docs/schemas/networkcommon.rng
@@ -193,7 +193,7 @@
   </define>
 
   <define name='unsignedShort'>
-    <data type='integer'>
+    <data type='unsignedInt'>
       <param name="minInclusive">0</param>
       <param name="maxInclusive">65535</param>
     </data>
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 4e6cf72..25a6991 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -104,18 +104,6 @@ struct _virNetworkDHCPHostDef {
     virSocketAddr ip;
 };
 
-typedef struct _virNetworkDNSSrvDef virNetworkDNSSrvDef;
-typedef virNetworkDNSSrvDef *virNetworkDNSSrvDefPtr;
-struct _virNetworkDNSSrvDef {
-    char *domain;
-    char *service;
-    char *protocol;
-    char *target;
-    unsigned int port;
-    unsigned int priority;
-    unsigned int weight;
-};
-
 typedef struct _virNetworkDNSHostDef virNetworkDNSHostDef;
 typedef virNetworkDNSHostDef *virNetworkDNSHostDefPtr;
 struct _virNetworkDNSHostDef {
-- 
2.17.1






More information about the libvir-list mailing list