- Devel - libvirt List Archives

[libvirt] [PATCH] MacOS: Re-add support for QEMU backend
by Doug Goldstein 30 Oct '13

30 Oct '13

The QEMU backend was disabled on Mac OS X without a reason in the code and due to refactors its difficult to understand when/why it was disabled. With QEMU being supported on Mac OS X there is no reason to disable QEMU on this platform. --- configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1c5b168..f519cbe 100644 --- a/configure.ac +++ b/configure.ac @@ -191,10 +191,6 @@ if test $with_freebsd = yes; then with_firewalld=no fi -if test $with_osx = yes; then - with_qemu=no -fi - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) @@ -2393,7 +2389,7 @@ fi AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"]) -if test $with_freebsd = yes; then +if test $with_freebsd = yes || test $with_osx = yes; then default_qemu_user=root default_qemu_group=wheel else -- 1.8.1.5

2 2

[libvirt] [PATCH] Add '+' to uid/gid printing for label processing
by John Ferlan 29 Oct '13

29 Oct '13

To ensure proper processing by virGetUserID() and virGetGroupID() of a uid/gid add a "+" prior to the uid/gid to denote it's really a uid/gid for the label. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/security/security_dac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 019c789..cb7d322 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -60,7 +60,7 @@ virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, priv->user = user; priv->group = group; - if (virAsprintf(&priv->baselabel, "%u:%u", + if (virAsprintf(&priv->baselabel, "+%u:+%u", (unsigned int) user, (unsigned int) group) < 0) return -1; @@ -1064,7 +1064,7 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, } break; case VIR_DOMAIN_SECLABEL_DYNAMIC: - if (virAsprintf(&seclabel->label, "%u:%u", + if (virAsprintf(&seclabel->label, "+%u:+%u", (unsigned int) priv->user, (unsigned int) priv->group) < 0) return rc; -- 1.8.3.1

2 2

[libvirt] [PATCH] storage: fix incorrect typedef
by Eric Blake 29 Oct '13

29 Oct '13

