From nobody Wed Jan 15 07:59:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 172535343563275.03165460183016; Tue, 3 Sep 2024 01:50:35 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3E46011ED; Tue, 3 Sep 2024 04:50:34 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 19E6A11BB; Tue, 3 Sep 2024 04:50:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 61C5110F5; Tue, 3 Sep 2024 04:50:13 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E4173D77 for ; Tue, 3 Sep 2024 04:50:12 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-WLbvAfI_OLWNk7QZz_76GQ-1; Tue, 03 Sep 2024 04:50:11 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9BBE718EA8AF for ; Tue, 3 Sep 2024 08:50:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.24]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7423319560AA for ; Tue, 3 Sep 2024 08:50:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725353412; h=from:from: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; bh=6NOKccW9RzPqiFmrWBLGM0wji3EHEmEK9wCxtxCkb4s=; b=QBYolgi5DhJG50W6b4a+F2K4PWFVqsIvsLG0afffwOB5F+7c8g/+ExWJjdAf1rVRs2BXJF bNaCALAHcZ5BjqMhfhHt1SYdThhEKIxInDBL+9pYW2VPpRkMV4tV53Ha/0/SxGh+Z2Y7gO B3oHtrAGYZdcwZwey/vO0VKbsY7FEnU= X-MC-Unique: WLbvAfI_OLWNk7QZz_76GQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH] qemuProcessSetupRawIO: Refactor return value and remove useless #ifdef Date: Tue, 3 Sep 2024 10:50:07 +0200 Message-ID: <5070a9493763d6b51b794032bc6e13c4cbf3ea02.1725353407.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZF65XRUXATOZ7CJ7EPSDS2XFSF3K74VW X-Message-ID-Hash: ZF65XRUXATOZ7CJ7EPSDS2XFSF3K74VW X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725353436715116600 Content-Type: text/plain; charset="utf-8" The function can return directly rather than setting 'ret' as there's no cleanup. It also doesn't make sense to conditionally compile out the 'break' statement when checking whether a disk has rawio enabled if 'CAP_SYS_RAWIO' is _not_ defined as the function will still behave the same. Signed-off-by: Peter Krempa Reviewed-by: Jiri Denemark --- src/qemu/qemu_process.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 242c93284e..2e4ee9e305 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5183,7 +5183,6 @@ qemuProcessSetupRawIO(virDomainObj *vm, { bool rawio =3D false; size_t i; - int ret =3D -1; /* in case a certain disk is desirous of CAP_SYS_RAWIO, add this */ for (i =3D 0; i < vm->def->ndisks; i++) { @@ -5191,9 +5190,7 @@ qemuProcessSetupRawIO(virDomainObj *vm, if (disk->rawio =3D=3D VIR_TRISTATE_BOOL_YES) { rawio =3D true; -#ifndef CAP_SYS_RAWIO break; -#endif } } @@ -5213,18 +5210,16 @@ qemuProcessSetupRawIO(virDomainObj *vm, } } - ret =3D 0; - if (rawio) { #ifdef CAP_SYS_RAWIO virCommandAllowCap(cmd, CAP_SYS_RAWIO); #else virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Raw I/O is not supported on this platform")); - ret =3D -1; + return -1; #endif } - return ret; + return 0; } --=20 2.46.0