- Devel - libvirt List Archives

[libvirt] [libvirt-perl][PATCH] Add VIR_ERR_NO_CLIENT constant
by Michal Privoznik 04 May '16

04 May '16

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 1 + Virt.xs | 1 + lib/Sys/Virt/Error.pm | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/Changes b/Changes index 106b812..5303c0e 100644 --- a/Changes +++ b/Changes @@ -8,6 +8,7 @@ Revision history for perl module Sys::Virt - Add VIR_STORAGE_VOL_PLOOP constant - Add VIR_MIGRATE_PARAM_COMPRESSION* constants - Add VIR_MIGRATE_PARAM_PERSIST_XML constant + - Add VIR_ERR_NO_CLIENT constant 1.3.3 2016-04-07 diff --git a/Virt.xs b/Virt.xs index b0c3282..d069abd 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8530,4 +8530,5 @@ BOOT: REGISTER_CONSTANT(VIR_ERR_MIGRATE_FINISH_OK, ERR_MIGRATE_FINISH_OK); REGISTER_CONSTANT(VIR_ERR_AUTH_UNAVAILABLE, ERR_AUTH_UNAVAILABLE); REGISTER_CONSTANT(VIR_ERR_NO_SERVER, ERR_NO_SERVER); + REGISTER_CONSTANT(VIR_ERR_NO_CLIENT, ERR_NO_CLIENT); } diff --git a/lib/Sys/Virt/Error.pm b/lib/Sys/Virt/Error.pm index b54f876..db23f1e 100644 --- a/lib/Sys/Virt/Error.pm +++ b/lib/Sys/Virt/Error.pm @@ -792,6 +792,10 @@ Authentication services were not available Libvirt server was not found +=item Sys::Virt::Error::ERR_NO_CLIENT + +Libvirt client was not found + =back =head1 AUTHORS -- 2.8.1

2 1

[libvirt] [PATCH 0/7] Admin API: Add support for client identity info retrieval
by Erik Skultety 04 May '16

04 May '16

This series adds support for client identity retrieval, i.e. information like remote IP (if connected remotely), uid,gid,pid, as well as username if connected locally and also information regarding authentication (if used). The series is rebased on the listing clients series, because it relies on the gendispatch stuff, so for testing purposes checkout my remote branch https://github.com/eskultety/libvirt/tree/list-clients-info-disconnect which also covers the next series about client disconnect. Erik Skultety (7): admin: Introduce virAdmServerLookupClient admin: include: Introduce some client's identity related typed params macros virnetsocket: Provide socket address format in a more standard form virneserverclient: Introduce virNetServerClientHasSASLSession virnetserverclient: Add an internal method to retrieve client's identity admin: Introduce virAdmClientGetInfo API virt-admin: Introduce command client-info daemon/admin.c | 59 ++++++++++++++++++ daemon/admin_server.c | 102 +++++++++++++++++++++++++++++++ daemon/admin_server.h | 9 +++ daemon/remote.c | 13 +++- include/libvirt/libvirt-admin.h | 130 ++++++++++++++++++++++++++++++++++++++++ include/libvirt/virterror.h | 1 + src/admin/admin_protocol.x | 34 ++++++++++- src/admin/admin_remote.c | 47 +++++++++++++++ src/admin_protocol-structs | 20 +++++++ src/libvirt-admin.c | 75 +++++++++++++++++++++++ src/libvirt_admin_private.syms | 4 ++ src/libvirt_admin_public.syms | 2 + src/remote/remote_driver.c | 7 +++ src/rpc/virnetclient.c | 10 ++++ src/rpc/virnetclient.h | 2 + src/rpc/virnetserver.c | 23 +++++++ src/rpc/virnetserver.h | 3 + src/rpc/virnetserverclient.c | 48 +++++++++++++++ src/rpc/virnetserverclient.h | 6 ++ src/rpc/virnetsocket.c | 17 +++++- src/rpc/virnetsocket.h | 2 + src/util/virerror.c | 6 ++ src/util/virsocketaddr.c | 24 ++++++-- tests/virnetsockettest.c | 10 ++-- tools/virt-admin.c | 91 ++++++++++++++++++++++++++++ 25 files changed, 731 insertions(+), 14 deletions(-) -- 2.4.11