The rbd code had a confusing typedef ending in Ptr that was not actually a pointer, which made the rest of the code harder to read. This fixes things to actually pass by pointer rather than by copy. * src/storage/storage_backend_rbd.c (virStorageBackendStatePtr): Fix typedef. (virStorageBackendRBDOpenRADOSConn) (virStorageBackendRBDCloseRADOSConn) (volStorageBackendRBDRefreshVolInfo) (virStorageBackendRBDRefreshPool, virStorageBackendRBDDeleteVol) (virStorageBackendRBDCreateVol, virStorageBackendRBDRefreshVol) (virStorageBackendRBDResizeVol): Fix fallout. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- A quick git grep found no other instances of a '...Ptr' typedef that wasn't actually a pointer; but I can also add a syntax check to prevent that mistake if desired. src/storage/storage_backend_rbd.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 60b48c2..4e18bf9 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -44,9 +44,9 @@ struct _virStorageBackendRBDState { }; typedef struct _virStorageBackendRBDState virStorageBackendRBDState; -typedef virStorageBackendRBDState virStorageBackendRBDStatePtr; +typedef virStorageBackendRBDState *virStorageBackendRBDStatePtr; -static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr *ptr, +static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, virConnectPtr conn, virStoragePoolObjPtr pool) { @@ -223,21 +223,21 @@ static int virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr) { int ret = 0; - if (ptr.ioctx != NULL) { + if (ptr->ioctx != NULL) { VIR_DEBUG("Closing RADOS IoCTX"); - rados_ioctx_destroy(ptr.ioctx); + rados_ioctx_destroy(ptr->ioctx); ret = -1; } - ptr.ioctx = NULL; + ptr->ioctx = NULL; - if (ptr.cluster != NULL) { + if (ptr->cluster != NULL) { VIR_DEBUG("Closing RADOS connection"); - rados_shutdown(ptr.cluster); + rados_shutdown(ptr->cluster); ret = -2; } - ptr.cluster = NULL; + ptr->cluster = NULL; - time_t runtime = time(0) - ptr.starttime; + time_t runtime = time(0) - ptr->starttime; VIR_DEBUG("RADOS connection existed for %ld seconds", runtime); return ret; @@ -249,7 +249,7 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, { int ret = -1; rbd_image_t image; - if (rbd_open(ptr.ioctx, vol->name, &image, NULL) < 0) { + if (rbd_open(ptr->ioctx, vol->name, &image, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to open the RBD image '%s'"), vol->name); @@ -298,7 +298,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, int ret = -1; int len = -1; char *name, *names = NULL; - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; @@ -373,7 +373,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, name += strlen(name) + 1; - if (volStorageBackendRBDRefreshVolInfo(vol, pool, ptr) < 0) { + if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) { virStorageVolDefFree(vol); goto cleanup; } @@ -388,7 +388,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, cleanup: VIR_FREE(names); - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -398,7 +398,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, unsigned int flags) { int ret = -1; - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; @@ -431,7 +431,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, ret = 0; cleanup: - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -439,7 +439,7 @@ static int virStorageBackendRBDCreateVol(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; int order = 0; @@ -475,14 +475,14 @@ static int virStorageBackendRBDCreateVol(virConnectPtr conn, goto cleanup; } - if (volStorageBackendRBDRefreshVolInfo(vol, pool, ptr) < 0) { + if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) { goto cleanup; } ret = 0; cleanup: - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -490,7 +490,7 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn, virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol) { - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; int ret = -1; @@ -507,14 +507,14 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn, goto cleanup; } - if (volStorageBackendRBDRefreshVolInfo(vol, pool, ptr) < 0) { + if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) { goto cleanup; } ret = 0; cleanup: - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -524,7 +524,7 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long long capacity, unsigned int flags) { - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; rbd_image_t image = NULL; @@ -563,7 +563,7 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, cleanup: if (image != NULL) rbd_close(image); - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } -- 1.8.3.1

2 2

[libvirt] [PATCH] apparmor: Fix typo in function name in driver struct initialization
by Peter Krempa 29 Oct '13

29 Oct '13

Commit 64a68a4a introduced a typo in the initialization of the apparmor driver structure breaking the build with apparmor enabled. --- src/security/security_apparmor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 776a470..a9f04d2 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -979,5 +979,5 @@ virSecurityDriver virAppArmorSecurityDriver = { .domainGetSecurityMountOptions = AppArmorGetMountOptions, - .getBaseLabel = AppArmoryGetBaseLabel, + .getBaseLabel = AppArmorGetBaseLabel, }; -- 1.8.3.2

2 2

[libvirt] [PATCH] LXC: don't free tty before using it in lxcContainerSetupDevices
by Gao feng 29 Oct '13

29 Oct '13

Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- .gnulib | 2 +- src/lxc/lxc_container.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 8f74258..4a5ee89 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8f7425866463f994538584d1dd7211603b8b0550 +Subproject commit 4a5ee89c8a8be7350a8fd8ca1bacb196a190e492 diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1ec59d5..255c711 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1042,10 +1042,10 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0) return -1; if (symlink(ttyPaths[i], tty) < 0) { - VIR_FREE(tty); virReportSystemError(errno, _("Failed to symlink %s to %s"), ttyPaths[i], tty); + VIR_FREE(tty); return -1; } VIR_FREE(tty); -- 1.8.3.1

2 1

