[libvirt] [PATCH] conf: don't output managed attr for non-pci hostdevs
by Nikolay Shirokovskiy
It is ignored on input for non pci hostdevs as written in docs.
I guess it would be better if the attr was disabled to be specified
in the first place instead but such behaviour is already documented.
At least let's not output it back. This will fix issue when
managed appeared on output for non pci hostdevs when it was not
specified on input.
The tests are fixed by next commands:
grep -lRP 'hostdev.*mode=.subsystem.*type=.(?!pci).*managed' `find tests -name '*.xml'` > files
sed -i.bak -re 's/ managed=.(yes|no).//' `cat files`
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
src/conf/domain_conf.c | 6 ++++--
tests/qemuargv2xmldata/hostdev-usb-address.xml | 2 +-
tests/qemuxml2argvdata/controller-order.xml | 2 +-
.../disk-hostdev-scsi-address-conflict.xml | 2 +-
.../disk-hostdev-scsi-virtio-iscsi-auth-AES.xml | 2 +-
.../hostdev-scsi-autogen-address.xml | 22 +++++++++++-----------
tests/qemuxml2argvdata/hostdev-scsi-boot.xml | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml | 2 +-
.../hostdev-scsi-lsi-iscsi-auth.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-rawio.xml | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-readonly.xml | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-sgio.xml | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-shareable.xml | 2 +-
.../hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
.../hostdev-scsi-vhost-scsi-pci.xml | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.xml | 2 +-
.../hostdev-scsi-virtio-iscsi-auth.xml | 4 ++--
.../qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml | 4 ++--
.../qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml | 2 +-
.../hostdev-usb-address-device-boot.xml | 2 +-
.../hostdev-usb-address-device.xml | 2 +-
tests/qemuxml2argvdata/hostdev-usb-address.xml | 2 +-
.../hostdevs-drive-address-conflict.xml | 4 ++--
tests/qemuxml2argvdata/name-escape.xml | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 2 +-
.../qemuxml2xmloutdata/hostdev-mdev-precreated.xml | 2 +-
.../hostdev-scsi-autogen-address.xml | 22 +++++++++++-----------
.../qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 2 +-
.../hostdev-scsi-lsi-iscsi-auth.xml | 4 ++--
.../qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 2 +-
tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 2 +-
tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml | 2 +-
tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 2 +-
.../qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 2 +-
.../hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
.../hostdev-scsi-vhost-scsi-pci.xml | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.xml | 2 +-
.../hostdev-scsi-virtio-iscsi-auth.xml | 4 ++--
.../hostdev-scsi-virtio-iscsi.xml | 4 ++--
.../hostdev-scsi-virtio-scsi.xml | 2 +-
.../hostdev-subsys-mdev-vfio-ccw.xml | 2 +-
tests/qemuxml2xmloutdata/hostdev-usb-address.xml | 2 +-
tests/xlconfigdata/test-usb.xml | 2 +-
47 files changed, 80 insertions(+), 78 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ceeb247..9ff659c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -27330,8 +27330,10 @@ virDomainHostdevDefFormat(virBufferPtr buf,
virBufferAsprintf(buf, "<hostdev mode='%s' type='%s'",
mode, type);
if (def->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
- virBufferAsprintf(buf, " managed='%s'",
- def->managed ? "yes" : "no");
+ if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
+ virBufferAsprintf(buf, " managed='%s'",
+ def->managed ? "yes" : "no");
+ }
if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
scsisrc->sgio)
diff --git a/tests/qemuargv2xmldata/hostdev-usb-address.xml b/tests/qemuargv2xmldata/hostdev-usb-address.xml
index 14514c9..0bdfd08 100644
--- a/tests/qemuargv2xmldata/hostdev-usb-address.xml
+++ b/tests/qemuargv2xmldata/hostdev-usb-address.xml
@@ -29,7 +29,7 @@
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='usb' managed='no'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='14' device='6'/>
</source>
diff --git a/tests/qemuxml2argvdata/controller-order.xml b/tests/qemuxml2argvdata/controller-order.xml
index 5aedadc..75bc7f5 100644
--- a/tests/qemuxml2argvdata/controller-order.xml
+++ b/tests/qemuxml2argvdata/controller-order.xml
@@ -76,7 +76,7 @@
<model type='cirrus' vram='16384' heads='1'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
- <hostdev mode='subsystem' type='usb' managed='yes'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='14' device='6'/>
</source>
diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
index 777d857..5482d43 100644
--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
@@ -18,7 +18,7 @@
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='scsi'/>
</disk>
- <hostdev mode='subsystem' type='scsi' managed='no'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host2'/>
<address bus='0' target='0' unit='1'/>
diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
index 21a0b11..363155d 100644
--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'>
<host name='example.org' port='6000'/>
<auth username='myname'>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
index 6f8cf56..bf00bb8 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
@@ -23,68 +23,68 @@
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host1'/>
<address bus='0' target='0' unit='1'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host2'/>
<address bus='0' target='0' unit='2'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host3'/>
<address bus='0' target='0' unit='3'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host4'/>
<address bus='0' target='0' unit='4'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host5'/>
<address bus='0' target='0' unit='5'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host6'/>
<address bus='0' target='0' unit='6'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host7'/>
<address bus='0' target='0' unit='7'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host8'/>
<address bus='0' target='0' unit='8'/>
</source>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host9'/>
<address bus='0' target='0' unit='9'/>
</source>
<address type='drive' controller='1' bus='0' target='0' unit='5'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host10'/>
<address bus='0' target='0' unit='10'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
index 13e159b..f9254fd 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
@@ -21,7 +21,7 @@
<controller type='scsi' index='0' model='virtio-scsi'/>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
index 8c654c4..5c36057 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='1074872354'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
index d39885b..79fb7a2 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>
<host name='example.org' port='3260'/>
<auth username='myname'>
@@ -34,7 +34,7 @@
</source>
<address type='drive' controller='0' bus='0' target='0' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'>
<host name='example.org' port='3260'/>
<auth username='myname'>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
index d84d0b3..911563d 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
@@ -25,13 +25,13 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example'>
<host name='example.org' port='3260'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example/1'>
<host name='example.org' port='3260'/>
</source>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
index df4777c..ecdfd55 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml b/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
index 2ece594..7fa470d 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes' sgio='unfiltered' rawio='yes'>
+ <hostdev mode='subsystem' type='scsi' sgio='unfiltered' rawio='yes'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
index 1cdf562..1593160 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml b/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
index bad2ceb..e0d786a 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes' sgio='unfiltered'>
+ <hostdev mode='subsystem' type='scsi' sgio='unfiltered'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
index 3b176a2..e4765ca 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
index 33234bc..21029d5 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
@@ -22,7 +22,7 @@
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
</controller>
- <hostdev mode='subsystem' type='scsi_host' managed='no'>
+ <hostdev mode='subsystem' type='scsi_host'>
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
</hostdev>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
index 13455f6..6f63453 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -31,7 +31,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi_host' managed='no'>
+ <hostdev mode='subsystem' type='scsi_host'>
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
</hostdev>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml
index c4e8c33..7ca9cc9 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml
@@ -15,7 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='none'/>
- <hostdev mode='subsystem' type='scsi_host' managed='no'>
+ <hostdev mode='subsystem' type='scsi_host'>
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
</hostdev>
<memballoon model='none'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
index 0f63f98..c286cb5 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>
<host name='example.org' port='3260'/>
<auth username='myname'>
@@ -34,7 +34,7 @@
</source>
<address type='drive' controller='0' bus='0' target='2' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'>
<host name='example.org' port='3260'/>
<auth username='myname'>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
index 9a457db..5162ddd 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
@@ -25,13 +25,13 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example'>
<host name='example.org' port='3260'/>
</source>
<address type='drive' controller='0' bus='0' target='2' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example/1'>
<host name='example.org' port='3260'/>
</source>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
index aa56cac..3bc79bb 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
index 8fd6720..f32a6f1 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
@@ -17,7 +17,7 @@
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
</disk>
- <hostdev mode='subsystem' type='usb' managed='no'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='14' device='6'/>
</source>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
index 0fe6d63..9ba0cbb 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
@@ -18,7 +18,7 @@
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
</disk>
- <hostdev mode='subsystem' type='usb' managed='no'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='14' device='6'/>
</source>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml
index 9deb2a6..04704bd 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.xml
@@ -25,7 +25,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='usb' managed='no'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='14' device='6'/>
</source>
diff --git a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
index c78c1be..d35a31b 100644
--- a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
+++ b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
@@ -14,14 +14,14 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
- <hostdev mode='subsystem' type='scsi' managed='no'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host2'/>
<address bus='0' target='0' unit='1'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='no'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host2'/>
<address bus='0' target='0' unit='2'/>
diff --git a/tests/qemuxml2argvdata/name-escape.xml b/tests/qemuxml2argvdata/name-escape.xml
index fab2a77..d533587 100644
--- a/tests/qemuxml2argvdata/name-escape.xml
+++ b/tests/qemuxml2argvdata/name-escape.xml
@@ -28,7 +28,7 @@
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:my,storage/1'>
<host name='example.foo.org' port='3260'/>
</source>
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.xml b/tests/qemuxml2argvdata/user-aliases-usb.xml
index 668a9c3..5647a0b 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.xml
+++ b/tests/qemuxml2argvdata/user-aliases-usb.xml
@@ -62,13 +62,13 @@
<master startport='4'/>
<address type='pci' domain='0' bus='0' slot='5' function='2'/>
</controller>
- <hostdev mode='subsystem' type='usb' managed='yes'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='14' device='6'/>
</source>
<address type='usb' bus='0' port='3'/>
</hostdev>
- <hostdev mode='subsystem' type='usb' managed='yes'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='15' device='6'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
index d0a8591..9fc998b 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
@@ -30,7 +30,7 @@
<model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
- <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci' display='on'>
+ <hostdev mode='subsystem' type='mdev' model='vfio-pci' display='on'>
<source>
<address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
index 9d35fac..9f350ce 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
@@ -23,7 +23,7 @@
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci'>
+ <hostdev mode='subsystem' type='mdev' model='vfio-pci'>
<source>
<address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
index 3b4242e..0b0cb12 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
@@ -35,77 +35,77 @@
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host1'/>
<address bus='0' target='0' unit='1'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host2'/>
<address bus='0' target='0' unit='2'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='2'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host3'/>
<address bus='0' target='0' unit='3'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='3'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host4'/>
<address bus='0' target='0' unit='4'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host5'/>
<address bus='0' target='0' unit='5'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='5'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host6'/>
<address bus='0' target='0' unit='6'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='6'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host7'/>
<address bus='0' target='0' unit='7'/>
</source>
<address type='drive' controller='1' bus='0' target='0' unit='0'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host8'/>
<address bus='0' target='0' unit='8'/>
</source>
<address type='drive' controller='1' bus='0' target='0' unit='1'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host9'/>
<address bus='0' target='0' unit='9'/>
</source>
<address type='drive' controller='1' bus='0' target='0' unit='5'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host10'/>
<address bus='0' target='0' unit='10'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
index 1b0da12..26b3c83 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='1074872354'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
index beeb3cb..5f5b3c5 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>
<host name='example.org' port='3260'/>
<auth username='myname'>
@@ -41,7 +41,7 @@
</source>
<address type='drive' controller='0' bus='0' target='0' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'>
<host name='example.org' port='3260'/>
<auth username='myname'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
index cff162b..da2667c 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
@@ -32,13 +32,13 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example/0'>
<host name='example.org' port='3260'/>
</source>
<address type='drive' controller='0' bus='0' target='0' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example/1'>
<host name='example.org' port='3260'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
index d8931da..36fd21f 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
index df1375d..34cbc9a 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes' sgio='unfiltered' rawio='yes'>
+ <hostdev mode='subsystem' type='scsi' sgio='unfiltered' rawio='yes'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
index dd252f8..79e7c7e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
index 05cefc0..eae879a 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes' sgio='unfiltered'>
+ <hostdev mode='subsystem' type='scsi' sgio='unfiltered'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
index 31aa2dd..57b9936 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
index 3723bd0..d41cdfe 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
@@ -23,7 +23,7 @@
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
</controller>
- <hostdev mode='subsystem' type='scsi_host' managed='no'>
+ <hostdev mode='subsystem' type='scsi_host'>
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
<address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
</hostdev>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
index 174096b..1dbacfc 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi_host' managed='no'>
+ <hostdev mode='subsystem' type='scsi_host'>
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</hostdev>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
index ef48d81..917e9cd 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
@@ -31,7 +31,7 @@
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi_host' managed='no'>
+ <hostdev mode='subsystem' type='scsi_host'>
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</hostdev>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
index a3886ec..013d8f3 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>
<host name='example.org' port='3260'/>
<auth username='myname'>
@@ -41,7 +41,7 @@
</source>
<address type='drive' controller='0' bus='0' target='2' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'>
<host name='example.org' port='3260'/>
<auth username='myname'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
index d31af32..847b785 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
@@ -32,13 +32,13 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example/0'>
<host name='example.org' port='3260'/>
</source>
<address type='drive' controller='0' bus='0' target='2' unit='4'/>
</hostdev>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source protocol='iscsi' name='iqn.1992-01.com.example/1'>
<host name='example.org' port='3260'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index df87897..cb79018 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -32,7 +32,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <hostdev mode='subsystem' type='scsi'>
<source>
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml
index a14ab05..5c4d2b5 100644
--- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml
@@ -14,7 +14,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-s390x</emulator>
- <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'>
+ <hostdev mode='subsystem' type='mdev' model='vfio-ccw'>
<source>
<address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
index 9e33773..c89780d 100644
--- a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
@@ -29,7 +29,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='usb' managed='no'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='14' device='6'/>
</source>
diff --git a/tests/xlconfigdata/test-usb.xml b/tests/xlconfigdata/test-usb.xml
index 5bac73b..017d9f6 100644
--- a/tests/xlconfigdata/test-usb.xml
+++ b/tests/xlconfigdata/test-usb.xml
@@ -26,7 +26,7 @@
</console>
<input type='mouse' bus='xen'/>
<input type='keyboard' bus='xen'/>
- <hostdev mode='subsystem' type='usb' managed='no'>
+ <hostdev mode='subsystem' type='usb'>
<source>
<address bus='1' device='3'/>
</source>
--
1.8.3.1
6 years, 1 month
- 2
- 2
Re: [libvirt] [Qemu-devel] Virtio-net control queue handling
by Stefan Hajnoczi
On Tue, Feb 26, 2019 at 02:13:43PM +0000, Nikhil Agarwal wrote:
> Is there any option in QEMU to offload virtio device control queue handling to backend instead of deciphering and passing to libvirt via QMP? if not, is there any interface in libvirt which passes on these message to application or i directly use QMP interface from QEMU?
I'm not sure I understand your question. It could be because of
terminology:
"virtio device control queue" == virtio-net control virtqueue?
"backend" == vhost-user-net device backend?
"message" == QMP event?
I have CCed Jason Wang, QEMU network subsystem maintainer, and the
libvirt mailing list.
Stefan
6 years, 1 month
- 3
- 2
[libvirt] Entering freeze for libvirt-5.1.0
by Daniel Veillard
As planned I just tagged it in git, and pushed the signed tarball and rpms
to the usual place:
ftp://libvirt.org/libvirt/
I'm travelling this week so my testing is even more limited than usual,
but that seems fine with me and https://ci.centos.org/view/libvirt/ seems
to be all green so I'm hopeful :-)
I will push rc2 on Wednesday, and possibly GA on Friday if everything
looks fine, worse case I will push it over the week-end.
Please give it some testing,
thanks !
Daniel
--
Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/
veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
http://veillard.com/ | virtualization library http://libvirt.org/
6 years, 1 month
- 1
- 1
[libvirt] [PATCH] snapshot: Improve message for VIR_ERR_INVALID_DOMAIN_SNAPSHOT
by Eric Blake
For consistency with other error messages, and the fact that
the object is always called a virDomainSnapshot rather than
a mere virSnapshot, include the word "domain" in the error
message.
Suggested-by: John Ferlan <jferlan(a)redhat.com>
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/util/virerror.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 9e3975fe76..05e535d859 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -1123,8 +1123,8 @@ const virErrorMsgTuple virErrorMsgStrings[VIR_ERR_NUMBER_LAST] = {
N_("Hook script execution failed"),
N_("Hook script execution failed: %s") },
[VIR_ERR_INVALID_DOMAIN_SNAPSHOT] = {
- N_("Invalid snapshot"),
- N_("Invalid snapshot: %s") },
+ N_("Invalid domain snapshot"),
+ N_("Invalid domain snapshot: %s") },
[VIR_ERR_NO_DOMAIN_SNAPSHOT] = {
N_("Domain snapshot not found"),
N_("Domain snapshot not found: %s") },
--
2.20.1
6 years, 1 month
- 2
- 2
[libvirt] [PATCH v2 00/11] bulk snapshot list/redefine (incremental backup saga)
by Eric Blake
While looking at my work on incremental backups, Nir raised a good
point: if we want to recreate a set of known checkpoints on one
machine that will be taking over a domain from another machine,
my initial proposal required making multiple API calls to list the
XML for each checkpoint on the source, and then more API calls to
redefine each checkpoint on the destination; it also had the drawback
that the list has to be presented in topological order (the API won't
let you define a child checkpoint if the parent is not defined first).
He asked if I could instead add bulk APIs, for getting the XML for
all checkpoints at once, and then for redefining all checkpoints at
once.
Since my checkpoint code borrows heavily from concepts in the snapshot
code, I chose to tackle the problem by starting with this series, which
does the same thing for snapshots as what I plan to do for checkpoints.
That is, since this patch series adds virDomainGetXMLDesc(,
VIR_DOMAIN_XML_SNAPSHOTS) and virDomainSnapshotCreateXML(,
VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST), the checkpoint series
will add virDOmainGetXMLDesc(, VIR_DOMAIN_XML_CHECKPOINTS) and
virDomainCheckpointCreateXML(, VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_LIST)
with very similar code.
Also available at:
https://repo.or.cz/libvirt/ericb.git/shortlog/refs/tags/snapshot-bulk-v2
Depends on:
https://www.redhat.com/archives/libvir-list/2019-February/msg01263.html
(virsh: Treat \n like ; in batch mode)
https://www.redhat.com/archives/libvir-list/2019-February/msg01343.html
(fix snapshot --redefine bugs)
Since v1:
Finish implementing the redefine code
Split the patches slightly differently: all snapshot_conf code first,
then just the public API changes, then virsh wrappers, then per-driver
implementations for test and qemu.
Rebase on top of bug fix and virsh feature addition found in the meantime.
001/11:[----] [--] 'domain: Document VIR_DOMAIN_XML_MIGRATABLE'
002/11:[----] [-C] 'snapshot: Give virDomainSnapshotDefFormat its own flags'
003/11:[0012] [FC] 'snapshot: Refactor virDomainSnapshotDefFormat'
004/11:[----] [-C] 'snapshot: Add virDomainSnapshotObjListFormat'
005/11:[----] [-C] 'domain: Expand virDomainDefFormatInternal with snapshots'
006/11:[down] 'snapshot: Add virDomainSnapshotDefParseList'
007/11:[0041] [FC] 'domain: Add VIR_DOMAIN_XML_SNAPSHOTS flag'
008/11:[0013] [FC] 'snapshot: Add VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST flag'
009/11:[down] 'virsh: Expose bulk snapshot dumpxml/redefine'
010/11:[down] 'test: Implement bulk snapshot operations'
011/11:[down] 'qemu: Implement bulk snapshot operations'
Eric Blake (11):
domain: Document VIR_DOMAIN_XML_MIGRATABLE
snapshot: Give virDomainSnapshotDefFormat its own flags
snapshot: Refactor virDomainSnapshotDefFormat
snapshot: Add virDomainSnapshotObjListFormat
domain: Expand virDomainDefFormatInternal with snapshots
snapshot: Add virDomainSnapshotDefParseList
domain: Add VIR_DOMAIN_XML_SNAPSHOTS flag
snapshot: Add VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST flag
virsh: Expose bulk snapshot dumpxml/redefine
test: Implement bulk snapshot operations
qemu: Implement bulk snapshot operations
include/libvirt/libvirt-domain-snapshot.h | 3 +
include/libvirt/libvirt-domain.h | 1 +
src/conf/domain_conf.h | 8 +
src/conf/snapshot_conf.h | 25 +-
src/qemu/qemu_domain.h | 2 +-
src/conf/domain_conf.c | 71 +++++-
src/conf/snapshot_conf.c | 297 ++++++++++++++++++----
src/esx/esx_driver.c | 1 -
src/libvirt-domain-snapshot.c | 21 +-
src/libvirt-domain.c | 14 +
src/libvirt_private.syms | 3 +
src/network/bridge_driver.c | 3 +-
src/qemu/qemu_domain.c | 36 ++-
src/qemu/qemu_driver.c | 67 ++++-
src/test/test_driver.c | 28 +-
src/vbox/vbox_common.c | 5 +-
src/vz/vz_driver.c | 3 +-
tests/domainsnapshotxml2xmltest.c | 16 +-
tools/virsh-domain.c | 7 +
tools/virsh-snapshot.c | 14 +
20 files changed, 523 insertions(+), 102 deletions(-)
--
2.20.1
6 years, 1 month
- 2
- 27
[libvirt] [PATCH v3 00/10] dirty-bitmaps: deprecate @status field
by John Snow
The current internal meanings of "locked", "user_locked",
"qmp_locked", "frozen", "enabled", and "disabled" are all
a little muddled.
Deprecate the @status field in favor of two new booleans
that carry very specific meanings. Then, rename and rework
some of the internal semantics to help make the API a bit
more clear and easier to read.
Well, in my opinion.
Based on my current bitmaps branch.
V3:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/10:[0002] [FC] 'block/dirty-bitmap: add recording and busy properties'
002/10:[0002] [FC] 'block/dirty-bitmaps: rename frozen predicate helper'
003/10:[down] 'block/dirty-bitmap: remove set/reset assertions against enabled bit'
004/10:[0006] [FC] 'block/dirty-bitmap: change semantics of enabled predicate'
005/10:[down] 'nbd: change error checking order for bitmaps'
006/10:[0002] [FC] 'block/dirty-bitmap: explicitly lock bitmaps with successors'
007/10:[0011] [FC] 'block/dirty-bitmaps: unify qmp_locked and user_locked calls'
008/10:[0002] [FC] 'block/dirty-bitmaps: move comment block'
009/10:[down] 'blockdev: remove unused paio parameter documentation'
010/10:[down] 'iotests: add busy/recording bit test to 124'
V3: (Following Vladimir's feedback)
001: Changed texi phrasing, parameter --> field
002: Commit message adjustment
comment edit: "not locked" --> "not user_locked"
003: pulled forward out of patch 004
004: Commit message rewrite
create_successor and abdicate doc adjustments
005: New.
006: Change successor doc comment
Commit message adjustment
007: BdrvDirtyBitmap struct comment adjustments
Comment change to create_successor (lock --> busy)
Incidental changes from 004's changes
008: Grammar fix (Eric)
009: New, trivial, unrelated fix tagging along.
010: iotest 124 added.
John Snow (10):
block/dirty-bitmap: add recording and busy properties
block/dirty-bitmaps: rename frozen predicate helper
block/dirty-bitmap: remove set/reset assertions against enabled bit
block/dirty-bitmap: change semantics of enabled predicate
nbd: change error checking order for bitmaps
block/dirty-bitmap: explicitly lock bitmaps with successors
block/dirty-bitmaps: unify qmp_locked and user_locked calls
block/dirty-bitmaps: move comment block
blockdev: remove unused paio parameter documentation
iotests: add busy/recording bit test to 124
block/dirty-bitmap.c | 111 ++++++++++++++++++---------------
blockdev.c | 19 +++---
include/block/dirty-bitmap.h | 7 +--
migration/block-dirty-bitmap.c | 8 +--
nbd/server.c | 14 ++---
qapi/block-core.json | 10 ++-
qemu-deprecated.texi | 6 ++
tests/qemu-iotests/124 | 110 ++++++++++++++++++++++++++++++++
tests/qemu-iotests/124.out | 4 +-
tests/qemu-iotests/236.out | 28 +++++++++
10 files changed, 239 insertions(+), 78 deletions(-)
--
2.17.2
6 years, 1 month
- 4
- 35
[libvirt] [PATCH] virsh: Treat \n like ; in batch mode
by Eric Blake
I wanted to do a demonstration with virsh batch mode, which
takes multiple commands all packed into a single argument:
$ virsh -c test:///default 'echo a; echo b;'
a
b
but that produced a really long line, so I tried to make it
more legible:
$ virsh -c test:///default '
echo a;
echo b;
'
error: unknown command: '
'
Let's be more like the shell, and treat unquoted newline as a
command separator just as we do for semicolon. In fact, with
that, I can even now mix styles:
$ virsh -c test:///default '
echo a; echo b
echo c
'
a
b
c
Fix the grammer in a nearby comment while at it.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
tools/virsh.pod | 4 ++--
tools/virt-admin.pod | 4 ++--
tools/vsh.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 67edb57b14..2bf1ee77bb 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -40,8 +40,8 @@ as a name.
The B<virsh> program can be used either to run one I<COMMAND> by giving the
command and its arguments on the shell command line, or a I<COMMAND_STRING>
which is a single shell argument consisting of multiple I<COMMAND> actions
-and their arguments joined with whitespace, and separated by semicolons
-between commands. Within I<COMMAND_STRING>, virsh understands the
+and their arguments joined with whitespace, and separated by semicolons or
+newlines between commands. Within I<COMMAND_STRING>, virsh understands the
same single, double, and backslash escapes as the shell, although you must
add another layer of shell escaping in creating the single shell argument.
If no command is given in the command line, B<virsh> will then start a minimal
diff --git a/tools/virt-admin.pod b/tools/virt-admin.pod
index 3ddbbff934..b2c9a1db6d 100644
--- a/tools/virt-admin.pod
+++ b/tools/virt-admin.pod
@@ -23,8 +23,8 @@ Where I<command> is one of the commands listed below.
The B<virt-admin> program can be used either to run one I<COMMAND> by giving the
command and its arguments on the shell command line, or a I<COMMAND_STRING>
which is a single shell argument consisting of multiple I<COMMAND> actions
-and their arguments joined with whitespace, and separated by semicolons
-between commands. Within I<COMMAND_STRING>, virt-admin understands the
+and their arguments joined with whitespace, and separated by semicolons or
+newlines between commands. Within I<COMMAND_STRING>, virt-admin understands the
same single, double, and backslash escapes as the shell, although you must
add another layer of shell escaping in creating the single shell argument.
If no command is given in the command line, B<virt-admin> will then start a minimal
diff --git a/tools/vsh.c b/tools/vsh.c
index 610de4495b..3d9bec896b 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -1664,7 +1664,7 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res,
if (*p == '\0')
return VSH_TK_END;
- if (*p == ';') {
+ if (*p == ';' || *p == '\n') {
parser->pos = ++p; /* = \0 or begin of next command */
return VSH_TK_SUBCMD_END;
}
@@ -1672,7 +1672,7 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res,
while (*p) {
/* end of token is blank space or ';' */
if (!double_quote && !single_quote &&
- (*p == ' ' || *p == '\t' || *p == ';'))
+ (*p == ' ' || *p == '\t' || *p == ';' || *p == '\n'))
break;
if (!double_quote && *p == '\'') { /* single quote */
@@ -1681,7 +1681,7 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res,
continue;
} else if (!single_quote && *p == '\\') { /* escape */
/*
- * The same as the bash, a \ in "" is an escaper,
+ * The same as in shell, a \ in "" is an escaper,
* but a \ in '' is not an escaper.
*/
p++;
--
2.20.1
6 years, 1 month
- 3
- 10
[libvirt] [tck PATCH] Add script testing network bandwidth functionality
by Daniel P. Berrangé
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
lib/Sys/Virt/TCK/DomainBuilder.pm | 10 ++
lib/Sys/Virt/TCK/NetworkBuilder.pm | 20 ++++
scripts/networks/400-guest-bandwidth.t | 147 +++++++++++++++++++++++++
3 files changed, 177 insertions(+)
create mode 100644 scripts/networks/400-guest-bandwidth.t
diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBuilder.pm
index 399534c..45336b5 100644
--- a/lib/Sys/Virt/TCK/DomainBuilder.pm
+++ b/lib/Sys/Virt/TCK/DomainBuilder.pm
@@ -466,6 +466,16 @@ sub as_xml {
$w->emptyTag("model",
type => $interface->{model});
}
+ if ($interface->{bandwidth}) {
+ $w->startTag("bandwidth");
+ if ($interface->{bandwidth}->{"in"}) {
+ $w->emptyTag("inbound", %{$interface->{bandwidth}->{"in"}});
+ }
+ if ($interface->{bandwidth}->{"out"}) {
+ $w->emptyTag("outbound", %{$interface->{bandwidth}->{"out"}});
+ }
+ $w->endTag("bandwidth");
+ }
if ($interface->{filterref}) {
$w->startTag("filterref",
filter => $interface->{filterref});
diff --git a/lib/Sys/Virt/TCK/NetworkBuilder.pm b/lib/Sys/Virt/TCK/NetworkBuilder.pm
index ad0cab8..446cc4f 100644
--- a/lib/Sys/Virt/TCK/NetworkBuilder.pm
+++ b/lib/Sys/Virt/TCK/NetworkBuilder.pm
@@ -87,6 +87,15 @@ sub ipaddr {
return $self;
}
+sub bandwidth {
+ my $self = shift;
+ my %bw = @_;
+
+ $self->{bandwidth} = \%bw;
+
+ return $self;
+}
+
sub dhcp_range {
my $self = shift;
my $start = shift;
@@ -114,6 +123,17 @@ sub as_xml {
$w->emptyTag("bridge", %{$self->{bridge}})
if $self->{bridge};
+ if ($self->{bandwidth}) {
+ $w->startTag("bandwidth");
+ if ($self->{bandwidth}->{"in"}) {
+ $w->emptyTag("inbound", %{$self->{bandwidth}->{"in"}});
+ }
+ if ($self->{bandwidth}->{"out"}) {
+ $w->emptyTag("outbound", %{$self->{bandwidth}->{"out"}});
+ }
+ $w->endTag("bandwidth");
+ }
+
if (exists $self->{forward}) {
$w->startTag("forward", %{$self->{forward}});
foreach (@{$self->{interfaces}}) {
diff --git a/scripts/networks/400-guest-bandwidth.t b/scripts/networks/400-guest-bandwidth.t
new file mode 100644
index 0000000..3a865fd
--- /dev/null
+++ b/scripts/networks/400-guest-bandwidth.t
@@ -0,0 +1,147 @@
+# -*- perl -*-
+#
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# This program is free software; You can redistribute it and/or modify
+# it under the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version
+#
+# The file "LICENSE" distributed along with this file provides full
+# details of the terms and conditions
+#
+
+=pod
+
+=head1 NAME
+
+network/400-guest-bandwidth.t - guest with bandwidth limits
+
+=head1 DESCRIPTION
+
+This test case validates that a guest is connected a network
+can have bandwidth limits set
+
+=cut
+
+use strict;
+use warnings;
+
+use Test::More tests => 8;
+use Test::Exception;
+
+use Sys::Virt::TCK;
+
+my $tck = Sys::Virt::TCK->new();
+my $conn = eval { $tck->setup(); };
+BAIL_OUT "failed to setup test harness: $@" if $@;
+END { $tck->cleanup if $tck; }
+
+my %subnet = Sys::Virt::TCK->find_free_ipv4_subnet();
+
+SKIP: {
+ skip "No available IPv4 subnet", 4 unless defined $subnet{address};
+
+ my $netbuilder = Sys::Virt::TCK::NetworkBuilder->new(name => "tck");
+ $netbuilder->bridge("tck");
+ $netbuilder->ipaddr($subnet{address}, $subnet{netmask});
+ $netbuilder->dhcp_range($subnet{dhcpstart}, $subnet{dhcpend});
+ my $netxml = $netbuilder->as_xml();
+
+ diag "Creating a new transient network";
+ diag $netxml;
+ my $net;
+ ok_network(sub { $net = $conn->create_network($netxml) }, "created transient network object");
+
+ my $dombuilder = $tck->generic_domain(name => "tck");
+ $dombuilder->interface(type => "network",
+ source => "tck",
+ model => "virtio",
+ mac => "52:54:00:11:11:11",
+ bandwidth => {
+ in => {
+ average => 1000,
+ peak => 5000,
+ floor => 2000,
+ burst => 1024,
+ },
+ out => {
+ average => 128,
+ peak => 256,
+ burst => 256,
+ },
+ });
+ my $domxml = $dombuilder->as_xml();
+
+ diag "Creating a new transient domain";
+ diag $domxml;
+ my $dom;
+ ok_error(sub { $dom = $conn->create_domain($domxml) }, "Unsupported op requesting bandwidth",
+ Sys::Virt::Error::ERR_OPERATION_UNSUPPORTED);
+
+ diag "Destroying the transient network";
+ $net->destroy;
+
+ $netbuilder->bandwidth(
+ in => {
+ average => 1000,
+ peak => 5000,
+ burst => 1024,
+ },
+ out => {
+ average => 128,
+ peak => 256,
+ burst => 256,
+ });
+
+ $netxml = $netbuilder->as_xml();
+
+ diag "Creating a new transient network";
+ diag $netxml;
+ ok_network(sub { $net = $conn->create_network($netxml) }, "created transient network object");
+
+ ok_domain(sub { $dom = $conn->create_domain($domxml) }, "created transient domain object");
+
+ lives_ok(sub {
+ $dom->set_interface_parameters(
+ "52:54:00:11:11:11",
+ {
+ Sys::Virt::Domain::BANDWIDTH_IN_AVERAGE => 1000,
+ Sys::Virt::Domain::BANDWIDTH_IN_PEAK => 5000,
+ Sys::Virt::Domain::BANDWIDTH_IN_FLOOR => 4000,
+ Sys::Virt::Domain::BANDWIDTH_IN_BURST => 1024,
+ Sys::Virt::Domain::BANDWIDTH_OUT_AVERAGE => 128,
+ Sys::Virt::Domain::BANDWIDTH_OUT_PEAK => 256,
+ Sys::Virt::Domain::BANDWIDTH_OUT_BURST => 256,
+ })});
+
+ ok_error(sub {
+ $dom->set_interface_parameters(
+ "52:54:00:11:11:11",
+ {
+ Sys::Virt::Domain::BANDWIDTH_IN_AVERAGE => 1000,
+ Sys::Virt::Domain::BANDWIDTH_IN_PEAK => 5000,
+ Sys::Virt::Domain::BANDWIDTH_IN_FLOOR => 40000,
+ Sys::Virt::Domain::BANDWIDTH_IN_BURST => 1024,
+ Sys::Virt::Domain::BANDWIDTH_OUT_AVERAGE => 128,
+ Sys::Virt::Domain::BANDWIDTH_OUT_PEAK => 256,
+ Sys::Virt::Domain::BANDWIDTH_OUT_BURST => 256,
+ }) }, "Canot overcommit bandwidth",
+ Sys::Virt::Error::ERR_OPERATION_INVALID);
+
+ diag "Destroying the transient guest";
+ $dom->destroy;
+
+ diag "Checking that transient domain has gone away";
+ ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain",
+ Sys::Virt::Error::ERR_NO_DOMAIN);
+
+ diag "Destroying the transient network";
+ $net->destroy;
+
+ diag "Checking that transient network has gone away";
+ ok_error(sub { $conn->get_network_by_name("tck") }, "NO_network error raised from missing network",
+ Sys::Virt::Error::ERR_NO_NETWORK);
+}
+
+# end
--
2.20.1
6 years, 1 month
- 2
- 2
[libvirt] [PATCH 0/5] Yet another set of VIR_AUTO-related patches
by Peter Krempa
Peter Krempa (5):
cfg: Add VIR_AUTO(UNREF|CLEAN|STRINGLIST) to
sc_requirere_attribute_cleanup_initialization
util: object: Reset pointer when unrefing object in virObjectAutoUnref
util: alloc: Clarify docs for VIR_DEFINE_AUTOCLEAN_FUNC
util: XML: Introduce automatic reset of XPath's current node
qemu: Use VIR_XPATH_NODE_AUTORESTORE when XPath context is modified
cfg.mk | 2 +-
src/libvirt_private.syms | 1 +
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_domain.c | 6 ++----
src/qemu/qemu_migration_cookie.c | 9 +++------
src/util/viralloc.h | 4 ++--
src/util/virobject.c | 1 +
src/util/virxml.c | 10 ++++++++++
src/util/virxml.h | 22 ++++++++++++++++++++++
9 files changed, 43 insertions(+), 15 deletions(-)
--
2.20.1
6 years, 1 month
- 3
- 14
[libvirt] Libvirt upstream CI efforts
by Erik Skultety
Hi,
I'm starting this thread in order to continue with the ongoing efforts to
bring actual integration testing to libvirt. Currently, the status quo is that
we build libvirt (along with our unit test suite) using different OS-flavoured
VMs in ci.centos.org. Andrea put a tremendous amount of work to not only
automate the whole process of creating the VMs but also having a way for a
dev to re-create the same environment locally without jenkins by using the
lcitool.
#TL;DR (if you're from QEMU, no TLDR for you ;), there are questions to answer)
- we need to run functional tests upstream on ci.centos.org
-> pure VM testing environment (nested for migration) vs Docker images
- we need to host the upstream test suite somewhere
-> main libvirt.git repo vs libvirt-jenkins-ci.git vs new standalone repo
- what framework to use for the test suite
-> TCK vs avocado-vt vs plain avocado
#THE LONG STORY SHORT
As far as the functional test suite goes, there's an already existing
integration with the avocado-vt and a massive number of test cases at [1]
which is currently not used for upstream testing, primarily because of the huge
number of test cases (and also many unnecessary legacy test cases). An
alternative set of functional test cases is available as part of the
libvirt-tck framework [2]. The obvious question now is how can we build upon
any of this and introduce proper functional testing of upstream libvirt to our
jenkins environment at ci.centos.org, so I formulated the following discussion
points as I think these are crucial to sort out before we move on to the test
suite itself:
* Infrastructure/Storage requirements (need for hosting pre-build images?)
- one of the main goals we should strive for with upstream CI is that
every developer should be able to run the integration test suite on
their own machine (conveniently) prior to submitting their patchset to
the list
- we need a reproducible environment to ensure that we don't get different
results across different platforms (including ci.centos.org), therefore
we could provide pre-built images with environment already set up to run
the suite in an L1 guest.
- as for performing migration tests, we could utilize nested virt
- should we go this way, having some publicly accessible storage to host
all the pre-built images is a key problem to solve
-> an estimate of how much we're currently using: roughly 130G from
our 500G allocation at ci.centos.org to store 8 qcow2 images + 2
freebsd isos
-> we're also fairly generous with how much we allocate for a guest
image as most of the guests don't even use half of the 20G
allocation
-> considering sparsifying the pre-built images and compressing them
+ adding a ton of dependencies to run the suite, extending the
pool of distros by including ubuntu 16 + 18, 200-250G is IMHO
quite a generous estimate of our real need
-> we need to find a party willing to give us the estimated amount
of publicly accessible storage and consider whether we'd need any
funds for that
-> we'd have to also talk to other projects that have done a similar
thing about possible caveats related to hosting images, e.g.
bandwidth
-> as for ci.centos.org, it does provide publicly accessible folder
where projects can store artifacts (the documentation even
mentions VM images), there might a limit though [3]
- alternatively, we could use Docker images to test migration instead of
nested virt (and not only migration)
-> we'd loose support for non-Linux platforms like FreeBSD which we
would not if we used nested
* Hosting the test suite itself
- the main point to discuss here is whether the test suite should be part
of the main libvirt repo following QEMU's lead by example or should they
live inside a separate repo (a new one or as part of
libvirt-jenkins-ci [4]
-> the question here for QEMU folks is:
*"What was the rationale for QEMU to decide to have avocado-qemu as
part of the main repo?"*
* What framework to use for the test suite
- libvirt-tck because it already contains a bunch of very useful tests as
mentioned in the beginning
- using the avocado-vt plugin because that's what's the existing
libvirt-test-provider [1] is about
- pure avocado for its community popularity and continuous development and
once again follow QEMU leading by example
-> and again a question for QEMU folks:
*"What was QEMU's take on this and why did they decide to go with
avocado-qemu?"*
* Integrating the test suite with the main libvirt.git repo
- if we host the suite as part of libvirt-jenkins-ci as mentioned in the
previous section then we could make libvirt-jenkins-ci a submodule of
libvirt.git and enhance the toolchain by having something like 'make
integration' that would prepare the selected guests and execute the test
suite in them (only on demand)
Regards,
Erik
[1] https://github.com/autotest/tp-libvirt
[2] https://libvirt.org/testtck.html
[3] https://wiki.centos.org/QaWiki/CI/GettingStarted#head-a46ee49e8818ef9b502...
[4] https://github.com/libvirt/libvirt-jenkins-ci
6 years, 1 month
- 4
- 5