From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwVYC-0005Hz-Jf for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:44:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwVYA-0003On-WB for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:44:36 -0400 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:37304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwVYA-0003Od-KT for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:44:34 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p7P8iXvw023862 for ; Thu, 25 Aug 2011 08:44:33 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7P8iX2K2494638 for ; Thu, 25 Aug 2011 09:44:33 +0100 Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7P8iXtJ032415 for ; Thu, 25 Aug 2011 02:44:33 -0600 From: Stefan Hajnoczi Date: Thu, 25 Aug 2011 09:44:24 +0100 Message-Id: <1314261865-11188-2-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1314261865-11188-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1314261865-11188-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/2] Fix up some style nits of last uq/master merge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jan Kiszka , Anthony Liguori , Jan Kiszka , Stefan Hajnoczi From: Jan Kiszka Signed-off-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- cutils.c | 2 +- target-i386/kvm.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cutils.c b/cutils.c index f2bcf20..c91f887 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 bd850ed..1d9b20c 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) { -- 1.7.5.4