- Devel - libvirt List Archives

[libvirt] [PATCH] Don't drop expired lease while reading custom leases file
by Nehal J Wani 30 Sep '16

30 Sep '16

Libvirt, on its own, shouldn't decide whether an expired lease should stay in the custom leases database or not. It should rather rely on the 'DEL' event from dnsmasq. --- src/util/virlease.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/util/virlease.c b/src/util/virlease.c index 920ebaf..b49105d 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -57,7 +57,6 @@ virLeaseReadCustomLeaseFile(virJSONValuePtr leases_array_new, { char *lease_entries = NULL; virJSONValuePtr leases_array = NULL; - long long currtime = 0; long long expirytime; int custom_lease_file_len = 0; virJSONValuePtr lease_tmp = NULL; @@ -66,8 +65,6 @@ virLeaseReadCustomLeaseFile(virJSONValuePtr leases_array_new, size_t i; int ret = -1; - currtime = (long long) time(NULL); - /* Read entire contents */ if ((custom_lease_file_len = virFileReadAll(custom_lease_file, VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, @@ -109,11 +106,6 @@ virLeaseReadCustomLeaseFile(virJSONValuePtr leases_array_new, _("failed to parse json")); goto cleanup; } - /* Check whether lease has expired or not */ - if (expirytime < currtime) { - i++; - continue; - } /* Check whether lease has to be included or not */ if (ip_to_delete && STREQ(ip_tmp, ip_to_delete)) { -- 2.7.4

2 3

[libvirt] [PATCH] NSS: Add explicit check to not report expired lease
by Nehal J Wani 30 Sep '16

30 Sep '16

The NSS module shouldn't rely on custom leases database to not have entries for leases which have expired. --- tools/nss/libvirt_nss.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 54c4a2a..57ba473 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -42,6 +42,7 @@ #include "virlease.h" #include "viralloc.h" #include "virfile.h" +#include "virtime.h" #include "virerror.h" #include "virstring.h" #include "virsocketaddr.h" @@ -114,6 +115,8 @@ findLease(const char *name, ssize_t i, nleases; leaseAddress *tmpAddress = NULL; size_t ntmpAddress = 0; + long long currtime = 0; + long long expirytime = -1; *address = NULL; *naddress = 0; @@ -161,6 +164,8 @@ findLease(const char *name, nleases = virJSONValueArraySize(leases_array); DEBUG("Read %zd leases", nleases); + currtime = (long long) time(NULL); + for (i = 0; i < nleases; i++) { virJSONValuePtr lease; const char *lease_name; @@ -181,6 +186,16 @@ findLease(const char *name, if (STRNEQ_NULLABLE(name, lease_name)) continue; + if (virJSONValueObjectGetNumberLong(lease, "expiry-time", &expirytime) < 0) { + /* A lease cannot be present without expiry-time */ + ERROR("expiry-time field missing for %s", name); + goto cleanup; + } + + /* Do not report expired lease */ + if (expirytime < currtime) + continue; + DEBUG("Found record for %s", lease_name); *found = true; -- 2.7.4

2 1

[libvirt] [PATCH v2]Pre-assign memory modules slot number and assign alias.
by Nitesh Konkar 30 Sep '16

30 Sep '16

Find the smallest missing slot number and pre-assign slot numbers and assign aliases of memory modules. This keeps the slot number consistent with the alias. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/qemu/qemu_alias.c | 54 +++++++++++++++++++++++++++++++++++++++---------- src/qemu/qemu_command.c | 5 ++++- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index cc83fec..cdca69a 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -331,23 +331,49 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def, return 0; } +static int +qemuGetSmallestSlotIdx(virDomainDefPtr def) +{ + size_t i; + int idx = 0; + int minidx = 0; + bool check[100] = {false}; + + /* Find the missing slot */ + for (i = 0; i < def->nmems; i++) { + idx = qemuDomainDeviceAliasIndex(&def->mems[i]->info, "dimm"); + check[idx] = true; + } + + for (i = 0; i < def->nmems; i++) { + if (!check[i]) { + minidx = i; + break; + } + } + + if (i >= def->nmems) + minidx = i; + + return minidx; +} int qemuAssignDeviceMemoryAlias(virDomainDefPtr def, virDomainMemoryDefPtr mem) { - size_t i; - int maxidx = 0; - int idx; + int minidx; - for (i = 0; i < def->nmems; i++) { - if ((idx = qemuDomainDeviceAliasIndex(&def->mems[i]->info, "dimm")) >= maxidx) - maxidx = idx + 1; - } + if (mem->info.addr.dimm.base) + minidx = mem->info.addr.dimm.slot; + else + minidx = qemuGetSmallestSlotIdx(def); - if (virAsprintf(&mem->info.alias, "dimm%d", maxidx) < 0) + if (virAsprintf(&mem->info.alias, "dimm%d", minidx) < 0) return -1; + mem->info.addr.dimm.slot = minidx; + return 0; } @@ -381,7 +407,6 @@ qemuAssignDeviceShmemAlias(virDomainDefPtr def, return 0; } - int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { @@ -475,8 +500,15 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) return -1; } for (i = 0; i < def->nmems; i++) { - if (virAsprintf(&def->mems[i]->info.alias, "dimm%zu", i) < 0) - return -1; + def->mems[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM; + if (def->mems[i]->info.addr.dimm.base) { + if (virAsprintf(&def->mems[i]->info.alias, "dimm%d", def->mems[i]->info.addr.dimm.slot) < 0) + return -1; + } else { + def->mems[i]->info.addr.dimm.slot = i; + if (virAsprintf(&def->mems[i]->info.alias, "dimm%zu", i) < 0) + return -1; + } } return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f24a98b..e236918 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3469,8 +3469,11 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem) mem->info.alias, mem->info.alias); if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) { + if (mem->info.addr.dimm.base) + virBufferAsprintf(&buf, ",addr=%llu", mem->info.addr.dimm.base); + virBufferAsprintf(&buf, ",slot=%d", mem->info.addr.dimm.slot); - virBufferAsprintf(&buf, ",addr=%llu", mem->info.addr.dimm.base); + } break; -- 1.9.3

