diff mbox

fixup! cpu: report hyperv feature words through qom

Message ID 20160707164904.GF4131@thinpad.lan.raisama.net
State New
Headers show

Commit Message

Eduardo Habkost July 7, 2016, 4:49 p.m. UTC 
On Thu, Jul 07, 2016 at 01:44:48PM -0300, Eduardo Habkost wrote:
> Hi,
> 
> Sorry for taking so long to review it.
> 
> The patch in general looks good, except for:
> 
> On Fri, Jun 24, 2016 at 01:49:36PM +0300, Denis V. Lunev wrote:
> [...]
> > +    if (MACHINE_GET_CLASS(current_machine)->hot_add_cpu != NULL) {
> > +        env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
> > +    }
> [...]
> > +}
> > +
> [...]
> > -        c->edx |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
> 
> If you want to change the rules for setting
> HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE, please do it in a
> separate patch.

I will apply the patch, but with the following fixup:

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-i386/kvm.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Denis V. Lunev July 7, 2016, 4:53 p.m. UTC | #1 
On 07/07/2016 07:49 PM, Eduardo Habkost wrote:
> On Thu, Jul 07, 2016 at 01:44:48PM -0300, Eduardo Habkost wrote:
>> Hi,
>>
>> Sorry for taking so long to review it.
>>
>> The patch in general looks good, except for:
>>
>> On Fri, Jun 24, 2016 at 01:49:36PM +0300, Denis V. Lunev wrote:
>> [...]
>>> +    if (MACHINE_GET_CLASS(current_machine)->hot_add_cpu != NULL) {
>>> +        env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
>>> +    }
>> [...]
>>> +}
>>> +
>> [...]
>>> -        c->edx |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
>> If you want to change the rules for setting
>> HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE, please do it in a
>> separate patch.
> I will apply the patch, but with the following fixup:
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>   target-i386/kvm.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 5df4b48..4193fe1 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -599,6 +599,7 @@ static int hyperv_handle_properties(CPUState *cs)
>       if (cpu->hyperv_crash && has_msr_hv_crash) {
>           env->features[FEAT_HYPERV_EDX] |= HV_X64_GUEST_CRASH_MSR_AVAILABLE;
>       }
> +    env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
>       if (cpu->hyperv_reset && has_msr_hv_reset) {
>           env->features[FEAT_HYPERV_EAX] |= HV_X64_MSR_RESET_AVAILABLE;
>       }
> @@ -630,9 +631,6 @@ static int hyperv_handle_properties(CPUState *cs)
>           }
>           env->features[FEAT_HYPERV_EAX] |= HV_X64_MSR_SYNTIMER_AVAILABLE;
>       }
> -    if (MACHINE_GET_CLASS(current_machine)->hot_add_cpu != NULL) {
> -        env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
> -    }
>       return 0;
>   }
>   
yes, you are right

Reviewed-by: Denis V. Lunev <den@openvz.org>
diff mbox

Patch

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 5df4b48..4193fe1 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -599,6 +599,7 @@  static int hyperv_handle_properties(CPUState *cs)
     if (cpu->hyperv_crash && has_msr_hv_crash) {
         env->features[FEAT_HYPERV_EDX] |= HV_X64_GUEST_CRASH_MSR_AVAILABLE;
     }
+    env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
     if (cpu->hyperv_reset && has_msr_hv_reset) {
         env->features[FEAT_HYPERV_EAX] |= HV_X64_MSR_RESET_AVAILABLE;
     }
@@ -630,9 +631,6 @@  static int hyperv_handle_properties(CPUState *cs)
         }
         env->features[FEAT_HYPERV_EAX] |= HV_X64_MSR_SYNTIMER_AVAILABLE;
     }
-    if (MACHINE_GET_CLASS(current_machine)->hot_add_cpu != NULL) {
-        env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
-    }
     return 0;
 }