|
 |
9bac43 |
From 72c1a30661e94a58a347dd6341dd8cabdc23d2dc Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Suraj Jitindar Singh <sursingh@redhat.com>
|
|
|
9bac43 |
Date: Tue, 13 Feb 2018 04:12:30 +0100
|
|
|
9bac43 |
Subject: [PATCH 13/15] spapr: add missing break in h_get_cpu_characteristics()
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Suraj Jitindar Singh <sursingh@redhat.com>
|
|
|
9bac43 |
Message-id: <1518495150-24134-10-git-send-email-sursingh@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 78985
|
|
|
9bac43 |
O-Subject: [RHEL7.5 qemu-kvm-rhev PATCH 9/9] spapr: add missing break in h_get_cpu_characteristics()
|
|
|
9bac43 |
Bugzilla: 1532050
|
|
|
9bac43 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Greg Kurz <groug@kaod.org>
|
|
|
9bac43 |
|
|
|
9bac43 |
Detected by Coverity (CID 1385702). This fixes the recently added hypercall
|
|
|
9bac43 |
to let guests properly apply Spectre and Meltdown workarounds.
|
|
|
9bac43 |
|
|
|
9bac43 |
Fixes: c59704b25473 "target/ppc/spapr: Add H-Call H_GET_CPU_CHARACTERISTICS"
|
|
|
9bac43 |
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Greg Kurz <groug@kaod.org>
|
|
|
9bac43 |
Reviewed-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
|
|
|
9bac43 |
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
9bac43 |
(cherry picked from commit fa86f59234919b479b7e8da6b0dc2dad894a5eac)
|
|
|
9bac43 |
|
|
|
9bac43 |
Conflicts: none
|
|
|
9bac43 |
|
|
|
9bac43 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1532050
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Suraj Jitindar Singh <sursingh@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
hw/ppc/spapr_hcall.c | 1 +
|
|
|
9bac43 |
1 file changed, 1 insertion(+)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
|
|
|
9bac43 |
index 21247cd..d3f811a 100644
|
|
|
9bac43 |
--- a/hw/ppc/spapr_hcall.c
|
|
|
9bac43 |
+++ b/hw/ppc/spapr_hcall.c
|
|
|
9bac43 |
@@ -1672,6 +1672,7 @@ static target_ulong h_get_cpu_characteristics(PowerPCCPU *cpu,
|
|
|
9bac43 |
switch (safe_indirect_branch) {
|
|
|
9bac43 |
case SPAPR_CAP_FIXED:
|
|
|
9bac43 |
characteristics |= H_CPU_CHAR_BCCTRL_SERIALISED;
|
|
|
9bac43 |
+ break;
|
|
|
9bac43 |
default: /* broken */
|
|
|
9bac43 |
assert(safe_indirect_branch == SPAPR_CAP_BROKEN);
|
|
|
9bac43 |
break;
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|