[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 03/21] elf_ops: Fix coding style for EM alias case
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PULL v1 03/21] elf_ops: Fix coding style for EM alias case statement |
Date: |
Thu, 10 Sep 2015 22:44:25 -0700 |
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>
---
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) {
--
1.9.1
- [Qemu-devel] [PULL v1 00/21] Multi-arch queue, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 01/21] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 03/21] elf_ops: Fix coding style for EM alias case statement,
Peter Crosthwaite <=
- [Qemu-devel] [PULL v1 02/21] linux-user: elfload: Provide default for elf_check_arch, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 05/21] arm: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 04/21] elf: Update EM_MOXIE definition, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 06/21] mb: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 07/21] m68k: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 08/21] cris: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 09/21] moxie: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 10/21] unicore: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 12/21] or32: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 13/21] tricore: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11