[PATCH 4/5] examples: xml: test: add xml for testing devices related APIs

Luke Yue posted 5 patches 4 years, 5 months ago
There is a newer version of this series
[PATCH 4/5] examples: xml: test: add xml for testing devices related APIs
Posted by Luke Yue 4 years, 5 months ago
Signed-off-by: Luke Yue <lukedyue@gmail.com>
---
 examples/xml/test/testdevcontroller.xml |  1 +
 examples/xml/test/testdevdiskcdrom.xml  |  5 +++
 examples/xml/test/testdevfs.xml         |  6 ++++
 examples/xml/test/testdevhostdev.xml    |  5 +++
 examples/xml/test/testdevif.xml         |  6 ++++
 examples/xml/test/testdevinput.xml      |  1 +
 examples/xml/test/testdevlease.xml      |  5 +++
 examples/xml/test/testdevmem.xml        |  6 ++++
 examples/xml/test/testdevnetif.xml      |  6 ++++
 examples/xml/test/testdevrng.xml        |  4 +++
 examples/xml/test/testdevshmem.xml      |  4 +++
 examples/xml/test/testdevsound.xml      |  3 ++
 examples/xml/test/testdevvsock.xml      |  3 ++
 examples/xml/test/testdevwatchdog.xml   |  1 +
 examples/xml/test/testdomfc5.xml        | 46 +++++++++++++++++++++++++
 examples/xml/test/testnodeinline.xml    | 46 +++++++++++++++++++++++++
 16 files changed, 148 insertions(+)
 create mode 100644 examples/xml/test/testdevcontroller.xml
 create mode 100644 examples/xml/test/testdevdiskcdrom.xml
 create mode 100644 examples/xml/test/testdevfs.xml
 create mode 100644 examples/xml/test/testdevhostdev.xml
 create mode 100644 examples/xml/test/testdevif.xml
 create mode 100644 examples/xml/test/testdevinput.xml
 create mode 100644 examples/xml/test/testdevlease.xml
 create mode 100644 examples/xml/test/testdevmem.xml
 create mode 100644 examples/xml/test/testdevnetif.xml
 create mode 100644 examples/xml/test/testdevrng.xml
 create mode 100644 examples/xml/test/testdevshmem.xml
 create mode 100644 examples/xml/test/testdevsound.xml
 create mode 100644 examples/xml/test/testdevvsock.xml
 create mode 100644 examples/xml/test/testdevwatchdog.xml

