- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: Report error when explicit connection fails
by Martin Kletzander 01 Aug '16

01 Aug '16

Commit 0c56d9431839 forgot to return false in the cmdConnect command after the clean up made there. Before (assuming you don't have uri alias for 'asdf'): $ virsh connect asdf error: failed to connect to the hypervisor $ echo $? 0 After (with the same assumption): $ virsh connect asdf error: failed to connect to the hypervisor error: no connection driver available for asdf $ echo $? 1 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1356461 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f74698fa5f9a..d3fe06f19032 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -210,7 +210,7 @@ virshConnect(vshControl *ctl, const char *uri, bool readonly) * Reconnect after a disconnect from libvirtd * */ -static void +static int virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) { bool connected = false; @@ -237,6 +237,7 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) vshError(ctl, "%s", _("Failed to reconnect to the hypervisor")); else vshError(ctl, "%s", _("failed to connect to the hypervisor")); + return -1; } else { if (name) { VIR_FREE(ctl->connname); @@ -253,6 +254,7 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) priv->useGetInfo = false; priv->useSnapshotOld = false; priv->blockJobNoBytes = false; + return 0; } int virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, @@ -301,7 +303,8 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - virshReconnect(ctl, name, ro, true); + if (virshReconnect(ctl, name, ro, true) < 0) + return false; return true; } @@ -333,11 +336,13 @@ virshConnectionHandler(vshControl *ctl) { virshControlPtr priv = ctl->privData; - if (!priv->conn || disconnected) - virshReconnect(ctl, NULL, false, false); + if ((!priv->conn || disconnected) && + virshReconnect(ctl, NULL, false, false) < 0) + return NULL; if (virshConnectionUsability(ctl, priv->conn)) return priv->conn; + return NULL; } @@ -444,14 +449,13 @@ virshInit(vshControl *ctl) return false; if (ctl->connname) { - 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 * non-default connection, or might be 'help' which needs no * connection). */ - if (!priv->conn) { + if (virshReconnect(ctl, NULL, false, false) < 0) { vshReportError(ctl); return false; } -- 2.9.2

2 1

[libvirt] [PATCH] qemuDomainDetermineDiskChain: initialize ret as -1
by Chen Hanxiao 31 Jul '16

31 Jul '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9b439df..35d4365 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4394,7 +4394,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, bool report_broken) { virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - int ret = 0; + int ret = -1; uid_t uid; gid_t gid; @@ -4416,6 +4416,8 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, report_broken) < 0) ret = -1; + ret = 0; + cleanup: virObjectUnref(cfg); return ret; -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: Fix domain state after reset
by Martin Kletzander 30 Jul '16

30 Jul '16

When reset was called from a domain that crashed we didn't change the crashed state into a paused one which could confuse users. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1269575 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cda85f65fc98..866580705493 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2139,6 +2139,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) virDomainObjPtr vm; int ret = -1; qemuDomainObjPrivatePtr priv; + virDomainState state; virCheckFlags(0, -1); @@ -2165,6 +2166,10 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) priv->fakeReboot = false; + state = virDomainObjGetState(vm, NULL); + if (state == VIR_DOMAIN_CRASHED) + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_CRASHED); + endjob: qemuDomainObjEndJob(driver, vm); -- 2.9.0

2 1

[libvirt] [PATCH 0/5] qemu: report actual vcpu state in virVcpuInfo
by Viktor Mihajlovski 29 Jul '16

29 Jul '16

Currently, the virVcpuInfo returned by virDomainGetVcpus() will always report a state of VIR_VCPU_RUNNING for each defined domain vcpu even if the vcpu is currently in the halted state. As the monitor interface is in fact reporting the accurate state, it is rather easy to transport this information with the existing API. This is done by - adding a new state of VIR_VCPU_HALTED - adding a monitor function to pass back the halted state for the vcpus - adding a new field to the private domain vcpu object reflecting the halted state for the vcpu - modifying the driver code to report the vcpu state based on the halted indicator - extending virsh vcpuinfo to also display the halted state The vcpu state is however not recorded in the internal XML format, since the state can change asynchronously (without notification). Viktor Mihajlovski (5): domain: Add new VCPU state "halted" qemu: Add monitor APIs for the detection of halted VCPUs tests: Add testcase for qemuMonitorJSONGetCPUState qemu: Add domain support for VCPU halted state qemu: Ensure reported VCPU state is current in driver API include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_domain.c | 82 ++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 23 ++++++++- src/qemu/qemu_monitor.c | 22 ++++++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 52 +++++++++++++++++-- src/qemu/qemu_monitor_json.h | 2 + src/qemu/qemu_monitor_text.c | 54 ++++++++++++++++---- src/qemu/qemu_monitor_text.h | 2 + tests/qemumonitorjsontest.c | 106 ++++++++++++++++++++++++--------------- tools/virsh-domain.c | 3 +- 12 files changed, 295 insertions(+), 58 deletions(-) -- 1.9.1

2 11

[libvirt] [PATCH 00/13] Move functions from qemu_domain_address.c to domain_addr.c
by Tomasz Flendrich 29 Jul '16

29 Jul '16

This series depends on another one: https://www.redhat.com/archives/libvir-list/2016-July/msg00696.html Because the address sets are no longer cached, it's possible to move functions that don't depend on qemu anymore from qemu_domain_address.c to domain_addr.c. I did that with virtioSerial and PCI. To make some functions not dependent on qemuCaps, their parameters were changed to booleans. These changes are in [PATCH 02/13]. If you are satisfied with this approach, I can do the same with the rest of the functions or just some of them. Tomasz Flendrich (13): Move and rename qemuDomainAssignVirtioSerialAddresses make pci address handling functions qemu-agnostic Move and rename qemuDomainCollectPCIAddress Move and rename qemuDomainMachineIsQ35 et al Move and rename qemuDomainValidateDevicePCISlotsPIIX3 Move and rename qemuDomainValidateDevicePCISlotsQ35 Move and rename qemuDomainValidateDevicePCISlotsChipsets Move and rename qemuDomainAddressFindNewBusNr et al Move and rename qemuDomainMachineIsVirt Move and rename qemuDomainSupportsPCI Move and rename qemuDomainPCIAddrSetCreateFromDomain Move and rename qemuDomainAssignPCIAddresses et al Make functions in qemu_domain_address static src/conf/domain_addr.c | 1315 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_addr.h | 28 + src/libvirt_private.syms | 6 + src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_command.c | 20 +- src/qemu/qemu_domain.c | 55 +- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_domain_address.c | 1284 +-------------------------------------- src/qemu/qemu_domain_address.h | 4 - src/qemu/qemu_hotplug.c | 33 +- 11 files changed, 1406 insertions(+), 1350 deletions(-) -- 2.7.4 (Apple Git-66)

3 15

[libvirt] [gconfig v2 0/2] Add host setters
by Visarion Alexandru 29 Jul '16

29 Jul '16

From: Visarion Alexandru <viorel.visarion(a)gmail.com> These new patches are a bit different than the last ones. I first delete the <listen address=""> child node and then I modify the <listen> attribute. Visarion Alexandru (2): config: Add vnc host setter config: Add spice host setter libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c | 10 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h | 3 +++ libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c | 9 +++++++++ libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h | 3 +++ libvirt-gconfig/libvirt-gconfig.sym | 2 ++ 5 files changed, 27 insertions(+) -- 2.7.4

2 4

[libvirt] [PATCH] conf: Catch invalid memory model earlier
by Michal Privoznik 29 Jul '16

29 Jul '16

Consider the following XML snippet: <memory model=''> <target> <size unit='KiB'>523264</size> <node>0</node> </target> </memory> Whats wrong you ask? The @model attribute. This should result in an error thrown into users faces during virDomainDefine phase. Except it doesn't. The XML validation catches this error, but if users chose to ignore that, they will end up with invalid XML. Well, they won't be able to start the machine - that's when error is produced currently. But it would be nice if we could catch the error like this earlier. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 2 -- src/qemu/qemu_domain.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c1ddb5a..a56e0f5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13215,7 +13215,7 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode, goto error; } - if ((def->model = virDomainMemoryModelTypeFromString(tmp)) < 0) { + if ((def->model = virDomainMemoryModelTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_XML_ERROR, _("invalid memory model '%s'"), tmp); goto error; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c4da8b5..5325f48 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3397,8 +3397,6 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem) case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("invalid memory device type")); break; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b3ca993..9b439df 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5183,8 +5183,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem, case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("invalid memory device type")); return -1; } -- 2.8.4

2 1

[libvirt] [PATCH python] allow pkg-config binary to be set by env
by Cole Robinson 28 Jul '16

28 Jul '16

From: Markus Rothe <markusr815(a)gmail.com> https://bugzilla.redhat.com/show_bug.cgi?id=1350523 --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 099b1e0..a4cfb88 100755 --- a/setup.py +++ b/setup.py @@ -28,6 +28,8 @@ _pkgcfg = -1 def get_pkgcfg(do_fail=True): global _pkgcfg if _pkgcfg == -1: + _pkgcfg = os.getenv('PKG_CONFIG') + if _pkgcfg is None: _pkgcfg = distutils.spawn.find_executable("pkg-config") if _pkgcfg is None and do_fail: raise Exception("pkg-config binary is required to compile libvirt-python") -- 2.7.4

2 3

[libvirt] [gconfig v2] config: Add spice host setter
by Visarion Alexandru 28 Jul '16

28 Jul '16

From: Visarion Alexandru <viorel.visarion(a)gmail.com> Learn to set the address that spice is listening on. Visarion Alexandru (1): config: Add spice host setter libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c | 10 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h | 3 +++ libvirt-gconfig/libvirt-gconfig.sym | 1 + 3 files changed, 14 insertions(+) -- 2.7.4

1 0

[libvirt] [PATCH] qemu: Need to free fileprops in error path
by John Ferlan 28 Jul '16

28 Jul '16

The virJSONValueObjectCreate only consumes the object on success, so on failure we must free - from commit id 'f4441017' (found by Coverity). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Coverity is also grumpy about the consumption of the object on the success path - probably because of the va_args manner in which the object gets consumed and later free'd. src/qemu/qemu_command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0094665..c4da8b5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1038,8 +1038,10 @@ qemuGetDriveSourceProps(virStorageSourcePtr src, } if (fileprops && - virJSONValueObjectCreate(props, "a:file", fileprops, NULL) < 0) + virJSONValueObjectCreate(props, "a:file", fileprops, NULL) < 0) { + virJSONValueFree(fileprops); return -1; + } return 0; } -- 2.5.5

2 1

[libvirt] [PATCH glib] Fix check for libvirt optional functions
by Daniel P. Berrange 28 Jul '16

28 Jul '16

The checks for virDomainOpenGraphicsFD and virNetworkGetDHCPLeases in configure are simply trying to compile and link a test program. This was assuming that libvirt was installed in /usr/lib & /usr/include, which is not always the case. Using a pkg-config version check avoids needing to compile and thus avoids the bad assumptions about install locations. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a broken build fix configure.ac | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index f71e5cf..b2848f2 100644 --- a/configure.ac +++ b/configure.ac @@ -92,13 +92,19 @@ LIBVIRT_GLIB_COMPILE_WARNINGS PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) # virDomainOpenGraphicsFD was introduced in libvirt 1.2.8 -AC_CHECK_LIB([virt], - [virDomainOpenGraphicsFD], - [AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have virDomainOpenGraphicsFD?])]) +AC_MSG_CHECKING([for virDomainOpenGraphicsFD]) +PKG_CHECK_EXISTS(libvirt >= 21.2.8, + [ + AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have virDomainOpenGraphicsFD?]) + AC_MSG_RESULT([yes]) + ],[AC_MSG_RESULT([no])]) # virNetworkGetDHCPLeases was introduced in libvirt 1.2.6 -AC_CHECK_LIB([virt], - [virNetworkGetDHCPLeases], - [AC_DEFINE([HAVE_VIR_NETWORK_GET_DHCP_LEASES], 1, [Have virNetworkGetDHCPLeases?])]) +AC_MSG_CHECKING([for virNetworkGetDHCPLeases]) +PKG_CHECK_EXISTS(libvirt >= 21.2.6, + [ + AC_DEFINE([HAVE_VIR_NETWORK_GET_DHCP_LEASES], 1, [Have virNetworkGetDHCPLeases?]) + AC_MSG_RESULT([yes]) + ],[AC_MSG_RESULT([no])]) enable_tests=no PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_TEST_REQUIRED, [enable_tests=yes], -- 2.7.4

