Re: [libvirt] [PATCH 4/6] qemu_conf: Use more of VIR_AUTOUNREF()

2019-09-10 Thread Pavel Hrdina 
On Mon, Sep 09, 2019 at 06:00:25PM +0200, Michal Privoznik wrote:
> Signed-off-by: Michal Privoznik 
> ---
>  src/qemu/qemu_conf.c | 139 ---
>  1 file changed, 63 insertions(+), 76 deletions(-)

Reviewed-by: Pavel Hrdina 


signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 4/6] qemu_conf: Use more of VIR_AUTOUNREF()

2019-09-09 Thread Daniel Henrique Barboza 




On 9/9/19 1:00 PM, Michal Privoznik wrote:

Signed-off-by: Michal Privoznik 
---


Reviewed-by: Daniel Henrique Barboza 



  src/qemu/qemu_conf.c | 139 ---
  1 file changed, 63 insertions(+), 76 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index c3255a6f54..f805991872 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -105,7 +105,7 @@ qemuDriverUnlock(virQEMUDriverPtr driver)
  
  virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)

  {
-virQEMUDriverConfigPtr cfg;
+VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = NULL;
  
  if (virQEMUConfigInitialize() < 0)

  return NULL;
@@ -117,9 +117,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool 
privileged)
  
  if (privileged) {

  if (virGetUserID(QEMU_USER, >user) < 0)
-goto error;
+return NULL;
  if (virGetGroupID(QEMU_GROUP, >group) < 0)
-goto error;
+return NULL;
  } else {
  cfg->user = (uid_t)-1;
  cfg->group = (gid_t)-1;
@@ -132,48 +132,48 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool 
privileged)
  if (privileged) {
  if (virAsprintf(>logDir,
  "%s/log/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
  
  if (virAsprintf(>swtpmLogDir,

  "%s/log/swtpm/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
  
  if (VIR_STRDUP(cfg->configBaseDir, SYSCONFDIR "/libvirt") < 0)

-goto error;
+return NULL;
  
  if (virAsprintf(>stateDir,

"%s/libvirt/qemu", RUNSTATEDIR) < 0)
-goto error;
+return NULL;
  
  if (virAsprintf(>swtpmStateDir,

 "%s/libvirt/qemu/swtpm", RUNSTATEDIR) < 0)
-goto error;
+return NULL;
  
  if (virAsprintf(>cacheDir,

"%s/cache/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
  
  if (virAsprintf(>libDir,

"%s/lib/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>saveDir, "%s/save", cfg->libDir) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>snapshotDir, "%s/snapshot", cfg->libDir) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>checkpointDir, "%s/checkpoint", cfg->libDir) < 
0)
-goto error;
+return NULL;
  if (virAsprintf(>autoDumpPath, "%s/dump", cfg->libDir) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>channelTargetDir,
  "%s/channel/target", cfg->libDir) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>nvramDir, "%s/nvram", cfg->libDir) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>memoryBackingDir, "%s/ram", cfg->libDir) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>swtpmStorageDir, "%s/lib/libvirt/swtpm",
  LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
  if (!virDoesUserExist("tss") ||
  virGetUserID("tss", >swtpm_user) < 0)
  cfg->swtpm_user = 0; /* fall back to root */
@@ -186,58 +186,58 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool 
privileged)
  
  cachedir = virGetUserCacheDirectory();

  if (!cachedir)
-goto error;
+return NULL;
  
  if (virAsprintf(>logDir, "%s/qemu/log", cachedir) < 0)

-goto error;
+return NULL;
  if (virAsprintf(>swtpmLogDir, "%s/qemu/log", cachedir) < 0)
-goto error;
+return NULL;
  if (virAsprintf(>cacheDir, "%s/qemu/cache", cachedir) < 0)
-goto error;
+return NULL;
  
  rundir = virGetUserRuntimeDirectory();

  if (!rundir)
-goto error;
+return NULL;
  if (virAsprintf(>stateDir, "%s/qemu/run", rundir) < 0) {
-goto error;
+return NULL;
  }
  
  if (virAsprintf(>swtpmStateDir, "%s/swtpm", cfg->stateDir) < 0)

-goto error;
+return NULL;
  
  if (!(cfg->configBaseDir = virGetUserConfigDirectory()))

-goto error;
+return NULL;
  
  if (virAsprintf(>libDir, "%s/qemu/lib", cfg->configBaseDir) < 0)

-goto error;
+return NULL;
  if (virAsprintf(>saveDir, "%s/qemu/save", cfg->configBaseDir) < 
0)
-goto error;
+return NULL;
  if (virAsprintf(>snapshotDir, "%s/qemu/snapshot", 
cfg->configBaseDir) < 0)
-goto error;
+return NULL;
  if

[libvirt] [PATCH 4/6] qemu_conf: Use more of VIR_AUTOUNREF()

2019-09-09 Thread Michal Privoznik 
Signed-off-by: Michal Privoznik 
---
 src/qemu/qemu_conf.c | 139 ---
 1 file changed, 63 insertions(+), 76 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index c3255a6f54..f805991872 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -105,7 +105,7 @@ qemuDriverUnlock(virQEMUDriverPtr driver)
 
 virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
 {
-virQEMUDriverConfigPtr cfg;
+VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = NULL;
 
 if (virQEMUConfigInitialize() < 0)
 return NULL;
@@ -117,9 +117,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool 
privileged)
 
 if (privileged) {
 if (virGetUserID(QEMU_USER, >user) < 0)
-goto error;
+return NULL;
 if (virGetGroupID(QEMU_GROUP, >group) < 0)
-goto error;
+return NULL;
 } else {
 cfg->user = (uid_t)-1;
 cfg->group = (gid_t)-1;
@@ -132,48 +132,48 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool 
privileged)
 if (privileged) {
 if (virAsprintf(>logDir,
 "%s/log/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
 
 if (virAsprintf(>swtpmLogDir,
 "%s/log/swtpm/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
 
 if (VIR_STRDUP(cfg->configBaseDir, SYSCONFDIR "/libvirt") < 0)
-goto error;
+return NULL;
 
 if (virAsprintf(>stateDir,
   "%s/libvirt/qemu", RUNSTATEDIR) < 0)
-goto error;
+return NULL;
 
 if (virAsprintf(>swtpmStateDir,
"%s/libvirt/qemu/swtpm", RUNSTATEDIR) < 0)
-goto error;
+return NULL;
 
 if (virAsprintf(>cacheDir,
   "%s/cache/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
 
 if (virAsprintf(>libDir,
   "%s/lib/libvirt/qemu", LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>saveDir, "%s/save", cfg->libDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>snapshotDir, "%s/snapshot", cfg->libDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>checkpointDir, "%s/checkpoint", cfg->libDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>autoDumpPath, "%s/dump", cfg->libDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>channelTargetDir,
 "%s/channel/target", cfg->libDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>nvramDir, "%s/nvram", cfg->libDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>memoryBackingDir, "%s/ram", cfg->libDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>swtpmStorageDir, "%s/lib/libvirt/swtpm",
 LOCALSTATEDIR) < 0)
-goto error;
+return NULL;
 if (!virDoesUserExist("tss") ||
 virGetUserID("tss", >swtpm_user) < 0)
 cfg->swtpm_user = 0; /* fall back to root */
@@ -186,58 +186,58 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool 
privileged)
 
 cachedir = virGetUserCacheDirectory();
 if (!cachedir)
-goto error;
+return NULL;
 
 if (virAsprintf(>logDir, "%s/qemu/log", cachedir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>swtpmLogDir, "%s/qemu/log", cachedir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>cacheDir, "%s/qemu/cache", cachedir) < 0)
-goto error;
+return NULL;
 
 rundir = virGetUserRuntimeDirectory();
 if (!rundir)
-goto error;
+return NULL;
 if (virAsprintf(>stateDir, "%s/qemu/run", rundir) < 0) {
-goto error;
+return NULL;
 }
 
 if (virAsprintf(>swtpmStateDir, "%s/swtpm", cfg->stateDir) < 0)
-goto error;
+return NULL;
 
 if (!(cfg->configBaseDir = virGetUserConfigDirectory()))
-goto error;
+return NULL;
 
 if (virAsprintf(>libDir, "%s/qemu/lib", cfg->configBaseDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>saveDir, "%s/qemu/save", cfg->configBaseDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>snapshotDir, "%s/qemu/snapshot", 
cfg->configBaseDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>checkpointDir, "%s/qemu/checkpoint", 
cfg->configBaseDir) < 0)
-goto error;
+return NULL;
 if (virAsprintf(>autoDumpPath,