From nobody Thu May 2 09:19:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616193040; cv=none; d=zohomail.com; s=zohoarc; b=PJc0HYFSeh4m2xIjLHOObO6l50yZjO4jA9+B4Z1u7cqFhpzxUv8Sbn3FbSwgPQvVw/GMvqz2b5MTiPc+i8xFk6wTXfQ3jHuOdzHAAwd6nQoK+vMyEsiM9utN3FzBv7b+9XFJ4Oj6FL+SKnFEIzf/weQT/QRHG46YhiBen/yyLlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616193040; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VRiWLpOS6aKQyPwRTz4KpSfRE139L0cJ+1yrdOrT+Rw=; b=eKc2xcDYTTWMGRQIl9GQjx2zrV+PnehNdLp63tl996xQikvQd0UlKdpNQn+IqsNU1bKMkLPFGAy3RHO6Dfb01yQL5/bCIhUxX34DVjhXCOmVkoD+AGkUqHPbcJvou7ELdy20rFmUaAggSWgauvKc191fMxMOy+J9sKv1zisrg54= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616193040141878.0062314961017; Fri, 19 Mar 2021 15:30:40 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-sD811_92MFCBmcFmY1vBsQ-1; Fri, 19 Mar 2021 18:30:37 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BBA71007467; Fri, 19 Mar 2021 22:30:32 +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 DCA846091B; Fri, 19 Mar 2021 22:30:31 +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 9C15E4BB7C; Fri, 19 Mar 2021 22:30:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JMUUQh021591 for ; Fri, 19 Mar 2021 18:30:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id D71715C237; Fri, 19 Mar 2021 22:30:30 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.40.194.173]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB2E75C1D1 for ; Fri, 19 Mar 2021 22:30:27 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id E32C924030D; Fri, 19 Mar 2021 23:30:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616193039; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VRiWLpOS6aKQyPwRTz4KpSfRE139L0cJ+1yrdOrT+Rw=; b=dtmzuCT1CBnb4N/aqkkfpl3AXsqjK4D9RjCRH5IduFHHSQkAbBUMfYhIbMd4909SHjY3AV p9HIt96AI/UQhOUlHK5m3Ql+5HgpJCzYjxBYB7V0GQSo3xwl7p5yTUcR5hqk10cZM7fP0Y qSwdN7VH8O2HaOr9qjsvW0rY7Q9zYas= X-MC-Unique: sD811_92MFCBmcFmY1vBsQ-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH] qemu: Drop redundant checks for qemuCaps before virQEMUCapsGet Date: Fri, 19 Mar 2021 23:30:24 +0100 Message-Id: <5953324856ca164d4fbf05e259dc48c3df0c5d2d.1616193024.git.jdenemar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" virQEMUCapsGet checks for qemuCaps itself, no need to do it explicitly. Signed-off-by: Jiri Denemark Reviewed-by: Erik Skultety --- src/qemu/qemu_domain.c | 5 +---- src/qemu/qemu_process.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5c98f8ff1a..fff67481a7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5289,7 +5289,6 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDo= mainDiskDefPtr disk, g_autofree char *encalias =3D NULL; =20 if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || - !qemuCaps || virStorageSourceIsEmpty(disk->src) || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET)) return 0; @@ -5475,7 +5474,6 @@ qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(vi= rDomainHostdevDefPtr hostde g_autofree char *authalias =3D NULL; =20 if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || - !qemuCaps || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET)) return 0; =20 @@ -5520,8 +5518,7 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAlia= s(virDomainHostdevDefPtr ho if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) return 0; =20 - if (!qemuCaps || - hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SC= SI || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) return 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0b79dde2c3..b86afe4daa 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8349,8 +8349,7 @@ qemuProcessReconnect(void *opaque) if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) goto error; =20 - if (priv->qemuCaps && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) retry =3D false; =20 if (qemuDomainObjStartWorker(obj) < 0) --=20 2.31.0