diff options
Diffstat (limited to 'arch/s390/kvm/priv.c')
-rw-r--r-- | arch/s390/kvm/priv.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index 34b42dc285ee..cb07147cda73 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c | |||
@@ -41,7 +41,7 @@ static int handle_set_prefix(struct kvm_vcpu *vcpu) | |||
41 | } | 41 | } |
42 | 42 | ||
43 | /* get the value */ | 43 | /* get the value */ |
44 | if (get_guest_u32(vcpu, operand2, &address)) { | 44 | if (get_guest(vcpu, address, (u32 *) operand2)) { |
45 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); | 45 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); |
46 | goto out; | 46 | goto out; |
47 | } | 47 | } |
@@ -82,7 +82,7 @@ static int handle_store_prefix(struct kvm_vcpu *vcpu) | |||
82 | address = address & 0x7fffe000u; | 82 | address = address & 0x7fffe000u; |
83 | 83 | ||
84 | /* get the value */ | 84 | /* get the value */ |
85 | if (put_guest_u32(vcpu, operand2, address)) { | 85 | if (put_guest(vcpu, address, (u32 *)operand2)) { |
86 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); | 86 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); |
87 | goto out; | 87 | goto out; |
88 | } | 88 | } |
@@ -107,7 +107,7 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu) | |||
107 | goto out; | 107 | goto out; |
108 | } | 108 | } |
109 | 109 | ||
110 | rc = put_guest_u16(vcpu, useraddr, vcpu->vcpu_id); | 110 | rc = put_guest(vcpu, vcpu->vcpu_id, (u16 *)useraddr); |
111 | if (rc) { | 111 | if (rc) { |
112 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); | 112 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); |
113 | goto out; | 113 | goto out; |
@@ -142,18 +142,18 @@ static int handle_tpi(struct kvm_vcpu *vcpu) | |||
142 | * Store the two-word I/O interruption code into the | 142 | * Store the two-word I/O interruption code into the |
143 | * provided area. | 143 | * provided area. |
144 | */ | 144 | */ |
145 | put_guest_u16(vcpu, addr, inti->io.subchannel_id); | 145 | put_guest(vcpu, inti->io.subchannel_id, (u16 *) addr); |
146 | put_guest_u16(vcpu, addr + 2, inti->io.subchannel_nr); | 146 | put_guest(vcpu, inti->io.subchannel_nr, (u16 *) (addr + 2)); |
147 | put_guest_u32(vcpu, addr + 4, inti->io.io_int_parm); | 147 | put_guest(vcpu, inti->io.io_int_parm, (u32 *) (addr + 4)); |
148 | } else { | 148 | } else { |
149 | /* | 149 | /* |
150 | * Store the three-word I/O interruption code into | 150 | * Store the three-word I/O interruption code into |
151 | * the appropriate lowcore area. | 151 | * the appropriate lowcore area. |
152 | */ | 152 | */ |
153 | put_guest_u16(vcpu, 184, inti->io.subchannel_id); | 153 | put_guest(vcpu, inti->io.subchannel_id, (u16 *) 184); |
154 | put_guest_u16(vcpu, 186, inti->io.subchannel_nr); | 154 | put_guest(vcpu, inti->io.subchannel_nr, (u16 *) 186); |
155 | put_guest_u32(vcpu, 188, inti->io.io_int_parm); | 155 | put_guest(vcpu, inti->io.io_int_parm, (u32 *) 188); |
156 | put_guest_u32(vcpu, 192, inti->io.io_int_word); | 156 | put_guest(vcpu, inti->io.io_int_word, (u32 *) 192); |
157 | } | 157 | } |
158 | cc = 1; | 158 | cc = 1; |
159 | } else | 159 | } else |
@@ -347,7 +347,7 @@ static int handle_stidp(struct kvm_vcpu *vcpu) | |||
347 | goto out; | 347 | goto out; |
348 | } | 348 | } |
349 | 349 | ||
350 | rc = put_guest_u64(vcpu, operand2, vcpu->arch.stidp_data); | 350 | rc = put_guest(vcpu, vcpu->arch.stidp_data, (u64 *)operand2); |
351 | if (rc) { | 351 | if (rc) { |
352 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); | 352 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); |
353 | goto out; | 353 | goto out; |