- Devel - libvirt List Archives

[libvirt] [PATCH] Adapt augeas profile to handle negative int values.
by Cédric Bosdonnat 02 May '16

02 May '16

Introducing keepalive_interval = -1 breaks to augeas lens. Fix the lens by allowing signed ints in the regular expression. --- daemon/libvirtd.aug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index a70aa1d..4d40ee2 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -13,7 +13,7 @@ module Libvirtd = let str_val = del /\"/ "\"" . store /[^\"]*/ . del /\"/ "\"" let bool_val = store /0|1/ - let int_val = store /[0-9]+/ + let int_val = store /-?[0-9]+/ let str_array_element = [ seq "el" . str_val ] . del /[ \t\n]*/ "" let str_array_val = counter "el" . array_start . ( str_array_element . ( array_sep . str_array_element ) * ) ? . array_end -- 2.6.6

4 3

[libvirt] [PATCH v3 0/4] Fix parsing our own XMLs
by Martin Kletzander 02 May '16

02 May '16

v3: - Actually use virPCIDeviceAddress. It was actually ACKed with that changed but I feel like it's way too big of a change for just pushing it. Also, I'm in no rush with this, so I'l gladly wait after therelease with this. v2: - Just a rebase - I did *not* use virPCIDeviceAddress wording instead as discussed in the v1 thread. That's because we have lot of functions working with virDevicePCIAddress named exactly after that and renaming those would be ugly IMHO. - https://www.redhat.com/archives/libvir-list/2016-April/msg00714.html v1: - https://www.redhat.com/archives/libvir-list/2016-April/msg00081.html Martin Kletzander (4): Change virDevicePCIAddress to virPCIDeviceAddress Move capability formatting together schemas: Update nodedev schema to match reality conf: Parse more of our nodedev XML docs/schemas/nodedev.rng | 29 +++--- src/bhyve/bhyve_device.c | 4 +- src/conf/device_conf.c | 16 +-- src/conf/device_conf.h | 25 ++--- src/conf/domain_addr.c | 24 ++--- src/conf/domain_addr.h | 22 ++-- src/conf/domain_conf.c | 26 ++--- src/conf/domain_conf.h | 10 +- src/conf/network_conf.c | 8 +- src/conf/network_conf.h | 2 +- src/conf/node_device_conf.c | 111 +++++++++++++++++++-- src/conf/storage_conf.c | 14 +-- src/conf/storage_conf.h | 2 +- src/libvirt_private.syms | 8 +- src/network/bridge_driver.c | 4 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_domain_address.c | 12 +-- src/qemu/qemu_hotplug.c | 10 +- src/qemu/qemu_monitor.c | 12 +-- src/qemu/qemu_monitor.h | 14 +-- src/qemu/qemu_monitor_json.c | 12 +-- src/qemu/qemu_monitor_json.h | 12 +-- src/qemu/qemu_monitor_text.c | 14 +-- src/qemu/qemu_monitor_text.h | 12 +-- src/storage/storage_backend_scsi.c | 2 +- src/util/virpci.c | 2 +- src/util/virpci.h | 3 +- src/xen/xend_internal.c | 2 +- .../pci_0000_00_1c_0_header_type.xml | 2 +- tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml | 23 +++++ .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 29 ++++++ ...i_0000_02_10_7_sriov_pf_vfs_all_header_type.xml | 30 ++++++ .../pci_0000_02_10_7_sriov_vfs.xml | 26 +++++ .../pci_0000_02_10_7_sriov_zero_vfs_max_count.xml | 21 ++++ tests/nodedevxml2xmltest.c | 7 ++ 35 files changed, 391 insertions(+), 161 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml -- 2.8.1

2 5

[libvirt] [PATCH] spec: add vz daemon related packages to libvirt.spec.in
by Maxim Nestratov 02 May '16

02 May '16

--- libvirt.spec.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8036fa3..cddf447 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -54,6 +54,7 @@ %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_libxl 0%{!?_without_libxl:%{server_drivers}} %define with_vbox 0%{!?_without_vbox:%{server_drivers}} +%define with_vz 0%{!?_without_vz:%{server_drivers}} %define with_qemu_tcg %{with_qemu} @@ -423,6 +424,9 @@ Requires: libvirt-daemon-driver-vbox = %{version}-%{release} %if %{with_nwfilter} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} %endif + %if %{with_vz} +Requires: libvirt-daemon-driver-vz = %{version}-%{release} + %endif %if %{with_interface} Requires: libvirt-daemon-driver-interface = %{version}-%{release} @@ -988,6 +992,19 @@ VirtualBox %endif + %if %{with_vz} +%package daemon-driver-vz +Summary: Virtuozzo driver plugin for the libvirtd daemon +Group: Development/Libraries +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-driver-vz +The vz driver plugin for the libvirtd daemon, providing +an implementation of the hypervisor driver APIs using +Virtuozzo + %endif + + %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon @@ -1141,6 +1158,27 @@ Requires: libvirt-daemon-driver-storage = %{version}-%{release} Server side daemon and driver required to manage the virtualization capabilities of VirtualBox %endif + + %if %{with_vz} +%package daemon-vz +Summary: Server side daemon & driver required to run Virtuozzo guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} + %if %{with_driver_modules} +Requires: libvirt-daemon-driver-vz = %{version}-%{release} +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} + %endif +%description daemon-vz +Server side daemon and driver required to manage the virtualization +capabilities of Virtuozzo + %endif + %endif # %{with_libvirtd} %package client @@ -2228,6 +2266,13 @@ exit 0 %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so %endif + + %if %{with_vz} +%files daemon-driver-vz +%defattr(-, root, root) +%{_libdir}/%{name}/connection-driver/libvirt_driver_vz.so + %endif + %endif # %{with_driver_modules} %if %{with_qemu_tcg} @@ -2259,6 +2304,11 @@ exit 0 %files daemon-vbox %defattr(-, root, root) %endif + + %if %{with_vz} +%files daemon-vz +%defattr(-, root, root) + %endif %endif # %{with_libvirtd} %if %{with_sanlock} -- 2.4.3

