[PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-18 Thread Liu, Jinsong
>From 1273f8b2e5464ec987facf9942fd3ccc0b69087e Mon Sep 17 00:00:00 2001
From: Liu Jinsong 
Date: Mon, 19 Aug 2013 09:33:30 +0800
Subject: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

This patch is to fix the bug https://bugs.launchpad.net/qemu-kvm/+bug/1207623

IA32_FEATURE_CONTROL is pointless if not expose VMX or SMX bits to
cpuid.1.ecx of vcpu. Current qemu-kvm will error return when kvm_put_msrs
or kvm_get_msrs.

Signed-off-by: Liu Jinsong 
---
 target-i386/kvm.c |   16 ++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 84ac00a..7facbfe 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -65,6 +65,7 @@ static bool has_msr_star;
 static bool has_msr_hsave_pa;
 static bool has_msr_tsc_adjust;
 static bool has_msr_tsc_deadline;
+static bool has_msr_feature_control;
 static bool has_msr_async_pf_en;
 static bool has_msr_pv_eoi_en;
 static bool has_msr_misc_enable;
@@ -644,6 +645,11 @@ int kvm_arch_init_vcpu(CPUState *cs)
 
 qemu_add_vm_change_state_handler(cpu_update_state, env);
 
+c = cpuid_find_entry(&cpuid_data.cpuid, 1, 0);
+if (c)
+has_msr_feature_control = !!(c->ecx & CPUID_EXT_VMX) |
+  !!(c->ecx & CPUID_EXT_SMX);
+
 cpuid_data.cpuid.padding = 0;
 r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data);
 if (r) {
@@ -1121,7 +1127,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
 if (hyperv_vapic_recommended()) {
 kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_APIC_ASSIST_PAGE, 0);
 }
-kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL, 
env->msr_ia32_feature_control);
+if (has_msr_feature_control) {
+kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL,
+  env->msr_ia32_feature_control);
+}
 }
 if (env->mcg_cap) {
 int i;
@@ -1346,7 +1355,9 @@ static int kvm_get_msrs(X86CPU *cpu)
 if (has_msr_misc_enable) {
 msrs[n++].index = MSR_IA32_MISC_ENABLE;
 }
-msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
+if (has_msr_feature_control) {
+msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
+}
 
 if (!env->tsc_valid) {
 msrs[n++].index = MSR_IA32_TSC;
@@ -1447,6 +1458,7 @@ static int kvm_get_msrs(X86CPU *cpu)
 break;
 case MSR_IA32_FEATURE_CONTROL:
 env->msr_ia32_feature_control = msrs[i].data;
+break;
 default:
 if (msrs[i].index >= MSR_MC0_CTL &&
 msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) {
-- 
1.7.1


0001-qemu-kvm-bugfix-for-IA32_FEATURE_CONTROL.patch
Description: 0001-qemu-kvm-bugfix-for-IA32_FEATURE_CONTROL.patch


Re: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-19 Thread Paolo Bonzini
Il 18/08/2013 20:23, Liu, Jinsong ha scritto:
> From 1273f8b2e5464ec987facf9942fd3ccc0b69087e Mon Sep 17 00:00:00 2001
> From: Liu Jinsong 
> Date: Mon, 19 Aug 2013 09:33:30 +0800
> Subject: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL
> 
> This patch is to fix the bug https://bugs.launchpad.net/qemu-kvm/+bug/1207623
> 
> IA32_FEATURE_CONTROL is pointless if not expose VMX or SMX bits to
> cpuid.1.ecx of vcpu. Current qemu-kvm will error return when kvm_put_msrs
> or kvm_get_msrs.
> 
> Signed-off-by: Liu Jinsong 
> ---
>  target-i386/kvm.c |   16 ++--
>  1 files changed, 14 insertions(+), 2 deletions(-)
> 
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 84ac00a..7facbfe 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -65,6 +65,7 @@ static bool has_msr_star;
>  static bool has_msr_hsave_pa;
>  static bool has_msr_tsc_adjust;
>  static bool has_msr_tsc_deadline;
> +static bool has_msr_feature_control;
>  static bool has_msr_async_pf_en;
>  static bool has_msr_pv_eoi_en;
>  static bool has_msr_misc_enable;
> @@ -644,6 +645,11 @@ int kvm_arch_init_vcpu(CPUState *cs)
>  
>  qemu_add_vm_change_state_handler(cpu_update_state, env);
>  
> +c = cpuid_find_entry(&cpuid_data.cpuid, 1, 0);
> +if (c)
> +has_msr_feature_control = !!(c->ecx & CPUID_EXT_VMX) |
> +  !!(c->ecx & CPUID_EXT_SMX);
> +
>  cpuid_data.cpuid.padding = 0;
>  r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data);
>  if (r) {
> @@ -1121,7 +1127,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
>  if (hyperv_vapic_recommended()) {
>  kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_APIC_ASSIST_PAGE, 0);
>  }
> -kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL, 
> env->msr_ia32_feature_control);
> +if (has_msr_feature_control) {
> +kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL,
> +  env->msr_ia32_feature_control);
> +}
>  }
>  if (env->mcg_cap) {
>  int i;
> @@ -1346,7 +1355,9 @@ static int kvm_get_msrs(X86CPU *cpu)
>  if (has_msr_misc_enable) {
>  msrs[n++].index = MSR_IA32_MISC_ENABLE;
>  }
> -msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
> +if (has_msr_feature_control) {
> +msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
> +}
>  
>  if (!env->tsc_valid) {
>  msrs[n++].index = MSR_IA32_TSC;
> @@ -1447,6 +1458,7 @@ static int kvm_get_msrs(X86CPU *cpu)
>  break;
>  case MSR_IA32_FEATURE_CONTROL:
>  env->msr_ia32_feature_control = msrs[i].data;
> +break;
>  default:
>  if (msrs[i].index >= MSR_MC0_CTL &&
>  msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) {
> 

The patch looks good.  Please repost it with checkpatch.pl failures fixed.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-19 Thread Liu, Jinsong
Paolo Bonzini wrote:
> 
> The patch looks good.  Please repost it with checkpatch.pl failures
> fixed. 
> 
> Paolo

Thanks Stefan and Paolo! Updated patch attached.

Regards,
Jinsong

===
>From a0ddf948d40e42de862543157a5668a1c12faae6 Mon Sep 17 00:00:00 2001
From: Liu Jinsong 
Date: Mon, 19 Aug 2013 09:33:30 +0800
Subject: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

This patch is to fix the bug https://bugs.launchpad.net/qemu-kvm/+bug/1207623

IA32_FEATURE_CONTROL is pointless if not expose VMX or SMX bits to
cpuid.1.ecx of vcpu. Current qemu-kvm will error return when kvm_put_msrs
or kvm_get_msrs.

Signed-off-by: Liu Jinsong 
---
 target-i386/kvm.c |   17 +++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 84ac00a..5adeb03 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -65,6 +65,7 @@ static bool has_msr_star;
 static bool has_msr_hsave_pa;
 static bool has_msr_tsc_adjust;
 static bool has_msr_tsc_deadline;
+static bool has_msr_feature_control;
 static bool has_msr_async_pf_en;
 static bool has_msr_pv_eoi_en;
 static bool has_msr_misc_enable;
@@ -644,6 +645,12 @@ int kvm_arch_init_vcpu(CPUState *cs)
 
 qemu_add_vm_change_state_handler(cpu_update_state, env);
 
+c = cpuid_find_entry(&cpuid_data.cpuid, 1, 0);
+if (c) {
+has_msr_feature_control = !!(c->ecx & CPUID_EXT_VMX) ||
+  !!(c->ecx & CPUID_EXT_SMX);
+}
+
 cpuid_data.cpuid.padding = 0;
 r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data);
 if (r) {
@@ -1121,7 +1128,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
 if (hyperv_vapic_recommended()) {
 kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_APIC_ASSIST_PAGE, 0);
 }
-kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL, 
env->msr_ia32_feature_control);
+if (has_msr_feature_control) {
+kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL,
+  env->msr_ia32_feature_control);
+}
 }
 if (env->mcg_cap) {
 int i;
@@ -1346,7 +1356,9 @@ static int kvm_get_msrs(X86CPU *cpu)
 if (has_msr_misc_enable) {
 msrs[n++].index = MSR_IA32_MISC_ENABLE;
 }
-msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
+if (has_msr_feature_control) {
+msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
+}
 
 if (!env->tsc_valid) {
 msrs[n++].index = MSR_IA32_TSC;
@@ -1447,6 +1459,7 @@ static int kvm_get_msrs(X86CPU *cpu)
 break;
 case MSR_IA32_FEATURE_CONTROL:
 env->msr_ia32_feature_control = msrs[i].data;
+break;
 default:
 if (msrs[i].index >= MSR_MC0_CTL &&
 msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) {
-- 
1.7.1


0001-qemu-kvm-bugfix-for-IA32_FEATURE_CONTROL.patch
Description: 0001-qemu-kvm-bugfix-for-IA32_FEATURE_CONTROL.patch


Re: [Qemu-devel] [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-18 Thread Stefan Weil
Am 18.08.2013 20:23, schrieb Liu, Jinsong:
> From 1273f8b2e5464ec987facf9942fd3ccc0b69087e Mon Sep 17 00:00:00 2001
> From: Liu Jinsong 
> Date: Mon, 19 Aug 2013 09:33:30 +0800
> Subject: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL
>
> This patch is to fix the bug https://bugs.launchpad.net/qemu-kvm/+bug/1207623
>
> IA32_FEATURE_CONTROL is pointless if not expose VMX or SMX bits to
> cpuid.1.ecx of vcpu. Current qemu-kvm will error return when kvm_put_msrs
> or kvm_get_msrs.
>
> Signed-off-by: Liu Jinsong 
> ---
>  target-i386/kvm.c |   16 ++--
>  1 files changed, 14 insertions(+), 2 deletions(-)
>

Hello,

please check your patch with scripts/checkpatch.pl
before sending it to the list.

For boolean operands, the boolean or (||) is better than
the bitwise or (|).

Regards,
Stefan



--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [Qemu-devel] [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-19 Thread Andreas Färber
Am 19.08.2013 16:31, schrieb Liu, Jinsong:
> Paolo Bonzini wrote:
>>
>> The patch looks good.  Please repost it with checkpatch.pl failures
>> fixed. 
>>
>> Paolo
> 
> Thanks Stefan and Paolo! Updated patch attached.
> 
> Regards,
> Jinsong
> 
> ===
> From a0ddf948d40e42de862543157a5668a1c12faae6 Mon Sep 17 00:00:00 2001
> From: Liu Jinsong 
> Date: Mon, 19 Aug 2013 09:33:30 +0800
> Subject: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL
> 
> This patch is to fix the bug https://bugs.launchpad.net/qemu-kvm/+bug/1207623
> 
> IA32_FEATURE_CONTROL is pointless if not expose VMX or SMX bits to
> cpuid.1.ecx of vcpu. Current qemu-kvm will error return when kvm_put_msrs
> or kvm_get_msrs.
> 
> Signed-off-by: Liu Jinsong 

Jinsong, if this is for upstream QEMU, then the commit message needs
some small improvements:

qemu-kvm is no longer maintained since 1.3 so it should not be occurring
any more.

Please use a prefix of "target-i386: " (the directory name) to signal
where you are changing code, i.e. x86 only.

"bugfix" is not a very telling description of what a patch is doing.

(Up to Paolo and Gleb whether they'll fix it or whether they require a
resend.)

Also please use git-send-email to submit patches and use "PATCH v2" etc.
for submission as top-level patch:
http://wiki.qemu.org/Contribute/SubmitAPatch

One question inline...

> ---
>  target-i386/kvm.c |   17 +++--
>  1 files changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 84ac00a..5adeb03 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -65,6 +65,7 @@ static bool has_msr_star;
>  static bool has_msr_hsave_pa;
>  static bool has_msr_tsc_adjust;
>  static bool has_msr_tsc_deadline;
> +static bool has_msr_feature_control;
>  static bool has_msr_async_pf_en;
>  static bool has_msr_pv_eoi_en;
>  static bool has_msr_misc_enable;
> @@ -644,6 +645,12 @@ int kvm_arch_init_vcpu(CPUState *cs)
>  
>  qemu_add_vm_change_state_handler(cpu_update_state, env);
>  
> +c = cpuid_find_entry(&cpuid_data.cpuid, 1, 0);
> +if (c) {
> +has_msr_feature_control = !!(c->ecx & CPUID_EXT_VMX) ||
> +  !!(c->ecx & CPUID_EXT_SMX);
> +}
> +
>  cpuid_data.cpuid.padding = 0;
>  r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data);
>  if (r) {
> @@ -1121,7 +1128,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
>  if (hyperv_vapic_recommended()) {
>  kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_APIC_ASSIST_PAGE, 0);
>  }
> -kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL, 
> env->msr_ia32_feature_control);
> +if (has_msr_feature_control) {
> +kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL,
> +  env->msr_ia32_feature_control);
> +}
>  }
>  if (env->mcg_cap) {
>  int i;
> @@ -1346,7 +1356,9 @@ static int kvm_get_msrs(X86CPU *cpu)
>  if (has_msr_misc_enable) {
>  msrs[n++].index = MSR_IA32_MISC_ENABLE;
>  }
> -msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
> +if (has_msr_feature_control) {
> +msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
> +}
>  
>  if (!env->tsc_valid) {
>  msrs[n++].index = MSR_IA32_TSC;
> @@ -1447,6 +1459,7 @@ static int kvm_get_msrs(X86CPU *cpu)
>  break;
>  case MSR_IA32_FEATURE_CONTROL:
>  env->msr_ia32_feature_control = msrs[i].data;
> +break;

Was the fallthrough previously intended? Or is this a second,
unmentioned bugfix?

Regards,
Andreas

>  default:
>  if (msrs[i].index >= MSR_MC0_CTL &&
>  msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) {
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [Qemu-devel] [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-19 Thread Paolo Bonzini
Il 19/08/2013 16:59, Andreas Färber ha scritto:
> qemu-kvm is no longer maintained since 1.3 so it should not be occurring
> any more.
> 
> Please use a prefix of "target-i386: " (the directory name) to signal
> where you are changing code, i.e. x86 only.
> 
> "bugfix" is not a very telling description of what a patch is doing.
> 
> (Up to Paolo and Gleb whether they'll fix it or whether they require a
> resend.)

No, not this time at least. :)

Paolo

> Also please use git-send-email to submit patches and use "PATCH v2" etc.
> for submission as top-level patch:
> http://wiki.qemu.org/Contribute/SubmitAPatch

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: [Qemu-devel] [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-19 Thread Liu, Jinsong
Andreas Färber wrote:
> Am 19.08.2013 16:31, schrieb Liu, Jinsong:
>> Paolo Bonzini wrote:
>>> 
>>> The patch looks good.  Please repost it with checkpatch.pl failures
>>> fixed. 
>>> 
>>> Paolo
>> 
>> Thanks Stefan and Paolo! Updated patch attached.
>> 
>> Regards,
>> Jinsong
>> 
>> ===
>> From a0ddf948d40e42de862543157a5668a1c12faae6 Mon Sep 17 00:00:00
>> 2001 
>> From: Liu Jinsong 
>> Date: Mon, 19 Aug 2013 09:33:30 +0800
>> Subject: [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL
>> 
>> This patch is to fix the bug
>> https://bugs.launchpad.net/qemu-kvm/+bug/1207623 
>> 
>> IA32_FEATURE_CONTROL is pointless if not expose VMX or SMX bits to
>> cpuid.1.ecx of vcpu. Current qemu-kvm will error return when
>> kvm_put_msrs 
>> or kvm_get_msrs.
>> 
>> Signed-off-by: Liu Jinsong 
> 
> Jinsong, if this is for upstream QEMU, then the commit message needs
> some small improvements:
> 
> qemu-kvm is no longer maintained since 1.3 so it should not be
> occurring any more.

Thanks Andreas!

This patch is for qemu-kvm.
Per my understanding, there are some patches firstly checked in qemu-kvm 
uq/master branch.
This patch is to fix c/s 0779caeb1a17f4d3ed14e2925b36ba09b084fb7b of qemu-kvm 
uq/master branch
(which is to co-work w/ kvm IA32_FEATURE_CONTROL, and currently not yet in 
upstream qemu).

This patch is used to fix the bug introduced by 
0779caeb1a17f4d3ed14e2925b36ba09b084fb7b of qemu-kvm uq/master branch. The bug 
is reported as
https://bugs.launchpad.net/qemu-kvm/+bug/1207623
https://bugs.launchpad.net/qemu/+bug/1213797

Anything I misunderstand, for upstream qemu and qemu-kvm?

> 
> Please use a prefix of "target-i386: " (the directory name) to signal
> where you are changing code, i.e. x86 only.
> 
> "bugfix" is not a very telling description of what a patch is doing.
> 
> (Up to Paolo and Gleb whether they'll fix it or whether they require a
> resend.)
> 
> Also please use git-send-email to submit patches and use "PATCH v2"
> etc. for submission as top-level patch:
> http://wiki.qemu.org/Contribute/SubmitAPatch

Thanks, will update per your comments :)

> 
> One question inline...
> 
>> ---
>>  target-i386/kvm.c |   17 +++--
>>  1 files changed, 15 insertions(+), 2 deletions(-)
>> 
>> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
>> index 84ac00a..5adeb03 100644
>> --- a/target-i386/kvm.c
>> +++ b/target-i386/kvm.c
>> @@ -65,6 +65,7 @@ static bool has_msr_star;
>>  static bool has_msr_hsave_pa;
>>  static bool has_msr_tsc_adjust;
>>  static bool has_msr_tsc_deadline;
>> +static bool has_msr_feature_control;
>>  static bool has_msr_async_pf_en;
>>  static bool has_msr_pv_eoi_en;
>>  static bool has_msr_misc_enable;
>> @@ -644,6 +645,12 @@ int kvm_arch_init_vcpu(CPUState *cs)
>> 
>>  qemu_add_vm_change_state_handler(cpu_update_state, env);
>> 
>> +c = cpuid_find_entry(&cpuid_data.cpuid, 1, 0); +if (c) {
>> +has_msr_feature_control = !!(c->ecx & CPUID_EXT_VMX) ||
>> +  !!(c->ecx & CPUID_EXT_SMX); +}
>> +
>>  cpuid_data.cpuid.padding = 0;
>>  r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data);  if
>> (r) { @@ -1121,7 +1128,10 @@ static int kvm_put_msrs(X86CPU *cpu,
>>  int level) if (hyperv_vapic_recommended()) {
>>  kvm_msr_entry_set(&msrs[n++],
>> HV_X64_MSR_APIC_ASSIST_PAGE, 0);  } -   
>> kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL,
>> env->msr_ia32_feature_control); +if
>> (has_msr_feature_control) { +   
>>  kvm_msr_entry_set(&msrs[n++], MSR_IA32_FEATURE_CONTROL, +  
>>  env->msr_ia32_feature_control); +} } if (env->mcg_cap) {
>>  int i;
>> @@ -1346,7 +1356,9 @@ static int kvm_get_msrs(X86CPU *cpu)
>>  if (has_msr_misc_enable) {
>>  msrs[n++].index = MSR_IA32_MISC_ENABLE;
>>  }
>> -msrs[n++].index = MSR_IA32_FEATURE_CONTROL;
>> +if (has_msr_feature_control) {
>> +msrs[n++].index = MSR_IA32_FEATURE_CONTROL; +}
>> 
>>  if (!env->tsc_valid) {
>>  msrs[n++].index = MSR_IA32_TSC;
>> @@ -1447,6 +1459,7 @@ static int kvm_get_msrs(X86CPU *cpu)  
>>  break; case MSR_IA32_FEATURE_CONTROL:
>>  env->msr_ia32_feature_control = msrs[i].data;
>> +break;
> 
> Was the fallthrough previously intended? Or is this a second,
> unmentioned bugfix?

Hmm, it just add 'break' I think patch 0779caeb1a17f4d3ed14e2925b36ba09b084fb7b 
forget.

Thanks,
Jinsong

> 
> Regards,
> Andreas
> 
>>  default:
>>  if (msrs[i].index >= MSR_MC0_CTL &&
>>  msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff)
>> * 4) { 

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: [Qemu-devel] [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-19 Thread Liu, Jinsong
Paolo Bonzini wrote:
> Il 19/08/2013 16:59, Andreas Färber ha scritto:
>> qemu-kvm is no longer maintained since 1.3 so it should not be
>> occurring any more. 
>> 
>> Please use a prefix of "target-i386: " (the directory name) to signal
>> where you are changing code, i.e. x86 only.
>> 
>> "bugfix" is not a very telling description of what a patch is doing.
>> 
>> (Up to Paolo and Gleb whether they'll fix it or whether they require
>> a resend.)
> 
> No, not this time at least. :)
> 
> Paolo

Thanks Paolo, and Andreas's comments is also good, so I update commit message 
and will send out later.

Regards,
Jinsong

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [Qemu-devel] [PATCH] qemu-kvm bugfix for IA32_FEATURE_CONTROL

2013-08-20 Thread Paolo Bonzini
Il 20/08/2013 05:33, Liu, Jinsong ha scritto:
> Thanks Andreas!
> 
> This patch is for qemu-kvm.

Even though the repository is still called qemu-kvm, the uq/master
branch is the only active one and patches there will end up in upstream
QEMU.

There are no qemu-kvm releases anymore.

I applied the patch to uq/master, thanks.

Paolo

> Per my understanding, there are some patches firstly checked in qemu-kvm 
> uq/master branch.
> This patch is to fix c/s 0779caeb1a17f4d3ed14e2925b36ba09b084fb7b of qemu-kvm 
> uq/master branch
> (which is to co-work w/ kvm IA32_FEATURE_CONTROL, and currently not yet in 
> upstream qemu).
> 
> This patch is used to fix the bug introduced by 
> 0779caeb1a17f4d3ed14e2925b36ba09b084fb7b of qemu-kvm uq/master branch. The 
> bug is reported as
> https://bugs.launchpad.net/qemu-kvm/+bug/1207623
> https://bugs.launchpad.net/qemu/+bug/1213797
> 
> Anything I misunderstand, for upstream qemu and qemu-kvm?

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html