* [Qemu-devel] [PATCH] Fix up some style nits of last uq/master merge
@ 2011-08-15 23:24 Jan Kiszka
2011-08-22 8:24 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2011-08-15 23:24 UTC (permalink / raw)
To: qemu-trivial; +Cc: qemu-devel
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.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 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) {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] Fix up some style nits of last uq/master merge
2011-08-15 23:24 [Qemu-devel] [PATCH] Fix up some style nits of last uq/master merge Jan Kiszka
@ 2011-08-22 8:24 ` Stefan Hajnoczi
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Hajnoczi @ 2011-08-22 8:24 UTC (permalink / raw)
To: Jan Kiszka; +Cc: qemu-trivial, qemu-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-22 8:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-15 23:24 [Qemu-devel] [PATCH] Fix up some style nits of last uq/master merge Jan Kiszka
2011-08-22 8:24 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.