[libvirt] [PATCH] travis: Test both python2 and python3
by Andrea Bolognani
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.travis.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index d071c98634..01dffaa602 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,12 @@ matrix:
- compiler: gcc
dist: trusty
env:
+ - PYTHON=$(which python2)
- DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart"
- compiler: clang
dist: trusty
env:
+ - PYTHON=$(which python3)
- DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd"
- compiler: clang
os: osx
--
2.14.3
6 years, 9 months
[libvirt] [PATCH 0/2] Update docs for GIT repo access
by Daniel P. Berrangé
Daniel P. Berrangé (2):
docs: remove obsolete docs about gitorious and cvs access
docs: update all GIT repo examples to use https:// protocol
README-hacking | 2 +-
docs/csharp.html.in | 2 +-
docs/devguide.html.in | 6 +++---
docs/downloads.html.in | 9 +++++++++
docs/hacking.html.in | 2 +-
docs/java.html.in | 45 +--------------------------------------------
docs/php.html.in | 2 +-
docs/virshcmdref.html.in | 2 +-
8 files changed, 18 insertions(+), 52 deletions(-)
--
2.14.3
6 years, 9 months
[libvirt] [PATCH 0/4] python3: Finishing touches
by Andrea Bolognani
>>> import blurb
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
ModuleNotFoundError: No module named 'blurb'
>>>
Andrea Bolognani (4):
configure: Allow (and prefer) Python 3
spec: Use Python 3 for building on Fedora
mingw: Use Python 3 for building
news: Update for Python 3 compatibility
configure.ac | 4 ++--
docs/news.xml | 11 +++++++++++
libvirt.spec.in | 9 ++++++++-
mingw-libvirt.spec.in | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
--
2.14.3
6 years, 9 months
[libvirt] [PATCH 0/3] Drop old Policy-Kit support
by Ján Tomko
The build WITH_POLKIT0 and -Wunused-label was broken for almost two
years.
Ján Tomko (3):
Remove Policy-Kit support
Merge WITH_POLKIT1 and WITH_POLKIT
Do not check for pkcheck
.gitignore | 1 -
m4/virt-polkit.m4 | 80 +++------------
src/access/Makefile.inc.am | 6 +-
src/access/viraccessmanager.c | 4 +-
src/libvirt.c | 27 -----
src/remote/Makefile.inc.am | 24 +----
src/remote/{libvirtd.policy.in => libvirtd.policy} | 6 +-
src/remote/remote_driver.c | 63 ------------
src/util/Makefile.inc.am | 2 -
src/util/virpolkit.c | 113 +--------------------
tests/Makefile.am | 4 +-
11 files changed, 28 insertions(+), 302 deletions(-)
rename src/remote/{libvirtd.policy.in => libvirtd.policy} (92%)
--
2.16.1
6 years, 9 months
[libvirt] [PATCH] mingw: Require Fedora
by Andrea Bolognani
Although it was never formally specified, it was always expected
that the mingw RPM build would happen on Fedora, if anything
because RHEL / CentOS don't ship the necessary mingw dependencies.
Make this fact explicit by erroring out if that's not the case,
the same way we already do in the main spec file.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
mingw-libvirt.spec.in | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in
index 5e12bb1cae..8f3f26d2d9 100644
--- a/mingw-libvirt.spec.in
+++ b/mingw-libvirt.spec.in
@@ -1,5 +1,16 @@
%{?mingw_package_header}
+# This spec file assumes you are building on a Fedora version
+# that's still supported by the vendor. It may work on other distros
+# or versions, but no effort will be made to ensure that going forward.
+%define min_fedora 26
+
+%if 0%{?fedora} && 0%{?fedora} >= %{min_fedora}
+ %define supported_platform 1
+%else
+ %define supported_platform 0
+%endif
+
# Default to skipping autoreconf. Distros can change just this one line
# (or provide a command-line override) if they backport any patches that
# touch configure.ac or Makefile.am.
@@ -124,6 +135,11 @@ MinGW Windows libvirt virtualization library, static version.
%setup -q -n libvirt-%{version}
%build
+%if ! %{supported_platform}
+echo "This RPM requires Fedora >= %{min_fedora}"
+exit 1
+%endif
+
%if ! %{with_phyp}
%define _without_phyp --without-phyp
%endif
--
2.14.3
6 years, 9 months
[libvirt] [PATCH] virDomainDeviceDefValidateAliasesIterator: Ignore some hostdevs
by Michal Privoznik
https://bugzilla.redhat.com/show_bug.cgi?id=1556828
When defining a domain that has <interface type='hostdev'/> our
parser creates two entries in virDomainDef: one for <interface/>
and one for <hostdev/>. However, some info is shared between the
two which makes user alias validation fail because alias belongs
to the set of shared info.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/domain_conf.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 86fc275116..c8d051fa9f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5584,6 +5584,13 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
virDomainChrEquals(def->serials[0], dev->data.chr))
return 0;
+ if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
+ dev->data.hostdev->parent.type == VIR_DOMAIN_DEVICE_NET) {
+ /* This hostdev is a copy of some previous interface.
+ * Aliases are duplicated. */
+ return 0;
+ }
+
if (virHashLookup(data->aliases, alias)) {
virReportError(VIR_ERR_XML_ERROR,
_("non unique alias detected: %s"),
--
2.16.1
6 years, 9 months
[libvirt] Emacs tip for easily adding Reviewed-by tags & friends
by Daniel P. Berrangé
It is nice that git has the short-hand for adding Signed-off-by, but
adding other tags during reviews is kind of tedious and long winded.
eg "ACK" is much shorter than typing "Reviewed-by: ...blah blah blah.."
Good editors have a way to setup macros though, and so I thought I'd
share the emacs approach to making life easy again...
In my $HOME/.emacs.d/abbrev_defs file I have this:
(define-abbrev-table 'global-abbrev-table
'(
("8rev" "Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1)
("8ack" "Acked-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1)
("8test" "Tested-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1)
("8sob" "Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1)
))
Now, if I type the "8rev" [1] and then hit space-bar or enter, emacs expands
it to the full "Reviewed-by: ....blah blah blah..." line. This makes adding
the full tags just as quick & easy as it was to type a traditional "ACK".
Anyone have an equivalent tip for Vim ?
Perhaps we could add them to the hacking file.
Regards,
Daniel
[1] Why the leading "8" you might ask ? I've no idea. I just got this
tip from QEMU developers - guess you just want some character seq
that you're unlikely to want to type for real, to avoid accidental
expansions.
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
6 years, 9 months
[libvirt] [PATCH] hyperv: Sync generator output between python versions
by Cole Robinson
Yet another dependency on dict() hash ordering
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/hyperv/hyperv_wmi_generator.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py
index d54810211..6582fe1f1 100755
--- a/src/hyperv/hyperv_wmi_generator.py
+++ b/src/hyperv/hyperv_wmi_generator.py
@@ -271,7 +271,7 @@ class WmiClass:
# isolate those that are common for all and keep track of their postions
pos = 0
- for key in property_info:
+ for key in sorted(property_info):
info = property_info[key]
# exists in all class versions
if info[1] == num_classes:
--
2.14.3
6 years, 9 months
[libvirt] [snmp PATCH 0/2] Fix build and use proper OID
by Michael Corcoran
The first patch fixes the build against net-snmp newer than 2016ish, where they removed their U64 typedef from headers to avoid a Perl incompability.
Second patch replaces the placeholder organisation OID (12345) with the IANA registered libvirt OID (36957).
I have tested these patches lightly on my local machine, but only get. My goal is purely monitoring.
Thanks to Michal Privoznik for his advice.
Michael Corcoran (2):
Replace U64 with struct counter64 to fix build
Replace placeholder org OID with libvirt OID
src/LIBVIRT-MIB.txt | 7 ++++---
src/defaults/node-libvirtGuestCpuTime.m2d | 2 +-
src/libvirtGuestTable-README-libvirtGuestTable.txt | 20 ++++++++++----------
src/libvirtGuestTable.h | 6 +++---
src/libvirtGuestTable_data_access.c | 4 ++--
src/libvirtGuestTable_data_access.h | 2 +-
src/libvirtGuestTable_data_get.c | 20 ++++++++++----------
src/libvirtGuestTable_data_get.h | 4 ++--
src/libvirtGuestTable_data_set.c | 6 +++---
src/libvirtGuestTable_data_set.h | 6 +++---
src/libvirtGuestTable_interface.c | 10 +++++-----
src/libvirtGuestTable_oids.h | 2 +-
src/libvirtNotifications.c | 10 +++++-----
13 files changed, 50 insertions(+), 49 deletions(-)
6 years, 9 months
[libvirt] [PATCH] qemu: Don't assign alias to disabled balloon device
by Jiri Denemark
<memballoon model='none'/> is the only way to disable balloon driver
since libvirt will add one automatically if the memballoon element is
missing. In other words, there's no balloon device if model is 'none'
and generating an alias for it makes no sense. The alias will be ignored
when parsing the XML and it will disappear once libvirtd is restarted.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_alias.c | 3 ++-
tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml | 4 +---
...muhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 +---
.../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 4 +---
...emuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 4 +---
.../qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 4 +---
.../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml | 4 +---
.../qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml | 4 +---
.../qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml | 4 +---
.../qemuhotplug-base-live+watchdog-user-alias.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml | 4 +---
tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml | 4 +---
.../qemuhotplug-base-with-scsi-controller-live.xml | 4 +---
.../qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml | 4 +---
20 files changed, 21 insertions(+), 58 deletions(-)
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index d0ca15bae2..95d1e0370a 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -612,7 +612,8 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
if (qemuAssignDeviceWatchdogAlias(def->watchdog) < 0)
return -1;
}
- if (def->memballoon) {
+ if (def->memballoon &&
+ def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) {
if (qemuAssingDeviceMemballoonAlias(def->memballoon, 0) < 0)
return -1;
}
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
index 75948f324e..f501cde333 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
@@ -50,9 +50,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<panic model='s390'/>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
index bb9d427c2f..223e929ad5 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
@@ -60,9 +60,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<panic model='s390'/>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
index c41f5affdd..c745d48558 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
@@ -50,9 +50,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<panic model='s390'/>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
index b1114dba9b..3189294b65 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
@@ -59,9 +59,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<panic model='s390'/>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
index b1114dba9b..3189294b65 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
@@ -59,9 +59,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<panic model='s390'/>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
index 3476f61db5..edf57fcd3f 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
@@ -49,9 +49,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<panic model='s390'/>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
index 3a202d069e..b97bba78c6 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
@@ -40,9 +40,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<panic model='s390'/>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
index 4c3ea3202b..035ec25304 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
@@ -66,9 +66,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
index 493a615fd3..dd65a48057 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
@@ -54,9 +54,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
index 3609819ea3..c161e5b289 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
@@ -54,9 +54,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
index b88b220e33..299d595d6e 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
@@ -54,9 +54,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
index 11ffd9fba8..a6930bfa69 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
@@ -44,9 +44,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<shmem name='shmem0'>
<model type='ivshmem-plain'/>
<size unit='M'>4</size>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
index 9736f6bda7..757b6b0980 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
@@ -44,9 +44,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
<shmem name='shmem0'>
<model type='ivshmem-plain'/>
<size unit='M'>4</size>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
index 051273ccf6..b1ba51b2d8 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
@@ -50,9 +50,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
index 27aff2b6f8..1fddd68a27 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
@@ -48,9 +48,7 @@
<alias name='ua-UserWatchdog'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</watchdog>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
index 9f8f983e5d..76b573f25c 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
@@ -48,9 +48,7 @@
<alias name='watchdog0'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</watchdog>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
index 67cf41ad6b..d46e20fa58 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
@@ -44,9 +44,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
index d23d3d483e..5ee6ea25c3 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
@@ -48,9 +48,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
index cceb678bb9..d35fea6f5f 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
@@ -58,9 +58,7 @@
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
- <memballoon model='none'>
- <alias name='balloon0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
<seclabel type='none' model='none'/>
</domain>
--
2.16.2
6 years, 9 months