2 1

[libvirt] fix some problems with configure in libvirt-sandbox-service
by Daniel Brooks 01 May '16

01 May '16

I had some trouble building it and ended up with these patches; they basically just fix up the configure checks so that they find things which would later cause the build to fail.

1 2

[libvirt] [PATCH 0/4] network/nwfilter daemon reload fixes
by Cole Robinson 30 Apr '16

30 Apr '16

Fix some issues with libvirtd reload (SIGHUP) handling in the network and nwfilter drivers Cole Robinson (4): network: Fix segfault on daemon reload nwfilter: Fix potential locking problems on ObjLoad failure nwfilter: Push configFile building into LoadConfig nwfilter: Save config to disk if we generated a UUID src/conf/nwfilter_conf.c | 113 ++++++++++++++++++++++------------------- src/conf/nwfilter_conf.h | 6 +-- src/network/bridge_driver.c | 2 +- src/nwfilter/nwfilter_driver.c | 6 +-- 4 files changed, 66 insertions(+), 61 deletions(-) -- 2.7.3

2 10

[libvirt] [PATCH] Fix minor typos in messages
by Yuri Chornoivan 30 Apr '16

30 Apr '16

Hi, Many thanks for reviewing this patch. Best regards, Yuri

2 1

[libvirt] [PATCH 0/3] revert publicly visible parts of IP address "peer" patches
by Laine Stump 29 Apr '16

29 Apr '16

Due to the feature not working, and a couple questions about the design that haven't been resolved and may require publicly visible changes, these patches temporarily revert the three patches that add support for the ip element "peer" attribute to qemu and lxc. (Note that I left in the patch that changes virNetDevSetIPAddress(), because it is correct (except a problem on FreeBSD that only occurs at runtime, and only if a peer address is given, which won't happen as long as this feature is removed). I posted patches yesterday that fixed most of the problems, but they are too numerous to consider pushing before release, and anyway don't fix everything. Laine Stump (3): Revert "qemu domain allow to set ip address, peer address and route" Revert "lxc domain allow to set peer address" Revert "libvirt domain xml allow to set peer address" docs/formatdomain.html.in | 12 +----------- docs/schemas/domaincommon.rng | 5 ----- src/conf/domain_conf.c | 14 +------------- src/conf/domain_conf.h | 1 - src/lxc/lxc_container.c | 2 +- src/qemu/qemu_interface.c | 41 +---------------------------------------- 6 files changed, 4 insertions(+), 71 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH 0/2] virsh: Properly handle detach-interface --live --config.
by Nitesh Konkar 29 Apr '16

29 Apr '16