diff --git a/examples/xml/test/testdevcontroller.xml b/examples/xml/test/testdevcontroller.xml
new file mode 100644
index 0000000000..d855bfa17f
--- /dev/null
+++ b/examples/xml/test/testdevcontroller.xml
@@ -0,0 +1 @@
+<controller type='ide' index='0'/>
diff --git a/examples/xml/test/testdevdiskcdrom.xml b/examples/xml/test/testdevdiskcdrom.xml
new file mode 100644
index 0000000000..edc90556bb
--- /dev/null
+++ b/examples/xml/test/testdevdiskcdrom.xml
@@ -0,0 +1,5 @@
+<disk type='block' device='cdrom'>
+    <source dev='/dev/sr0'/>
+    <target dev='hdb' bus='ide'/>
+    <readonly/>
+</disk>
diff --git a/examples/xml/test/testdevfs.xml b/examples/xml/test/testdevfs.xml
new file mode 100644
index 0000000000..cee5ed4ed9
--- /dev/null
+++ b/examples/xml/test/testdevfs.xml
@@ -0,0 +1,6 @@
+<filesystem type='file' accessmode='passthrough'>
+  <driver type='loop' format='raw'/>
+  <source file='/root/test/guest.img'/>
+  <target dir='/root/libvirt/test'/>
+  <readonly/>
+</filesystem>
diff --git a/examples/xml/test/testdevhostdev.xml b/examples/xml/test/testdevhostdev.xml
new file mode 100644
index 0000000000..e364b50f36
--- /dev/null
+++ b/examples/xml/test/testdevhostdev.xml
@@ -0,0 +1,5 @@
+<hostdev mode='capabilities' type='storage'>
+  <source>
+    <block>/dev/sdf1</block>s
+  </source>
+</hostdev>
diff --git a/examples/xml/test/testdevif.xml b/examples/xml/test/testdevif.xml
new file mode 100644
index 0000000000..7e0be80050
--- /dev/null
+++ b/examples/xml/test/testdevif.xml
@@ -0,0 +1,6 @@
+<interface type='network'>
+  <source network='testbrigde' />
+  <mac address='00:11:22:33:44:55' />
+  <model type='virtio' />
+  <alias name='ua-testNIC' />
+</interface>
diff --git a/examples/xml/test/testdevinput.xml b/examples/xml/test/testdevinput.xml
new file mode 100644
index 0000000000..d958f5b931
--- /dev/null
+++ b/examples/xml/test/testdevinput.xml
@@ -0,0 +1 @@
+<input type='mouse' bus='virtio'/>
diff --git a/examples/xml/test/testdevlease.xml b/examples/xml/test/testdevlease.xml
new file mode 100644
index 0000000000..c53c0c7e7d
--- /dev/null
+++ b/examples/xml/test/testdevlease.xml
@@ -0,0 +1,5 @@
+<lease>
+  <lockspace>testarea</lockspace>
+  <key>testkey</key>
+  <target path='/root/test/lease/path' offset='1024'/>
+</lease>
diff --git a/examples/xml/test/testdevmem.xml b/examples/xml/test/testdevmem.xml
new file mode 100644
index 0000000000..49efd4af55
--- /dev/null
+++ b/examples/xml/test/testdevmem.xml
@@ -0,0 +1,6 @@
+<memory model='dimm' access='private' discard='yes'>
+  <target>
+    <size unit='KiB'>524287</size>
+    <node>0</node>
+  </target>
+</memory>
diff --git a/examples/xml/test/testdevnetif.xml b/examples/xml/test/testdevnetif.xml
new file mode 100644
index 0000000000..89e01a611f
--- /dev/null
+++ b/examples/xml/test/testdevnetif.xml
@@ -0,0 +1,6 @@
+<interface type='network'>
+  <source network='testbrigde' />
+  <mac address='00:16:3e:5d:c7:26' />
+  <model type='virtio' />
+  <alias name='ua-testNIC' />
+</interface>
diff --git a/examples/xml/test/testdevrng.xml b/examples/xml/test/testdevrng.xml
new file mode 100644
index 0000000000..369f423740
--- /dev/null
+++ b/examples/xml/test/testdevrng.xml
@@ -0,0 +1,4 @@
+<rng model='virtio'>
+  <rate period="2000" bytes="1234" />
+  <backend model='builtin' />
+</rng>
diff --git a/examples/xml/test/testdevshmem.xml b/examples/xml/test/testdevshmem.xml
new file mode 100644
index 0000000000..04bf3d9a53
--- /dev/null
+++ b/examples/xml/test/testdevshmem.xml
@@ -0,0 +1,4 @@
+<shmem name='my_shmem0' role='peer'>
+  <model type='ivshmem-plain'/>
+  <size unit='M'>4</size>
+</shmem>
diff --git a/examples/xml/test/testdevsound.xml b/examples/xml/test/testdevsound.xml
new file mode 100644
index 0000000000..cf7323077f
--- /dev/null
+++ b/examples/xml/test/testdevsound.xml
@@ -0,0 +1,3 @@
+<sound model='ich6'>
+  <codec type='micro'/>
+</sound>
diff --git a/examples/xml/test/testdevvsock.xml b/examples/xml/test/testdevvsock.xml
new file mode 100644
index 0000000000..dda45780c4
--- /dev/null
+++ b/examples/xml/test/testdevvsock.xml
@@ -0,0 +1,3 @@
+<vsock model='virtio'>
+  <cid auto='no' address='3'/>
+</vsock>
diff --git a/examples/xml/test/testdevwatchdog.xml b/examples/xml/test/testdevwatchdog.xml
new file mode 100644
index 0000000000..a02086f296
--- /dev/null
+++ b/examples/xml/test/testdevwatchdog.xml
@@ -0,0 +1 @@
+<watchdog model='i6300esb'/>
diff --git a/examples/xml/test/testdomfc5.xml b/examples/xml/test/testdomfc5.xml
index a8afc211f6..a529505543 100644
--- a/examples/xml/test/testdomfc5.xml
+++ b/examples/xml/test/testdomfc5.xml
@@ -29,6 +29,12 @@
       <mac address='00:16:3e:5d:c7:26'/>
       <script path='vif-bridge'/>
     </interface>