3 15

[libvirt] [PATCH] daemon: Add VIR_ERR_NO_SERVER and VIR_ERR_NO_CLIENT to daemonErrorLogFilter
by Erik Skultety 04 May '16

04 May '16

Commits 52a2eef9 and 62be5486 forgot to add these errors to daemon's error whitelist, i.e. in order to avoid log file pollution with errors like "Domain not found" or "Server not found" in this case, since these events are valid and expected to occur. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under trivial rule. daemon/libvirtd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index f0fdaed..cc5190f 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -333,6 +333,8 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority) case VIR_ERR_NO_DOMAIN_SNAPSHOT: case VIR_ERR_OPERATION_INVALID: case VIR_ERR_NO_DOMAIN_METADATA: + case VIR_ERR_NO_SERVER: + case VIR_ERR_NO_CLIENT: return VIR_LOG_DEBUG; } -- 2.4.11

1 0

[libvirt] [PATCH v2] send default USB controller in xml to destination during migration
by Shivaprasad G Bhat 04 May '16

04 May '16

The default USB controller is not sent to destination as the older versions of libvirt(0.9.4 or earlier as I see in commit log of 409b5f54) didn't support them. For some archs where the support started much later can safely send the USB controllers without this worry. So, send the controller to destination for all archs except x86. Moreover this is not very applicable to x86 as the USB controller has model ich9_ehci1 on q35 and for pc-i440fx, there cant be any slots before USB as it is fixed on slot 1. The patch fixes a bug that, if the USB controller happens to occupy a slot after disks/interfaces and one of them is hot-unplugged, then the default USB controller added on destination takes the smallest slot number and that would lead to savestate mismatch and migration failure. Seen and verified on PPC64. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6262bfe..963ff35 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2599,7 +2599,11 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, usb = def->controllers[i]; } } - if (usb && usb->idx == 0 && usb->model == -1) { + /* The original purpose of the check was the migration compatibility + * with libvirt <= 0.9.4. Limitation doesn't apply to other archs + * and can cause problems on PPC64. + */ + if (ARCH_IS_X86(def->os.arch) && usb && usb->idx == 0 && usb->model == -1) { VIR_DEBUG("Removing default USB controller from domain '%s'" " for migration compatibility", def->name); toremove++;

5 5

[libvirt] [PATCH] dist: ln(1) is not guaranteed to have a '-f' option
by Andrea Bolognani 04 May '16

04 May '16

According to the autoconf manual, using '$(LN_S) -f' is not portable; remove the target explicitly beforehand to work around this limitation. Adjust some slightly awkward indentation while at it. --- src/Makefile.am | 3 ++- tools/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c639e37..b71e694 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3079,7 +3079,8 @@ if WITH_NETWORK $(DESTDIR)$(confdir)/qemu/networks/default.xml && \ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; } ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \ - $(LN_S) -f ../default.xml default.xml ) + rm -f default.xml && \ + $(LN_S) ../default.xml default.xml ) endif WITH_NETWORK uninstall-local:: uninstall-init uninstall-systemd diff --git a/tools/Makefile.am b/tools/Makefile.am index e963b91..c5a6a0d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -424,7 +424,8 @@ NSS_SO_VER = 1 install-exec-hook: ( cd $(DESTDIR)$(libdir) && \ - $(LN_S) -f libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) ) + rm -f nss_libvirt.so.$(NSS_SO_VER) && \ + $(LN_S) libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) ) uninstall-local: -rm -f $(DESTDIR)$(libdir)/nss_libvirt.so.$(NSS_SO_VER) -- 2.5.5

3 3

