david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migration fix for virtio-serial devices on bi-endian targets by David

Browse Source 
Gibson.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUqjyPAAoJEB6aO1+FQIO2Vq4P/3yYa1AbD6wFj2K6NaVlhEM5
 HHIa03Zv/i1OESx14JgnB9dlS5ZYagQLs6C6IIHZqmmQeTa01fHkOVwhEisFXiXm
 m/XzBus6DtH65ZlM0PQT7RAu3qPceaEkMbXh+jVGbbz1IEDgNblINgXYpBaFWp0f
 EtKqQpWL0ImW8BSeYZGEAGYCX+IUtVez54Iyfzs7ZHneAhwUwydZosz5gDPPNkDf
 u61LnY9DEULkn+KHGEj1kQ8+/wWJKJrN9H7PzPtSWdUHpSwBb+RqmXMjUvW97HNd
 ObQCX3+8kMGOex2sGXQsBkx0zQcnJHTFpukTC+uM+D5PGZOoFXhrkxrjmuXWJp9C
 71yEYoQcuKMpDnBmWIdiKLMVIA8hnqJd7/DNWKA9xETIpQbkIoyitsFV8lKVOUdS
 MnDKaIPkn/kgWfc1LwGKPAtcKL3gjxswOXxSpU54snPitihcGqeMqcVICMYEqvKy
 AbbJXSxquAsUDP4mlRrE9zSI6viS6+r7BocaGn5pTLt+ZdTkSzPr2Umo+LsEBOpv
 OJwScc8HyD9vppJHIoHJuUiJLHoX6dmazOhUVJsjmW1rU3qBVNGGJT3n9dzldqeK
 5Fw7680bHU3ICUt9lleGr/7fkPD5vNS5H6gsLiq0wjwMwWFb8aeJpoHuvP5x+EWO
 QbrHlQqYdJ7eC8/1nttq
 =hnwv
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/amit/tags/for-2.3' into staging

Migration fix for virtio-serial devices on bi-endian targets by David
Gibson.

# gpg: Signature made Mon 05 Jan 2015 07:26:07 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"

* remotes/amit/tags/for-2.3:
  virtio-serial: Don't keep a persistent copy of config space
  virtio_serial: Don't use vser->config.max_nr_ports internally

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-01-09 17:59:16 +00:00
commit 11fe680858
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
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,15 +551,16 @@ 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 = virtio_tswap32(vdev, s->config.max_nr_ports); max_nr_ports = s->serial.max_virtserial_ports;
for (i = 0; i < (max_nr_ports + 31) / 32; i++) { for (i = 0; i < (max_nr_ports + 31) / 32; i++) {
qemu_put_be32s(f, &s->ports_map[i]); qemu_put_be32s(f, &s->ports_map[i]);
} }
@ -715,13 +716,7 @@ static int virtio_serial_load_device(VirtIODevice *vdev, QEMUFile *f,
qemu_get_be16s(f, (uint16_t *) &tmp); qemu_get_be16s(f, (uint16_t *) &tmp);
qemu_get_be32s(f, &tmp); qemu_get_be32s(f, &tmp);
/* Note: this is the only location where we use tswap32() instead of max_nr_ports = s->serial.max_virtserial_ports;
* virtio_tswap32() because:
* - virtio_tswap32() only makes sense when the device is fully restored
* - the target endianness that was used to populate s->config is
* necessarly the default one
*/
max_nr_ports = tswap32(s->config.max_nr_ports);
for (i = 0; i < (max_nr_ports + 31) / 32; i++) { for (i = 0; i < (max_nr_ports + 31) / 32; i++) {
qemu_get_be32s(f, &ports_map); qemu_get_be32s(f, &ports_map);
@ -784,10 +779,9 @@ static void virtser_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent)
/* This function is only used if a port id is not provided by the user */ /* This function is only used if a port id is not provided by the user */
static uint32_t find_free_port_id(VirtIOSerial *vser) static uint32_t find_free_port_id(VirtIOSerial *vser)
{ {
VirtIODevice *vdev = VIRTIO_DEVICE(vser);
unsigned int i, max_nr_ports; unsigned int i, max_nr_ports;
max_nr_ports = virtio_tswap32(vdev, vser->config.max_nr_ports); max_nr_ports = vser->serial.max_virtserial_ports;
for (i = 0; i < (max_nr_ports + 31) / 32; i++) { for (i = 0; i < (max_nr_ports + 31) / 32; i++) {
uint32_t map, bit; uint32_t map, bit;
@ -848,7 +842,6 @@ static void virtser_port_device_realize(DeviceState *dev, Error **errp)
VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(dev); VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(dev);
VirtIOSerialPortClass *vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port); VirtIOSerialPortClass *vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port);
VirtIOSerialBus *bus = VIRTIO_SERIAL_BUS(qdev_get_parent_bus(dev)); VirtIOSerialBus *bus = VIRTIO_SERIAL_BUS(qdev_get_parent_bus(dev));
VirtIODevice *vdev = VIRTIO_DEVICE(bus->vser);
int max_nr_ports; int max_nr_ports;
bool plugging_port0; bool plugging_port0;
Error *err = NULL; Error *err = NULL;
@ -890,7 +883,7 @@ static void virtser_port_device_realize(DeviceState *dev, Error **errp)
} }
} }
max_nr_ports = virtio_tswap32(vdev, port->vser->config.max_nr_ports); max_nr_ports = port->vser->serial.max_virtserial_ports;
if (port->id >= max_nr_ports) { if (port->id >= max_nr_ports) {
error_setg(errp, "virtio-serial-bus: Out-of-range port id specified, " error_setg(errp, "virtio-serial-bus: Out-of-range port id specified, "
"max. allowed: %u", max_nr_ports - 1); "max. allowed: %u", max_nr_ports - 1);
@ -995,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;