[libvirt] [PATCH v2] Fix race condition reconnecting to vms & loading configs
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The following sequence 1. Define a persistent QMEU guest 2. Start the QEMU guest 3. Stop libvirtd 4. Kill the QEMU process 5. Start libvirtd 6. List persistent guets At the last step, the previously running persistent guest will be missing. This is because of a race condition in the QEMU driver startup code. It does 1. Load all VM state files 2. Spawn thread to reconnect to each VM 3. Load all VM config files Only at the end of step 3, does the 'virDomainObjPtr' get marked as "persistent". There is therefore a window where the thread reconnecting to the VM will remove the persistent VM from the list. The easy fix is to simply switch the order of steps 2 & 3. In addition to this though, we must only attempt to reconnect to a VM which had a non-zero PID loaded from its state file. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_process.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c613967..9c3daad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -816,8 +816,6 @@ qemuStateInitialize(bool privileged, conn = virConnectOpen(cfg->uri); - qemuProcessReconnectAll(conn, qemu_driver); - /* Then inactive persistent configs */ if (virDomainObjListLoadAllConfigs(qemu_driver->domains, cfg->configDir, @@ -828,6 +826,7 @@ qemuStateInitialize(bool privileged, NULL, NULL) < 0) goto error; + qemuProcessReconnectAll(conn, qemu_driver); virDomainObjListForEach(qemu_driver->domains, qemuDomainSnapshotLoad, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b278742..bdffdf8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3253,6 +3253,9 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, struct qemuProcessReconnectData *src = opaque; struct qemuProcessReconnectData *data; + if (!obj->pid) + return 0; + if (VIR_ALLOC(data) < 0) return -1; -- 1.8.3.1

2 1

[libvirt] [PATCH] Fix leak of objects when reconnecting to QEMU instances
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The 'error' cleanup block in qemuProcessReconnect() had a 'return' statement in the middle of it. This caused a leak of virConnectPtr & virQEMUDriverConfigPtr instances. This was identified because netcf recently started checking its refcount in libvirtd shutdown: netcfStateCleanup:109 : internal error: Attempt to close netcf state driver with open connections Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 354e079..b278742 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3219,10 +3219,7 @@ error: if (!virDomainObjIsActive(obj)) { if (virObjectUnref(obj)) virObjectUnlock(obj); - return; - } - - if (virObjectUnref(obj)) { + } else if (virObjectUnref(obj)) { /* We can't get the monitor back, so must kill the VM * to remove danger of it ending up running twice if * user tries to start it again later -- 1.8.3.1

2 1

[libvirt] [PATCH] Push RPM deps down into libvirt-daemon-driver-XXXX sub-RPMs
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> For inexplicable reasons, many of the 3rd party package deps were left against the 'libvirt-daemon' RPM when the drivers were split out. This makes a minimal install heavier that it should be. Push them all down into libvirt-daemon-driver-XXX so they're only pulled in when truely needed With this change applied, a minimal install of just the libvirt-daemon-driver-lxc RPM is reduced by 41 MB on a Fedora 19 host. Fedora cloud team has requested that we cut down minimal libvirt install size as much as is possible. Fixing these deps is the biggest win without coding work, per: https://bugzilla.redhat.com/show_bug.cgi?id=1012198 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 135 +++++++++++++++++++++++++++----------------------------- 1 file changed, 66 insertions(+), 69 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index fb4d46f..48feea5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -657,31 +657,6 @@ Requires: avahi Requires: avahi-libs %endif %endif - %if %{with_network} -Requires: dnsmasq >= 2.41 -Requires: radvd - %endif - %if %{with_network} || %{with_nwfilter} -Requires: iptables -Requires: iptables-ipv6 - %endif - %if %{with_nwfilter} -Requires: ebtables - %endif - %if %{with_netcf} && (0%{?fedora} >= 18 || 0%{?rhel} >= 7) -Requires: netcf-libs >= 0.2.2 - %endif -# needed for device enumeration - %if %{with_hal} -Requires: hal - %endif - %if %{with_udev} - %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Requires: systemd >= 185 - %else -Requires: udev >= 145 - %endif - %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 @@ -689,50 +664,6 @@ Requires: polkit >= 0.93 Requires: PolicyKit >= 0.6 %endif %endif - %if %{with_storage_fs} -Requires: nfs-utils -# For mkfs -Requires: util-linux -# For glusterfs - %if 0%{?fedora} >= 11 -Requires: glusterfs-client >= 2.0.1 - %endif - %endif - %if %{with_qemu} -# From QEMU RPMs -Requires: /usr/bin/qemu-img -# For image compression -Requires: gzip -Requires: bzip2 -Requires: lzop -Requires: xz - %else - %if %{with_xen} -# From Xen RPMs -Requires: /usr/sbin/qcow-create - %endif - %endif - %if %{with_storage_lvm} -# For LVM drivers -Requires: lvm2 - %endif - %if %{with_storage_iscsi} -# For ISCSI driver -Requires: iscsi-initiator-utils - %endif - %if %{with_storage_disk} -# For disk driver -Requires: parted -Requires: device-mapper - %endif - %if %{with_storage_mpath} -# For multipath support -Requires: device-mapper - %endif - %if %{with_storage_sheepdog} -# For Sheepdog support -Requires: sheepdog - %endif %if %{with_cgconfig} Requires: libcgroup %endif @@ -788,6 +719,10 @@ Network filter configuration files for cleaning guest traffic Summary: Network driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} +Requires: dnsmasq >= 2.41 +Requires: radvd +Requires: iptables +Requires: iptables-ipv6 %description daemon-driver-network The network driver plugin for the libvirtd daemon, providing @@ -801,6 +736,9 @@ bridge capabilities. Summary: Nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} +Requires: iptables +Requires: iptables-ipv6 +Requires: ebtables %description daemon-driver-nwfilter The nwfilter driver plugin for the libvirtd daemon, providing @@ -814,6 +752,17 @@ iptables and ip6tables capabilities Summary: Nodedev driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} +# needed for device enumeration + %if %{with_hal} +Requires: hal + %endif + %if %{with_udev} + %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +Requires: systemd >= 185 + %else +Requires: udev >= 145 + %endif + %endif %description daemon-driver-nodedev The nodedev driver plugin for the libvirtd daemon, providing @@ -827,6 +776,9 @@ capabilities. Summary: Interface driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} + %if %{with_netcf} && (0%{?fedora} >= 18 || 0%{?rhel} >= 7) +Requires: netcf-libs >= 0.2.2 + %endif %description daemon-driver-interface The interface driver plugin for the libvirtd daemon, providing @@ -850,6 +802,45 @@ an implementation of the secret key APIs. Summary: Storage driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} + %if %{with_storage_fs} +Requires: nfs-utils +# For mkfs +Requires: util-linux +# For glusterfs + %if 0%{?fedora} >= 11 +Requires: glusterfs-client >= 2.0.1 + %endif + %endif + %if %{with_storage_lvm} +# For LVM drivers +Requires: lvm2 + %endif + %if %{with_storage_iscsi} +# For ISCSI driver +Requires: iscsi-initiator-utils + %endif + %if %{with_storage_disk} +# For disk driver +Requires: parted +Requires: device-mapper + %endif + %if %{with_storage_mpath} +# For multipath support +Requires: device-mapper + %endif + %if %{with_storage_sheepdog} +# For Sheepdog support +Requires: sheepdog + %endif + %if %{with_qemu} +# From QEMU RPMs +Requires: /usr/bin/qemu-img + %else + %if %{with_xen} +# From Xen RPMs +Requires: /usr/sbin/qcow-create + %endif + %endif %description daemon-driver-storage The storage driver plugin for the libvirtd daemon, providing @@ -865,6 +856,12 @@ Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: /usr/bin/qemu-img +# For image compression +Requires: gzip +Requires: bzip2 +Requires: lzop +Requires: xz %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing -- 1.8.3.1

2 1

[libvirt] [PATCH v4 0/3] expose baselabel for each sec model/virt type
by Giuseppe Scrivano 29 Oct '13

29 Oct '13

Now each security model can define its own base label, that describes the default security context used by libvirt to run an hypervisor process. This information is exposed to users trough the host capabilities XML. *v4 major changes - Refactor virSecurityDACSetUser and virSecurityDACSetGroup in a separate patch - virSecurityManagerGetBaseLabel never causes a VIR_ERR_NO_SUPPORT error. *v3 major changes - support LXC - merge virSecurityDACSetUser and virSecurityDACSetGroup in virSecurityDACSetUserAndGroup - DAC sets the baselabel in virSecurityDACSetUserAndGroup - Use virDomainVirtTypeToString instead of hardcoding the name Giuseppe Scrivano (3): security: use a single function to set DAC user and group security: add new internal function "virSecurityManagerGetBaseLabel" capabilities: add baselabel per sec driver/virt type to secmodel docs/schemas/capability.rng | 8 ++++ src/conf/capabilities.c | 60 +++++++++++++++++++++++++++- src/conf/capabilities.h | 14 +++++++ src/libvirt_private.syms | 2 + src/lxc/lxc_conf.c | 10 ++++- src/qemu/qemu_conf.c | 21 ++++++++-- src/security/security_apparmor.c | 8 ++++ src/security/security_dac.c | 34 +++++++++++----- src/security/security_dac.h | 7 ++-- src/security/security_driver.h | 4 ++ src/security/security_manager.c | 21 +++++++++- src/security/security_manager.h | 2 + src/security/security_nop.c | 10 +++++ src/security/security_selinux.c | 12 ++++++ src/security/security_stack.c | 9 +++++ tests/capabilityschemadata/caps-qemu-kvm.xml | 2 + tests/capabilityschemadata/caps-test3.xml | 2 + 17 files changed, 203 insertions(+), 23 deletions(-) -- 1.8.3.1

3 7

[libvirt] [PATCH] virsh: new environment variable VIRSH_HISTSIZE
by Pavel Raiskup 29 Oct '13

29 Oct '13

Allow adjust the number of commands to remember in the command history. * tools/virsh.c (vshReadlineInit): Read and sanity the VIRSH_HISTSIZE variable. (VIRSH_HISTSIZE_MAX): New constant. * tools/virsh.pod: Document VIRSH_HISTSIZE variable. --- tools/virsh.c | 17 ++++++++++++++++- tools/virsh.pod | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index bad78c9..58bc841 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2748,11 +2748,14 @@ vshReadlineCompletion(const char *text, int start, return matches; } +#define VIRSH_HISTSIZE_MAX 500000 static int vshReadlineInit(vshControl *ctl) { char *userdir = NULL; + int max_history = 500; + char *histsize_str; /* Allow conditional parsing of the ~/.inputrc file. */ rl_readline_name = "virsh"; @@ -2761,7 +2764,19 @@ vshReadlineInit(vshControl *ctl) rl_attempted_completion_function = vshReadlineCompletion; /* Limit the total size of the history buffer */ - stifle_history(500); + if ((histsize_str = getenv("VIRSH_HISTSIZE"))) { + if (virStrToLong_i(histsize_str, NULL, 10, &max_history) < 0) { + vshError(ctl, "%s", _("Bad $VIRSH_HISTSIZE value.")); + VIR_FREE(userdir); + return -1; + } else if (max_history > VIRSH_HISTSIZE_MAX || max_history < 0) { + vshError(ctl, _("$VIRSH_HISTSIZE value should be between 0 and %d"), + VIRSH_HISTSIZE_MAX); + VIR_FREE(userdir); + return -1; + } + } + stifle_history(max_history); /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ userdir = virGetUserCacheDirectory(); diff --git a/tools/virsh.pod b/tools/virsh.pod index 23d17c4..dac9a08 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3349,6 +3349,11 @@ The editor to use by the B<edit> and related options. The editor to use by the B<edit> and related options, if C<VISUAL> is not set. +=item VIRSH_HISTSIZE + +The number of commands to remember in the command history. The +default value is 500. + =item LIBVIRT_DEBUG=LEVEL Turn on verbose debugging of all libvirt API calls. Valid levels are -- 1.8.3.1

3 4