pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-30 09:46:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

char_device: Don't set active when stopped and don't access dev after unref

Browse Source 
2 closely related changes in one:
1) When leaving the read or write loop because the chardev has been stopped
active should not be updated. It has been set to FALSE by
spice_char_device_stop and should stay FALSE
2) The updating of dev->active should be done *before* unref-ing dev

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2013-03-29 10:07:26 +01:00
parent 3d775594b5
commit baa7cab700
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/char_device.c
View File

@ -320,8 +320,10 @@ static int spice_char_device_read_from_device(SpiceCharDeviceState *dev)
max_send_tokens--;
}
dev->during_read_from_device = 0;
if (dev->running) {
dev->active = dev->active || did_read;
}
spice_char_device_state_unref(dev);
dev->active = dev->active || did_read;
return did_read;
}
@ -475,9 +477,9 @@ static int spice_char_device_write_to_device(SpiceCharDeviceState *dev)
} else {
spice_assert(ring_is_empty(&dev->write_queue));
}
dev->active = dev->active || total;
}
spice_char_device_state_unref(dev);
dev->active = dev->active || total;
return total;
}