1 0

[libvirt] [PATCH glib] Avoid unused variable in DHCP lease finalize method
by Daniel P. Berrange 28 Jul '16

28 Jul '16

If the network DHCP lease support is not detected, the build will generate a warning / error: libvirt-gobject-network-dhcp-lease.c: In function 'gvir_network_dhcp_lease_finalize': libvirt-gobject-network-dhcp-lease.c:99:27: error: unused variable 'lease' [-Werror=unused-variable] GVirNetworkDHCPLease *lease = GVIR_NETWORK_DHCP_LEASE(object); ^~~~~ cc1: all warnings being treated as errors Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a broken build fix libvirt-gobject/libvirt-gobject-network-dhcp-lease.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c index 7d1c979..200778d 100644 --- a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c +++ b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c @@ -96,12 +96,10 @@ static void gvir_network_dhcp_lease_set_property(GObject *object, static void gvir_network_dhcp_lease_finalize(GObject *object) { - GVirNetworkDHCPLease *lease = GVIR_NETWORK_DHCP_LEASE(object); #ifdef HAVE_VIR_NETWORK_GET_DHCP_LEASES + GVirNetworkDHCPLease *lease = GVIR_NETWORK_DHCP_LEASE(object); GVirNetworkDHCPLeasePrivate *priv = lease->priv; -#endif /* HAVE_VIR_NETWORK_GET_DHCP_LEASES */ -#ifdef HAVE_VIR_NETWORK_GET_DHCP_LEASES virNetworkDHCPLeaseFree(priv->handle); #endif /* HAVE_VIR_NETWORK_GET_DHCP_LEASES */ -- 2.7.4

1 0

[libvirt] [PATCH] wireshark: Adapt to dissector function header change
by Michal Privoznik 28 Jul '16

28 Jul '16

In wireshark commit bbdd89b9 (contained in 2.1.0 release) they have changed prototype of dissector function. Now it returns number of bytes consumed by the dissector, and can get a pointer to user specified data (which we don't use). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/wireshark/src/packet-libvirt.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c index aa1c323..569a0a1 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -442,8 +442,14 @@ get_message_len(packet_info *pinfo ATTRIBUTE_UNUSED, tvbuff_t *tvb, int offset) return tvb_get_ntohl(tvb, offset); } +#if WIRESHARK_VERSION >= 2000001 +static int +dissect_libvirt(tvbuff_t *tvb, packet_info *pinfo, + proto_tree *tree, void *data ATTRIBUTE_UNUSED) +#else static void dissect_libvirt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +#endif { /* Another magic const - 4; simply, how much bytes * is needed to tell the length of libvirt packet. */ @@ -454,6 +460,10 @@ dissect_libvirt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 4, get_message_len, dissect_libvirt_message, NULL); #endif + +#if WIRESHARK_VERSION >= 2000001 + return tvb_captured_length(tvb); +#endif } void -- 2.8.4

2 1

[libvirt] [PATCH 0/2] tools: Fix usage of incorrect environment variables
by Erik Skultety 28 Jul '16

28 Jul '16

According to https://bugzilla.redhat.com/show_bug.cgi?id=1357363, most of virt-admin's environment variables are not taken into effect when set. As it turned out, virsh suffers from the very same problem which resides in the generic vsh.c module. Erik Skultety (2): vsh: Make vshInitDebug return int instead of void tools: Make use of the correct environment variables tools/virsh.c | 1 + tools/virt-admin.c | 1 + tools/vsh.c | 34 +++++++++++++++++++--------------- tools/vsh.h | 1 + 4 files changed, 22 insertions(+), 15 deletions(-) -- 2.5.5

2 4

[libvirt] logging: Libvirtd could not create its own logfile, when the path /var/log/libvirt is not exist.
by weifuqiang 28 Jul '16

28 Jul '16

Hi all: Libvirtd could not create its own logfile, such as /var/log/libvirt/libvirtd.log, when the path /var/log/libvirt is not exist. It may be a problem,I think,so try to make patch when open file failed in virLogAddOutputToFile. or any better idea? ------------ Libvirtd just creates its logfile, such as /var/log/libvirt/libvirtd.log, DURING INSTALLATION. If the logfile(we mean its path here,that's /var/log/libvirt/) is deleted during its runtime, even if we restart libvirtd, such file would not be generated automatically, thus, the logs are all missing after then, it becomes impossible to debug problems after then as well. So, we try to mkdir the deleted path after restarting libvirtd. Or, any better idea? Thanks in advance. Wei Fuqiang

2 1

[libvirt] [PATCH 0/2] Couple of build fixes
by Michal Privoznik 28 Jul '16

28 Jul '16

Contradictory to my previous patch set [1], these are not pushed yet and thus require proper review. 1: https://www.redhat.com/archives/libvir-list/2016-July/msg01147.html Michal Privoznik (2): vshCmddefGetOption: Change type of opt_index vshReadlineParse: Drop some unused variables tools/vsh.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -- 2.8.4

2 3

[libvirt] [PATCH] Fix RPM spec for wireshark on Fedora < 24
by Daniel P. Berrange 28 Jul '16

28 Jul '16

This previous commit commit cd9fcc8be7dcb9126d70f744ce54b0b742eeefb8 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Wed Jul 27 16:58:32 2016 +0200 libvirt.spec.in: Adapt to newest wireshark plugindir Adapted the libvirt spec for wireshark >= 2.1.0 but this ignored the fact that we enable wireshark from Fedora 21 and 2.1.0 was only added in Fedora 24 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 35c7449..5841f45 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -406,7 +406,11 @@ BuildRequires: numad %endif %if %{with_wireshark} +%if 0%{fedora} >= 24 BuildRequires: wireshark-devel >= 2.1.0 +%else +BuildRequires: wireshark-devel >= 1.12.1 +%endif %endif Provides: bundled(gnulib) @@ -1212,7 +1216,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a %if %{with_wireshark} +%if 0%{fedora} >= 24 rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.la +%else +rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la +mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \ + $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so +%endif %endif install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ -- 2.5.5

1 0

[libvirt] [PATCH 0/3] libxl hooks
by Cédric Bosdonnat 28 Jul '16

28 Jul '16

Hi there! Here is small patchset adding hooks support to the libxl driver. Cédric Bosdonnat (3): libxl: add a flag to mark guests as tainted by a hook libxl: fix segfault in libxlReconnectDomain libxl: add hooks support docs/hooks.html.in | 53 ++++++++++++++++++++++++++-- src/libxl/libxl_domain.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_domain.h | 2 ++ src/libxl/libxl_driver.c | 52 ++++++++++++++++++++------- src/libxl/libxl_migration.c | 58 +++++++++++++++++++++++++++++++ src/util/virhook.c | 16 ++++++++- src/util/virhook.h | 13 +++++++ 7 files changed, 264 insertions(+), 15 deletions(-) -- 2.6.6

3 7

[libvirt] [PATCH] qemu: remove panic device with model s390 when migrating
by Boris Fiuczynski 28 Jul '16

28 Jul '16

The panic device with model s390 is autogenerated on domains with S390 architecture since libvirt version 1.3.5. For backwards compatibility reasons the device is to be removed when migrating. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ceac22f..0d97ea6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3310,6 +3310,28 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, virDomainControllerDefFree(usb); } + /* Remove the panic device with model s390 if present */ + for (i = 0; i < def->npanics; i++) { + if (def->panics[i]->model == VIR_DOMAIN_PANIC_MODEL_S390) { + virDomainPanicDefPtr *panics = def->panics; + int npanics = def->npanics; + size_t j; + + if (VIR_ALLOC_N(def->panics, npanics - 1) < 0) { + def->panics = panics; + goto cleanup; + } + + def->npanics = 0; + for (j = 0; j < npanics; j++) { + if (j != i) + def->panics[def->npanics++] = panics[j]; + } + VIR_FREE(panics); + break; /* only one panic dev with model s390 can exist */ + } + } + for (i = 0; i < def->nchannels; i++) qemuDomainChrDefDropDefaultPath(def->channels[i], driver); } -- 2.9.0

3 3

[libvirt] [libvirt RFC PATCH 00/10] Add support for qemu's JSON pseudo'protocol for backing store
by Peter Krempa 28 Jul '16

28 Jul '16

Libvirt didn't handle this for a long time and VMs with such config would not start we should implement it. Using JSON is basically the only option to specify advanced configuration for a backing file. Field names were taken from qemu's source since there isn't really documentation for this. CCing qemu-block for possible comments on patches 2-8,10. Peter Krempa (10): tests: Add testing of backing store string parser util: storage: Add parser for qemu's "json" backing pseudo-protocol util: storage: Add support for host device backing specified via JSON util: storage: Add support for URI based backing volumes in qemu's JSON pseudo-protocol util: storage: Add json pseudo protocol support for gluster volumes util: storage: Add json pseudo protocol support for iSCSI volumes Add JSON backing volume parser for 'nbd' protocol util: storage: Add JSON backing store parser for 'sheepdog' protocol util: storage: Add 'ssh' network storage protocol util: storage: Add JSON backing volume parser for 'ssh' protocol src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 1 + src/qemu/qemu_command.c | 7 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_parse_command.c | 1 + src/util/virstoragefile.c | 288 ++++++++++++++++++++++++++++++++++++++++-- src/util/virstoragefile.h | 4 + src/xenconfig/xen_xl.c | 1 + tests/virstoragetest.c | 128 +++++++++++++++++++ 9 files changed, 425 insertions(+), 9 deletions(-) -- 2.8.2

3 18

[libvirt] [PATCH 0/2] Two wireshark fixes
by Michal Privoznik 27 Jul '16

27 Jul '16

While trying to do an RPM, I've ran into two problems. I've already pushed the fixes under 'build breaker rule'. I'm sending them for completeness. Michal Privoznik (2): virt-wireshark: Properly substract wireshark prefix libvirt.spec.in: Adapt to newest wireshark plugindir libvirt.spec.in | 6 ++---- m4/virt-wireshark.m4 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) -- 2.8.4

2 3

[libvirt] [PATCH 0/2] Updates for LUKS support
by Daniel P. Berrange 27 Jul '16

27 Jul '16

Daniel P. Berrange (2): virstoragefile: refactor virStorageFileMatchesNNN methods storage: remove "luks" storage volume type src/qemu/qemu_command.c | 10 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/storage/storage_backend.c | 41 ++-- src/storage/storage_backend_fs.c | 17 +- src/storage/storage_backend_gluster.c | 5 - src/util/virstoragefile.c | 265 +++++++++++++++------ src/util/virstoragefile.h | 1 - tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml | 4 +- tests/storagevolxml2xmlin/vol-luks-cipher.xml | 2 +- tests/storagevolxml2xmlin/vol-luks.xml | 2 +- tests/storagevolxml2xmlout/vol-luks-cipher.xml | 2 +- tests/storagevolxml2xmlout/vol-luks.xml | 2 +- 13 files changed, 235 insertions(+), 120 deletions(-) -- 2.7.4

2 9

[libvirt] [PATCH libvirt-glib] docs: Document gvir_connection_get_{storage_pools, networks, domains}
by Guido Günther 27 Jul '16

27 Jul '16

In contrast to libvirt itself all get_* methods need to prefetch the corresponding information first so document this. --- libvirt-gobject/libvirt-gobject-connection.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 00d5eda..3f17265 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -700,6 +700,11 @@ void gvir_connection_close(GVirConnection *conn) * gvir_connection_fetch_domains: * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object + * + * Use this method to fetch all domains managed by connection + * @conn. Use e.g. #gvir_connection_find_domain_by_id or + * #gvir_connection_get_domain afterwards to query the fetched + * domains. */ gboolean gvir_connection_fetch_domains(GVirConnection *conn, GCancellable *cancellable, @@ -783,6 +788,11 @@ cleanup: * gvir_connection_fetch_storage_pools: * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object + * + * Use this method to fetch all storage pools managed by connection + * @conn. Use e.g. #gvir_connection_find_storage_pool_by_name or + * #gvir_connection_get_storage_pools afterwards to query the fetched + * pools. */ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, GCancellable *cancellable, @@ -1722,6 +1732,11 @@ GVirInterface *gvir_connection_find_interface_by_mac(GVirConnection *conn, * gvir_connection_fetch_networks: * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object + * + * Use this method to fetch all networks managed by connection + * @conn. Use e.g. #gvir_connection_find_network_by_name or + * #gvir_connection_get_networks afterwards to query the fetched + * domains. */ gboolean gvir_connection_fetch_networks(GVirConnection *conn, GCancellable *cancellable, -- 2.8.1

2 2

[libvirt] Entering freeze for libvirt-2.1.0
by Daniel Veillard 27 Jul '16

27 Jul '16

So as planned I tagged the Release Candidate 1 version in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Please give it a try, I plan to push the rc2 on Friday and if everything goes fine have the final release on Monday or Tuesday. Please give it a good test :) thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] virconf: Fix config file path construction
by Erik Skultety 27 Jul '16

