mirror of https://github.com/xemu-project/xemu.git
s390/virtio-ccw: migration support
This patch adds live migration support for virtio-ccw devices. It's not done with vmstate because virtio itself is not yet ported to vmstate either. Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
parent
6449a41a4d
commit
bcb2b582f3
111
hw/s390x/css.c
111
hw/s390x/css.c
|
@ -1293,6 +1293,117 @@ int css_enable_mss(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void subch_device_save(SubchDev *s, QEMUFile *f)
|
||||
{
|
||||
int i;
|
||||
|
||||
qemu_put_byte(f, s->cssid);
|
||||
qemu_put_byte(f, s->ssid);
|
||||
qemu_put_be16(f, s->schid);
|
||||
qemu_put_be16(f, s->devno);
|
||||
qemu_put_byte(f, s->thinint_active);
|
||||
/* SCHIB */
|
||||
/* PMCW */
|
||||
qemu_put_be32(f, s->curr_status.pmcw.intparm);
|
||||
qemu_put_be16(f, s->curr_status.pmcw.flags);
|
||||
qemu_put_be16(f, s->curr_status.pmcw.devno);
|
||||
qemu_put_byte(f, s->curr_status.pmcw.lpm);
|
||||
qemu_put_byte(f, s->curr_status.pmcw.pnom);
|
||||
qemu_put_byte(f, s->curr_status.pmcw.lpum);
|
||||
qemu_put_byte(f, s->curr_status.pmcw.pim);
|
||||
qemu_put_be16(f, s->curr_status.pmcw.mbi);
|
||||
qemu_put_byte(f, s->curr_status.pmcw.pom);
|
||||
qemu_put_byte(f, s->curr_status.pmcw.pam);
|
||||
qemu_put_buffer(f, s->curr_status.pmcw.chpid, 8);
|
||||
qemu_put_be32(f, s->curr_status.pmcw.chars);
|
||||
/* SCSW */
|
||||
qemu_put_be16(f, s->curr_status.scsw.flags);
|
||||
qemu_put_be16(f, s->curr_status.scsw.ctrl);
|
||||
qemu_put_be32(f, s->curr_status.scsw.cpa);
|
||||
qemu_put_byte(f, s->curr_status.scsw.dstat);
|
||||
qemu_put_byte(f, s->curr_status.scsw.cstat);
|
||||
qemu_put_be16(f, s->curr_status.scsw.count);
|
||||
qemu_put_be64(f, s->curr_status.mba);
|
||||
qemu_put_buffer(f, s->curr_status.mda, 4);
|
||||
/* end SCHIB */
|
||||
qemu_put_buffer(f, s->sense_data, 32);
|
||||
qemu_put_be64(f, s->channel_prog);
|
||||
/* last cmd */
|
||||
qemu_put_byte(f, s->last_cmd.cmd_code);
|
||||
qemu_put_byte(f, s->last_cmd.flags);
|
||||
qemu_put_be16(f, s->last_cmd.count);
|
||||
qemu_put_be32(f, s->last_cmd.cda);
|
||||
qemu_put_byte(f, s->last_cmd_valid);
|
||||
qemu_put_byte(f, s->id.reserved);
|
||||
qemu_put_be16(f, s->id.cu_type);
|
||||
qemu_put_byte(f, s->id.cu_model);
|
||||
qemu_put_be16(f, s->id.dev_type);
|
||||
qemu_put_byte(f, s->id.dev_model);
|
||||
qemu_put_byte(f, s->id.unused);
|
||||
for (i = 0; i < ARRAY_SIZE(s->id.ciw); i++) {
|
||||
qemu_put_byte(f, s->id.ciw[i].type);
|
||||
qemu_put_byte(f, s->id.ciw[i].command);
|
||||
qemu_put_be16(f, s->id.ciw[i].count);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
int subch_device_load(SubchDev *s, QEMUFile *f)
|
||||
{
|
||||
int i;
|
||||
|
||||
s->cssid = qemu_get_byte(f);
|
||||
s->ssid = qemu_get_byte(f);
|
||||
s->schid = qemu_get_be16(f);
|
||||
s->devno = qemu_get_be16(f);
|
||||
s->thinint_active = qemu_get_byte(f);
|
||||
/* SCHIB */
|
||||
/* PMCW */
|
||||
s->curr_status.pmcw.intparm = qemu_get_be32(f);
|
||||
s->curr_status.pmcw.flags = qemu_get_be16(f);
|
||||
s->curr_status.pmcw.devno = qemu_get_be16(f);
|
||||
s->curr_status.pmcw.lpm = qemu_get_byte(f);
|
||||
s->curr_status.pmcw.pnom = qemu_get_byte(f);
|
||||
s->curr_status.pmcw.lpum = qemu_get_byte(f);
|
||||
s->curr_status.pmcw.pim = qemu_get_byte(f);
|
||||
s->curr_status.pmcw.mbi = qemu_get_be16(f);
|
||||
s->curr_status.pmcw.pom = qemu_get_byte(f);
|
||||
s->curr_status.pmcw.pam = qemu_get_byte(f);
|
||||
qemu_get_buffer(f, s->curr_status.pmcw.chpid, 8);
|
||||
s->curr_status.pmcw.chars = qemu_get_be32(f);
|
||||
/* SCSW */
|
||||
s->curr_status.scsw.flags = qemu_get_be16(f);
|
||||
s->curr_status.scsw.ctrl = qemu_get_be16(f);
|
||||
s->curr_status.scsw.cpa = qemu_get_be32(f);
|
||||
s->curr_status.scsw.dstat = qemu_get_byte(f);
|
||||
s->curr_status.scsw.cstat = qemu_get_byte(f);
|
||||
s->curr_status.scsw.count = qemu_get_be16(f);
|
||||
s->curr_status.mba = qemu_get_be64(f);
|
||||
qemu_get_buffer(f, s->curr_status.mda, 4);
|
||||
/* end SCHIB */
|
||||
qemu_get_buffer(f, s->sense_data, 32);
|
||||
s->channel_prog = qemu_get_be64(f);
|
||||
/* last cmd */
|
||||
s->last_cmd.cmd_code = qemu_get_byte(f);
|
||||
s->last_cmd.flags = qemu_get_byte(f);
|
||||
s->last_cmd.count = qemu_get_be16(f);
|
||||
s->last_cmd.cda = qemu_get_be32(f);
|
||||
s->last_cmd_valid = qemu_get_byte(f);
|
||||
s->id.reserved = qemu_get_byte(f);
|
||||
s->id.cu_type = qemu_get_be16(f);
|
||||
s->id.cu_model = qemu_get_byte(f);
|
||||
s->id.dev_type = qemu_get_be16(f);
|
||||
s->id.dev_model = qemu_get_byte(f);
|
||||
s->id.unused = qemu_get_byte(f);
|
||||
for (i = 0; i < ARRAY_SIZE(s->id.ciw); i++) {
|
||||
s->id.ciw[i].type = qemu_get_byte(f);
|
||||
s->id.ciw[i].command = qemu_get_byte(f);
|
||||
s->id.ciw[i].count = qemu_get_be16(f);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void css_init(void)
|
||||
{
|
||||
channel_subsys = g_malloc0(sizeof(*channel_subsys));
|
||||
|
|
|
@ -85,6 +85,8 @@ struct SubchDev {
|
|||
|
||||
typedef SubchDev *(*css_subch_cb_func)(uint8_t m, uint8_t cssid, uint8_t ssid,
|
||||
uint16_t schid);
|
||||
void subch_device_save(SubchDev *s, QEMUFile *f);
|
||||
int subch_device_load(SubchDev *s, QEMUFile *f);
|
||||
int css_create_css_image(uint8_t cssid, bool default_image);
|
||||
bool css_devno_used(uint8_t cssid, uint8_t ssid, uint16_t devno);
|
||||
void css_subch_assign(uint8_t cssid, uint8_t ssid, uint16_t schid,
|
||||
|
|
|
@ -1275,6 +1275,97 @@ irqroute_error:
|
|||
return r;
|
||||
}
|
||||
|
||||
static void virtio_ccw_save_queue(DeviceState *d, int n, QEMUFile *f)
|
||||
{
|
||||
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
||||
VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);
|
||||
|
||||
qemu_put_be16(f, virtio_queue_vector(vdev, n));
|
||||
}
|
||||
|
||||
static int virtio_ccw_load_queue(DeviceState *d, int n, QEMUFile *f)
|
||||
{
|
||||
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
||||
VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);
|
||||
uint16_t vector;
|
||||
|
||||
qemu_get_be16s(f, &vector);
|
||||
virtio_queue_set_vector(vdev, n , vector);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void virtio_ccw_save_config(DeviceState *d, QEMUFile *f)
|
||||
{
|
||||
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
||||
SubchDev *s = dev->sch;
|
||||
|
||||
subch_device_save(s, f);
|
||||
if (dev->indicators != NULL) {
|
||||
qemu_put_be32(f, dev->indicators->len);
|
||||
qemu_put_be64(f, dev->indicators->addr);
|
||||
} else {
|
||||
qemu_put_be32(f, 0);
|
||||
qemu_put_be64(f, 0UL);
|
||||
}
|
||||
if (dev->indicators2 != NULL) {
|
||||
qemu_put_be32(f, dev->indicators2->len);
|
||||
qemu_put_be64(f, dev->indicators2->addr);
|
||||
} else {
|
||||
qemu_put_be32(f, 0);
|
||||
qemu_put_be64(f, 0UL);
|
||||
}
|
||||
if (dev->summary_indicator != NULL) {
|
||||
qemu_put_be32(f, dev->summary_indicator->len);
|
||||
qemu_put_be64(f, dev->summary_indicator->addr);
|
||||
} else {
|
||||
qemu_put_be32(f, 0);
|
||||
qemu_put_be64(f, 0UL);
|
||||
}
|
||||
qemu_put_be64(f, dev->routes.adapter.ind_offset);
|
||||
qemu_put_byte(f, dev->thinint_isc);
|
||||
}
|
||||
|
||||
static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f)
|
||||
{
|
||||
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
||||
SubchDev *s = dev->sch;
|
||||
int len;
|
||||
|
||||
s->driver_data = dev;
|
||||
subch_device_load(s, f);
|
||||
len = qemu_get_be32(f);
|
||||
if (len != 0) {
|
||||
dev->indicators = get_indicator(qemu_get_be64(f), len);
|
||||
} else {
|
||||
qemu_get_be64(f);
|
||||
dev->indicators = NULL;
|
||||
}
|
||||
len = qemu_get_be32(f);
|
||||
if (len != 0) {
|
||||
dev->indicators2 = get_indicator(qemu_get_be64(f), len);
|
||||
} else {
|
||||
qemu_get_be64(f);
|
||||
dev->indicators2 = NULL;
|
||||
}
|
||||
len = qemu_get_be32(f);
|
||||
if (len != 0) {
|
||||
dev->summary_indicator = get_indicator(qemu_get_be64(f), len);
|
||||
} else {
|
||||
qemu_get_be64(f);
|
||||
dev->summary_indicator = NULL;
|
||||
}
|
||||
dev->routes.adapter.ind_offset = qemu_get_be64(f);
|
||||
dev->thinint_isc = qemu_get_byte(f);
|
||||
if (s->thinint_active) {
|
||||
return css_register_io_adapter(CSS_IO_ADAPTER_VIRTIO,
|
||||
dev->thinint_isc, true, false,
|
||||
&dev->routes.adapter.adapter_id);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**************** Virtio-ccw Bus Device Descriptions *******************/
|
||||
|
||||
static Property virtio_ccw_net_properties[] = {
|
||||
|
@ -1597,6 +1688,10 @@ static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data)
|
|||
k->query_guest_notifiers = virtio_ccw_query_guest_notifiers;
|
||||
k->set_host_notifier = virtio_ccw_set_host_notifier;
|
||||
k->set_guest_notifiers = virtio_ccw_set_guest_notifiers;
|
||||
k->save_queue = virtio_ccw_save_queue;
|
||||
k->load_queue = virtio_ccw_load_queue;
|
||||
k->save_config = virtio_ccw_save_config;
|
||||
k->load_config = virtio_ccw_load_config;
|
||||
}
|
||||
|
||||
static const TypeInfo virtio_ccw_bus_info = {
|
||||
|
|
Loading…
Reference in New Issue