+    <interface type='network'>
+      <source network='testbrigde' />
+      <mac address='00:11:22:33:44:55' />
+      <model type='virtio' />
+      <alias name='ua-testNIC' />
+    </interface>
     <disk type='file'>
       <source file='/root/fv0'/>
       <target dev='hda'/>
@@ -36,6 +42,7 @@
     <disk type='block' device='cdrom'>
       <source dev='/dev/sr0'/>
       <target dev='hdb' bus='ide'/>
+      <alias name='ua-testCD' />
       <readonly/>
     </disk>
     <disk type='file' device='floppy'>
@@ -47,5 +54,44 @@
       <target dev='sda' bus='scsi'/>
     </disk>
     <graphics type='vnc' port='5904'/>
+    <sound model='ich6'>
+      <codec type='micro'/>
+    </sound>
+    <hostdev mode='capabilities' type='storage'>
+      <source>
+        <block>/dev/sdf1</block>
+      </source>
+    </hostdev>
+    <lease>
+      <lockspace>testarea</lockspace>
+      <key>testkey</key>
+      <target path='/root/test/lease/path' offset='1024'/>
+    </lease>
+    <controller type='ide' index='0'/>
+    <filesystem type='file' accessmode='passthrough'>
+      <driver type='loop' format='raw'/>
+      <source file='/root/test/guest.img'/>
+      <target dir='/root/libvirt/test'/>
+      <readonly/>
+    </filesystem>
+    <rng model='virtio'>
+      <rate period="2000" bytes="1234" />
+      <backend model='builtin' />
+    </rng>
+    <memory model='dimm' access='private' discard='yes'>
+      <target>
+        <size unit='KiB'>524287</size>
+        <node>0</node>
+      </target>
+    </memory>
+    <shmem name='my_shmem0' role='peer'>
+      <model type='ivshmem-plain'/>
+      <size unit='M'>4</size>
+    </shmem>
+    <watchdog model='i6300esb'/>
+    <input type='mouse' bus='virtio'/>
+    <vsock model='virtio'>
+      <cid auto='no' address='3'/>
+    </vsock>
   </devices>
 </domain>
diff --git a/examples/xml/test/testnodeinline.xml b/examples/xml/test/testnodeinline.xml
index 60970145a0..c7b939cdff 100644
--- a/examples/xml/test/testnodeinline.xml
+++ b/examples/xml/test/testnodeinline.xml
@@ -106,6 +106,12 @@
         <mac address='00:16:3e:5d:c7:26'/>
         <script path='vif-bridge'/>
       </interface>
+      <interface type='network'>
+        <source network='testbrigde' />
+        <mac address='00:11:22:33:44:55' />
+        <model type='virtio' />
+        <alias name='ua-testNIC' />
+      </interface>
       <disk type='file'>
         <source file='/root/fv0'/>
         <target dev='hda'/>
@@ -113,6 +119,7 @@
       <disk type='block' device='cdrom'>
         <source dev='/dev/sr0'/>
         <target dev='hdb' bus='ide'/>
+        <alias name='ua-testCD' />
         <readonly/>
       </disk>
       <disk type='file' device='floppy'>
@@ -124,6 +131,45 @@
         <target dev='sda' bus='scsi'/>
       </disk>
       <graphics type='vnc' port='5904'/>
