* [Qemu-devel] [RESEND PATCH] kvm: Allow the Hyper-V vendor ID to be specified
@ 2015-10-15 22:16 Alex Williamson
2015-10-16 7:30 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Alex Williamson @ 2015-10-15 22:16 UTC (permalink / raw)
To: qemu-devel, kvm; +Cc: pbonzini, ehabkost, rth
According to Microsoft documentation, the signature in the standard
hypervisor CPUID leaf at 0x40000000 identifies the Vendor ID and is
for reporting and diagnostic purposes only. We can therefore allow
the user to change it to whatever they want, within the 12 character
limit. Add a new hyperv-vendor-id option to the -cpu flag to allow
for this, ex:
-cpu host,hv_time,hv_vendor_id=KeenlyKVM
Link: http://msdn.microsoft.com/library/windows/hardware/hh975392
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
Cc'ing get_maintainers this time. Any takers? Thanks,
Alex
target-i386/cpu-qom.h | 1 +
target-i386/cpu.c | 1 +
target-i386/kvm.c | 14 +++++++++++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index c35b624..6c1eaaa 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -88,6 +88,7 @@ typedef struct X86CPU {
bool hyperv_vapic;
bool hyperv_relaxed_timing;
int hyperv_spinlock_attempts;
+ char *hyperv_vendor_id;
bool hyperv_time;
bool hyperv_crash;
bool check_cpuid;
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 05d7f26..71df546 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3146,6 +3146,7 @@ static Property x86_cpu_properties[] = {
DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0),
DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0),
DEFINE_PROP_UINT32("xlevel2", X86CPU, env.cpuid_xlevel2, 0),
+ DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
DEFINE_PROP_END_OF_LIST()
};
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 80d1a7e..5e3ab22 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -490,7 +490,19 @@ int kvm_arch_init_vcpu(CPUState *cs)
if (hyperv_enabled(cpu)) {
c = &cpuid_data.entries[cpuid_i++];
c->function = HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
- memcpy(signature, "Microsoft Hv", 12);
+ if (!cpu->hyperv_vendor_id) {
+ memcpy(signature, "Microsoft Hv", 12);
+ } else {
+ size_t len = strlen(cpu->hyperv_vendor_id);
+
+ if (len > 12) {
+ fprintf(stderr,
+ "hyperv-vendor-id too long, limited to 12 charaters");
+ abort();
+ }
+ memset(signature, 0, 12);
+ memcpy(signature, cpu->hyperv_vendor_id, len);
+ }
c->eax = HYPERV_CPUID_MIN;
c->ebx = signature[0];
c->ecx = signature[1];
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [RESEND PATCH] kvm: Allow the Hyper-V vendor ID to be specified
2015-10-15 22:16 [Qemu-devel] [RESEND PATCH] kvm: Allow the Hyper-V vendor ID to be specified Alex Williamson
@ 2015-10-16 7:30 ` Paolo Bonzini
2015-10-16 14:26 ` Alex Williamson
0 siblings, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2015-10-16 7:30 UTC (permalink / raw)
To: Alex Williamson, qemu-devel, kvm; +Cc: ehabkost, rth
On 16/10/2015 00:16, Alex Williamson wrote:
> According to Microsoft documentation, the signature in the standard
> hypervisor CPUID leaf at 0x40000000 identifies the Vendor ID and is
> for reporting and diagnostic purposes only. We can therefore allow
> the user to change it to whatever they want, within the 12 character
> limit. Add a new hyperv-vendor-id option to the -cpu flag to allow
> for this, ex:
>
> -cpu host,hv_time,hv_vendor_id=KeenlyKVM
>
> Link: http://msdn.microsoft.com/library/windows/hardware/hh975392
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>
> Cc'ing get_maintainers this time. Any takers? Thanks,
> Alex
>
> target-i386/cpu-qom.h | 1 +
> target-i386/cpu.c | 1 +
> target-i386/kvm.c | 14 +++++++++++++-
> 3 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
> index c35b624..6c1eaaa 100644
> --- a/target-i386/cpu-qom.h
> +++ b/target-i386/cpu-qom.h
> @@ -88,6 +88,7 @@ typedef struct X86CPU {
> bool hyperv_vapic;
> bool hyperv_relaxed_timing;
> int hyperv_spinlock_attempts;
> + char *hyperv_vendor_id;
> bool hyperv_time;
> bool hyperv_crash;
> bool check_cpuid;
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 05d7f26..71df546 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -3146,6 +3146,7 @@ static Property x86_cpu_properties[] = {
> DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0),
> DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0),
> DEFINE_PROP_UINT32("xlevel2", X86CPU, env.cpuid_xlevel2, 0),
> + DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
> DEFINE_PROP_END_OF_LIST()
> };
>
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 80d1a7e..5e3ab22 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -490,7 +490,19 @@ int kvm_arch_init_vcpu(CPUState *cs)
> if (hyperv_enabled(cpu)) {
> c = &cpuid_data.entries[cpuid_i++];
> c->function = HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
> - memcpy(signature, "Microsoft Hv", 12);
> + if (!cpu->hyperv_vendor_id) {
> + memcpy(signature, "Microsoft Hv", 12);
> + } else {
> + size_t len = strlen(cpu->hyperv_vendor_id);
> +
> + if (len > 12) {
> + fprintf(stderr,
> + "hyperv-vendor-id too long, limited to 12 charaters");
> + abort();
I'm removing this abort and queueing the patch. I'll send a pull
request today.
Paolo
> + }
> + memset(signature, 0, 12);
> + memcpy(signature, cpu->hyperv_vendor_id, len);
> + }
> c->eax = HYPERV_CPUID_MIN;
> c->ebx = signature[0];
> c->ecx = signature[1];
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [RESEND PATCH] kvm: Allow the Hyper-V vendor ID to be specified
2015-10-16 7:30 ` Paolo Bonzini
@ 2015-10-16 14:26 ` Alex Williamson
2015-10-16 15:15 ` Igor Mammedov
0 siblings, 1 reply; 4+ messages in thread
From: Alex Williamson @ 2015-10-16 14:26 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: rth, qemu-devel, kvm, ehabkost
On Fri, 2015-10-16 at 09:30 +0200, Paolo Bonzini wrote:
>
> On 16/10/2015 00:16, Alex Williamson wrote:
> > According to Microsoft documentation, the signature in the standard
> > hypervisor CPUID leaf at 0x40000000 identifies the Vendor ID and is
> > for reporting and diagnostic purposes only. We can therefore allow
> > the user to change it to whatever they want, within the 12 character
> > limit. Add a new hyperv-vendor-id option to the -cpu flag to allow
> > for this, ex:
> >
> > -cpu host,hv_time,hv_vendor_id=KeenlyKVM
> >
> > Link: http://msdn.microsoft.com/library/windows/hardware/hh975392
> > Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> > ---
> >
> > Cc'ing get_maintainers this time. Any takers? Thanks,
> > Alex
> >
> > target-i386/cpu-qom.h | 1 +
> > target-i386/cpu.c | 1 +
> > target-i386/kvm.c | 14 +++++++++++++-
> > 3 files changed, 15 insertions(+), 1 deletion(-)
> >
> > diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
> > index c35b624..6c1eaaa 100644
> > --- a/target-i386/cpu-qom.h
> > +++ b/target-i386/cpu-qom.h
> > @@ -88,6 +88,7 @@ typedef struct X86CPU {
> > bool hyperv_vapic;
> > bool hyperv_relaxed_timing;
> > int hyperv_spinlock_attempts;
> > + char *hyperv_vendor_id;
> > bool hyperv_time;
> > bool hyperv_crash;
> > bool check_cpuid;
> > diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> > index 05d7f26..71df546 100644
> > --- a/target-i386/cpu.c
> > +++ b/target-i386/cpu.c
> > @@ -3146,6 +3146,7 @@ static Property x86_cpu_properties[] = {
> > DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0),
> > DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0),
> > DEFINE_PROP_UINT32("xlevel2", X86CPU, env.cpuid_xlevel2, 0),
> > + DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
> > DEFINE_PROP_END_OF_LIST()
> > };
> >
> > diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> > index 80d1a7e..5e3ab22 100644
> > --- a/target-i386/kvm.c
> > +++ b/target-i386/kvm.c
> > @@ -490,7 +490,19 @@ int kvm_arch_init_vcpu(CPUState *cs)
> > if (hyperv_enabled(cpu)) {
> > c = &cpuid_data.entries[cpuid_i++];
> > c->function = HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
> > - memcpy(signature, "Microsoft Hv", 12);
> > + if (!cpu->hyperv_vendor_id) {
> > + memcpy(signature, "Microsoft Hv", 12);
> > + } else {
> > + size_t len = strlen(cpu->hyperv_vendor_id);
> > +
> > + if (len > 12) {
> > + fprintf(stderr,
> > + "hyperv-vendor-id too long, limited to 12 charaters");
> > + abort();
>
> I'm removing this abort and queueing the patch. I'll send a pull
> request today.
If we don't abort then we should really set len = 12 here. Thanks,
Alex
> > + }
> > + memset(signature, 0, 12);
> > + memcpy(signature, cpu->hyperv_vendor_id, len);
> > + }
> > c->eax = HYPERV_CPUID_MIN;
> > c->ebx = signature[0];
> > c->ecx = signature[1];
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe kvm" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [RESEND PATCH] kvm: Allow the Hyper-V vendor ID to be specified
2015-10-16 14:26 ` Alex Williamson
@ 2015-10-16 15:15 ` Igor Mammedov
0 siblings, 0 replies; 4+ messages in thread
From: Igor Mammedov @ 2015-10-16 15:15 UTC (permalink / raw)
To: Alex Williamson; +Cc: Paolo Bonzini, ehabkost, qemu-devel, kvm, rth
On Fri, 16 Oct 2015 08:26:14 -0600
Alex Williamson <alex.williamson@redhat.com> wrote:
> On Fri, 2015-10-16 at 09:30 +0200, Paolo Bonzini wrote:
> >
> > On 16/10/2015 00:16, Alex Williamson wrote:
> > > According to Microsoft documentation, the signature in the standard
> > > hypervisor CPUID leaf at 0x40000000 identifies the Vendor ID and is
> > > for reporting and diagnostic purposes only. We can therefore allow
> > > the user to change it to whatever they want, within the 12 character
> > > limit. Add a new hyperv-vendor-id option to the -cpu flag to allow
> > > for this, ex:
> > >
> > > -cpu host,hv_time,hv_vendor_id=KeenlyKVM
> > >
> > > Link: http://msdn.microsoft.com/library/windows/hardware/hh975392
> > > Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> > > ---
> > >
> > > Cc'ing get_maintainers this time. Any takers? Thanks,
> > > Alex
> > >
> > > target-i386/cpu-qom.h | 1 +
> > > target-i386/cpu.c | 1 +
> > > target-i386/kvm.c | 14 +++++++++++++-
> > > 3 files changed, 15 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
> > > index c35b624..6c1eaaa 100644
> > > --- a/target-i386/cpu-qom.h
> > > +++ b/target-i386/cpu-qom.h
> > > @@ -88,6 +88,7 @@ typedef struct X86CPU {
> > > bool hyperv_vapic;
> > > bool hyperv_relaxed_timing;
> > > int hyperv_spinlock_attempts;
> > > + char *hyperv_vendor_id;
> > > bool hyperv_time;
> > > bool hyperv_crash;
> > > bool check_cpuid;
> > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> > > index 05d7f26..71df546 100644
> > > --- a/target-i386/cpu.c
> > > +++ b/target-i386/cpu.c
> > > @@ -3146,6 +3146,7 @@ static Property x86_cpu_properties[] = {
> > > DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0),
> > > DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0),
> > > DEFINE_PROP_UINT32("xlevel2", X86CPU, env.cpuid_xlevel2, 0),
> > > + DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
> > > DEFINE_PROP_END_OF_LIST()
> > > };
> > >
> > > diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> > > index 80d1a7e..5e3ab22 100644
> > > --- a/target-i386/kvm.c
> > > +++ b/target-i386/kvm.c
> > > @@ -490,7 +490,19 @@ int kvm_arch_init_vcpu(CPUState *cs)
> > > if (hyperv_enabled(cpu)) {
> > > c = &cpuid_data.entries[cpuid_i++];
> > > c->function = HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
> > > - memcpy(signature, "Microsoft Hv", 12);
> > > + if (!cpu->hyperv_vendor_id) {
> > > + memcpy(signature, "Microsoft Hv", 12);
> > > + } else {
> > > + size_t len = strlen(cpu->hyperv_vendor_id);
> > > +
> > > + if (len > 12) {
> > > + fprintf(stderr,
> > > + "hyperv-vendor-id too long, limited to 12 charaters");
> > > + abort();
> >
> > I'm removing this abort and queueing the patch. I'll send a pull
> > request today.
>
> If we don't abort then we should really set len = 12 here. Thanks,
or make custom property setter that will check value validity,
so it could safely fail CPU creation during hotplug.
>
> Alex
>
> > > + }
> > > + memset(signature, 0, 12);
> > > + memcpy(signature, cpu->hyperv_vendor_id, len);
> > > + }
> > > c->eax = HYPERV_CPUID_MIN;
> > > c->ebx = signature[0];
> > > c->ecx = signature[1];
> > >
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe kvm" in
> > > the body of a message to majordomo@vger.kernel.org
> > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > >
> > --
> > To unsubscribe from this list: send the line "unsubscribe kvm" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-16 15:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-15 22:16 [Qemu-devel] [RESEND PATCH] kvm: Allow the Hyper-V vendor ID to be specified Alex Williamson
2015-10-16 7:30 ` Paolo Bonzini
2015-10-16 14:26 ` Alex Williamson
2015-10-16 15:15 ` Igor Mammedov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).