Re: [Xen-devel] [PATCH v14 04/11] x86/hvm: Introduce hvm_save_cpu_xsave_states_one

[Jan Beulich]

>>> On 25.07.18 at 14:14,  wrote:
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -1188,33 +1188,45 @@ HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, 
> hvm_load_cpu_ctxt,
> save_area) + \
>xstate_ctxt_size(xcr0))
>  
> -static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t 
> *h)
> +static int hvm_save_cpu_xsave_states_one(struct vcpu *v, 
> hvm_domain_context_t *h)
>  {
> -struct vcpu *v;
>  struct hvm_hw_cpu_xsave *ctxt;
> +unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum);
> +int err = 0;

Pointless initializer.

>  if ( !cpu_has_xsave )
>  return 0;   /* do nothing */
>  
> +err = _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size);
> +if ( err )
> +return err;
> +
> +ctxt = (struct hvm_hw_cpu_xsave *)>data[h->cur];
> +h->cur += size;
> +ctxt->xfeature_mask = xfeature_mask;
> +ctxt->xcr0 = v->arch.xcr0;
> +ctxt->xcr0_accum = v->arch.xcr0_accum;
> +
> +expand_xsave_states(v, >save_area,
> +size - offsetof(typeof(*ctxt), save_area));
> +return 0;
> +}

Blank line please ahead of main return statement of a function.

Jan



___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH v14 04/11] x86/hvm: Introduce hvm_save_cpu_xsave_states_one

[Alexandru Isaila]

This is used to save data from a single instance.

Signed-off-by: Alexandru Isaila 

---
Changes since V11:
- hvm_save_cpu_xsave_states_one() returns the err from
  _hvm_init_entry().
- hvm_save_cpu_xsave_states() returns err from
  hvm_save_cpu_xsave_states_one();
---
 xen/arch/x86/hvm/hvm.c | 42 +++---
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 720204c..a6708f5 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1188,33 +1188,45 @@ HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, 
hvm_load_cpu_ctxt,
save_area) + \
   xstate_ctxt_size(xcr0))
 
-static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h)
+static int hvm_save_cpu_xsave_states_one(struct vcpu *v, hvm_domain_context_t 
*h)
 {
-struct vcpu *v;
 struct hvm_hw_cpu_xsave *ctxt;
+unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum);
+int err = 0;
 
 if ( !cpu_has_xsave )
 return 0;   /* do nothing */
 
+err = _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size);
+if ( err )
+return err;
+
+ctxt = (struct hvm_hw_cpu_xsave *)>data[h->cur];
+h->cur += size;
+ctxt->xfeature_mask = xfeature_mask;
+ctxt->xcr0 = v->arch.xcr0;
+ctxt->xcr0_accum = v->arch.xcr0_accum;
+
+expand_xsave_states(v, >save_area,
+size - offsetof(typeof(*ctxt), save_area));
+return 0;
+}
+
+static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h)
+{
+struct vcpu *v;
+int err = 0;
+
 for_each_vcpu ( d, v )
 {
-unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum);
-
 if ( !xsave_enabled(v) )
 continue;
-if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size) )
-return 1;
-ctxt = (struct hvm_hw_cpu_xsave *)>data[h->cur];
-h->cur += size;
-
-ctxt->xfeature_mask = xfeature_mask;
-ctxt->xcr0 = v->arch.xcr0;
-ctxt->xcr0_accum = v->arch.xcr0_accum;
-expand_xsave_states(v, >save_area,
-size - offsetof(typeof(*ctxt), save_area));
+err = hvm_save_cpu_xsave_states_one(v, h);
+if ( err )
+break;
 }
 
-return 0;
+return err;
 }
 
 /*
-- 
2.7.4


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel