From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx3Cl-0008Si-RL for qemu-devel@nongnu.org; Tue, 17 Jun 2014 19:54:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx3Cf-0007gT-Na for qemu-devel@nongnu.org; Tue, 17 Jun 2014 19:54:19 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42399 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx3Cf-0007gN-H4 for qemu-devel@nongnu.org; Tue, 17 Jun 2014 19:54:13 -0400 Message-ID: <53A0D522.5070709@suse.de> Date: Wed, 18 Jun 2014 01:54:10 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <20140529165514.GB13386@amt.cnet> In-Reply-To: <20140529165514.GB13386@amt.cnet> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [qom/qom-cpu PATCH] i386: improve invtsc migration blocker error message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcelo Tosatti , Eduardo Habkost Cc: qemu-devel , Juan Quintela Am 29.05.2014 18:55, schrieb Marcelo Tosatti: >=20 > Improve migration blocker error message. >=20 > Signed-off-by: Marcelo Tosatti >=20 > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index f9ffa4b..cfe1271 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -711,7 +711,8 @@ int kvm_arch_init_vcpu(CPUState *cs) > if (c && (c->edx & 1<<8) && invtsc_mig_blocker =3D=3D NULL) { > /* for migration */ > error_setg(&invtsc_mig_blocker, > - "State blocked by non-migratable CPU device"); > + "State blocked by non-migratable CPU device" > + " (invtsc flag)"); > migrate_add_blocker(invtsc_mig_blocker); > /* for savevm */ > vmstate_x86_cpu.unmigratable =3D 1; Thanks, squashed: https://github.com/afaerber/qemu-cpu/commits/qom-cpu Andreas --=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