From 06ba5dd4d1e57eaf600bd32185b248da5928b5a01de1b4d3aff688b9f56f274a Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Fri, 23 Feb 2018 01:52:34 +0000 Subject: [PATCH] Accepting request 579226 from home:bfrogers:branches:Virtualization qemu-testsuite wasn't building due to null pointers in the new migration warning patch. OBS-URL: https://build.opensuse.org/request/show/579226 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=394 --- 0075-migration-warn-about-inconsistent-s.patch | 8 ++++---- 0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/0075-migration-warn-about-inconsistent-s.patch b/0075-migration-warn-about-inconsistent-s.patch index e9e98c78..28571a2d 100644 --- a/0075-migration-warn-about-inconsistent-s.patch +++ b/0075-migration-warn-about-inconsistent-s.patch @@ -1,4 +1,4 @@ -From 2b3e17db667199d2df374f2537f0ef60c86add2f Mon Sep 17 00:00:00 2001 +From 555715ac88c361e4c9b262235010c265729738bf Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Wed, 21 Feb 2018 14:00:52 -0700 Subject: [PATCH] migration: warn about inconsistent spec_ctrl state @@ -22,7 +22,7 @@ Signed-off-by: Bruce Rogers 3 files changed, 21 insertions(+) diff --git a/cpus.c b/cpus.c -index d1e7e28993..238570badc 100644 +index d1e7e28993..1bfdb155dc 100644 --- a/cpus.c +++ b/cpus.c @@ -2039,6 +2039,18 @@ exit: @@ -33,8 +33,8 @@ index d1e7e28993..238570badc 100644 +{ +#if defined(TARGET_I386) + X86CPU *x86_cpu = X86_CPU(current_cpu); -+ CPUX86State *env = &x86_cpu->env; -+ if (!(env->features[FEAT_7_0_EDX] & CPUID_7_0_EDX_SPEC_CTRL) && ++ CPUX86State *env = x86_cpu != NULL ? &x86_cpu->env : NULL; ++ if (env && !(env->features[FEAT_7_0_EDX] & CPUID_7_0_EDX_SPEC_CTRL) && + env->spec_ctrl) + return true; +#endif diff --git a/0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch b/0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch index cd88f26f..268d999d 100644 --- a/0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch +++ b/0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch @@ -1,4 +1,4 @@ -From d3e377d2c0d2ab163482f3eaccdfc4c7e291ac7e Mon Sep 17 00:00:00 2001 +From 4e5e2c853977dc27ddab5937e55d181e7f1b5d2a Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Thu, 22 Feb 2018 04:48:07 -0700 Subject: [PATCH] i386: Compensate for KVM SPEC_CTRL feature availability bug