From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wl2Az-0003fl-Eo for qemu-devel@nongnu.org; Thu, 15 May 2014 16:22:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wl2Ar-0000ag-Tz for qemu-devel@nongnu.org; Thu, 15 May 2014 16:22:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52616 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wl2Ar-0000a6-JH for qemu-devel@nongnu.org; Thu, 15 May 2014 16:22:41 -0400 Message-ID: <5375220F.6060505@suse.de> Date: Thu, 15 May 2014 22:22:39 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1398876525-28831-1-git-send-email-ehabkost@redhat.com> <1398876525-28831-18-git-send-email-ehabkost@redhat.com> In-Reply-To: <1398876525-28831-18-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 17/18] target-i386: block migration and savevm if invariant tsc is exposed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Juan Quintela , Marcelo Tosatti , Igor Mammedov , Paolo Bonzini , Aurelien Jarno , Richard Henderson Am 30.04.2014 18:48, schrieb Eduardo Habkost: > From: Marcelo Tosatti >=20 > Invariant TSC documentation mentions that "invariant TSC will run at a > constant rate in all ACPI P-, C-. and T-states". >=20 > This is not the case if migration to a host with different TSC frequenc= y > is allowed, or if savevm is performed. So block migration/savevm. >=20 > Also do not expose invariant tsc flag by default. >=20 > Cc: Juan Quintela > Signed-off-by: Marcelo Tosatti > Reviewed-by: Eduardo Habkost > Signed-off-by: Eduardo Habkost > --- > target-i386/cpu-qom.h | 2 +- > target-i386/kvm.c | 13 +++++++++++++ > target-i386/machine.c | 2 +- > 3 files changed, 15 insertions(+), 2 deletions(-) >=20 > diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h > index 016f90d..473d803 100644 > --- a/target-i386/cpu-qom.h > +++ b/target-i386/cpu-qom.h > @@ -121,7 +121,7 @@ static inline X86CPU *x86_env_get_cpu(CPUX86State *= env) > #define ENV_OFFSET offsetof(X86CPU, env) > =20 > #ifndef CONFIG_USER_ONLY > -extern const struct VMStateDescription vmstate_x86_cpu; > +extern struct VMStateDescription vmstate_x86_cpu; > #endif > =20 > /** > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 4389959..99cc7e3 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -33,6 +33,8 @@ > #include "exec/ioport.h" > #include > #include "hw/pci/pci.h" > +#include "migration/migration.h" > +#include "qapi/qmp/qerror.h" > =20 > //#define DEBUG_KVM > =20 > @@ -447,6 +449,8 @@ static bool hyperv_enabled(X86CPU *cpu) > cpu->hyperv_relaxed_timing); > } > =20 > +Error *invtsc_mig_blocker; This should be static, even if no zero-initialization is needed below. > + > #define KVM_MAX_CPUID_ENTRIES 100 > =20 > int kvm_arch_init_vcpu(CPUState *cs) > @@ -702,6 +706,15 @@ int kvm_arch_init_vcpu(CPUState *cs) > !!(c->ecx & CPUID_EXT_SMX); > } > =20 > + c =3D cpuid_find_entry(&cpuid_data.cpuid, 0x80000007, 0); > + if (c && (c->edx & 1<<8) && invtsc_mig_blocker =3D=3D NULL) { > + /* for migration */ > + error_set(&invtsc_mig_blocker, QERR_MIGRATION_NOT_SUPPORTED, "= cpu"); This does not compile for me. error_setg()? With what text? Regards, Andreas > + migrate_add_blocker(invtsc_mig_blocker); > + /* for savevm */ > + vmstate_x86_cpu.unmigratable =3D 1; > + } > + > cpuid_data.cpuid.padding =3D 0; > r =3D kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data); > if (r) { > diff --git a/target-i386/machine.c b/target-i386/machine.c > index 168cab6..4d4c023 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -613,7 +613,7 @@ static const VMStateDescription vmstate_msr_hyperv_= time =3D { > } > }; > =20 > -const VMStateDescription vmstate_x86_cpu =3D { > +VMStateDescription vmstate_x86_cpu =3D { > .name =3D "cpu", > .version_id =3D 12, > .minimum_version_id =3D 3, >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg