motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-18 15:42:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/s390x/css: Remove the obsolete "css_migration_enabled" variable

Browse source 
Now that the s390-ccw-virtio-2.9 machine type has been removed, we
don't need the "css_migration_enabled" variable anymore and can remove
the related code.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250115073819.15452-3-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-01-15 08:38:13 +01:00
parent 2de267c330
commit 2abe338958
2 changed files with 1 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

31
hw/s390x/css.c
View file

@ -23,8 +23,6 @@
#include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/s390-virtio-ccw.h"
#include "hw/s390x/s390-ccw.h" #include "hw/s390x/s390-ccw.h"
bool css_migration_enabled = true;
typedef struct CrwContainer { typedef struct CrwContainer {
CRW crw; CRW crw;
QTAILQ_ENTRY(CrwContainer) sibling; QTAILQ_ENTRY(CrwContainer) sibling;
@ -180,16 +178,10 @@ static const VMStateDescription vmstate_orb = {
} }
}; };
static bool vmstate_schdev_orb_needed(void *opaque)
{
return css_migration_enabled;
}
static const VMStateDescription vmstate_schdev_orb = { static const VMStateDescription vmstate_schdev_orb = {
.name = "s390_subch_dev/orb", .name = "s390_subch_dev/orb",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.needed = vmstate_schdev_orb_needed,
.fields = (const VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_STRUCT(orb, SubchDev, 1, vmstate_orb, ORB), VMSTATE_STRUCT(orb, SubchDev, 1, vmstate_orb, ORB),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
@ -390,33 +382,12 @@ static int subch_dev_post_load(void *opaque, int version_id)
css_subch_assign(s->cssid, s->ssid, s->schid, s->devno, s); css_subch_assign(s->cssid, s->ssid, s->schid, s->devno, s);
} }
if (css_migration_enabled) {
/* No compat voodoo to do ;) */
return 0;
}
/*
* Hack alert. If we don't migrate the channel subsystem status
* we still need to find out if the guest enabled mss/mcss-e.
* If the subchannel is enabled, it certainly was able to access it,
* so adjust the max_ssid/max_cssid values for relevant ssid/cssid
* values. This is not watertight, but better than nothing.
*/
if (s->curr_status.pmcw.flags & PMCW_FLAGS_MASK_ENA) {
if (s->ssid) {
channel_subsys.max_ssid = MAX_SSID;
}
if (s->cssid != channel_subsys.default_cssid) {
channel_subsys.max_cssid = MAX_CSSID;
}
}
return 0; return 0;
} }
void css_register_vmstate(void) void css_register_vmstate(void)
{ {
if (css_migration_enabled) { vmstate_register(NULL, 0, &vmstate_css, &channel_subsys);
vmstate_register(NULL, 0, &vmstate_css, &channel_subsys);
}
} }
IndAddr *get_indicator(hwaddr ind_addr, int len) IndAddr *get_indicator(hwaddr ind_addr, int len)

6
include/hw/s390x/css.h
View file

@ -333,10 +333,4 @@ 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_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)) #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 #endif