2 1

[libvirt] [PATCH] Fix Typo.
by Nitesh Konkar 30 Sep '16

30 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/libvirt-nodedev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 6ea14b3..bba9768 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -488,7 +488,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) * virNodeDeviceDettach: * @dev: pointer to the node device * - * Dettach the node device from the node itself so that it may be + * Detach the node device from the node itself so that it may be * assigned to a guest domain. * * Depending on the hypervisor, this may involve operations such -- 2.1.0

1 1

[libvirt] [PATCH 0/7] qemu: vcpu coldplug and ordering fixes
by Peter Krempa 30 Sep '16

30 Sep '16

Few fixes for various isues connected to coldplug and vcpu order. Peter Krempa (7): qemu: process: Fix off-by-one in vcpu order duplicate error message qemu: process: Don't use shifted indexes for vcpu order verification qemu: process: Enforce 'vcpu' order range to <1,maxvcpus> qemu: Fix coldplug of vcpus qemu: vcpu: Clear vcpu order information rather than making it invalid lib: Introduce VIR_DOMAIN_VCPU_HOTPLUGGABLE for virDomainSetVcpusFlags qemu: Allow making vcpus hotpluggable with virDomainSetVcpusFlags docs/formatdomain.html.in | 3 +- include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 10 ++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 76 +++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_process.c | 14 +++++--- tools/virsh-domain.c | 7 ++++ tools/virsh.pod | 7 +++- 9 files changed, 108 insertions(+), 12 deletions(-) -- 2.10.0

3 21

[libvirt] summary of current vfio mdev upstreaming status
by Jike Song 30 Sep '16

30 Sep '16

Hi all, In order to have a clear understanding about the VFIO mdev upstreaming status, I'd like to summarize it. Please share your opinions on this, and correct my misunderstandings. The whole vfio mdev series can be logically divided into several parts, they work together to provide the mdev support. PART 1: mdev core driver [task] - the mdev bus/device support - the utilities of mdev lifecycle management - the physical device register/unregister interfaces [status] - basically agreed by community PART 2: vfio bus driver for mdev [task] - interfaces with vendor drivers - the vfio bus implementation [status] - basically agreed by community PART 3: iommu support for mdev [task] - iommu support for mdev [status] - Kirti's v7 implementation, not yet fully reviewed PART 4: sysfs interfaces for mdev [task] - define the hierarchy of minimal sysfs directories/files - check the validity from vendor drivers, init/de-init them [status] - interfaces are in discussion PART 6: Documentation [task] - clearly document the architecture and interfaces - coding example for vendor drivers [status] - N/A What I'm curious here is 'PART 4', which is needed by other parts to perform further steps, is it possible to accelerate the process somehow? :-) -- Thanks, Jike

6 9

[libvirt] [PATCH v2] virsh domdisplay: introduce '--all' for showing all possible graphical display
by Chen Hanxiao 30 Sep '16

