[libvirt] [PATCH v3 0/4] Restructure firewall rules for virtual networks into private chains
by Daniel P. Berrangé
v1: https://www.redhat.com/archives/libvir-list/2018-November/msg00018.html
v2: https://www.redhat.com/archives/libvir-list/2018-December/msg00198.html
The virtual networks in NAT mode are supposed to only allow outbound
network access for guests. Unfortunately due to ordering of the firewall
rules libvirt creates, when you have multiple virtual networks, guests
on the more recently created virtual networks can connect to guests on
old virtual networks.
This was reported way back in 2008 but we always thought the fix would
be very complicated to deal with, so we've been putting it off forever.
In parallel with this there's also been a long standing desire since
2009 to move our firewall rules out of the builtin chains, to libvirt
private chains. This is to make it easier for admins to use hook scripts
to setup rules in the builtin chains that take priority over rules
libvirt creates.
In implementing the changes to use private chains, I suddenly realized
that fixing the network to network traffic blocking problem was trivial
if I grouped the forwarding rules into three distinct sets.
So this series finally fixes an annoying 10 year old bug, and implements
a 9 year old RFE.
It may take us a while, but we'll get to your bugs eventually ;-)
Changed in v3:
- Rebase to git master
Changed in v2:
- Detect whether chains already exist before creating them
- Only try to delete legacy rules from builtin chain during startup
Daniel P. Berrangé (4):
network: add platform driver callbacks around firewall reload
util: pass layer into firewall query callback
util: create private chains for virtual network firewall rules
util: move virtual network firwall rules into private chains
src/libvirt_private.syms | 2 +
src/network/bridge_driver.c | 13 +-
src/network/bridge_driver_linux.c | 32 +++
src/network/bridge_driver_nop.c | 11 +
src/network/bridge_driver_platform.h | 3 +
src/nwfilter/nwfilter_ebiptables_driver.c | 17 +-
src/util/virfirewall.c | 2 +-
src/util/virfirewall.h | 1 +
src/util/viriptables.c | 254 +++++++++++++++---
src/util/viriptables.h | 4 +
.../nat-default-linux.args | 32 +--
.../nat-ipv6-linux.args | 48 ++--
.../nat-many-ips-linux.args | 60 ++---
.../nat-no-dhcp-linux.args | 46 ++--
.../nat-tftp-linux.args | 34 +--
.../route-default-linux.args | 22 +-
tests/virfirewalltest.c | 3 +-
17 files changed, 405 insertions(+), 179 deletions(-)
--
2.20.1
6 years, 2 months
[libvirt] [PATCH 0/3] SEV: Make /dev/sev available only to domains that need it
by Erik Skultety
Erik Skultety (3):
qemu: conf: Remove /dev/sev from the default cgroup device acl list
qemu: cgroup: Expose /dev/sev/ only to domains that require SEV
qemu: domain: Add /dev/sev into the domain mount namespace selectively
src/qemu/qemu.conf | 2 +-
src/qemu/qemu_cgroup.c | 21 ++++++++++++++++++++-
src/qemu/qemu_domain.c | 23 +++++++++++++++++++++++
src/qemu/test_libvirtd_qemu.aug.in | 1 -
4 files changed, 44 insertions(+), 3 deletions(-)
--
2.20.1
6 years, 2 months
[libvirt] [PATCH] docs: Drop /dev/net/tun from the list of shared devices
by Erik Skultety
This was a left-over that should have been dropped along the change in
qemu.conf.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
Pushed as trivial.
docs/drvqemu.html.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index 0d14027646..bf60a9144b 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -396,8 +396,7 @@ chmod o+x /path/to/directory
/dev/null, /dev/full, /dev/zero,
/dev/random, /dev/urandom,
/dev/ptmx, /dev/kvm, /dev/kqemu,
-/dev/rtc, /dev/hpet, /dev/net/tun,
-/dev/sev
+/dev/rtc, /dev/hpet, /dev/sev
</pre>
<p>
--
2.20.1
6 years, 2 months
[libvirt] [PATCH 00/27] network: refactor to decouple virt drivers from network driver
by Daniel P. Berrangé
Currently the network driver registers a set of callbacks with the virt
driver in order to handle allocating/releasing network ports associated
with guest NICs.
This series introduces a virNetworkPortPtr object and associated XML
that describes a network port. The virt drivers now call public APIs
associated with this new object to create/delete ports for guest NICs.
There are some parts that are not yet addressed by this series
- The live updating of bandwidth limits on network ports
- The old code would re-connect VIFs to bridges, and/or change
bridges during startup. This code is deleted right now as it
doesn't belong in the network driver. It needs to move to the
virt drivers in some (to be determined) manner.
Daniel P. Berrangé (27):
conf: make virPCIDeviceAddressFormat void
network: restrict usage of port management APIs
network: pass a virNetworkPtr to port management APIs
conf: simplify link from hostdev back to network device
network: add missing bandwidth limits for bridge forward type
network: use 'bridge' as actual type instead of 'network'
virt drivers: don't handle type=network after resolving actual network
type
network: unconditionally merge port profiles
conf: introduce virNetworkPortDefPtr struct and XML support
network: stop passing virDomainNetDefPtr into bandwidth functions
network: make networkLogAllocation independent of domain conf
util: add API for copying virtual port profile data
conf: add APIs to convert virDomainNetDef to virNetworkPortDef
network: convert networkAllocateActualDevice to virNetworkPortDef
network: convert networkNotifyActualDevice to virNetworkPortDef
network: convert networkReleaseActualDevice to virNetworkPortDef
network: convert hook script to take a network port XML
network: introduce networkAllocatePort
network: introduce networkNotifyPort
network: introduce networkReleasePort
network: add public APIs for network port object
access: add permissions for network port objects
remote: add support for new network port APIs
virsh: add support for network port APIs
conf: support recording ports against virNetworkObjPtr
network: add implementation of network port APIs
conf: switch over to use network port APIs for virt drivers
include/libvirt/libvirt-network.h | 49 +
include/libvirt/virterror.h | 3 +
src/access/genpolkit.pl | 2 +-
src/access/viraccessdriver.h | 6 +
src/access/viraccessdrivernop.c | 11 +
src/access/viraccessdriverpolkit.c | 26 +
src/access/viraccessdriverstack.c | 25 +
src/access/viraccessmanager.c | 16 +
src/access/viraccessmanager.h | 6 +
src/access/viraccessperm.c | 8 +-
src/access/viraccessperm.h | 38 +
src/conf/Makefile.inc.am | 2 +
src/conf/device_conf.c | 3 +-
src/conf/device_conf.h | 6 +-
src/conf/domain_conf.c | 413 ++++++-
src/conf/domain_conf.h | 46 +-
src/conf/network_conf.c | 7 +-
src/conf/storage_adapter_conf.c | 4 +-
src/conf/virnetworkobj.c | 303 +++++
src/conf/virnetworkobj.h | 30 +
src/conf/virnetworkportdef.c | 497 ++++++++
src/conf/virnetworkportdef.h | 112 ++
src/datatypes.c | 60 +
src/datatypes.h | 41 +
src/driver-network.h | 27 +
src/libvirt-network.c | 351 ++++++
src/libvirt_private.syms | 21 +
src/libvirt_public.syms | 14 +
src/libxl/libxl_conf.c | 21 +-
src/libxl/libxl_domain.c | 28 +-
src/libxl/libxl_driver.c | 27 +-
src/lxc/lxc_driver.c | 37 +-
src/lxc/lxc_process.c | 21 +-
src/network/bridge_driver.c | 1069 +++++++++--------
src/qemu/qemu_command.c | 11 +-
src/qemu/qemu_domain_address.c | 4 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hotplug.c | 84 +-
src/qemu/qemu_hotplug.h | 2 +-
src/qemu/qemu_interface.c | 12 +-
src/qemu/qemu_process.c | 32 +-
src/remote/remote_daemon_dispatch.c | 25 +
src/remote/remote_driver.c | 28 +
src/remote/remote_protocol.x | 89 +-
src/remote_protocol-structs | 47 +
src/rpc/gendispatch.pl | 18 +-
src/util/virerror.c | 9 +
src/util/virhook.c | 4 +-
src/util/virhook.h | 4 +-
src/util/virhostdev.c | 17 +-
src/util/virnetdevvportprofile.c | 16 +
src/util/virnetdevvportprofile.h | 2 +
tests/Makefile.am | 7 +
.../plug-bridge-mactbl.xml | 9 +
.../virnetworkportxml2xmldata/plug-bridge.xml | 9 +
.../virnetworkportxml2xmldata/plug-direct.xml | 12 +
.../plug-hostdev-pci.xml | 12 +
tests/virnetworkportxml2xmldata/plug-none.xml | 8 +
tests/virnetworkportxml2xmltest.c | 104 ++
tools/virsh-completer.c | 51 +
tools/virsh-completer.h | 4 +
tools/virsh-network.c | 399 +++++-
tools/virsh-network.h | 5 +
63 files changed, 3681 insertions(+), 675 deletions(-)
create mode 100644 src/conf/virnetworkportdef.c
create mode 100644 src/conf/virnetworkportdef.h
create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-mactbl.xml
create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge.xml
create mode 100644 tests/virnetworkportxml2xmldata/plug-direct.xml
create mode 100644 tests/virnetworkportxml2xmldata/plug-hostdev-pci.xml
create mode 100644 tests/virnetworkportxml2xmldata/plug-none.xml
create mode 100644 tests/virnetworkportxml2xmltest.c
--
2.19.2
6 years, 2 months
[libvirt] [PATCH 00/32] qemu: add support for 'device_id' of SCSI disks (blockdev-add saga)
by Peter Krempa
The quest for -blockdev will sidetrack through disk formatter wasteland
through hordes of (un)dead(s) [code] while heroicaly slaying the guest
ABI regression dragon.
Note that the corresponding qemu feature was not pushed yet.
Peter Krempa (32):
tests: qemucaps: Make fake 'microcodeVersion' depend on filename
instead of length
qemu: capabilities: Probe caps for 'scsi-hd' instead of 'scsi-disk'
qemu: capabilities: Probe caps for 'ide-hd' instead of 'ide-drive'
tests: qemuxml: Add a common test file for the 'virtio-scsi'
controller
tests: qemu: Remove 'disk-scsi-virtio-scsi' test
tests: qemuxml: Merge 'num-queues' variant of 'virtio-scsi' test into
the common file
tests: qemuxml: Merge 'cmd_per_lun' variant of 'virtio-scsi' test into
the common file
tests: qemuxml: Merge 'max_sectors' variant of 'virtio-scsi' test into
the common file
tests: qemuxml: Merge 'ioeventfd' variant of 'virtio-scsi' test into
the common file
tests: qemuxml2argv: Use real caps when auto-generating SCSI
controller type
tests: qemuxml2argv: Remove testing of post startup change to
'cachemode' for shared disks
tests: qemuxml2argv: Remove the 'after startup XML' testing machinery
tests: qemuxml2argv: Move cases from 'disk-shared-locking' into
'disk-shared'
tests: qemu: Rename 'disk-scsi-device' to 'disk-scsi'
tests: qemuxml2argv: Modernize 'disk-scsi' test
tests: qemu: Merge 'disk-scsi-megasas' test into 'disk-scsi'
tests: qemu: Merge 'disk-scsi-mptsas1068' test into 'disk-scsi'
tests: qemu: Merge 'disk-scsi-mptsas1068' test into 'disk-scsi'
tests: qemuxml2argv: Use 1.5.3 version for very old state in
'disk-cache'
tests: qemuxml2argv: Modernize virtio-scsi iothread tests
tests: qemuxml2argv: Remove 'disk-virtio-scsi-ccw' test
qemu: caps: Always assume presence of 'scsi-hd' and 'scsi-cd' device
qemu: caps: Always assume presence of 'ide-hd' and 'ide-cd' devices
qemu: command: Use correct type for switch in qemuBuildDiskDeviceStr
tests: qemuxml2argv: Add CDROM disks for all untested buses
qemu: Forbid cdroms on virtio bus
qemu: command: Drop formatting of 'media=cdrom' from -drive
tests: qemuxml2argv: Add a 'serial' value for a SCSI disk
DON'T PUSH: test: qemucaps: Update caps with scsi 'device_id' patches
qemu: caps: Introduce capability for 'device_id' property of
'scsi-disk'
qemu: Use the 'device_id' property of SCSI disks to avoid regressing
qemu: caps: Add lockout for -blockdev if QEMU_CAPS_SCSI_DISK_DEVICE_ID
is not present
src/qemu/qemu_capabilities.c | 13 +-
src/qemu/qemu_capabilities.h | 5 +-
src/qemu/qemu_command.c | 78 +-
src/qemu/qemu_domain.c | 8 +
tests/Makefile.am | 1 -
.../caps_1.5.3.x86_64.replies | 4 +-
.../caps_1.5.3.x86_64.xml | 4 +-
.../caps_1.6.0.x86_64.replies | 4 +-
.../caps_1.6.0.x86_64.xml | 4 +-
.../caps_1.7.0.x86_64.replies | 4 +-
.../caps_1.7.0.x86_64.xml | 4 +-
.../caps_2.1.1.x86_64.replies | 4 +-
.../caps_2.1.1.x86_64.xml | 4 +-
.../caps_2.10.0.aarch64.replies | 4 +-
.../caps_2.10.0.aarch64.xml | 4 +-
.../caps_2.10.0.ppc64.replies | 4 +-
.../caps_2.10.0.ppc64.xml | 4 +-
.../caps_2.10.0.s390x.replies | 4 +-
.../caps_2.10.0.s390x.xml | 3 +-
.../caps_2.10.0.x86_64.replies | 4 +-
.../caps_2.10.0.x86_64.xml | 4 +-
.../caps_2.11.0.s390x.replies | 4 +-
.../caps_2.11.0.s390x.xml | 3 +-
.../caps_2.11.0.x86_64.replies | 4 +-
.../caps_2.11.0.x86_64.xml | 4 +-
.../caps_2.12.0.aarch64.replies | 4 +-
.../caps_2.12.0.aarch64.xml | 4 +-
.../caps_2.12.0.ppc64.replies | 4 +-
.../caps_2.12.0.ppc64.xml | 4 +-
.../caps_2.12.0.s390x.replies | 4 +-
.../caps_2.12.0.s390x.xml | 3 +-
.../caps_2.12.0.x86_64.replies | 4 +-
.../caps_2.12.0.x86_64.xml | 4 +-
.../caps_2.4.0.x86_64.replies | 4 +-
.../caps_2.4.0.x86_64.xml | 4 +-
.../caps_2.5.0.x86_64.replies | 4 +-
.../caps_2.5.0.x86_64.xml | 4 +-
.../caps_2.6.0.aarch64.replies | 4 +-
.../caps_2.6.0.aarch64.xml | 4 +-
.../caps_2.6.0.ppc64.replies | 4 +-
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 4 +-
.../caps_2.6.0.x86_64.replies | 4 +-
.../caps_2.6.0.x86_64.xml | 4 +-
.../caps_2.7.0.s390x.replies | 4 +-
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +-
.../caps_2.7.0.x86_64.replies | 4 +-
.../caps_2.7.0.x86_64.xml | 4 +-
.../caps_2.8.0.s390x.replies | 4 +-
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +-
.../caps_2.8.0.x86_64.replies | 4 +-
.../caps_2.8.0.x86_64.xml | 4 +-
.../caps_2.9.0.ppc64.replies | 4 +-
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 4 +-
.../caps_2.9.0.s390x.replies | 4 +-
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +-
.../caps_2.9.0.x86_64.replies | 4 +-
.../caps_2.9.0.x86_64.xml | 4 +-
.../caps_3.0.0.ppc64.replies | 4 +-
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 4 +-
.../caps_3.0.0.riscv32.replies | 4 +-
.../caps_3.0.0.riscv32.xml | 1 -
.../caps_3.0.0.riscv64.replies | 4 +-
.../caps_3.0.0.riscv64.xml | 1 -
.../caps_3.0.0.s390x.replies | 4 +-
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 +-
.../caps_3.0.0.x86_64.replies | 4 +-
.../caps_3.0.0.x86_64.xml | 4 +-
.../caps_3.1.0.ppc64.replies | 4 +-
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 4 +-
.../caps_3.1.0.x86_64.replies | 4 +-
.../caps_3.1.0.x86_64.xml | 4 +-
.../caps_4.0.0.x86_64.replies | 2735 ++++++++---------
.../caps_4.0.0.x86_64.xml | 22 +-
tests/qemucapabilitiestest.c | 17 +-
.../aarch64-virtio-pci-manual-addresses.args | 4 +-
tests/qemuxml2argvdata/autoindex.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.args | 3 +-
.../balloon-device-deflate-off.args | 3 +-
.../balloon-device-deflate.args | 3 +-
.../balloon-device-period.args | 3 +-
tests/qemuxml2argvdata/balloon-device.args | 3 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 4 +-
tests/qemuxml2argvdata/bios-nvram.args | 3 +-
tests/qemuxml2argvdata/bios.args | 3 +-
.../blkdeviotune-group-num.args | 5 +-
.../blkdeviotune-max-length.args | 5 +-
tests/qemuxml2argvdata/blkdeviotune-max.args | 5 +-
tests/qemuxml2argvdata/blkiotune-device.args | 3 +-
tests/qemuxml2argvdata/blkiotune.args | 3 +-
tests/qemuxml2argvdata/boot-cdrom.args | 6 +-
tests/qemuxml2argvdata/boot-complex.args | 10 +-
tests/qemuxml2argvdata/boot-floppy.args | 2 +-
.../boot-menu-disable-drive.args | 6 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 6 +-
.../boot-menu-enable-with-timeout.args | 6 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 6 +-
tests/qemuxml2argvdata/boot-multi.args | 6 +-
tests/qemuxml2argvdata/boot-network.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 8 +-
tests/qemuxml2argvdata/boot-strict.args | 10 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 3 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 3 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 3 +-
.../channel-virtio-autoadd.args | 3 +-
.../channel-virtio-autoassign.args | 3 +-
.../channel-virtio-default.args | 3 +-
.../channel-virtio-state.args | 3 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 3 +-
tests/qemuxml2argvdata/channel-virtio.args | 3 +-
tests/qemuxml2argvdata/clock-catchup.args | 3 +-
tests/qemuxml2argvdata/clock-france.args | 3 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 3 +-
.../clock-localtime-basis-localtime.args | 3 +-
tests/qemuxml2argvdata/clock-localtime.args | 3 +-
tests/qemuxml2argvdata/clock-utc.args | 3 +-
tests/qemuxml2argvdata/clock-variable.args | 3 +-
.../qemuxml2argvdata/console-compat-auto.args | 3 +-
.../console-compat-chardev.args | 3 +-
tests/qemuxml2argvdata/console-compat.args | 3 +-
.../qemuxml2argvdata/console-virtio-many.args | 3 +-
tests/qemuxml2argvdata/console-virtio.args | 3 +-
tests/qemuxml2argvdata/controller-order.args | 4 +-
.../controller-virtio-scsi.x86_64-latest.args | 50 +
.../controller-virtio-scsi.xml | 61 +
.../cpu-host-passthrough-features.args | 3 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 3 +-
tests/qemuxml2argvdata/cputune.args | 3 +-
tests/qemuxml2argvdata/debug-threads.args | 3 +-
tests/qemuxml2argvdata/disk-aio.args | 7 +-
tests/qemuxml2argvdata/disk-boot-cdrom.args | 7 +-
tests/qemuxml2argvdata/disk-boot-disk.args | 7 +-
...ache.args => disk-cache.x86_64-1.5.3.args} | 16 +-
.../disk-cache.x86_64-latest.args | 4 +-
.../disk-cdrom-bus-other.x86_64-latest.args | 37 +
.../qemuxml2argvdata/disk-cdrom-bus-other.xml | 47 +
.../qemuxml2argvdata/disk-cdrom-network.args | 17 +-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 9 +-
tests/qemuxml2argvdata/disk-cdrom.args | 16 +-
tests/qemuxml2argvdata/disk-copy_on_read.args | 5 +-
.../qemuxml2argvdata/disk-detect-zeroes.args | 5 +-
tests/qemuxml2argvdata/disk-discard.args | 5 +-
tests/qemuxml2argvdata/disk-error-policy.args | 7 +-
tests/qemuxml2argvdata/disk-floppy-tray.args | 3 +-
tests/qemuxml2argvdata/disk-floppy.args | 3 +-
tests/qemuxml2argvdata/disk-fmt-qcow.args | 7 +-
tests/qemuxml2argvdata/disk-geometry.args | 4 +-
tests/qemuxml2argvdata/disk-ioeventfd.args | 5 +-
tests/qemuxml2argvdata/disk-iscsi.args | 3 +-
.../disk-network-sheepdog.args | 3 +-
tests/qemuxml2argvdata/disk-no-boot.args | 8 +-
tests/qemuxml2argvdata/disk-order.args | 7 +-
.../qemuxml2argvdata/disk-readonly-disk.args | 8 +-
tests/qemuxml2argvdata/disk-sata-device.args | 2 +-
...> disk-scsi-device-auto.x86_64-1.5.3.args} | 11 +-
.../disk-scsi-device-auto.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/disk-scsi-device.args | 30 -
.../disk-scsi-disk-vpd-build-error.xml | 2 +-
tests/qemuxml2argvdata/disk-scsi-megasas.args | 31 -
tests/qemuxml2argvdata/disk-scsi-megasas.xml | 35 -
.../disk-scsi-mptsas1068.args | 31 -
.../qemuxml2argvdata/disk-scsi-mptsas1068.xml | 36 -
.../disk-scsi-virtio-scsi.args | 31 -
.../disk-scsi-virtio-scsi.xml | 35 -
tests/qemuxml2argvdata/disk-scsi-vscsi.args | 31 -
tests/qemuxml2argvdata/disk-scsi-vscsi.xml | 35 -
.../disk-scsi.x86_64-latest.args | 49 +
.../{disk-scsi-device.xml => disk-scsi.xml} | 20 +
tests/qemuxml2argvdata/disk-serial.args | 6 +-
.../qemuxml2argvdata/disk-shared-locking.args | 34 -
.../qemuxml2argvdata/disk-shared-locking.xml | 42 -
tests/qemuxml2argvdata/disk-shared.args | 31 -
.../disk-shared.x86_64-2.12.0.args | 9 +-
.../disk-shared.x86_64-latest.args | 10 +-
tests/qemuxml2argvdata/disk-shared.xml | 14 +
tests/qemuxml2argvdata/disk-snapshot.args | 9 +-
.../disk-source-pool-mode.args | 15 +-
tests/qemuxml2argvdata/disk-source-pool.args | 12 +-
.../disk-usb-device-removable.args | 3 +-
tests/qemuxml2argvdata/disk-usb-device.args | 3 +-
.../disk-virtio-scsi-ccw.args | 29 -
.../qemuxml2argvdata/disk-virtio-scsi-ccw.xml | 31 -
.../disk-virtio-scsi-cmd_per_lun.args | 28 -
.../disk-virtio-scsi-cmd_per_lun.xml | 31 -
.../disk-virtio-scsi-ioeventfd.args | 28 -
.../disk-virtio-scsi-ioeventfd.xml | 31 -
.../disk-virtio-scsi-max_sectors.args | 28 -
.../disk-virtio-scsi-max_sectors.xml | 31 -
.../disk-virtio-scsi-num_queues.args | 28 -
.../disk-virtio-scsi-num_queues.xml | 31 -
tests/qemuxml2argvdata/disk-virtio.args | 7 +-
tests/qemuxml2argvdata/event_idx.args | 5 +-
tests/qemuxml2argvdata/fips-enabled.args | 3 +-
tests/qemuxml2argvdata/fs9p.args | 3 +-
.../graphics-egl-headless.args | 3 +-
.../graphics-sdl-fullscreen.args | 3 +-
tests/qemuxml2argvdata/graphics-sdl.args | 3 +-
.../graphics-spice-agent-file-xfer.args | 3 +-
.../graphics-spice-agentmouse.args | 3 +-
.../graphics-spice-compression.args | 3 +-
.../graphics-spice-egl-headless.args | 3 +-
.../graphics-spice-qxl-vga.args | 3 +-
.../qemuxml2argvdata/graphics-spice-sasl.args | 3 +-
.../graphics-spice-timeout.args | 5 +-
tests/qemuxml2argvdata/graphics-spice.args | 3 +-
.../graphics-vnc-auto-socket-cfg.args | 3 +-
.../graphics-vnc-egl-headless.args | 3 +-
.../graphics-vnc-no-listen-attr.args | 3 +-
.../qemuxml2argvdata/graphics-vnc-policy.args | 3 +-
.../graphics-vnc-remove-generated-socket.args | 3 +-
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 3 +-
tests/qemuxml2argvdata/graphics-vnc.args | 3 +-
.../hostdev-pci-address-device.args | 3 +-
.../qemuxml2argvdata/hostdev-pci-address.args | 3 +-
.../hostdev-scsi-lsi-iscsi-auth.args | 3 +-
.../hostdev-scsi-lsi-iscsi.args | 3 +-
tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 3 +-
.../hostdev-scsi-readonly.args | 3 +-
.../hostdev-scsi-vhost-scsi-pci.args | 3 +-
.../hostdev-scsi-virtio-iscsi-auth.args | 3 +-
.../hostdev-scsi-virtio-iscsi.args | 3 +-
.../hostdev-scsi-virtio-scsi.args | 3 +-
.../hostdev-usb-address-device-boot.args | 2 +-
.../hostdev-usb-address-device.args | 3 +-
.../qemuxml2argvdata/hostdev-usb-address.args | 3 +-
.../hostdev-vfio-multidomain.args | 3 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 3 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 3 +-
.../hugepages-memaccess2.args | 3 +-
tests/qemuxml2argvdata/hugepages-shared.args | 3 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 3 +-
tests/qemuxml2argvdata/input-usbmouse.args | 3 +-
tests/qemuxml2argvdata/input-usbtablet.args | 3 +-
tests/qemuxml2argvdata/iothreads-disk.args | 3 +-
.../iothreads-ids-partial.args | 3 +-
tests/qemuxml2argvdata/iothreads-ids.args | 3 +-
...threads-virtio-scsi-ccw.s390x-latest.args} | 20 +-
...hreads-virtio-scsi-pci.x86_64-latest.args} | 23 +-
tests/qemuxml2argvdata/iothreads.args | 3 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 3 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 3 +-
tests/qemuxml2argvdata/machine-aliases1.args | 3 +-
tests/qemuxml2argvdata/machine-aliases2.args | 3 +-
tests/qemuxml2argvdata/machine-core-off.args | 3 +-
tests/qemuxml2argvdata/machine-core-on.args | 3 +-
tests/qemuxml2argvdata/machine-smm-opt.args | 4 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 3 +-
tests/qemuxml2argvdata/master-key.args | 3 +-
.../memory-hotplug-dimm-addr.args | 3 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 3 +-
tests/qemuxml2argvdata/memory-hotplug.args | 3 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 3 +-
tests/qemuxml2argvdata/memtune.args | 3 +-
tests/qemuxml2argvdata/migrate.args | 3 +-
.../minimal-msg-timestamp.args | 3 +-
tests/qemuxml2argvdata/minimal-sandbox.args | 3 +-
tests/qemuxml2argvdata/minimal.args | 3 +-
tests/qemuxml2argvdata/misc-acpi.args | 3 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 3 +-
.../misc-disable-suspends.args | 3 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 3 +-
tests/qemuxml2argvdata/misc-no-reboot.args | 3 +-
tests/qemuxml2argvdata/misc-uuid.args | 3 +-
tests/qemuxml2argvdata/monitor-json.args | 3 +-
.../multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/name-escape.args | 3 +-
tests/qemuxml2argvdata/net-client.args | 3 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 3 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 3 +-
tests/qemuxml2argvdata/net-eth-names.args | 3 +-
tests/qemuxml2argvdata/net-eth.args | 3 +-
.../net-hostdev-bootorder.args | 3 +-
.../net-hostdev-multidomain.args | 3 +-
.../net-hostdev-vfio-multidomain.args | 3 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 3 +-
tests/qemuxml2argvdata/net-hostdev.args | 3 +-
tests/qemuxml2argvdata/net-mcast.args | 3 +-
tests/qemuxml2argvdata/net-server.args | 3 +-
tests/qemuxml2argvdata/net-udp.args | 3 +-
tests/qemuxml2argvdata/net-user-addr.args | 3 +-
tests/qemuxml2argvdata/net-user.args | 3 +-
.../net-vhostuser-multiq.args | 3 +-
tests/qemuxml2argvdata/net-virtio-device.args | 3 +-
.../net-virtio-disable-offloads.args | 3 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 3 +-
.../net-virtio-rxtxqueuesize.args | 3 +-
tests/qemuxml2argvdata/net-virtio.args | 3 +-
tests/qemuxml2argvdata/nosharepages.args | 3 +-
.../numad-auto-memory-vcpu-cpuset.args | 3 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 3 +-
.../numad-auto-vcpu-static-numatune.args | 3 +-
.../numad-static-memory-auto-vcpu.args | 3 +-
tests/qemuxml2argvdata/numad.args | 3 +-
.../numatune-auto-nodeset-invalid.args | 3 +-
tests/qemuxml2argvdata/numatune-memory.args | 3 +-
tests/qemuxml2argvdata/panic-no-address.args | 3 +-
tests/qemuxml2argvdata/panic.args | 3 +-
.../parallel-parport-chardev.args | 3 +-
.../parallel-tcp-chardev.args | 3 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 4 +-
tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 4 +-
tests/qemuxml2argvdata/pci-many.args | 4 +-
tests/qemuxml2argvdata/pci-rom.args | 3 +-
.../pci-serial-dev-chardev.args | 3 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port.args | 2 +-
.../pcie-switch-downstream-port.args | 2 +-
.../pcie-switch-upstream-port.args | 2 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 2 +-
.../pseries-vio-user-assigned.args | 4 +-
tests/qemuxml2argvdata/pseries-vio.args | 4 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +-
tests/qemuxml2argvdata/q35-usb2.args | 2 +-
tests/qemuxml2argvdata/q35.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 3 +-
.../qemu-ns-commandline-ns0.args | 3 +-
.../qemu-ns-commandline-ns1.args | 3 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 3 +-
.../qemu-ns-domain-commandline-ns0.args | 3 +-
.../qemu-ns-domain-commandline.args | 3 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +-
tests/qemuxml2argvdata/qemu-ns.args | 3 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 3 +-
tests/qemuxml2argvdata/restore-v2.args | 3 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 3 +-
.../seclabel-dynamic-baselabel.args | 3 +-
.../seclabel-dynamic-labelskip.args | 3 +-
.../seclabel-dynamic-override.args | 5 +-
.../seclabel-dynamic-relabel.args | 3 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +-
tests/qemuxml2argvdata/seclabel-none.args | 3 +-
.../seclabel-static-labelskip.args | 3 +-
.../seclabel-static-relabel.args | 3 +-
tests/qemuxml2argvdata/seclabel-static.args | 3 +-
.../serial-dev-chardev-iobase.args | 3 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 3 +-
.../qemuxml2argvdata/serial-file-chardev.args | 3 +-
tests/qemuxml2argvdata/serial-file-log.args | 3 +-
.../qemuxml2argvdata/serial-many-chardev.args | 3 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 3 +-
.../serial-spiceport-nospice.args | 3 +-
tests/qemuxml2argvdata/serial-spiceport.args | 3 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 3 +-
.../serial-tcp-telnet-chardev.args | 3 +-
.../serial-tcp-tlsx509-chardev-notls.args | 3 +-
.../serial-tcp-tlsx509-chardev-verify.args | 3 +-
.../serial-tcp-tlsx509-chardev.args | 3 +-
.../serial-tcp-tlsx509-secret-chardev.args | 3 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 3 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +-
tests/qemuxml2argvdata/smbios.args | 3 +-
tests/qemuxml2argvdata/smp.args | 3 +-
tests/qemuxml2argvdata/sound-device.args | 3 +-
tests/qemuxml2argvdata/sound.args | 3 +-
tests/qemuxml2argvdata/user-aliases.args | 4 +-
.../video-device-pciaddr-default.args | 3 +-
tests/qemuxml2argvdata/video-none-device.args | 3 +-
.../video-qxl-device-vgamem.args | 3 +-
tests/qemuxml2argvdata/video-qxl-device.args | 3 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 3 +-
.../qemuxml2argvdata/video-qxl-nodevice.args | 3 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +-
.../video-qxl-sec-device-vgamem.args | 3 +-
.../video-qxl-sec-device.args | 3 +-
.../video-vga-device-vgamem.args | 3 +-
tests/qemuxml2argvdata/video-vga-device.args | 3 +-
.../qemuxml2argvdata/video-vga-nodevice.args | 3 +-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 3 +-
.../video-virtio-gpu-device.args | 3 +-
.../video-virtio-gpu-sdl-gl.args | 3 +-
.../video-virtio-gpu-spice-gl.args | 3 +-
.../video-virtio-gpu-virgl.args | 3 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 3 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 3 +-
tests/qemuxml2argvdata/watchdog-device.args | 3 +-
tests/qemuxml2argvdata/watchdog-dump.args | 3 +-
.../qemuxml2argvdata/watchdog-injectnmi.args | 3 +-
tests/qemuxml2argvdata/watchdog.args | 3 +-
tests/qemuxml2argvtest.c | 115 +-
.../qemuxml2startupxmloutdata/disk-shared.xml | 56 -
.../controller-virtio-scsi.xml | 76 +
...rtio-scsi.xml => disk-cdrom-bus-other.xml} | 44 +-
.../qemuxml2xmloutdata/disk-scsi-megasas.xml | 45 -
.../disk-scsi-mptsas1068.xml | 46 -
tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 45 -
.../{disk-scsi-device.xml => disk-scsi.xml} | 31 +-
.../disk-virtio-scsi-cmd_per_lun.xml | 37 -
.../disk-virtio-scsi-ioeventfd.xml | 37 -
.../disk-virtio-scsi-max_sectors.xml | 37 -
.../disk-virtio-scsi-num_queues.xml | 37 -
.../qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +-
tests/qemuxml2xmltest.c | 28 +-
396 files changed, 2424 insertions(+), 3414 deletions(-)
create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.xml
rename tests/qemuxml2argvdata/{disk-cache.args => disk-cache.x86_64-1.5.3.args} (72%)
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.xml
rename tests/qemuxml2argvdata/{disk-scsi-device-auto.args => disk-scsi-device-auto.x86_64-1.5.3.args} (69%)
create mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.xml
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.xml
create mode 100644 tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} (58%)
delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.xml
delete mode 100644 tests/qemuxml2argvdata/disk-shared.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml
rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-ccw.args => iothreads-virtio-scsi-ccw.s390x-latest.args} (58%)
rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-pci.args => iothreads-virtio-scsi-pci.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2startupxmloutdata/disk-shared.xml
create mode 100644 tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
rename tests/qemuxml2xmloutdata/{disk-scsi-virtio-scsi.xml => disk-cdrom-bus-other.xml} (54%)
delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
rename tests/qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} (57%)
delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
--
2.20.1
6 years, 2 months
[libvirt] [PATCH] qemu: remove check for 'qemu' binary
by Daniel P. Berrangé
The 'qemu' binary used to provide the i386 emulator until it was renamed
to qemu-system-i386 in QEMU 1.0. Since we don't support such old
versions we don't need to check for 'qemu' when probing capabilities.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f504db7d05..5cf4b617c6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -744,12 +744,6 @@ virQEMUCapsFindBinaryForArch(virArch hostarch,
goto out;
}
- /* Third attempt, i686 only: try 'qemu' */
- if (guestarch == VIR_ARCH_I686) {
- if ((ret = virQEMUCapsFindBinary("%s", "qemu")) != NULL)
- goto out;
- }
-
out:
return ret;
}
--
2.20.1
6 years, 2 months
[libvirt] [cim PATCH] configure: no need to tell us we can run make
by Daniel P. Berrangé
autogen.sh already tells us we can run make, there's no need for
configure.ac to tell us too.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
configure.ac | 2 --
1 file changed, 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2439dbe..28bfc16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,5 +195,3 @@ echo "----------------------------------------------------------"
# Generate configure scripts for the Makefile
AC_OUTPUT(libvirt-cim.spec)
-
-echo "You may now run make"
--
2.20.1
6 years, 2 months
[libvirt] [go PATCH 0/8] Refactor the way typed parameters are handled
by Daniel P. Berrangé
Go 1.12 breaks our current typed parameter handling as it appears to be
deciding some various are no longer live & free'ing them. Mixing go
allocated memory with C API calls often trips with this kind of thing.
This series thus changes the code to use C allocated memory for typed
parameter arrays and use the libvirt APIs where possible.
I'm not sure if anyone on list feels like reviewing this Go code or not.
Most of the time I've just pushed Go changes directly, but I figure putting
it out for review might help people spread the knowledge of the Go
bindings
Daniel P. Berrangé (8):
Fix GetGuestVcpus to actually return some data
Add missing error reporting when setting typed parameters
Change typedParamsPackNew to use a C allocated array
Switch typedParamsUnpackLen to use accessor methods
Use 'cnparams' for virTypedParameters array length variables
Simplify setting of typed parameters
Switch remaining typed parameter code to use C allocs
Rename typedParamsUnpackLen to typedParamsUnpack
connect.go | 81 ++++----
domain.go | 429 +++++++++++++++++------------------------
domain_events.go | 20 +-
typedparams.go | 295 ++++++++++++----------------
typedparams_test.go | 8 +-
typedparams_wrapper.go | 240 +++++++++++++++++++++++
typedparams_wrapper.h | 126 ++++++++++++
7 files changed, 721 insertions(+), 478 deletions(-)
create mode 100644 typedparams_wrapper.go
create mode 100644 typedparams_wrapper.h
--
2.20.1
6 years, 2 months
[libvirt] [PATCH] tests: Fix storagepoolxml2xmltest execution for XML namespaces
by John Ferlan
Only run the pool-netfs-ns-mountopts if built WITH_STORAGE_FS and only
run pool-rbd-ns-configopts if built with WITH_STORAGE_RBD since the
namespace support is only enabled if the pool is enabled.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
tests/storagepoolxml2xmltest.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 90d00a8d9e..acb15f3a2c 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -91,7 +91,9 @@ mymain(void)
DO_TEST("pool-netfs-protocol-ver");
DO_TEST("pool-netfs-gluster");
DO_TEST("pool-netfs-cifs");
+#ifdef WITH_STORAGE_FS
DO_TEST("pool-netfs-ns-mountopts");
+#endif
DO_TEST("pool-scsi");
DO_TEST("pool-scsi-type-scsi-host");
DO_TEST("pool-scsi-type-fc-host");
@@ -106,7 +108,9 @@ mymain(void)
DO_TEST("pool-zfs");
DO_TEST("pool-zfs-sourcedev");
DO_TEST("pool-rbd");
+#ifdef WITH_STORAGE_RBD
DO_TEST("pool-rbd-ns-configopts");
+#endif
DO_TEST("pool-vstorage");
DO_TEST("pool-iscsi-direct-auth");
DO_TEST("pool-iscsi-direct");
--
2.20.1
6 years, 2 months
[libvirt] [PATCH] storage: change custom namespace URIs to drop '/source' component
by Daniel P. Berrangé
The custom namespaces were originally registered against the storage
pool source struct, but during review this was changed to the top level
storage pool struct. The namespace URIs were not updated to match, so
had a redundant '/source' component.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/formatstorage.html.in | 8 ++++----
docs/schemas/storagepool.rng | 4 ++--
src/storage/storage_backend_fs.c | 2 +-
src/storage/storage_backend_rbd.c | 2 +-
tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml | 2 +-
tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml | 2 +-
tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml | 2 +-
tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index d19bc579a4..6ebd23549f 100644
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -535,7 +535,7 @@
provide the XML namespace attribute syntax as follows:
<p>
- xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'
+ xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'
</p>
<p>
@@ -551,7 +551,7 @@
The following XML snippet shows the syntax required in order to
utilize for a netfs pool:
<pre>
-<pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'>
+<pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'>
<name>nfsimages</name>
...
<source>
@@ -580,7 +580,7 @@
syntax as follows:
<p>
- xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'
+ xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'
</p>
<p>
@@ -598,7 +598,7 @@
The following XML snippet shows the syntax required in order to
utilize
<pre>
-<pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'>
+<pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'>
<name>myrbdpool</name>
...
<source>
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index e1944ff8e1..3907f70afe 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -697,7 +697,7 @@
-->
<define name="fs_mount_opts">
- <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/source/fs/1.0">
+ <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/fs/1.0">
<zeroOrMore>
<element name="option">
<attribute name='name'>
@@ -714,7 +714,7 @@
-->
<define name="rbd_config_opts">
- <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/source/rbd/1.0">
+ <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/rbd/1.0">
<zeroOrMore>
<element name="option">
<attribute name='name'>
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 0ec99c60ed..ddb422d874 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -562,7 +562,7 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool,
#if WITH_STORAGE_FS
-# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/fs/1.0"
+# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/fs/1.0"
/* Backend XML Namespace handling for fs or netfs specific mount options to
* be added to the mount -o {options_list} command line that are not otherwise
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 2348f80146..cfbce1ad19 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -59,7 +59,7 @@ struct _virStoragePoolRBDConfigOptionsDef {
char **values;
};
-#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/rbd/1.0"
+#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0"
static void
virStoragePoolDefRBDNamespaceFree(void *nsdata)
diff --git a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
index 0434b16eb7..c2777ed29d 100644
--- a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'>
+<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'>
<name>nfsimages</name>
<uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid>
<capacity>0</capacity>
diff --git a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
index 6b62aa6f7e..a924fc103d 100644
--- a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'>
+<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'>
<name>ceph</name>
<uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid>
<source>
diff --git a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
index 4bd164f220..fdc332087f 100644
--- a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'>
+<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'>
<name>nfsimages</name>
<uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid>
<capacity unit='bytes'>0</capacity>
diff --git a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
index 342a0ff74a..7fbcc3e0bc 100644
--- a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'>
+<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'>
<name>ceph</name>
<uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid>
<capacity unit='bytes'>0</capacity>
--
2.20.1
6 years, 2 months
