From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
Anthony Liguori <aliguori@us.ibm.com>,
Jan Kiszka <jan.kiszka@web.de>,
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 1/2] Fix up some style nits of last uq/master merge
Date: Thu, 25 Aug 2011 09:44:24 +0100 [thread overview]
Message-ID: <1314261865-11188-2-git-send-email-stefanha@linux.vnet.ibm.com> (raw)
In-Reply-To: <1314261865-11188-1-git-send-email-stefanha@linux.vnet.ibm.com>
From: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
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
next prev parent reply other threads:[~2011-08-25 8:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 8:44 [Qemu-devel] [PULL 0/2] Trivial patches for August 13 to 25 2011 Stefan Hajnoczi
2011-08-25 8:44 ` Stefan Hajnoczi [this message]
2011-08-25 8:44 ` [Qemu-devel] [PATCH 2/2] disasm: update comment Stefan Hajnoczi
2011-08-25 9:36 ` Peter Maydell
2011-08-25 9:42 ` Frediano Ziglio
2011-08-25 13:04 ` [Qemu-devel] [PULL 0/2] Trivial patches for August 13 to 25 2011 Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314261865-11188-2-git-send-email-stefanha@linux.vnet.ibm.com \
--to=stefanha@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=jan.kiszka@siemens.com \
--cc=jan.kiszka@web.de \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).