[Qemu-devel] [PULL 0/2] Trivial patches for August 13 to 25 2011

[Qemu-devel] [PULL 0/2] Trivial patches for August 13 to 25 2011

[Stefan Hajnoczi]

The following changes since commit 89da90b1b4acf24a9a3f2fd197b1bdf69ab24e72:

  gt64xxx: fix crash in gt64120_pci_mapping() (2011-08-24 21:11:21 +0200)

are available in the git repository at:
  ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Frediano Ziglio (1):
      disasm: update comment

Jan Kiszka (1):
      Fix up some style nits of last uq/master merge

 cutils.c          |    2 +-
 disas.c           |    2 +-
 target-i386/kvm.c |    5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

-- 
1.7.5.4

[Qemu-devel] [PATCH 1/2] Fix up some style nits of last uq/master merge

[Stefan Hajnoczi]

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

[Qemu-devel] [PATCH 2/2] disasm: update comment

[Stefan Hajnoczi]

From: Frediano Ziglio <freddy77@gmail.com>

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 disas.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/disas.c b/disas.c
index 1334b8e..611b30b 100644
--- a/disas.c
+++ b/disas.c
@@ -137,7 +137,7 @@ print_insn_thumb1(bfd_vma pc, disassemble_info *info)
 
 /* Disassemble this for me please... (debugging). 'flags' has the following
    values:
-    i386 - nonzero means 16 bit code
+    i386 - 1 means 16 bit code, 2 means 64 bit code
     arm  - nonzero means thumb code
     ppc  - nonzero means little endian
     other targets - unused
-- 
1.7.5.4

Re: [Qemu-devel] [PATCH 2/2] disasm: update comment

[Peter Maydell]

On 25 August 2011 09:44, Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> wrote:
>  /* Disassemble this for me please... (debugging). 'flags' has the following
>    values:
> -    i386 - nonzero means 16 bit code
> +    i386 - 1 means 16 bit code, 2 means 64 bit code

...presumably 0 means 32 bit code, by elimination ?

-- PMM

Re: [Qemu-devel] [PATCH 2/2] disasm: update comment

[Frediano Ziglio]

2011/8/25 Peter Maydell <peter.maydell@linaro.org>:
> On 25 August 2011 09:44, Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> wrote:
>>  /* Disassemble this for me please... (debugging). 'flags' has the following
>>    values:
>> -    i386 - nonzero means 16 bit code
>> +    i386 - 1 means 16 bit code, 2 means 64 bit code
>
> ...presumably 0 means 32 bit code, by elimination ?
>
> -- PMM
>

Currently you can pass even 10 :)
Yes, 0 (default) means 32 bit.

Frediano

Re: [Qemu-devel] [PULL 0/2] Trivial patches for August 13 to 25 2011

[Anthony Liguori]

On 08/25/2011 03:44 AM, Stefan Hajnoczi wrote:
> The following changes since commit 89da90b1b4acf24a9a3f2fd197b1bdf69ab24e72:
>
>    gt64xxx: fix crash in gt64120_pci_mapping() (2011-08-24 21:11:21 +0200)

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> are available in the git repository at:
>    ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches
>
> Frediano Ziglio (1):
>        disasm: update comment
>
> Jan Kiszka (1):
>        Fix up some style nits of last uq/master merge
>
>   cutils.c          |    2 +-
>   disas.c           |    2 +-
>   target-i386/kvm.c |    5 +++--
>   3 files changed, 5 insertions(+), 4 deletions(-)
>