rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 579226 from home:bfrogers:branches:Virtualization

Browse Source 
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
This commit is contained in:
Bruce Rogers 2018-02-23 01:52:34 +00:00 committed by Git OBS Bridge
parent 113f4d1d02
commit 06ba5dd4d1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0075-migration-warn-about-inconsistent-s.patch
View File

@ -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 <brogers@suse.com> From: Bruce Rogers <brogers@suse.com>
Date: Wed, 21 Feb 2018 14:00:52 -0700 Date: Wed, 21 Feb 2018 14:00:52 -0700
Subject: [PATCH] migration: warn about inconsistent spec_ctrl state Subject: [PATCH] migration: warn about inconsistent spec_ctrl state
@ -22,7 +22,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
3 files changed, 21 insertions(+) 3 files changed, 21 insertions(+)
diff --git a/cpus.c b/cpus.c diff --git a/cpus.c b/cpus.c
index d1e7e28993..238570badc 100644 index d1e7e28993..1bfdb155dc 100644
--- a/cpus.c --- a/cpus.c
+++ b/cpus.c +++ b/cpus.c
@@ -2039,6 +2039,18 @@ exit: @@ -2039,6 +2039,18 @@ exit:
@ -33,8 +33,8 @@ index d1e7e28993..238570badc 100644
+{ +{
+#if defined(TARGET_I386) +#if defined(TARGET_I386)
+ X86CPU *x86_cpu = X86_CPU(current_cpu); + X86CPU *x86_cpu = X86_CPU(current_cpu);
+ CPUX86State *env = &x86_cpu->env; + CPUX86State *env = x86_cpu != NULL ? &x86_cpu->env : NULL;
+ if (!(env->features[FEAT_7_0_EDX] & CPUID_7_0_EDX_SPEC_CTRL) && + if (env && !(env->features[FEAT_7_0_EDX] & CPUID_7_0_EDX_SPEC_CTRL) &&
+ env->spec_ctrl) + env->spec_ctrl)
+ return true; + return true;
+#endif +#endif

2
0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
View File

@ -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 <brogers@suse.com> From: Bruce Rogers <brogers@suse.com>
Date: Thu, 22 Feb 2018 04:48:07 -0700 Date: Thu, 22 Feb 2018 04:48:07 -0700
Subject: [PATCH] i386: Compensate for KVM SPEC_CTRL feature availability bug Subject: [PATCH] i386: Compensate for KVM SPEC_CTRL feature availability bug