30 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> For one VM, it could had more than one graphical display. Such as we coud add both vnc and spice display to a VM. This patch introduces '--all' for showing all possible graphical display of a active VM. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: VIR_FREE befor use in loops add descriptions in virsh.pod tools/virsh-domain.c | 15 ++++++++++++++- tools/virsh.pod | 3 ++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3829b17..a6124b6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10648,6 +10648,10 @@ static const vshCmdOptDef opts_domdisplay[] = { .help = N_("select particular graphical display " "(e.g. \"vnc\", \"spice\", \"rdp\")") }, + {.name = "all", + .type = VSH_OT_BOOL, + .help = N_("show all possible graphical displays") + }, {.name = NULL} }; @@ -10671,6 +10675,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) int tmp; int flags = 0; bool params = false; + bool all = vshCommandOptBool(cmd, "all"); const char *xpath_fmt = "string(/domain/devices/graphics[@type='%s']/%s)"; virSocketAddr addr; @@ -10701,6 +10706,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) continue; /* Create our XPATH lookup for the current display's port */ + VIR_FREE(xpath); if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@port") < 0) goto cleanup; @@ -10733,6 +10739,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* Attempt to get the listening addr if set for the current * graphics scheme */ + VIR_FREE(listen_addr); listen_addr = virXPathString(xpath, ctxt); VIR_FREE(xpath); @@ -10788,6 +10795,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) goto cleanup; /* Attempt to get the password */ + VIR_FREE(passwd); passwd = virXPathString(xpath, ctxt); VIR_FREE(xpath); @@ -10840,12 +10848,17 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) } /* Print out our full URI */ + VIR_FREE(output); output = virBufferContentAndReset(&buf); vshPrint(ctl, "%s", output); /* We got what we came for so return successfully */ ret = true; - break; + if (!all) { + break; + } else { + vshPrint(ctl, "\n"); + } } if (!ret) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 49abda9..6255b36 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1229,7 +1229,8 @@ Output a URI which can be used to connect to the graphical display of the domain via VNC, SPICE or RDP. The particular graphical display type can be selected using the B<type> parameter (e.g. "vnc", "spice", "rdp"). If I<--include-password> is specified, the SPICE channel password will be -included in the URI. +included in the URI. If I<--all> is specified, then all show all possible +graphical displays, for a VM could have more than one graphical displays. =item B<domfsinfo> I<domain> -- 1.8.3.1

2 2

[libvirt] [PATCH] docs: correct version requirements for <kvm><hidden='on'/></kvm>
by Laine Stump 29 Sep '16

29 Sep '16

When support was added for the kvm hidden='on' attribute in commit d07116, the version requirement was listed as "2.1.0 (QEMU only)". However, this was added when libvirt was at version 1.2.8 - it is *QEMU* that must be at version 2.1.0 or later. This went unnoticed for a very long time (over 2 years). Then a week or two ago a new Windows convert in the #virt channel on OFTC was told he needed to use this feature (to prevent nvidia drivers in a guest from refusing to work due to being run in a virtual machine). There was some problem with it being recognized and "someone" (it may have been me, or may have been someone else, I don't remember) pointed out that the documentation at http://www.libvirt.org/formatdomain.html says that it requires libvirt 2.1.0. The next several days were filled with agony as a new convert to Linux first tried to upgrade a Linux Mint host running their "LTS" version to something newer, then tried to install a libvirt build built for Ubuntu onto this, and later back to the old LTS Linux Mint. After this he tried building his own libvirt from source (with all the expected problems), and finally switched to Fedora. In the end it was hours and hours of everybody's lives that they will never get back. To now learn that he didn't need to do this (his original libvirt version was 1.3.3, so whatever his problem was, it was elsewhere) makes the pain all that much worse. To prevent this from happening again, this simple patch changes the version requirement for the kvm hidden attribute from "2.1.0 (QEMU only)" to "1.2.8 (QEMU 2.1.0)". --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7008005..513bc0e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1703,7 +1703,7 @@ <td>hidden</td> <td>Hide the KVM hypervisor from standard MSR based discovery</td> <td>on, off</td> - <td><span class="since">2.1.0 (QEMU only)</span></td> + <td><span class="since">1.2.8 (QEMU 2.1.0)</span></td> </tr> </table> </dd> -- 2.7.4

2 1

[libvirt] [PATCH 0/3] Fix io_timeout for sanlock
by Michal Privoznik 29 Sep '16

29 Sep '16

Just read the 3/3. I didn't know whether I should laugh or cry. I did both. Michal Privoznik (3): lock_driver_sanlock: Avoid global driver variable whenever possible m4: Check for sanlock_write_lockspace sanlock: Properly init io_timeout m4/virt-sanlock.m4 | 14 +++++--- src/locking/lock_driver_sanlock.c | 69 +++++++++++++++++++++++++++++---------- 2 files changed, 60 insertions(+), 23 deletions(-) -- 2.8.4

2 10

[libvirt] support for qemu werror and rerror
by Vasiliy Tolstov 29 Sep '16

29 Sep '16

Sometimes ago qemu anounced support for action for disk: werror=action,rerror=action Specify which action to take on write and read errors. Valid actions are: "ignore" (ignore the error and try to continue), "stop" (pause QEMU), "report" (report the error to the guest), "enospc" (pause QEMU only if the host disk is full; report the error to the guest otherwise). The default setting iswerror=enospc and rerror=report. Does somebody can write this support to libvirt ? Or how can i enable werror and rerror ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 2