cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 246d822cd39a0c9ee0cac082e64a20ea6d49b1c9 Mon Sep 17 00:00:00 2001
26ba25
From: David Gibson <dgibson@redhat.com>
26ba25
Date: Mon, 12 Nov 2018 01:28:34 +0000
26ba25
Subject: [PATCH 03/16] target/ppc: Add one reg id for ptcr
26ba25
26ba25
RH-Author: David Gibson <dgibson@redhat.com>
26ba25
Message-id: <20181112012835.21863-4-dgibson@redhat.com>
26ba25
Patchwork-id: 82979
26ba25
O-Subject: [RHEL-8 qemu-kvm PATCH 3/4] target/ppc: Add one reg id for ptcr
26ba25
Bugzilla: 1639069
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
RH-Acked-by: Serhii Popovych <spopovyc@redhat.com>
26ba25
RH-Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
26ba25
From: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
26ba25
26ba25
The ptcr (partition table control register) is used to store the address
26ba25
and size of the partition table. For nested kvm-hv we have a level 1
26ba25
guest register the location of it's partition table with the hypervisor.
26ba25
Thus to support migration we need to be able to read this out of kvm
26ba25
and restore it post migration.
26ba25
26ba25
Add the one reg id for the ptcr.
26ba25
26ba25
Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
26ba25
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
26ba25
(cherry picked from commit 56de52cad954a94530953bf979007db84c5f4dbb)
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
26ba25
Conflicts:
26ba25
	target/ppc/translate_init.inc.c
26ba25
26ba25
Adjusting for an upstream rename / code rearrangement that we don't
26ba25
have downstream.
26ba25
26ba25
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1639069
26ba25
26ba25
Signed-off-by: David Gibson <dgibson@redhat.com>
26ba25
---
26ba25
 target/ppc/translate_init.c | 10 +++++-----
26ba25
 1 file changed, 5 insertions(+), 5 deletions(-)
26ba25
26ba25
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
26ba25
index 926efbc..db9df8a 100644
26ba25
--- a/target/ppc/translate_init.c
26ba25
+++ b/target/ppc/translate_init.c
26ba25
@@ -8176,11 +8176,11 @@ static void gen_spr_power9_mmu(CPUPPCState *env)
26ba25
 {
26ba25
 #if !defined(CONFIG_USER_ONLY)
26ba25
     /* Partition Table Control */
26ba25
-    spr_register_hv(env, SPR_PTCR, "PTCR",
26ba25
-                    SPR_NOACCESS, SPR_NOACCESS,
26ba25
-                    SPR_NOACCESS, SPR_NOACCESS,
26ba25
-                    &spr_read_generic, &spr_write_ptcr,
26ba25
-                    0x00000000);
26ba25
+    spr_register_kvm_hv(env, SPR_PTCR, "PTCR",
26ba25
+                        SPR_NOACCESS, SPR_NOACCESS,
26ba25
+                        SPR_NOACCESS, SPR_NOACCESS,
26ba25
+                        &spr_read_generic, &spr_write_ptcr,
26ba25
+                        KVM_REG_PPC_PTCR, 0x00000000);
26ba25
 #endif
26ba25
 }
26ba25
 
26ba25
-- 
26ba25
1.8.3.1
26ba25