[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/40] s390x/css: activate ChannelSubSys migration
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 16/40] s390x/css: activate ChannelSubSys migration |
Date: |
Fri, 14 Jul 2017 12:40:43 +0200 |
From: Halil Pasic <address@hidden>
Turn on migration for the channel subsystem for the next machine. For
legacy machines we still have to do things the old way.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/css.c | 5 +++++
hw/s390x/s390-virtio-ccw.c | 9 ++++-----
include/hw/s390x/css.h | 4 ++++
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 0768fec..62db7f6 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -408,6 +408,11 @@ static int subch_dev_post_load(void *opaque, int
version_id)
return 0;
}
+void css_register_vmstate(void)
+{
+ vmstate_register(NULL, 0, &vmstate_css, &channel_subsys);
+}
+
IndAddr *get_indicator(hwaddr ind_addr, int len)
{
IndAddr *indicator;
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 75bce6b..e086cb5 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -209,7 +209,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void
*data)
s390mc->ri_allowed = true;
s390mc->cpu_model_allowed = true;
- s390mc->css_migration_enabled = false; /* TODO: set to true */
+ s390mc->css_migration_enabled = true;
mc->init = ccw_init;
mc->reset = s390_machine_reset;
mc->hot_add_cpu = s390_hot_add_cpu;
@@ -490,10 +490,9 @@ bool css_migration_enabled(void)
static void ccw_machine_2_10_instance_options(MachineState *machine)
{
- /*
- * TODO Once preparations are done register vmstate for the css if
- * css_migration_enabled().
- */
+ if (css_migration_enabled()) {
+ css_register_vmstate();
+ }
}
static void ccw_machine_2_10_class_options(MachineClass *mc)
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
index 8f08126..71076cb 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -234,4 +234,8 @@ extern PropertyInfo css_devid_ro_propinfo;
*/
SubchDev *css_create_sch(CssDevId bus_id, bool is_virtual, bool squash_mcss,
Error **errp);
+
+/** Turn on css migration */
+void css_register_vmstate(void);
+
#endif
--
2.7.4
- [Qemu-devel] [PULL 09/40] s390x/flic: introduce inject_airq callback, (continued)
- [Qemu-devel] [PULL 09/40] s390x/flic: introduce inject_airq callback, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 11/40] s390x/css: update css_adapter_interrupt, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 08/40] s390x/flic: introduce modify_ais_mode callback, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 21/40] pc-bios/s390-ccw: Add a write() function for stdio, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 32/40] s390x/cpumodel: add zpci, aen and ais facilities, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 24/40] pc-bios/s390-ccw: Add code for virtio feature negotiation, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 31/40] s390x: initialize cpu firstly, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 16/40] s390x/css: activate ChannelSubSys migration,
Christian Borntraeger <=
- [Qemu-devel] [PULL 34/40] s390x/cpumodel: wire up new hardware features, Christian Borntraeger, 2017/07/14
[Qemu-devel] [PULL 33/40] s390x/flic: migrate ais states, Christian Borntraeger, 2017/07/14
[Qemu-devel] [PULL 04/40] s390x/migration: Monitor commands for storage attributes, Christian Borntraeger, 2017/07/14
[Qemu-devel] [PULL 12/40] s390x: add helper get_machine_class, Christian Borntraeger, 2017/07/14
[Qemu-devel] [PULL 10/40] s390x/sic: realize SIC handling, Christian Borntraeger, 2017/07/14
[Qemu-devel] [PULL 29/40] pc-bios/s390: add s390-netboot.img, Christian Borntraeger, 2017/07/14
Re: [Qemu-devel] [PULL 00/40] s390x: fixes, enhancements for 2.10 softfreeze, Peter Maydell, 2017/07/14