All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sergio Lopez <slp@redhat.com>
To: qemu-devel@nongnu.org
Cc: ehabkost@redhat.com, Sergio Lopez <slp@redhat.com>,
	mst@redhat.com, lersek@redhat.com, kraxel@redhat.com,
	pbonzini@redhat.com, imammedo@redhat.com, sgarzare@redhat.com,
	philmd@redhat.com, rth@twiddle.net
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	[thread overview]
Message-ID: <20191015112346.45554-6-slp@redhat.com> (raw)
In-Reply-To: <20191015112346.45554-1-slp@redhat.com>

Follow checkpatch.pl recommendation and avoid an assignment in if
condition in x86_load_linux().

Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 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,
 
     /* load the kernel header */
     f = fopen(kernel_filename, "rb");
-    if (!f || !(kernel_size = 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 = get_file_size(f);
+    if (!kernel_size ||
         fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) !=
         MIN(ARRAY_SIZE(header), kernel_size)) {
         fprintf(stderr, "qemu: could not load kernel '%s': %s\n",
-- 
2.21.0



  parent reply	other threads:[~2019-10-15 11:33 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-15 11:23 [PATCH v9 00/15] Introduce the microvm machine type Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 01/15] hw/virtio: Factorize virtio-mmio headers Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 02/15] hw/i386/pc: rename functions shared with non-PC machines Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 03/15] hw/i386/pc: fix code style issues on functions that will be moved out Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 04/15] hw/i386/pc: replace use of strtol with qemu_strtol in x86_load_linux() Sergio Lopez
2019-10-15 11:36   ` Philippe Mathieu-Daudé
2019-10-16 20:40     ` Markus Armbruster
2019-10-17  6:43       ` Sergio Lopez
2019-10-18  5:05         ` Markus Armbruster
2019-10-15 11:23 ` Sergio Lopez [this message]
2019-10-15 11:23 ` [PATCH v9 06/15] hw/i386/pc: remove commented out code from x86_load_linux() Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 07/15] hw/i386/pc: move shared x86 functions to x86.c and export them Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 08/15] hw/i386: split PCMachineState deriving X86MachineState from it Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 09/15] hw/i386: make x86.c independent from PCMachineState Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 10/15] fw_cfg: add "modify" functions for all types Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 11/15] hw/intc/apic: reject pic ints if isa_pic == NULL Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 12/15] roms: add microvm-bios (qboot) as binary and git submodule Sergio Lopez
2019-10-15 11:23 ` [PATCH v9 13/15] docs/microvm.rst: document the new microvm machine type Sergio Lopez
2019-10-15 11:50   ` Greg Kurz
2019-10-15 11:23 ` [PATCH v9 14/15] hw/i386: Introduce the " Sergio Lopez
2019-10-16  7:46   ` Paolo Bonzini
2019-10-16  9:26     ` Philippe Mathieu-Daudé
2019-10-16  9:29       ` Paolo Bonzini
2019-12-24  0:09         ` Philippe Mathieu-Daudé
2020-01-07 13:35           ` Paolo Bonzini
2020-01-07 13:56             ` Philippe Mathieu-Daudé
2019-10-15 11:23 ` [PATCH v9 15/15] MAINTAINERS: add microvm related files Sergio Lopez
2019-10-15 11:39   ` Philippe Mathieu-Daudé
2019-10-15 11:45   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191015112346.45554-6-slp@redhat.com \
    --to=slp@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=lersek@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=sgarzare@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.