[Qemu-devel] [PATCH v2] arch_init: Setting QEMU_ARCH enum straight

[Qemu-devel] [PATCH v2] arch_init: Setting QEMU_ARCH enum straight

[Bastian Koppelmann]

Every QEMU_ARCH is now in (1 << n) notation, instead of a mixture of decimal and hexadecimal.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
v1 -> v2:
    - As Michael suggested it is now in (1 << n) notation.

 include/sysemu/arch_init.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index 8939233..42a99bc 100644
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -7,22 +7,22 @@
 enum {
     QEMU_ARCH_ALL = -1,
     QEMU_ARCH_ALPHA = 1,
-    QEMU_ARCH_ARM = 2,
-    QEMU_ARCH_CRIS = 4,
-    QEMU_ARCH_I386 = 8,
-    QEMU_ARCH_M68K = 16,
-    QEMU_ARCH_LM32 = 32,
-    QEMU_ARCH_MICROBLAZE = 64,
-    QEMU_ARCH_MIPS = 128,
-    QEMU_ARCH_PPC = 256,
-    QEMU_ARCH_S390X = 512,
-    QEMU_ARCH_SH4 = 1024,
-    QEMU_ARCH_SPARC = 2048,
-    QEMU_ARCH_XTENSA = 4096,
-    QEMU_ARCH_OPENRISC = 8192,
-    QEMU_ARCH_UNICORE32 = 0x4000,
-    QEMU_ARCH_MOXIE = 0x8000,
-    QEMU_ARCH_TRICORE = 0x10000,
+    QEMU_ARCH_ARM = (1 << 1),
+    QEMU_ARCH_CRIS = (1 << 2),
+    QEMU_ARCH_I386 = (1 << 3),
+    QEMU_ARCH_M68K = (1 << 4),
+    QEMU_ARCH_LM32 = (1 << 5),
+    QEMU_ARCH_MICROBLAZE = (1 << 6),
+    QEMU_ARCH_MIPS = (1 << 7),
+    QEMU_ARCH_PPC = (1 << 8),
+    QEMU_ARCH_S390X = (1 << 9),
+    QEMU_ARCH_SH4 = (1 << 10),
+    QEMU_ARCH_SPARC = (1 << 11),
+    QEMU_ARCH_XTENSA = (1 << 12),
+    QEMU_ARCH_OPENRISC = (1 << 13),
+    QEMU_ARCH_UNICORE32 = (1 << 14),
+    QEMU_ARCH_MOXIE = (1 << 15),
+    QEMU_ARCH_TRICORE = (1 << 16),
 };

 extern const uint32_t arch_type;
--
2.1.0

Re: [Qemu-devel] [Qemu-trivial] [PATCH v2] arch_init: Setting QEMU_ARCH enum straight

[Michael Tokarev]

21.09.2014 15:07, Bastian Koppelmann wrote:
> Every QEMU_ARCH is now in (1 << n) notation, instead of a mixture of decimal and hexadecimal.

Applied to -trivial.  ALso changed QEMU_ARCH_ALPHA
from 1 to (1 << 0) for consistency with all others.

Thank you!

/mjt

>  enum {
>      QEMU_ARCH_ALL = -1,
>      QEMU_ARCH_ALPHA = 1,
> +    QEMU_ARCH_ARM = (1 << 1),
> +    QEMU_ARCH_CRIS = (1 << 2),
...