[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/48] elf_ops: Fix coding style for EM alias case st
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 30/48] elf_ops: Fix coding style for EM alias case statement |
Date: |
Tue, 22 Sep 2015 17:05:53 +0200 |
From: Peter Crosthwaite <address@hidden>
Fix the coding style for these cases as per CODING_STYLE. Reverse the
Yoda conditions and add missing if braces.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/hw/elf_ops.h | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
index bd71968..0d41f24 100644
--- a/include/hw/elf_ops.h
+++ b/include/hw/elf_ops.h
@@ -282,25 +282,28 @@ static int glue(load_elf, SZ)(const char *name, int fd,
switch (elf_machine) {
case EM_PPC64:
- if (EM_PPC64 != ehdr.e_machine)
- if (EM_PPC != ehdr.e_machine) {
+ if (ehdr.e_machine != EM_PPC64) {
+ if (ehdr.e_machine != EM_PPC) {
ret = ELF_LOAD_WRONG_ARCH;
goto fail;
}
+ }
break;
case EM_X86_64:
- if (EM_X86_64 != ehdr.e_machine)
- if (EM_386 != ehdr.e_machine) {
+ if (ehdr.e_machine != EM_X86_64) {
+ if (ehdr.e_machine != EM_386) {
ret = ELF_LOAD_WRONG_ARCH;
goto fail;
}
+ }
break;
case EM_MICROBLAZE:
- if (EM_MICROBLAZE != ehdr.e_machine)
- if (EM_MICROBLAZE_OLD != ehdr.e_machine) {
+ if (ehdr.e_machine != EM_MICROBLAZE) {
+ if (ehdr.e_machine != EM_MICROBLAZE_OLD) {
ret = ELF_LOAD_WRONG_ARCH;
goto fail;
}
+ }
break;
default:
if (elf_machine != ehdr.e_machine) {
--
2.5.0
- [Qemu-devel] [PULL 20/48] apic_internal.h: rename ESR_ILLEGAL_ADDRESS to APIC_ESR_ILLEGAL_ADDRESS, (continued)
- [Qemu-devel] [PULL 20/48] apic_internal.h: rename ESR_ILLEGAL_ADDRESS to APIC_ESR_ILLEGAL_ADDRESS, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 21/48] apic_internal.h: added more constants, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 22/48] apic_internal.h: fix formatting and drop unused consts, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 24/48] hmp: added local apic dump state, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 25/48] ioapic_internal.h: added more constants, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 23/48] monitor: make monitor_fprintf and mon_get_cpu externally visible, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 26/48] hmp: added io apic dump state, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 28/48] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 29/48] linux-user: elfload: Provide default for elf_check_arch, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 27/48] hmp: implemented io apic dump state for TCG, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 30/48] elf_ops: Fix coding style for EM alias case statement,
Paolo Bonzini <=
- [Qemu-devel] [PULL 33/48] mb: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 31/48] elf: Update EM_MOXIE definition, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 32/48] arm: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 36/48] moxie: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 37/48] unicore: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 34/48] m68k: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 35/48] cris: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 38/48] lm32: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 40/48] tricore: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 39/48] or32: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22