27 Jul '16

Since commit c4bdff19, the path to the configuration file has been constructed in the following manner: - if no config filename was passed to virConfLoadConfigPath, libvirt.conf was used as default - otherwise the filename was concatenated with "<config_dir>/libvirt/libvirt%s%s.conf" which in admin case resulted in "libvirt-libvirt-admin.conf.conf". Obviously, this non-existent config led to ignoring all user settings in libvirt-admin.conf. This patch requires the config filename to be always provided as an argument with the concatenation being simplified. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1357364 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/libvirt.c | 2 +- src/util/virconf.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 68c8317..52462e3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -969,7 +969,7 @@ virConnectOpenInternal(const char *name, if (ret == NULL) return NULL; - if (virConfLoadConfig(&conf, NULL) < 0) + if (virConfLoadConfig(&conf, "libvirt.conf") < 0) goto failed; if (name && name[0] == '\0') diff --git a/src/util/virconf.c b/src/util/virconf.c index ee54072..3e49f41 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1566,20 +1566,16 @@ virConfLoadConfigPath(const char *name) { char *path; if (geteuid() == 0) { - if (virAsprintf(&path, "%s/libvirt/libvirt%s%s.conf", - SYSCONFDIR, - name ? "-" : "", - name ? name : "") < 0) + if (virAsprintf(&path, "%s/libvirt/%s", + SYSCONFDIR, name) < 0) return NULL; } else { char *userdir = virGetUserConfigDirectory(); if (!userdir) return NULL; - if (virAsprintf(&path, "%s/libvirt%s%s.conf", - userdir, - name ? "-" : "", - name ? name : "") < 0) { + if (virAsprintf(&path, "%s/%s", + userdir, name) < 0) { VIR_FREE(userdir); return NULL; } -- 2.5.5

3 3