From nobody Wed Nov 12 15:23:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571139198; cv=none; d=zoho.com; s=zohoarc; b=iBcsMHjmt+hjTxQAdIBeN1ISaDfGEhpQBuFCQPZpZzfsIK31s8YSMRrycDqEgwNYeMMk3KCwuqK719penk9HgKIIcnLlbzYxp+RPkc3Q5FBzSAEYOgnv9VUUOQ+mMGgp3UgxG7zAs8uz2BVicTmvLPu7xZFRa2IWWuMZEWtCom8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571139198; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZKw6F2EYTF1cRn4ev0tZ47kdjtS0UV5pGKtC/wxOcw=; b=Hc8VP9S+/w6LqPfu7xIJVPsiZbGXvtH+t32aoWR8Ex6BE4jmzcGL0N/IJevSAANb+5M5L3dFpWVNpydtvFOMtwqhOBWNuFJbdpxwhBYhF+mbzK43ZNx+RUafQg1n+4cPfwhTYe55dVoiWTU1A1cqet/iFbzfKEPs+gcclakqYAo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571139198159797.7092793929041; Tue, 15 Oct 2019 04:33:18 -0700 (PDT) Received: from localhost ([::1]:41602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKL4m-0008HY-8s for importer@patchew.org; Tue, 15 Oct 2019 07:33:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56299) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKKwL-0008Rx-Tx for qemu-devel@nongnu.org; Tue, 15 Oct 2019 07:24:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKKwK-00049N-Tm for qemu-devel@nongnu.org; Tue, 15 Oct 2019 07:24:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55624) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKKwK-00049F-Nx for qemu-devel@nongnu.org; Tue, 15 Oct 2019 07:24:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03AA0A3CD83; Tue, 15 Oct 2019 11:24:32 +0000 (UTC) Received: from dritchie.redhat.com (unknown [10.33.36.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3513E10027A8; Tue, 15 Oct 2019 11:24:29 +0000 (UTC) From: Sergio Lopez To: qemu-devel@nongnu.org Subject: [PATCH v9 05/15] hw/i386/pc: avoid an assignment in if condition in x86_load_linux() Date: Tue, 15 Oct 2019 13:23:36 +0200 Message-Id: <20191015112346.45554-6-slp@redhat.com> In-Reply-To: <20191015112346.45554-1-slp@redhat.com> References: <20191015112346.45554-1-slp@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 15 Oct 2019 11:24:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, Sergio Lopez , mst@redhat.com, lersek@redhat.com, kraxel@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, sgarzare@redhat.com, philmd@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Follow checkpatch.pl recommendation and avoid an assignment in if condition in x86_load_linux(). Signed-off-by: Sergio Lopez Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c8608b8007..90c2263a33 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1045,7 +1045,14 @@ static void x86_load_linux(PCMachineState *pcms, =20 /* load the kernel header */ f =3D fopen(kernel_filename, "rb"); - if (!f || !(kernel_size =3D get_file_size(f)) || + if (!f) { + fprintf(stderr, "qemu: could not open kernel file '%s': %s\n", + kernel_filename, strerror(errno)); + exit(1); + } + + kernel_size =3D get_file_size(f); + if (!kernel_size || fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) !=3D MIN(ARRAY_SIZE(header), kernel_size)) { fprintf(stderr, "qemu: could not load kernel '%s': %s\n", --=20 2.21.0