[PATCH v2 08/12] getstats: report block sizes for offline domains

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The prior refactoring can now be put to use. With the same domain
as the previous commit (one qcow2 disk and an empty cdrom drive):
$ virsh domstats --block foo
Domain: 'foo'
  block.count=2
  block.0.name=hda
  block.0.allocation=200704
  block.0.capacity=42949672960
  block.0.physical=200704
  block.1.name=hdc

* src/qemu/qemu_driver.c (qemuStorageLimitsRefresh): Tweak
semantics of helper function.
(qemuDomainGetStatsBlock): Use it to report offline statistics.

Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
---
 src/qemu/qemu_driver.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 13ec903..ef73502 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18548,6 +18548,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver,
     virHashTablePtr stats = NULL;
     qemuDomainObjPrivatePtr priv = dom->privateData;
     bool abbreviated = false;
+    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);

     if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) {
         abbreviated = true; /* it's ok, just go ahead silently */
@@ -18577,8 +18578,20 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver,

         if (abbreviated || !disk->info.alias ||
             !(entry = virHashLookup(stats, disk->info.alias))) {
-            /* FIXME: we could still look up sizing by sharing code
-             * with qemuDomainGetBlockInfo */
+            if (virStorageSourceIsEmpty(disk->src))
+                continue;
+            if (qemuStorageLimitsRefresh(driver, cfg, dom,
+                                         disk, disk->src) < 0)
+                goto cleanup;
+            if (disk->src->allocation)
+                QEMU_ADD_BLOCK_PARAM_ULL(record, maxparams, i,
+                                         "allocation", disk->src->allocation);
+            if (disk->src->capacity)
+                QEMU_ADD_BLOCK_PARAM_ULL(record, maxparams, i,
+                                         "capacity", disk->src->capacity);
+            if (disk->src->physical)
+                QEMU_ADD_BLOCK_PARAM_ULL(record, maxparams, i,
+                                         "physical", disk->src->physical);
             continue;
         }

@@ -18615,6 +18628,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver,

  cleanup:
     virHashFree(stats);
+    virObjectUnref(cfg);
     return ret;
 }

-- 
1.9.3

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]