Message ID | 1490029701-4311-4-git-send-email-paul.durrant@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
>>> On 20.03.17 at 18:08, <paul.durrant@citrix.com> wrote: > The numbers correspond to ASCII characters so just use appropriate > character strings directly. > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 0d208c3..27ad5e8 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -134,14 +134,16 @@ void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf, switch ( leaf ) { case 0: + /* See section 2.4.1 of the specification */ res->a = 0x40000006; /* Maximum leaf */ - res->b = 0x7263694d; /* Magic numbers */ - res->c = 0x666F736F; - res->d = 0x76482074; + memcpy(&res->b, "Micr", 4); + memcpy(&res->c, "osof", 4); + memcpy(&res->d, "t Hv", 4); break; case 1: - res->a = 0x31237648; /* Version number */ + /* See section 2.4.2 of the specification */ + memcpy(&res->a, "Hv#1", 4); break; case 2:
The numbers correspond to ASCII characters so just use appropriate character strings directly. Signed-off-by: Paul Durrant <paul.durrant@citrix.com> --- Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> v2: - Use memcpy() rather than cast-and-assign --- xen/arch/x86/hvm/viridian.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)