[libvirt] [PATCH 04/22] cpu: Fix misaligned arguments

[Shi Lei]

This patch fixes misaligned arguments.

Signed-off-by: Shi Lei <shi_lei at massclouds.com>
---
 src/cpu/cpu_ppc64.c |  4 ++--
 src/cpu/cpu_x86.c   | 16 ++++------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 858f40e..96f9df1 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -488,7 +488,7 @@ ppc64Compute(virCPUDefPtr host,
         if (message &&
             virAsprintf(message,
                         _("host CPU vendor does not match required "
-                        "CPU vendor %s"),
+                          "CPU vendor %s"),
                         cpu->vendor) < 0)
             goto cleanup;
 
@@ -543,7 +543,7 @@ ppc64Compute(virCPUDefPtr host,
         if (message &&
             virAsprintf(message,
                         _("host CPU model does not match required "
-                        "CPU model %s"),
+                          "CPU model %s"),
                         guest_model->name) < 0)
             goto cleanup;
 
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 69a0c8d..e978cf0 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2040,12 +2040,8 @@ cpuidCall(virCPUx86CPUID *cpuid)
     asm("xor %%ebx, %%ebx;" /* clear the other registers as some cpuid */
         "xor %%edx, %%edx;" /* functions may use them as additional arguments */
         "cpuid;"
-        : "=a" (cpuid->eax),
-          "=b" (cpuid->ebx),
-          "=c" (cpuid->ecx),
-          "=d" (cpuid->edx)
-        : "a" (cpuid->eax_in),
-          "c" (cpuid->ecx_in));
+        : "=a" (cpuid->eax), "=b" (cpuid->ebx), "=c" (cpuid->ecx), "=d" (cpuid->edx)
+        : "a" (cpuid->eax_in), "c" (cpuid->ecx_in));
 # else
     /* we need to avoid direct use of ebx for CPUID output as it is used
      * for global offset table on i386 with -fPIC
@@ -2056,12 +2052,8 @@ cpuidCall(virCPUx86CPUID *cpuid)
         "cpuid;"
         "mov %%ebx, %1;"
         "pop %%ebx;"
-        : "=a" (cpuid->eax),
-          "=r" (cpuid->ebx),
-          "=c" (cpuid->ecx),
-          "=d" (cpuid->edx)
-        : "a" (cpuid->eax_in),
-          "c" (cpuid->ecx_in)
+        : "=a" (cpuid->eax), "=r" (cpuid->ebx), "=c" (cpuid->ecx), "=d" (cpuid->edx)
+        : "a" (cpuid->eax_in), "c" (cpuid->ecx_in)
         : "cc");
 # endif
 }
-- 
2.17.1