diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-09 19:00:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-10 15:45:15 +0200 |
| commit | a55ae46683f289c46a0c0a807dbb89229a1e00cd (patch) | |
| tree | 72e18acd2a2d6e9c0988dd6a51dbcc3d52fff371 /include | |
| parent | 9d1b0f5bf515a0dd8e4174d9f3aca2c549727ef6 (diff) | |
| download | qemu-a55ae46683f289c46a0c0a807dbb89229a1e00cd.zip qemu-a55ae46683f289c46a0c0a807dbb89229a1e00cd.tar.gz qemu-a55ae46683f289c46a0c0a807dbb89229a1e00cd.tar.bz2 | |
s390: move css_migration_enabled from machine to css.c
The CSS subsystem uses global variables, just face the truth and use
a variable also for whether the CSS vmstate is in use; remove the
indirection of fetching it from the machine type, which makes the
TCG code depend unnecessarily on the virtio-ccw machine.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20240509170044.190795-4-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/s390x/css.h | 6 | ||||
| -rw-r--r-- | include/hw/s390x/s390-virtio-ccw.h | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h index ba72ee3..8289e45 100644 --- a/include/hw/s390x/css.h +++ b/include/hw/s390x/css.h @@ -333,4 +333,10 @@ static inline int ccw_dstream_read_buf(CcwDataStream *cds, void *buff, int len) #define ccw_dstream_read(cds, v) ccw_dstream_read_buf((cds), &(v), sizeof(v)) #define ccw_dstream_write(cds, v) ccw_dstream_write_buf((cds), &(v), sizeof(v)) +/** + * true if (vmstate based) migration of the channel subsystem + * is enabled, false if it is disabled. + */ +extern bool css_migration_enabled; + #endif diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h index 7605d06..996864a 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -46,7 +46,6 @@ struct S390CcwMachineClass { /*< public >*/ bool ri_allowed; bool cpu_model_allowed; - bool css_migration_enabled; bool hpage_1m_allowed; int max_threads; }; @@ -58,10 +57,4 @@ bool cpu_model_allowed(void); /* 1M huge page mappings allowed by the machine */ bool hpage_1m_allowed(void); -/** - * Returns true if (vmstate based) migration of the channel subsystem - * is enabled, false if it is disabled. - */ -bool css_migration_enabled(void); - #endif |