[libvirt] [PATCH v2 0/3] Add support for virtio-scsi-{pci, ccw} iothread support
by John Ferlan 03 May '16

03 May '16

v1 here: http://www.redhat.com/archives/libvir-list/2016-May/msg00077.html (patches 1-4 were pushed already, the following are patches 5-7) Changes: Patch 1: - Clean up docs, use 1.3.5 as the version instead of 1.3.4. - Use post parse callback virDomainDeviceDefPostParseInternal to handle the controller check if iothread's are set on a controller (rather than during Controller Def parsing Patch 2: - Clean up commit message - Use the _() for message - Use 'target' not 'dst' in message (more specific) Patch 3: - No changes John Ferlan (3): conf: Add support for virtio-scsi iothreads qemu: Use switch for qemuCheckIOThreads qemu: Add 'iothread' to command line for supported controller docs/formatdomain.html.in | 21 ++++ docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 32 +++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 115 ++++++++++++++++++--- .../qemuxml2argv-iothreads-virtio-scsi-ccw.args | 28 +++++ .../qemuxml2argv-iothreads-virtio-scsi-ccw.xml | 39 +++++++ .../qemuxml2argv-iothreads-virtio-scsi-pci.args | 32 ++++++ .../qemuxml2argv-iothreads-virtio-scsi-pci.xml | 47 +++++++++ tests/qemuxml2argvtest.c | 6 ++ .../qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml | 40 +++++++ .../qemuxml2xmlout-iothreads-virtio-scsi-pci.xml | 51 +++++++++ tests/qemuxml2xmltest.c | 7 ++ 13 files changed, 409 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-pci.xml -- 2.5.5

2 4

[libvirt] [PATCH REPOST 0/7] Add support for virtio-scsi-{pci, ccw} iothread support
by John Ferlan 03 May '16

03 May '16

Repost of : http://www.redhat.com/archives/libvir-list/2016-April/msg01539.html Essentially the same patches as previous, but refreshed to current HEAD of '6620cd1ef'. I did remove patch 5 since it's not necessary. Also had to adjust one test to add the new default panic device for ccw. John Ferlan (7): qemu: Add capability for virtio-scsi iothreads docs: clarify disk iothread support docs: Reformat the Controllers description conf: Move virDomainControllerModelTypeToString conf: Add support for virtio-scsi iothreads qemu: Use switch for qemuCheckIOThreads qemu: Add 'iothread' to command line for supported controller docs/formatdomain.html.in | 87 ++++++--- docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 54 ++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 9 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 115 ++++++++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 80 +++++---- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 80 +++++---- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 88 +++++---- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 88 +++++---- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 88 +++++---- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 88 +++++---- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 88 +++++---- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 177 ++++++++++++++---- tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 197 +++++++++++++++++---- tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 192 ++++++++++++++++---- .../qemuxml2argv-iothreads-virtio-scsi-ccw.args | 28 +++ .../qemuxml2argv-iothreads-virtio-scsi-ccw.xml | 39 ++++ .../qemuxml2argv-iothreads-virtio-scsi-pci.args | 32 ++++ .../qemuxml2argv-iothreads-virtio-scsi-pci.xml | 47 +++++ tests/qemuxml2argvtest.c | 6 + .../qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml | 40 +++++ .../qemuxml2xmlout-iothreads-virtio-scsi-pci.xml | 51 ++++++ tests/qemuxml2xmltest.c | 7 + 28 files changed, 1308 insertions(+), 381 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-pci.xml -- 2.5.5

2 21

[libvirt] [PATCH] Allow blkdeviotune to take human readable values
by Nishith Shah 03 May '16

03 May '16

