[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/39] hw/i386/pc: avoid an assignment in if condition in x86_load
From: |
Paolo Bonzini |
Subject: |
[PULL 11/39] hw/i386/pc: avoid an assignment in if condition in x86_load_linux() |
Date: |
Thu, 24 Oct 2019 16:03:27 +0200 |
From: Sergio Lopez <address@hidden>
Follow checkpatch.pl recommendation and avoid an assignment in if
condition in x86_load_linux().
Signed-off-by: Sergio Lopez <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
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 b5b660f..77198d5 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",
--
1.8.3.1
- [PULL 00/39] Misc (mostly x86) patches for 2019-10-24, Paolo Bonzini, 2019/10/24
- [PULL 01/39] target/i386: log MCE guest and host addresses, Paolo Bonzini, 2019/10/24
- [PULL 06/39] memory-device: simplify Makefile.objs conditions, Paolo Bonzini, 2019/10/24
- [PULL 04/39] i386/kvm: add NoNonArchitecturalCoreSharing Hyper-V enlightenment, Paolo Bonzini, 2019/10/24
- [PULL 02/39] mc146818rtc: fix timer interrupt reinjection, Paolo Bonzini, 2019/10/24
- [PULL 05/39] Do not use %m in common code to print error messages, Paolo Bonzini, 2019/10/24
- [PULL 03/39] Updated Bulgarian translation (19) - 4.1.0, Paolo Bonzini, 2019/10/24
- [PULL 08/39] hw/i386/pc: rename functions shared with non-PC machines, Paolo Bonzini, 2019/10/24
- [PULL 07/39] hw/virtio: Factorize virtio-mmio headers, Paolo Bonzini, 2019/10/24
- [PULL 10/39] hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux(), Paolo Bonzini, 2019/10/24
- [PULL 11/39] hw/i386/pc: avoid an assignment in if condition in x86_load_linux(),
Paolo Bonzini <=
- [PULL 09/39] hw/i386/pc: fix code style issues on functions that will be moved out, Paolo Bonzini, 2019/10/24
- [PULL 17/39] hw/intc/apic: reject pic ints if isa_pic == NULL, Paolo Bonzini, 2019/10/24
- [PULL 21/39] MAINTAINERS: add microvm related files, Paolo Bonzini, 2019/10/24
- [PULL 18/39] roms: add microvm-bios (qboot) as binary and git submodule, Paolo Bonzini, 2019/10/24
- [PULL 15/39] hw/i386: make x86.c independent from PCMachineState, Paolo Bonzini, 2019/10/24
- [PULL 12/39] hw/i386/pc: remove commented out code from x86_load_linux(), Paolo Bonzini, 2019/10/24
- [PULL 23/39] runstate: ignore exit request in finish migrate state, Paolo Bonzini, 2019/10/24
- [PULL 20/39] hw/i386: Introduce the microvm machine type, Paolo Bonzini, 2019/10/24
- [PULL 19/39] docs/microvm.rst: document the new microvm machine type, Paolo Bonzini, 2019/10/24
- [PULL 16/39] fw_cfg: add "modify" functions for all types, Paolo Bonzini, 2019/10/24