Re: [Qemu-devel] [qemu-s390x] [PATCH 2/3] s390x/cpumodel: also change name of vxbeh

[Cornelia Huck]

On Tue, 16 Jul 2019 09:25:42 +0200
Christian Borntraeger <address@hidden> wrote:

> On 16.07.19 09:24, David Hildenbrand wrote:

> > We also have
> > 
> > sortl vs. sort
> > vxe vs. vxeh
> > vxe2 vs. vxeh2
> > 
> > So I tend to prefer "vxpde", or rather "vxpdeh".
> > 
> > (all other enhancement facilities have "eh", so we should actually use
> > "vxpdeh")  
> 
> Fine with me. Conny, shall I resend or can you fixup everything?
> 

I now have the following; can you please double check?

commit a02c8264b7219bc30ec258f068c89b93ad244c36
Author: Christian Borntraeger <address@hidden>
Date:   Mon Jul 15 16:23:03 2019 +0200

    s390x/cpumodel: also change name of vxbeh
    
    David suggested to keep everything in sync as 4.1 is not yet released.
    This patch fixes the name "vxbeh" into "vxpdeh".
    
    To simplify the backports this patch will not change VECTOR_BCD_ENH as
    this is just an internal name. That will be done by an extra patch that
    does not need to be backported.
    
    Suggested-by: David Hildenbrand <address@hidden>
    Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector 
facility")
    Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements")
    Signed-off-by: Christian Borntraeger <address@hidden>
    Message-Id: <address@hidden>
    Reviewed-by: David Hildenbrand <address@hidden>
    Signed-off-by: Cornelia Huck <address@hidden>

diff --git a/target/s390x/cpu_features_def.inc.h 
b/target/s390x/cpu_features_def.inc.h
index 3118a9f89228..05b7674affe6 100644
--- a/target/s390x/cpu_features_def.inc.h
+++ b/target/s390x/cpu_features_def.inc.h
@@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement 
(no translate) facil
 DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2")
 DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility 
(excluding subfunctions)")
 DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility 
(excluding subfunctions)")
-DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, 
"Vector-Packed-Decimal-Enhancement Facility")
+DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, 
"Vector-Packed-Decimal-Enhancement Facility")
 DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, 
"Message-security-assist-extension-9 facility (excluding subfunctions)")
 DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")