[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/11] s390x/kvm: sync register support helper functi
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 06/11] s390x/kvm: sync register support helper function |
Date: |
Mon, 15 Dec 2014 12:35:27 +0100 |
From: David Hildenbrand <address@hidden>
Let's unify the code to sync registers by moving the checks into a helper
function can_sync_regs().
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target-s390x/kvm.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 52ddb44..2cd8386 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -214,6 +214,11 @@ void kvm_s390_reset_vcpu(S390CPU *cpu)
}
}
+static int can_sync_regs(CPUState *cs, int regs)
+{
+ return cap_sync_regs && (cs->kvm_run->kvm_valid_regs & regs) == regs;
+}
+
int kvm_arch_put_registers(CPUState *cs, int level)
{
S390CPU *cpu = S390_CPU(cs);
@@ -228,7 +233,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
cs->kvm_run->psw_addr = env->psw.addr;
cs->kvm_run->psw_mask = env->psw.mask;
- if (cap_sync_regs && cs->kvm_run->kvm_valid_regs & KVM_SYNC_GPRS) {
+ if (can_sync_regs(cs, KVM_SYNC_GPRS)) {
for (i = 0; i < 16; i++) {
cs->kvm_run->s.regs.gprs[i] = env->regs[i];
cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS;
@@ -285,9 +290,8 @@ int kvm_arch_put_registers(CPUState *cs, int level)
}
}
- if (cap_sync_regs &&
- cs->kvm_run->kvm_valid_regs & KVM_SYNC_ACRS &&
- cs->kvm_run->kvm_valid_regs & KVM_SYNC_CRS) {
+ /* access registers and control registers*/
+ if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {
for (i = 0; i < 16; i++) {
cs->kvm_run->s.regs.acrs[i] = env->aregs[i];
cs->kvm_run->s.regs.crs[i] = env->cregs[i];
@@ -306,7 +310,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
}
/* Finally the prefix */
- if (cap_sync_regs && cs->kvm_run->kvm_valid_regs & KVM_SYNC_PREFIX) {
+ if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {
cs->kvm_run->s.regs.prefix = env->psa;
cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_PREFIX;
} else {
@@ -329,7 +333,7 @@ int kvm_arch_get_registers(CPUState *cs)
env->psw.mask = cs->kvm_run->psw_mask;
/* the GPRS */
- if (cap_sync_regs && cs->kvm_run->kvm_valid_regs & KVM_SYNC_GPRS) {
+ if (can_sync_regs(cs, KVM_SYNC_GPRS)) {
for (i = 0; i < 16; i++) {
env->regs[i] = cs->kvm_run->s.regs.gprs[i];
}
@@ -344,9 +348,7 @@ int kvm_arch_get_registers(CPUState *cs)
}
/* The ACRS and CRS */
- if (cap_sync_regs &&
- cs->kvm_run->kvm_valid_regs & KVM_SYNC_ACRS &&
- cs->kvm_run->kvm_valid_regs & KVM_SYNC_CRS) {
+ if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {
for (i = 0; i < 16; i++) {
env->aregs[i] = cs->kvm_run->s.regs.acrs[i];
env->cregs[i] = cs->kvm_run->s.regs.crs[i];
@@ -373,7 +375,7 @@ int kvm_arch_get_registers(CPUState *cs)
env->fpc = fpu.fpc;
/* The prefix */
- if (cap_sync_regs && cs->kvm_run->kvm_valid_regs & KVM_SYNC_PREFIX) {
+ if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {
env->psa = cs->kvm_run->s.regs.prefix;
}
--
1.7.9.5
- [Qemu-devel] [PULL 00/11] s390x changes for 2.3, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 03/11] kvm: extend kvm_irqchip_add_msi_route to work on s390, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 01/11] s390: Add PCI bus support, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 04/11] s390x/ccw: fix oddity in machine class init, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 07/11] s390x/kvm: avoid syscalls by syncing registers with kvm_run, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 08/11] s390/pci: add error event support, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 05/11] s390x/css: Clean up unnecessary CONFIG_USER_ONLY wrappers, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 02/11] s390: implement pci instructions, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 06/11] s390x/kvm: sync register support helper function,
Cornelia Huck <=
- [Qemu-devel] [PULL 09/11] s390/pci: implement stpcifc instruction, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 10/11] s390/pci: remove unnecessary cpu_synchronize_state, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 11/11] s390x: update MAINTAINERS, Cornelia Huck, 2014/12/15
- Re: [Qemu-devel] [PULL 00/11] s390x changes for 2.3, Peter Maydell, 2014/12/15