From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 11 Jul 2018 15:30:19 +0000 (+0200)
Subject: qemu: hotplug: Don't format NULL in %s in qemuHotplugPrepareDiskAccess
X-Git-Tag: v4.6.0-rc1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f763fcddc7394961d86c80a12aae21d51a111a;p=thirdparty%2Flibvirt.git

qemu: hotplug: Don't format NULL in %s in qemuHotplugPrepareDiskAccess

The warning messages which include the disk source could potentially
format NULL using %s as virDomainDiskGetSource may return NULL for e.g.
NBD disks. As most of the APIs are NOOP for remote disks the usage of
the source string only should be fine for now.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 4df3f8ab8e..171d9ed50c 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -126,21 +126,21 @@ qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver,
  rollback_cgroup:
     if (qemuTeardownDiskCgroup(vm, disk) < 0)
         VIR_WARN("Unable to tear down cgroup access on %s",
-                 virDomainDiskGetSource(disk));
+                 NULLSTR(virDomainDiskGetSource(disk)));
  rollback_label:
     if (qemuSecurityRestoreDiskLabel(driver, vm, disk) < 0)
         VIR_WARN("Unable to restore security label on %s",
-                 virDomainDiskGetSource(disk));
+                 NULLSTR(virDomainDiskGetSource(disk)));
 
  rollback_namespace:
     if (qemuDomainNamespaceTeardownDisk(vm, disk->src) < 0)
         VIR_WARN("Unable to remove /dev entry for %s",
-                 virDomainDiskGetSource(disk));
+                 NULLSTR(virDomainDiskGetSource(disk)));
 
  rollback_lock:
     if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0)
         VIR_WARN("Unable to release lock on %s",
-                 virDomainDiskGetSource(disk));
+                 NULLSTR(virDomainDiskGetSource(disk)));
 
  cleanup:
     if (origsrc)