SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/s390x/css: Have css_do_sic() take S390CPU instead of CPUS390XState

Browse Source 
"hw/s390x/css.h" is a header used by target-agnostic objects
(such hw/s390x/virtio-ccw-gpu.c), thus can not use target-specific
types, such CPUS390XState.

Have css_do_sic() take S390CPU a pointer, which is target-agnostic.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20231106114500.5269-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-11-05 19:22:57 +01:00
parent 2bb53fa2f3
commit 6233759ae1
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/s390x/css.c
View File

@ -644,8 +644,9 @@ void css_conditional_io_interrupt(SubchDev *sch)
} }
} }
int css_do_sic(CPUS390XState *env, uint8_t isc, uint16_t mode) int css_do_sic(S390CPU *cpu, uint8_t isc, uint16_t mode)
{ {
CPUS390XState *env = &cpu->env;
S390FLICState *fs = s390_get_flic(); S390FLICState *fs = s390_get_flic();
S390FLICStateClass *fsc = s390_get_flic_class(fs); S390FLICStateClass *fsc = s390_get_flic_class(fs);
int r; int r;

2
include/hw/s390x/css.h
View File

@ -233,7 +233,7 @@ typedef enum {
} CssIoAdapterType; } CssIoAdapterType;
void css_adapter_interrupt(CssIoAdapterType type, uint8_t isc); void css_adapter_interrupt(CssIoAdapterType type, uint8_t isc);
int css_do_sic(CPUS390XState *env, uint8_t isc, uint16_t mode); int css_do_sic(S390CPU *cpu, uint8_t isc, uint16_t mode);
uint32_t css_get_adapter_id(CssIoAdapterType type, uint8_t isc); uint32_t css_get_adapter_id(CssIoAdapterType type, uint8_t isc);
void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable, void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable,
uint8_t flags, Error **errp); uint8_t flags, Error **errp);

2
target/s390x/kvm/kvm.c
View File

@ -1358,7 +1358,7 @@ static int kvm_sic_service_call(S390CPU *cpu, struct kvm_run *run)
mode = env->regs[r1] & 0xffff; mode = env->regs[r1] & 0xffff;
isc = (env->regs[r3] >> 27) & 0x7; isc = (env->regs[r3] >> 27) & 0x7;
r = css_do_sic(env, isc, mode); r = css_do_sic(cpu, isc, mode);
if (r) { if (r) {
kvm_s390_program_interrupt(cpu, -r); kvm_s390_program_interrupt(cpu, -r);
} }

3
target/s390x/tcg/misc_helper.c
View File

@ -761,10 +761,11 @@ void HELPER(stpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba,
void HELPER(sic)(CPUS390XState *env, uint64_t r1, uint64_t r3) void HELPER(sic)(CPUS390XState *env, uint64_t r1, uint64_t r3)
{ {
S390CPU *cpu = env_archcpu(env);
int r; int r;
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
r = css_do_sic(env, (r3 >> 27) & 0x7, r1 & 0xffff); r = css_do_sic(cpu, (r3 >> 27) & 0x7, r1 & 0xffff);
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
/* css_do_sic() may actually return a PGM_xxx value to inject */ /* css_do_sic() may actually return a PGM_xxx value to inject */
if (r) { if (r) {