From nobody Wed May 14 16:34:03 2025 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.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1520344923645944.1674640747676; Tue, 6 Mar 2018 06:02:03 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CACB6C0587CE; Tue, 6 Mar 2018 14:02:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 90ED017AFE; Tue, 6 Mar 2018 14:02:01 +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 431DF4A479; Tue, 6 Mar 2018 14:02:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w26E1kp3017526 for ; Tue, 6 Mar 2018 09:01:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id D416810B0F3B; Tue, 6 Mar 2018 14:01:46 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B56910B0F3D for ; Tue, 6 Mar 2018 14:01:46 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 6 Mar 2018 15:01:39 +0100 Message-Id: <03788ecedbf5b7e9b1135e7f2dc3ca674b71aa58.1520344846.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/7] Simplify some conditions 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: , Content-Type: text/plain; charset="utf-8" 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 06 Mar 2018 14:02:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 In qemuMigrationSrcRun, we already checked for non-NULL mig and then dereferenced it. It's only possible for mig to be NULL in the error section. In remoteConnectOpen, conn->uri cannot be NULL in the second part of the OR expression due to short-circuit evaluation. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_migration.c | 2 +- src/remote/remote_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index bf89e184e..e5231555d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3992,7 +3992,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, goto error; } =20 - if (mig && mig->nbd && + if (mig->nbd && qemuMigrationSrcCancelDriveMirror(driver, vm, true, QEMU_ASYNC_JOB_MIGRATION_OUT, dconn) < 0) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2ec69166f..9390bead6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1310,7 +1310,7 @@ remoteConnectOpen(virConnectPtr conn, int ret, rflags =3D 0; const char *autostart =3D virGetEnvBlockSUID("LIBVIRT_AUTOSTART"); =20 - if (inside_daemon && (!conn->uri || (conn->uri && !conn->uri->server))) + if (inside_daemon && (!conn->uri || !conn->uri->server)) return VIR_DRV_OPEN_DECLINED; =20 if (!(priv =3D remoteAllocPrivateData())) --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list