On Tue, Feb 02, 2021 at 16:04:10 +0100, Pavel Hrdina wrote: > Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> > --- > > We need to find a better way to validate different combinations of XML > elements and attributes. > > src/conf/domain_conf.c | 85 ++++++++ > src/conf/domain_validate.c | 187 ++++++++++++++++++ > src/conf/storage_source_conf.c | 3 + > src/conf/storage_source_conf.h | 4 + > src/libxl/xen_xl.c | 1 + > src/qemu/qemu_block.c | 4 + > src/qemu/qemu_command.c | 1 + > src/qemu/qemu_migration.c | 2 + > src/qemu/qemu_snapshot.c | 4 + > src/storage_file/storage_source.c | 1 + > tests/qemuxml2argvdata/disk-vhostuser.xml | 29 +++ > .../disk-vhostuser.x86_64-latest.xml | 48 +++++ > tests/qemuxml2xmltest.c | 1 + > 13 files changed, 370 insertions(+) > create mode 100644 tests/qemuxml2argvdata/disk-vhostuser.xml > create mode 100644 tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml [...] > diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxml2argvdata/disk-vhostuser.xml > new file mode 100644 > index 0000000000..48883ff2db > --- /dev/null > +++ b/tests/qemuxml2argvdata/disk-vhostuser.xml > @@ -0,0 +1,29 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219136</memory> > + <currentMemory unit='KiB'>219136</currentMemory> > + <memoryBacking> > + <source type='memfd'/> > + <access mode='shared'/> > + </memoryBacking> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='i686' machine='pc'>hvm</type> > + </os> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + <disk type='vhostuser' device='disk'> > + <driver name='qemu' type='raw'/> > + <source type='unix' path='/tmp/vhost1.sock'/> > + <target dev='vda' bus='virtio'/> > + </disk> > + <disk type='vhostuser' device='disk'> > + <driver name='qemu' type='raw'/> > + <source type='unix' path='/tmp/vhost1.sock'> > + <reconnect enabled='yes' timeout='10'/> > + </source> > + <target dev='vdb' bus='virtio'/> Please add boot order to one of the disks at least. > + </disk> > + </devices> > +</domain>
