Patchwork Fix up some style nits of last uq/master merge

login
register
mail settings
Submitter Jan Kiszka
Date Aug. 15, 2011, 11:24 p.m.
Message ID <4E49AAC0.1090508@web.de>
Download mbox | patch
Permalink /patch/110110/
State New
Headers show

Comments

Jan Kiszka - Aug. 15, 2011, 11:24 p.m.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 cutils.c          |    2 +-
 target-i386/kvm.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
Stefan Hajnoczi - Aug. 22, 2011, 8:24 a.m.
On Mon, Aug 15, 2011 at 04:24:48PM -0700, Jan Kiszka wrote:
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  cutils.c          |    2 +-
>  target-i386/kvm.c |    5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)

Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Stefan

Patch

diff --git a/cutils.c b/cutils.c
index 28049e0..92c26a6 100644
--- a/cutils.c
+++ b/cutils.c
@@ -408,7 +408,7 @@  fail:
 
 int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix)
 {
-        return strtosz_suffix_unit(nptr, end, default_suffix, 1024);
+    return strtosz_suffix_unit(nptr, end, default_suffix, 1024);
 }
 
 int64_t strtosz(const char *nptr, char **end)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 31b88b7..5144447 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -501,8 +501,9 @@  int kvm_arch_init_vcpu(CPUState *env)
     qemu_add_vm_change_state_handler(cpu_update_state, env);
 
     r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);
-    if (r)
-	    return r;
+    if (r) {
+        return r;
+    }
 
     r = kvm_check_extension(env->kvm_state, KVM_CAP_TSC_CONTROL);
     if (r && env->tsc_khz) {