Use vshCommandOptScaledInt instead of vshCommandOptULongLong so there is no need to pass values in raw bytes, which is seldom the case. --- tools/virsh-domain.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0a6caae..3843675 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1299,7 +1299,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "device", &disk) < 0) goto cleanup; - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1308,7 +1308,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1317,7 +1317,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1326,7 +1326,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1335,7 +1335,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1344,7 +1344,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1353,7 +1353,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1362,7 +1362,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1371,7 +1371,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1380,7 +1380,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-iops-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-iops-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1389,7 +1389,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-iops-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-iops-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1398,7 +1398,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-iops-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-iops-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1407,7 +1407,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "size-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "size-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, -- 2.1.4

4 6

[libvirt] [PATCH] virsh: volume: Add --bytes to 'vol-info'
by Peter Krempa 03 May '16

03 May '16

--- tools/virsh-volume.c | 23 +++++++++++++++++++---- tools/virsh.pod | 4 +++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 9cc8e52..d35fee1 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -992,6 +992,10 @@ static const vshCmdInfo info_vol_info[] = { static const vshCmdOptDef opts_vol_info[] = { VIRSH_COMMON_OPT_VOLUME_VOL, VIRSH_COMMON_OPT_POOL_OPTIONAL, + {.name = "bytes", + .type = VSH_OT_BOOL, + .help = N_("sizes are represented in bytes rather than pretty units") + }, {.name = NULL} }; @@ -1000,6 +1004,7 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) { virStorageVolInfo info; virStorageVolPtr vol; + bool bytes = vshCommandOptBool(cmd, "bytes"); bool ret = true; if (!(vol = virshCommandOptVol(ctl, cmd, "vol", "pool", NULL))) @@ -1014,11 +1019,21 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%-15s %s\n", _("Type:"), virshVolumeTypeToString(info.type)); - val = vshPrettyCapacity(info.capacity, &unit); - vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit); + if (bytes) { + vshPrint(ctl, "%-15s %llu %s\n", _("Capacity:"), + info.capacity, _("bytes")); + } else { + val = vshPrettyCapacity(info.capacity, &unit); + vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit); + } - val = vshPrettyCapacity(info.allocation, &unit); - vshPrint(ctl, "%-15s %2.2lf %s\n", _("Allocation:"), val, unit); + if (bytes) { + vshPrint(ctl, "%-15s %llu %s\n", _("Allocation:"), + info.allocation, _("bytes")); + } else { + val = vshPrettyCapacity(info.allocation, &unit); + vshPrint(ctl, "%-15s %2.2lf %s\n", _("Allocation:"), val, unit); + } } else { ret = false; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 90ab47d..2a95df7 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3639,11 +3639,13 @@ is in. I<vol-name-or-key-or-path> is the name or key or path of the volume to output the XML of. =item B<vol-info> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> +[I<--bytes>] Returns basic information about the given storage volume. I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. I<vol-name-or-key-or-path> is the name or key or path of the volume -to return information for. +to return information for. If I<--bytes> is specified the sizes are not +converted to human friendly units. =item B<vol-list> [I<--pool> I<pool-or-uuid>] [I<--details>] -- 2.8.1

2 1

[libvirt] [PATCH 0/4] configure: Fix init script choice
by Andrea Bolognani 03 May '16

03 May '16

The changes pushed yesterday have introduced an issue where systemd was turned into systemd+redhat on RHEL systems, which in turn caused RPM building to fail[1]. Patch 1/4 is the actual fix; patch 2/4 changes the code so that breaking it again is hopefully a bit harder. Patches 3/4 and 4/4 clean up a couple of barely related issues in the spec file that I've ran into while investigating this. [1] https://ci.centos.org/view/libvirt-project/job/libvirt-daemon-rpm/systems=l… Andrea Bolognani (4): configure: Change RHEL default from systemd+redhat to systemd configure: Remove nested conditionals in LIBVIRT_CHECK_INIT_SCRIPT spec: Type --with-init-script correctly spec: Rename %{init_scripts} -> %{with_init_script} libvirt.spec.in | 6 +++--- m4/virt-init-script.m4 | 21 ++++++--------------- 2 files changed, 9 insertions(+), 18 deletions(-) -- 2.5.5

2 6