diff mbox

[qom/qom-cpu] i386: improve invtsc migration blocker error message

Message ID 20140529165514.GB13386@amt.cnet
State New
Headers show

Commit Message

Marcelo Tosatti May 29, 2014, 4:55 p.m. UTC 
Improve migration blocker error message.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Comments

Eduardo Habkost May 29, 2014, 6:13 p.m. UTC | #1 
On Thu, May 29, 2014 at 01:55:14PM -0300, Marcelo Tosatti wrote:
> 
> Improve migration blocker error message.
> 
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Andreas Färber June 17, 2014, 11:54 p.m. UTC | #2 
Am 29.05.2014 18:55, schrieb Marcelo Tosatti:
> 
> Improve migration blocker error message.
> 
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> 
> 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 == 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 = 1;

Thanks, squashed:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu

Andreas
diff mbox

Patch

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 == 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 = 1;