+      <sound model='ich6'>
+        <codec type='micro'/>
+      </sound>
+      <hostdev mode='capabilities' type='storage'>
+        <source>
+          <block>/dev/sdf1</block>
+        </source>
+      </hostdev>
+      <lease>
+        <lockspace>testarea</lockspace>
+        <key>testkey</key>
+        <target path='/root/test/lease/path' offset='1024'/>
+      </lease>
+      <controller type='ide' index='0'/>
+      <filesystem type='file' accessmode='passthrough'>
+        <driver type='loop' format='raw'/>
+        <source file='/root/test/guest.img'/>
+        <target dir='/root/libvirt/test'/>
+        <readonly/>
+      </filesystem>
+      <rng model='virtio'>
+        <rate period="2000" bytes="1234" />
+        <backend model='builtin' />
+      </rng>
+      <memory model='dimm' access='private' discard='yes'>
+        <target>
+          <size unit='KiB'>524287</size>
+          <node>0</node>
+        </target>
+      </memory>
+      <shmem name='my_shmem0' role='peer'>
+        <model type='ivshmem-plain'/>
+        <size unit='M'>4</size>
+      </shmem>
+      <watchdog model='i6300esb'/>
+      <input type='mouse' bus='virtio'/>
+      <vsock model='virtio'>
+        <cid auto='no' address='3'/>
+      </vsock>
     </devices>
   </domain>
   <network>
-- 
2.32.0

Re: [PATCH 4/5] examples: xml: test: add xml for testing devices related APIs
Posted by Martin Kletzander 4 years, 5 months ago
On Mon, Aug 16, 2021 at 07:19:48PM +0800, Luke Yue wrote:
>Signed-off-by: Luke Yue <lukedyue@gmail.com>
>---
> examples/xml/test/testdevcontroller.xml |  1 +
> examples/xml/test/testdevdiskcdrom.xml  |  5 +++
> examples/xml/test/testdevfs.xml         |  6 ++++
> examples/xml/test/testdevhostdev.xml    |  5 +++
> examples/xml/test/testdevif.xml         |  6 ++++

This one and ...

> examples/xml/test/testdevinput.xml      |  1 +
> examples/xml/test/testdevlease.xml      |  5 +++
> examples/xml/test/testdevmem.xml        |  6 ++++
> examples/xml/test/testdevnetif.xml      |  6 ++++

... this one only differ in MAC addresses, but the names suggest
something else.  Since this commit does not use them anywhere it is
difficult to see if they are both useful or not.

Consider adding these in a commit where they are being used.
Re: [PATCH 4/5] examples: xml: test: add xml for testing devices related APIs
Posted by Luke Yue 4 years, 5 months ago
On Tue, 2021-08-17 at 14:18 +0200, Martin Kletzander wrote:
> On Mon, Aug 16, 2021 at 07:19:48PM +0800, Luke Yue wrote:
> > Signed-off-by: Luke Yue <lukedyue@gmail.com>
> > ---
> > examples/xml/test/testdevcontroller.xml |  1 +
> > examples/xml/test/testdevdiskcdrom.xml  |  5 +++
> > examples/xml/test/testdevfs.xml         |  6 ++++
> > examples/xml/test/testdevhostdev.xml    |  5 +++
> > examples/xml/test/testdevif.xml         |  6 ++++
> 
> This one and ...
> 
> > examples/xml/test/testdevinput.xml      |  1 +
> > examples/xml/test/testdevlease.xml      |  5 +++
> > examples/xml/test/testdevmem.xml        |  6 ++++
> > examples/xml/test/testdevnetif.xml      |  6 ++++
> 
> ... this one only differ in MAC addresses, but the names suggest
> something else.  Since this commit does not use them anywhere it is
> difficult to see if they are both useful or not.
> 
> Consider adding these in a commit where they are being used.

Sorry for that, one of them is for attach APIs, and was added by
accident, will delete it in v2.