[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/6] s390x/css: activate ChannelSubSys migration
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH v3 5/6] s390x/css: activate ChannelSubSys migration |
Date: |
Tue, 11 Jul 2017 16:54:40 +0200 |
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>
---
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 20b5fbed68..b89b60751a 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -407,6 +407,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 751febb87a..20e3f06519 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -206,7 +206,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;
@@ -482,10 +482,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 5d302223e6..949e0f0a28 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -226,4 +226,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.11.2
- [Qemu-devel] [PATCH v3 0/6] migration: s390x css migration, Halil Pasic, 2017/07/11
- [Qemu-devel] [PATCH v3 1/6] s390x: add helper get_machine_class, Halil Pasic, 2017/07/11
- [Qemu-devel] [PATCH v3 2/6] s390x: add css_migration_enabled to machine class, Halil Pasic, 2017/07/11
- [Qemu-devel] [PATCH v3 4/6] s390x/css: add ORB to SubchDev, Halil Pasic, 2017/07/11
- [Qemu-devel] [PATCH v3 6/6] s390x/css: use SubchDev.orb, Halil Pasic, 2017/07/11
- [Qemu-devel] [PATCH v3 3/6] s390x/css: add missing css state conditionally, Halil Pasic, 2017/07/11
- [Qemu-devel] [PATCH v3 5/6] s390x/css: activate ChannelSubSys migration,
Halil Pasic <=
- Re: [Qemu-devel] [PATCH v3 0/6] migration: s390x css migration, Cornelia Huck, 2017/07/12
- Re: [Qemu-devel] [PATCH v3 0/6] migration: s390x css migration, Christian Borntraeger, 2017/07/12
- Re: [Qemu-devel] [PATCH v3 0/6] migration: s390x css migration, Christian Borntraeger, 2017/07/12
- Re: [Qemu-devel] [PATCH v3 0/6] migration: s390x css migration, Dr. David Alan Gilbert, 2017/07/12