Re: [PATCH 9/9] virsh: allow empty targets in cmdDomFSInfo

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

 



On 2/12/19 10:21 AM, Ján Tomko wrote:
Ever since the introduction of the guest-get-fsinfo command
in QEMU commit 46d4c572 qga/qapi-schema.json says that
the 'disks' array can possibly be empty. For example when getting
the target list is unsupported:
https://bugzilla.redhat.com/show_bug.cgi?id=1567041

Pass an empty string instead of NULL to vshTableRowAppend to prevent
a mismatched column number.

Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
  tools/virsh-domain.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 6124126576..686fea8dd1 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -13978,7 +13978,7 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
                                    info[i]->mountpoint,
                                    info[i]->name,
                                    info[i]->fstype,
-                                  targets,
+                                  targets ? : "",

Last time I posted a patch that had this I was told (most probably by Eric) that this is not portable. I think we need to use expanded version.

                                    NULL) < 0)
                  goto cleanup;
          }


Michal


[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]

  Powered by Linux