OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-serial: Don't keep a persistent copy of config space

Browse Source 
The 'config' field in the VirtIOSerial structure keeps a copy of the virtio
console's config space as visible to the guest, that is to say, in guest
endianness.  This is fiddly to maintain, because on some targets, such as
powerpc, the "guest endianness" can change when a new guest OS boots.

In fact, there's no need to maintain such a guest view of config space -
instead we can reconstruct it from host-format data when it is accessed
with get_config.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
David Gibson 2014-12-19 14:57:27 +11:00 committed by Amit Shah
parent f2f6e00b2e
commit 08f432aa3e
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/char/virtio-serial-bus.c
View File

@ -482,10 +482,14 @@ static uint32_t get_features(VirtIODevice *vdev, uint32_t features)
/* Guest requested config info */ /* Guest requested config info */
static void get_config(VirtIODevice *vdev, uint8_t *config_data) static void get_config(VirtIODevice *vdev, uint8_t *config_data)
{ {
VirtIOSerial *vser; VirtIOSerial *vser = VIRTIO_SERIAL(vdev);
struct virtio_console_config *config =
(struct virtio_console_config *)config_data;
vser = VIRTIO_SERIAL(vdev); config->cols = 0;
memcpy(config_data, &vser->config, sizeof(struct virtio_console_config)); config->rows = 0;
config->max_nr_ports = virtio_tswap32(vdev,
vser->serial.max_virtserial_ports);
} }
static void guest_reset(VirtIOSerial *vser) static void guest_reset(VirtIOSerial *vser)
@ -533,10 +537,6 @@ static void vser_reset(VirtIODevice *vdev)
vser = VIRTIO_SERIAL(vdev); vser = VIRTIO_SERIAL(vdev);
guest_reset(vser); guest_reset(vser);
/* In case we have switched endianness */
vser->config.max_nr_ports =
virtio_tswap32(vdev, vser->serial.max_virtserial_ports);
} }
static void virtio_serial_save(QEMUFile *f, void *opaque) static void virtio_serial_save(QEMUFile *f, void *opaque)
@ -551,12 +551,13 @@ static void virtio_serial_save_device(VirtIODevice *vdev, QEMUFile *f)
VirtIOSerialPort *port; VirtIOSerialPort *port;
uint32_t nr_active_ports; uint32_t nr_active_ports;
unsigned int i, max_nr_ports; unsigned int i, max_nr_ports;
struct virtio_console_config config;
/* The config space */ /* The config space (ignored on the far end in current versions) */
qemu_put_be16s(f, &s->config.cols); get_config(vdev, (uint8_t *)&config);
qemu_put_be16s(f, &s->config.rows); qemu_put_be16s(f, &config.cols);
qemu_put_be16s(f, &config.rows);
qemu_put_be32s(f, &s->config.max_nr_ports); qemu_put_be32s(f, &config.max_nr_ports);
/* The ports map */ /* The ports map */
max_nr_ports = s->serial.max_virtserial_ports; max_nr_ports = s->serial.max_virtserial_ports;
@ -987,8 +988,6 @@ static void virtio_serial_device_realize(DeviceState *dev, Error **errp)
vser->ovqs[i] = virtio_add_queue(vdev, 128, handle_output); vser->ovqs[i] = virtio_add_queue(vdev, 128, handle_output);
} }
vser->config.max_nr_ports =
virtio_tswap32(vdev, vser->serial.max_virtserial_ports);
vser->ports_map = g_malloc0(((vser->serial.max_virtserial_ports + 31) / 32) vser->ports_map = g_malloc0(((vser->serial.max_virtserial_ports + 31) / 32)
* sizeof(vser->ports_map[0])); * sizeof(vser->ports_map[0]));
/* /*

2
include/hw/virtio/virtio-serial.h
View File

@ -207,8 +207,6 @@ struct VirtIOSerial {
/* bitmap for identifying active ports */ /* bitmap for identifying active ports */
uint32_t *ports_map; uint32_t *ports_map;
struct virtio_console_config config;
struct VirtIOSerialPostLoad *post_load; struct VirtIOSerialPostLoad *post_load;
virtio_serial_conf serial; virtio_serial_conf serial;