Re: [libvirt] [PATCH 17/19] qemu_command: remove unnecessary labels and ret variables

2019-08-26 Thread Ján Tomko 

On Wed, Aug 21, 2019 at 09:44:01AM +0200, Michal Privoznik wrote:

On 8/20/19 2:59 PM, Ján Tomko wrote:

The recent cleanups allow us to clean up the code a bit.

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_command.c | 741 +++-
 1 file changed, 274 insertions(+), 467 deletions(-)


qemuBuildMemoryBackendProps
qemuBuildMemoryCellBackendStr


The ret usage there does not closely follow the usual mechanical pattern
so I sent those separately.

qemuBuildHostNetStr (if you take mu suggestion from previous patch and 
use VIR_AUTOUNREF() for @cfg)


Actually, doing that shows that cfg has been unused for a few years
there.
Dealt with separately.

Jano



Michal


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

Re: [libvirt] [PATCH 17/19] qemu_command: remove unnecessary labels and ret variables

2019-08-21 Thread Michal Privoznik 

On 8/20/19 2:59 PM, Ján Tomko wrote:

The recent cleanups allow us to clean up the code a bit.

Signed-off-by: Ján Tomko 
---
  src/qemu/qemu_command.c | 741 +++-
  1 file changed, 274 insertions(+), 467 deletions(-)


qemuBuildMemoryBackendProps
qemuBuildMemoryCellBackendStr
qemuBuildHostNetStr (if you take mu suggestion from previous patch and 
use VIR_AUTOUNREF() for @cfg)


Michal

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

[libvirt] [PATCH 17/19] qemu_command: remove unnecessary labels and ret variables

2019-08-20 Thread Ján Tomko 
The recent cleanups allow us to clean up the code a bit.

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_command.c | 741 +++-
 1 file changed, 274 insertions(+), 467 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a4df133ca0..0e9bd77f62 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -202,7 +202,6 @@ static int
 qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
   qemuDomainObjPrivatePtr priv)
 {
-int ret = -1;
 VIR_AUTOFREE(char *) alias = NULL;
 VIR_AUTOFREE(char *) path = NULL;
 VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -225,17 +224,14 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
  * existence of socket files before using.
  */
 if (!(path = qemuDomainGetMasterKeyFilePath(priv->libDir)))
-goto cleanup;
+return -1;
 
 virCommandAddArg(cmd, "-object");
 virBufferAsprintf(, "secret,id=%s,format=raw,file=", alias);
 virQEMUBuildBufferEscapeComma(, path);
 virCommandAddArgBuffer(cmd, );
 
-ret = 0;
-
- cleanup:
-return ret;
+return 0;
 }
 
 
@@ -298,7 +294,6 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
   virDomainDeviceInfoPtr info,
   virQEMUCapsPtr qemuCaps)
 {
-int ret = -1;
 VIR_AUTOFREE(char *) devStr = NULL;
 const char *contAlias = NULL;
 bool contIsPHB = false;
@@ -308,7 +303,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
 size_t i;
 
 if (!(devStr = virPCIDeviceAddressAsString(>addr.pci)))
-goto cleanup;
+return -1;
 for (i = 0; i < domainDef->ncontrollers; i++) {
 virDomainControllerDefPtr cont = domainDef->controllers[i];
 
@@ -324,7 +319,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
  "controller with index %u required "
  "for device at address %s"),
info->addr.pci.bus, devStr);
-goto cleanup;
+return -1;
 }
 
 if (virDomainDeviceAliasIsUserAlias(contAlias)) {
@@ -350,7 +345,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
  "controller with index %u required "
  "for device at address %s"),
info->addr.pci.bus, devStr);
-goto cleanup;
+return -1;
 }
 
 if (contIsPHB && contTargetIndex > 0) {
@@ -376,7 +371,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
 if (!(contAlias = virDomainControllerAliasFind(domainDef,

VIR_DOMAIN_CONTROLLER_TYPE_USB,
info->addr.usb.bus)))
-goto cleanup;
+return -1;
 virBufferAsprintf(buf, ",bus=%s.0", contAlias);
 if (virDomainUSBAddressPortIsValid(info->addr.usb.port)) {
 virBufferAddLit(buf, ",port=");
@@ -397,9 +392,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
   info->addr.isa.irq);
 }
 
-ret = 0;
- cleanup:
-return ret;
+return 0;
 }
 
 
@@ -733,22 +726,18 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd,
  qemuDomainSecretInfoPtr secinfo)
 {
 VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-int ret = -1;
 VIR_AUTOPTR(virJSONValue) props = NULL;
 
 if (qemuBuildSecretInfoProps(secinfo, ) < 0)
 return -1;
 
 if (virQEMUBuildObjectCommandlineFromJSON(, props) < 0)
-goto cleanup;
+return -1;
 
 virCommandAddArg(cmd, "-object");
 virCommandAddArgBuffer(cmd, );
 
-ret  = 0;
-
- cleanup:
-return ret;
+return 0;
 }
 
 
@@ -929,23 +918,19 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd,
 virQEMUCapsPtr qemuCaps)
 {
 VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-int ret = -1;
 VIR_AUTOPTR(virJSONValue) props = NULL;
 
 if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias,
  certEncSecretAlias, qemuCaps, ) < 0)
-goto cleanup;
+return -1;
 
 if (virQEMUBuildObjectCommandlineFromJSON(, props) < 0)
-goto cleanup;
+return -1;
 
 virCommandAddArg(cmd, "-object");
 virCommandAddArgBuffer(cmd, );
 
-ret = 0;
-
- cleanup:
-return ret;
+return 0;
 }
 
 
@@ -954,22 +939,18 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src,
  qemuDomainSecretInfoPtr secinfo)
 {
 VIR_AUTOPTR(virURI) uri = NULL;
-char *ret = NULL;
 
 if (!(uri = qemuBlockStorageSourceGetURI(src)))
-goto cleanup;
+return NULL;
 
 if (src->hosts->socket &&
 virAsprintf(>query, "socket=%s", src->hosts->socket) < 0)
-goto cleanup;
+