[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [qemu-xen master] s390x/kvm: fix run_on_cpu sigp conversions



commit 0ea3eb65e84c5d4665dbeee3e3e5ed56b43f7648
Author:     Cornelia Huck <cornelia.huck@xxxxxxxxxx>
AuthorDate: Wed Nov 2 17:21:03 2016 +0100
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Mon Nov 7 11:25:02 2016 +0000

    s390x/kvm: fix run_on_cpu sigp conversions
    
    Commit 14e6fe12a ("*_run_on_cpu: introduce run_on_cpu_data type")
    attempted to convert all users of run_on_cpu to use the new
    run_on_cpu_data type. It missed to change the called sigp_* routines,
    however. Fix that.
    
    Fixes: 14e6fe12a ("*_run_on_cpu: introduce run_on_cpu_data type")
    Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
    Acked-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
    Message-id: 20161102162103.66480-1-cornelia.huck@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
---
 target-s390x/kvm.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 36b4847..97afe02 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1401,10 +1401,10 @@ static void set_sigp_status(SigpInfo *si, uint64_t 
status)
     si->cc = SIGP_CC_STATUS_STORED;
 }
 
-static void sigp_start(CPUState *cs, void *arg)
+static void sigp_start(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
 
     if (s390_cpu_get_state(cpu) != CPU_STATE_STOPPED) {
         si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
@@ -1415,10 +1415,10 @@ static void sigp_start(CPUState *cs, void *arg)
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
 
-static void sigp_stop(CPUState *cs, void *arg)
+static void sigp_stop(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
     struct kvm_s390_irq irq = {
         .type = KVM_S390_SIGP_STOP,
     };
@@ -1501,10 +1501,10 @@ static int kvm_s390_store_status(S390CPU *cpu, hwaddr 
addr, bool store_arch)
     return 0;
 }
 
-static void sigp_stop_and_store_status(CPUState *cs, void *arg)
+static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
     struct kvm_s390_irq irq = {
         .type = KVM_S390_SIGP_STOP,
     };
@@ -1529,10 +1529,10 @@ static void sigp_stop_and_store_status(CPUState *cs, 
void *arg)
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
 
-static void sigp_store_status_at_address(CPUState *cs, void *arg)
+static void sigp_store_status_at_address(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
     uint32_t address = si->param & 0x7ffffe00u;
 
     /* cpu has to be stopped */
@@ -1550,10 +1550,10 @@ static void sigp_store_status_at_address(CPUState *cs, 
void *arg)
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
 
-static void sigp_store_adtl_status(CPUState *cs, void *arg)
+static void sigp_store_adtl_status(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
 
     if (!s390_has_feat(S390_FEAT_VECTOR)) {
         set_sigp_status(si, SIGP_STAT_INVALID_ORDER);
@@ -1581,10 +1581,10 @@ static void sigp_store_adtl_status(CPUState *cs, void 
*arg)
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
 
-static void sigp_restart(CPUState *cs, void *arg)
+static void sigp_restart(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
     struct kvm_s390_irq irq = {
         .type = KVM_S390_RESTART,
     };
@@ -1612,11 +1612,11 @@ int kvm_s390_cpu_restart(S390CPU *cpu)
     return 0;
 }
 
-static void sigp_initial_cpu_reset(CPUState *cs, void *arg)
+static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
     S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
 
     cpu_synchronize_state(cs);
     scc->initial_cpu_reset(cs);
@@ -1624,11 +1624,11 @@ static void sigp_initial_cpu_reset(CPUState *cs, void 
*arg)
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
 
-static void sigp_cpu_reset(CPUState *cs, void *arg)
+static void sigp_cpu_reset(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
     S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
 
     cpu_synchronize_state(cs);
     scc->cpu_reset(cs);
@@ -1636,10 +1636,10 @@ static void sigp_cpu_reset(CPUState *cs, void *arg)
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
 
-static void sigp_set_prefix(CPUState *cs, void *arg)
+static void sigp_set_prefix(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPU *cpu = S390_CPU(cs);
-    SigpInfo *si = arg;
+    SigpInfo *si = arg.host_ptr;
     uint32_t addr = si->param & 0x7fffe000u;
 
     cpu_synchronize_state(cs);
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.