Message ID | 1274421493-9036-1-git-send-email-andre.przywara@amd.com |
---|---|
State | New |
Headers | show |
On 05/21/2010 12:58 AM, Andre Przywara wrote: > the meaning of vendor_override is actually the opposite of how it > is currently used :-( > Fix it to allow KVM to export the non-native CPUID vendor if > explicitly requested by the user. > The semantic is now as intended: > - With TCG, the guest always sees the configured vendor. > - With KVM, the default is to propagate the host's vendor > - when explicitly requested via -cpu<base>,vendor=xxx obey this > and use the specified vendor > > Signed-off-by: Andre Przywara<andre.przywara@amd.com> > This should go through uq/master. But I'm not sure that the new behavior is really what's desired. It's certainly going to break compatibility since -M pc-0.12 is going to show a different vendor_id by default. Regards, Anthony Liguori > --- > target-i386/cpuid.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > Hi, > > this hasn't been picked up the last time I sent it out, are there any > objections? > > Regards, > Andre. > > diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c > index 56938e2..99d1f44 100644 > --- a/target-i386/cpuid.c > +++ b/target-i386/cpuid.c > @@ -962,7 +962,7 @@ static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx, > * this if you want to use KVM's sysenter/syscall emulation > * in compatibility mode and when doing cross vendor migration > */ > - if (kvm_enabled()&& env->cpuid_vendor_override) { > + if (kvm_enabled()&& ! env->cpuid_vendor_override) { > host_cpuid(0, 0, NULL, ebx, ecx, edx); > } > } >
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 56938e2..99d1f44 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -962,7 +962,7 @@ static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx, * this if you want to use KVM's sysenter/syscall emulation * in compatibility mode and when doing cross vendor migration */ - if (kvm_enabled() && env->cpuid_vendor_override) { + if (kvm_enabled() && ! env->cpuid_vendor_override) { host_cpuid(0, 0, NULL, ebx, ecx, edx); } }
the meaning of vendor_override is actually the opposite of how it is currently used :-( Fix it to allow KVM to export the non-native CPUID vendor if explicitly requested by the user. The semantic is now as intended: - With TCG, the guest always sees the configured vendor. - With KVM, the default is to propagate the host's vendor - when explicitly requested via -cpu <base>,vendor=xxx obey this and use the specified vendor Signed-off-by: Andre Przywara <andre.przywara@amd.com> --- target-i386/cpuid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Hi, this hasn't been picked up the last time I sent it out, are there any objections? Regards, Andre.