From a5f8a01abb602d187528c9917d19e7771ab06482 Mon Sep 17 00:00:00 2001 From: Osier Yang Date: Mon, 16 Jan 2012 22:08:07 +0800 Subject: [PATCH] docs: Add missed RNG schema for interface We support of type "mcast", "server", and "client", but the RNG schema for them are missed. Attribute "address" is optional for "server" type. And these 3 types support , too. --- docs/formatdomain.html.in | 3 ++ docs/schemas/domaincommon.rng | 53 +++++++++++++++++++ .../qemuxml2argv-net-client.args | 5 ++ .../qemuxml2argv-net-client.xml | 29 ++++++++++ .../qemuxml2argv-net-mcast.args | 5 ++ .../qemuxml2argv-net-mcast.xml | 29 ++++++++++ .../qemuxml2argv-net-server.args | 5 ++ .../qemuxml2argv-net-server.xml | 29 ++++++++++ tests/qemuxml2argvtest.c | 3 ++ 9 files changed, 161 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-client.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-client.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-server.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-server.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index faf42df9ba..6b06723095 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2189,6 +2189,7 @@ 
   ...
   <devices>
+    <mac address='52:54:00:6d:90:01'>
     <interface type='mcast'>
       <source address='230.0.0.1' port='5558'/>
     </interface>
@@ -2210,10 +2211,12 @@
   ...
   <devices>
     <interface type='server'>
+    <mac address='52:54:00:22:c9:42'>
       <source address='192.168.0.1' port='5558'/>
     </interface>
     ...
     <interface type='client'>
+    <mac address='52:54:00:8b:c9:51'>
     <source address='192.168.0.1' port='5558'/>
     </interface>
   </devices>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 243ff934e7..b54fd68ac7 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1322,6 +1322,59 @@
             
           
         
+        
+          
+            
+              mcast
+              client
+            
+          
+          
+            
+              
+                
+              
+              
+                
+              
+              
+            
+            
+              
+                
+                  
+                
+                
+              
+            
+          
+        
+        
+          
+            server
+          
+          
+            
+              
+                
+                  
+                
+              
+              
+                
+              
+              
+            
+            
+              
+                
+                  
+                
+                
+              
+            
+          
+        
       
     
   
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
new file mode 100644
index 0000000000..f8853ac84f
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
@@ -0,0 +1,5 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
+pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
+-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
+macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,connect=192.168.0.1:5558,vlan=0 \
+-serial none -parallel none -usb
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml
new file mode 100644
index 0000000000..b4cca6e65f
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml
@@ -0,0 +1,29 @@
+
+  QEMUGuest1
+  c7a5fdbd-edaf-9455-926a-d65c16db1809
+  219136
+  219136
+  1
+  
+    hvm
+    
+  
+  
+  destroy
+  restart
+  destroy
+  
+    /usr/bin/qemu
+    
+      
+      
+      

+    
+    
+    
+      
+      
+    
+    
+  
+
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
new file mode 100644
index 0000000000..bb4a042ed5
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
@@ -0,0 +1,5 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
+pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
+-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
+macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,mcast=192.0.0.1:5558,vlan=0 \
+-serial none -parallel none -usb
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml
new file mode 100644
index 0000000000..a3929a55aa
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml
@@ -0,0 +1,29 @@
+
+  QEMUGuest1
+  c7a5fdbd-edaf-9455-926a-d65c16db1809
+  219136
+  219136
+  1
+  
+    hvm
+    
+  
+  
+  destroy
+  restart
+  destroy
+  
+    /usr/bin/qemu
+    
+      
+      
+      

+    
+    
+    
+      
+      
+    
+    
+  
+
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
new file mode 100644
index 0000000000..1451e325b5
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
@@ -0,0 +1,5 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
+pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
+-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
+macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,listen=192.168.0.1:5558,vlan=0 \
+-serial none -parallel none -usb
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml
new file mode 100644
index 0000000000..eca440d9b6
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml
@@ -0,0 +1,29 @@
+
+  QEMUGuest1
+  c7a5fdbd-edaf-9455-926a-d65c16db1809
+  219136
+  219136
+  1
+  
+    hvm
+    
+  
+  
+  destroy
+  restart
+  destroy
+  
+    /usr/bin/qemu
+    
+      
+      
+      

+    
+    
+    
+      
+      
+    
+    
+  
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7beaa4b8cf..fd3c9bbd53 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -519,6 +519,9 @@ mymain(void)
     DO_TEST("net-eth", false, NONE);
     DO_TEST("net-eth-ifname", false, NONE);
     DO_TEST("net-eth-names", false, QEMU_CAPS_NET_NAME);
+    DO_TEST("net-client", false, NONE);
+    DO_TEST("net-server", false, NONE);
+    DO_TEST("net-mcast", false, NONE);
 
     DO_TEST("serial-vc", false, NONE);
     DO_TEST("serial-pty", false, NONE);