The virsh attach/detach interface command fails when both live and config are set and when the interface gets attached to different pci slots on live and config xml respectively. When we attach an interface with both --live and --config, the first time they get the same PCI slots, but the second time onwards it differs and hence the virsh detach-interface --live --config command fails. This patch makes sure that when both --live --config are set , qemuDomainDetachDeviceFlags is called twice, once with config xml and once with live xml. Steps to see the issue: virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config Nitesh Konkar (2): virsh: Introduce virshDomainDetachInterface function. virsh: Pass the corect live/config xml to virshDomainDetachInterface. tools/virsh-domain.c | 107 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 42 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH v3] tools: Fix connect command
by Martin Kletzander 29 Apr '16

29 Apr '16

The man page says: "(Re)-Connect to the hypervisor. When the shell is first started, this is automatically run with the URI parameter requested by the "-c" option on the command line." However, if you run: virsh -c 'test://default' 'connect; uri' the output will not be 'test://default'. That's because the 'connect' command does not care about any virsh-only related settings and if it is run without parameters, it connects with @uri == NULL. Not only that doesn't comply to what the man page describes, but it also doesn't make sense. It also means you aren't able to reconnect to whatever you are connected currently. So let's fix that in both virsh and virt-admin add a test case for it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: - Don't say "error: Reconnected..." when connected by a user request (by using the 'connect' command) v2: - rebased on top of Cole's changes - https://www.redhat.com/archives/libvir-list/2016-April/msg01551.html v1: - https://www.redhat.com/archives/libvir-list/2016-April/msg01462.html tests/test-lib.sh | 6 ++++++ tests/virsh-uriprecedence | 54 +++++++++++++++++++++++++++++++++++------------ tools/virsh.c | 50 +++++++++++-------------------------------- tools/virt-admin.c | 6 ++++-- 4 files changed, 63 insertions(+), 53 deletions(-) diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 8e0ce83e118c..49e8d2209572 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -232,6 +232,12 @@ if test -n "$VIR_TEST_DEBUG" || test -n "$VIR_TEST_VERBOSE" ; then verbose=1 fi +debug() { :; } + +if test "$VIR_TEST_DEBUG" = "2"; then + debug() { echo "$@"; } +fi + # This is a stub function that is run upon trap (upon regular exit and # interrupt). Override it with a per-test function, e.g., to unmount # a partition, or to undo any other global state changes. diff --git a/tests/virsh-uriprecedence b/tests/virsh-uriprecedence index 1cf3d22ec74c..564e3dc42c72 100755 --- a/tests/virsh-uriprecedence +++ b/tests/virsh-uriprecedence @@ -7,7 +7,8 @@ test_intro "virsh-uriprecedence" virsh_bin="$abs_top_builddir/tools/virsh" -counter=1 +virsh_cmd="$virsh_bin" +counter=0 ret=0 cleanup_() { rm -rf "$tmphome"; } @@ -22,16 +23,44 @@ mkdir -p "$XDG_CONFIG_HOME/libvirt" "$XDG_CONFIG_HOME/virsh" mkdir -p "$XDG_CACHE_HOME/libvirt" "$XDG_CACHE_HOME/virsh" mkdir -p "$XDG_RUNTIME_HOME/libvirt" "$XDG_RUNTIME_HOME/virsh" -# Main function checking for the proper uri being returned +is_uri_good() +{ + echo "$1" | grep -q -F "$good_uri" +} + +test_uri_internal() +{ + test_name=$1 + test_cmd="$virsh_cmd \"$2\"" + result=0 + + debug "Running '$test_cmd'" + out="$($virsh_cmd "$2")" + + if ! is_uri_good "$out"; then + debug "Invalid output: '$out'" + result=1 + ret=1 + fi + + counter="$((counter+1))" + test_result "$counter" "$1" "$result" +} + +test_uri_connect() +{ + test_uri_internal "$1" "connect; uri" +} + +test_uri_noconnect() +{ + test_uri_internal "$1" "uri" +} + test_uri() { - result=0 - if [ "$($virsh_bin uri)" != "$good_uri" ]; then - result=1 - ret=1 - fi - test_result "$counter" "$1" "$result" - counter="$((counter+1))" + test_uri_connect "$1" + test_uri_noconnect "$1" } # Precedence is the following (lowest priority first): @@ -56,6 +85,7 @@ good_uri="test:///default?good_uri" printf "uri_default=\"%s\"\n" "$good_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" if uid_is_privileged_; then + counter="$((counter+1))" test_skip_case "$counter" "User config file" "must not be run as root" else test_uri "User config file" @@ -70,10 +100,8 @@ export VIRSH_DEFAULT_CONNECT_URI="$good_uri" test_uri "VIRSH_DEFAULT_CONNECT_URI" export VIRSH_DEFAULT_CONNECT_URI="$bad_uri" -virsh_bin="$virsh_bin --connect $good_uri" +virsh_cmd="$virsh_bin --connect $good_uri" test_uri "Parameter" -# test_uri() increases $counter even for the last test, so we must -# decrement it -test_final "$((counter-1))" "$ret" +test_final "$counter" "$ret" (exit "$ret"); exit "$ret" diff --git a/tools/virsh.c b/tools/virsh.c index af072510870d..2a807d99af71 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -211,10 +211,11 @@ virshConnect(vshControl *ctl, const char *uri, bool readonly) * */ static void -virshReconnect(vshControl *ctl) +virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) { bool connected = false; virshControlPtr priv = ctl->privData; + bool ro = name ? readonly : priv->readonly; if (priv->conn) { int ret; @@ -229,7 +230,7 @@ virshReconnect(vshControl *ctl) "disconnect from the hypervisor")); } - priv->conn = virshConnect(ctl, ctl->connname, priv->readonly); + priv->conn = virshConnect(ctl, name ? name : ctl->connname, ro); if (!priv->conn) { if (disconnected) @@ -237,10 +238,15 @@ virshReconnect(vshControl *ctl) else vshError(ctl, "%s", _("failed to connect to the hypervisor")); } else { + if (name) { + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); + priv->readonly = readonly; + } if (virConnectRegisterCloseCallback(priv->conn, virshCatchDisconnect, ctl, NULL) < 0) vshError(ctl, "%s", _("Unable to register disconnect callback")); - if (connected) + if (connected && !force) vshError(ctl, "%s", _("Reconnected to the hypervisor")); } disconnected = 0; @@ -291,43 +297,11 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) { bool ro = vshCommandOptBool(cmd, "readonly"); const char *name = NULL; - virshControlPtr priv = ctl->privData; - virConnectPtr conn; if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - conn = virshConnect(ctl, name, ro); - - if (!conn) { - vshError(ctl, "%s", _("Failed to connect to the hypervisor")); - return false; - } - - if (priv->conn) { - int ret; - - virConnectUnregisterCloseCallback(priv->conn, virshCatchDisconnect); - ret = virConnectClose(priv->conn); - if (ret < 0) - vshError(ctl, "%s", _("Failed to disconnect from the hypervisor")); - else if (ret > 0) - vshError(ctl, "%s", _("One or more references were leaked after " - "disconnect from the hypervisor")); - } - priv->conn = conn; - - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, name); - - priv->useGetInfo = false; - priv->useSnapshotOld = false; - priv->blockJobNoBytes = false; - priv->readonly = ro; - - if (virConnectRegisterCloseCallback(priv->conn, virshCatchDisconnect, - ctl, NULL) < 0) - vshError(ctl, "%s", _("Unable to register disconnect callback")); + virshReconnect(ctl, name, ro, true); return true; } @@ -360,7 +334,7 @@ virshConnectionHandler(vshControl *ctl) virshControlPtr priv = ctl->privData; if (!priv->conn || disconnected) - virshReconnect(ctl); + virshReconnect(ctl, NULL, false, false); if (virshConnectionUsability(ctl, priv->conn)) return priv->conn; @@ -431,7 +405,7 @@ virshInit(vshControl *ctl) return false; if (ctl->connname) { - virshReconnect(ctl); + virshReconnect(ctl, NULL, false, false); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it * (since the first command might be 'connect' which allows a diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 22160ad929d0..4275aa37a1bf 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -291,8 +291,10 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, name); + if (name) { + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); + } vshAdmReconnect(ctl); if (!connected) -- 2.8.1

2 1

[libvirt] [PATCH 0/2] qemu: fixes for empty ejectable media drives
by Peter Krempa 29 Apr '16

29 Apr '16

Peter Krempa (2): qemu: process: Refresh ejectable media tray state on VM start qemu: hotplug: Skip waiting for tray opening if qemu doesn't notify us src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_hotplug.c | 19 +++++++++++++++++-- src/qemu/qemu_process.c | 4 ++++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + 14 files changed, 34 insertions(+), 2 deletions(-) -- 2.8.1

2 3