ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-serial: Simplify virtio_serial_load() 

For all i, ports_map[i] is used in and only in the i-th iteration.
Replace the dynamic array by a scalar variable.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Markus Armbruster 2010-05-31 16:19:43 +02:00 committed by Aurelien Jarno
parent 81bf96d3d2
commit f83ccb3eab
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/virtio-serial-bus.c
View File

@ -492,8 +492,7 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id)
{ {
VirtIOSerial *s = opaque; VirtIOSerial *s = opaque;
VirtIOSerialPort *port; VirtIOSerialPort *port;
size_t ports_map_size; uint32_t max_nr_ports, nr_active_ports, ports_map;
uint32_t max_nr_ports, nr_active_ports, *ports_map;
unsigned int i; unsigned int i;
if (version_id > 2) { if (version_id > 2) {
@ -517,22 +516,17 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id)
return -EINVAL; return -EINVAL;
} }
ports_map_size = sizeof(uint32_t) * (max_nr_ports + 31) / 32;
ports_map = qemu_malloc(ports_map_size);
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[i]); qemu_get_be32s(f, &ports_map);
if (ports_map[i] != s->ports_map[i]) { if (ports_map != s->ports_map[i]) {
/* /*
* Ports active on source and destination don't * Ports active on source and destination don't
* match. Fail migration. * match. Fail migration.
*/ */
qemu_free(ports_map);
return -EINVAL; return -EINVAL;
} }
} }
qemu_free(ports_map);
qemu_get_be32s(f, &nr_active_ports); qemu_get_be32s(f, &nr_active_ports);