From nobody Sun May 5 02:31:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491238424876781.1460703392156; Mon, 3 Apr 2017 09:53:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D02E9D412; Mon, 3 Apr 2017 16:53:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4069880F7A; Mon, 3 Apr 2017 16:53:43 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BC0A05EC62; Mon, 3 Apr 2017 16:53:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v33GrcaX031923 for ; Mon, 3 Apr 2017 12:53:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 78A7DA0A2A; Mon, 3 Apr 2017 16:53:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3728D53C75 for ; Mon, 3 Apr 2017 16:53:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7D02E9D412 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7D02E9D412 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 3 Apr 2017 12:53:31 -0400 Message-Id: <20170403165333.26216-2-jferlan@redhat.com> In-Reply-To: <20170403165333.26216-1-jferlan@redhat.com> References: <20170403165333.26216-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] tests: Pass BlockIOThrottle arguments by reference not value X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 03 Apr 2017 16:53:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Pass the data by reference rather than everything on the stack. Signed-off-by: John Ferlan --- tests/qemumonitorjsontest.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 5d53609..ac87c9c 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2035,27 +2035,27 @@ testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(co= nst void *data) =20 =20 static int -testValidateGetBlockIoThrottle(virDomainBlockIoTuneInfo info, - virDomainBlockIoTuneInfo expectedInfo) +testValidateGetBlockIoThrottle(const virDomainBlockIoTuneInfo *info, + const virDomainBlockIoTuneInfo *expectedInf= o) { #define VALIDATE_IOTUNE(field) \ - if (info.field !=3D expectedInfo.field) { \ + if (info->field !=3D expectedInfo->field) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - "info.%s=3D%llu !=3D expected=3D%llu", \ - #field, info.field, expectedInfo.field); \ + "info->%s=3D%llu !=3D expected=3D%llu", \ + #field, info->field, expectedInfo->field); \ return -1; \ } \ - if (info.field##_max !=3D expectedInfo.field##_max) { \ + if (info->field##_max !=3D expectedInfo->field##_max) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - "info.%s_max=3D%llu !=3D expected=3D%llu", \ - #field, info.field##_max, expectedInfo.field##_max)= ; \ + "info->%s_max=3D%llu !=3D expected=3D%llu", \ + #field, info->field##_max, expectedInfo->field##_ma= x); \ return -1; \ } \ - if (info.field##_max_length !=3D expectedInfo.field##_max_length) { \ + if (info->field##_max_length !=3D expectedInfo->field##_max_length) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - "info.%s_max_length=3D%llu !=3D expected=3D%llu", \ - #field, info.field##_max_length, \ - expectedInfo.field##_max_length); \ + "info->%s_max_length=3D%llu !=3D expected=3D%llu", = \ + #field, info->field##_max_length, \ + expectedInfo->field##_max_length); \ return -1; \ } VALIDATE_IOTUNE(total_bytes_sec); @@ -2064,16 +2064,16 @@ testValidateGetBlockIoThrottle(virDomainBlockIoTune= Info info, VALIDATE_IOTUNE(total_iops_sec); VALIDATE_IOTUNE(read_iops_sec); VALIDATE_IOTUNE(write_iops_sec); - if (info.size_iops_sec !=3D expectedInfo.size_iops_sec) { + if (info->size_iops_sec !=3D expectedInfo->size_iops_sec) { virReportError(VIR_ERR_INTERNAL_ERROR, - "info.size_iops_sec=3D%llu !=3D expected=3D%llu", - info.size_iops_sec, expectedInfo.size_iops_sec); + "info->size_iops_sec=3D%llu !=3D expected=3D%llu", + info->size_iops_sec, expectedInfo->size_iops_sec); return -1; } - if (STRNEQ(info.group_name, expectedInfo.group_name)) { + if (STRNEQ(info->group_name, expectedInfo->group_name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "info.group_name=3D%s !=3D expected=3D%s", - info.group_name, expectedInfo.group_name); + "info->group_name=3D%s !=3D expected=3D%s", + info->group_name, expectedInfo->group_name); return -1; } #undef VALIDATE_IOTUNE @@ -2121,7 +2121,7 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(= const void *data) "drive-virtio-disk0", &info) < 0) goto cleanup; =20 - if (testValidateGetBlockIoThrottle(info, expectedInfo) < 0) + if (testValidateGetBlockIoThrottle(&info, &expectedInfo) < 0) goto cleanup; =20 if (qemuMonitorJSONSetBlockIoThrottle(qemuMonitorTestGetMonitor(test), --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 02:31:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149123844061459.71359229270627; Mon, 3 Apr 2017 09:54:00 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0D0AF3B74F; Mon, 3 Apr 2017 16:53:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CFAC219E91; Mon, 3 Apr 2017 16:53:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 78EE518523CE; Mon, 3 Apr 2017 16:53:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v33Grc9x031928 for ; Mon, 3 Apr 2017 12:53:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC26617AA1; Mon, 3 Apr 2017 16:53:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB588A0A2D for ; Mon, 3 Apr 2017 16:53:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0D0AF3B74F Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0D0AF3B74F From: John Ferlan To: libvir-list@redhat.com Date: Mon, 3 Apr 2017 12:53:32 -0400 Message-Id: <20170403165333.26216-3-jferlan@redhat.com> In-Reply-To: <20170403165333.26216-1-jferlan@redhat.com> References: <20170403165333.26216-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] qemu: Initialize 'data' argument X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 03 Apr 2017 16:53:59 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Initialize stack variable to {0} Signed-off-by: John Ferlan --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e1ad243..388af4f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10265,7 +10265,7 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr = dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm =3D NULL; - virDomainCputune data; + virDomainCputune data =3D {0}; int ret =3D -1; bool cpu_bw_status =3D true; virDomainDefPtr persistentDef; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 02:31:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491238424957380.0961117374716; Mon, 3 Apr 2017 09:53:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20518C057FA7; Mon, 3 Apr 2017 16:53:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A9AD47EFCC; Mon, 3 Apr 2017 16:53:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A5B8818523C6; Mon, 3 Apr 2017 16:53:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v33Grdhu031933 for ; Mon, 3 Apr 2017 12:53:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D4CFA0A2D; Mon, 3 Apr 2017 16:53:39 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CF2E60A9D for ; Mon, 3 Apr 2017 16:53:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 20518C057FA7 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 20518C057FA7 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 3 Apr 2017 12:53:33 -0400 Message-Id: <20170403165333.26216-4-jferlan@redhat.com> In-Reply-To: <20170403165333.26216-1-jferlan@redhat.com> References: <20170403165333.26216-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] qemu: Fix resource leak in qemuDomainAddChardevTLSObjects error path X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 03 Apr 2017 16:53:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" On any failure, call virJSONValueFree for the *Props. Signed-off-by: John Ferlan --- src/qemu/qemu_migration.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 87d7dcd..852d85b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -213,7 +213,7 @@ qemuMigrationAddTLSObjects(virQEMUDriverPtr driver, cfg->migrateTLSx509verify, QEMU_MIGRATION_TLS_ALIAS_BASE, &tlsProps, tlsAlias, &secProps, secAlias) = < 0) - return -1; + goto error; =20 /* Ensure the domain doesn't already have the TLS objects defined... * This should prevent any issues just in case some cleanup wasn't @@ -223,12 +223,17 @@ qemuMigrationAddTLSObjects(virQEMUDriverPtr driver, =20 if (qemuDomainAddTLSObjects(driver, vm, asyncJob, *secAlias, &secProps, *tlsAlias, &tlsProps) < 0) - return -1; + goto error; =20 if (VIR_STRDUP(migParams->migrateTLSAlias, *tlsAlias) < 0) - return -1; + goto error; =20 return 0; + + error: + virJSONValueFree(tlsProps); + virJSONValueFree(secProps); + return -1; } =20 =20 --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list