On Sun, Dec 18, 2011 at 11:32:26AM +0100, Hans de Goede wrote:
> Currently when the main channel disconnects while a spicevmc channel
> (such as a usbredir channel) is still connected, qemu will abort with the
> following message:
> ring_remove: ASSERT item->next != NULL && item->prev != NULL failed
>
> This is caused by red_client_destroy() first calling:
> rcc->channel->client_cbs.disconnect(rcc);
> And then calling:
> red_channel_client_destroy(rcc);
>
> For each channel. This is fine, but the spicevmc disconnect code does a
> red_channel_client_destroy(rcc) itself since as usb devices are added
> / removed, the channels carrying their traffic get connected / disconnected
> and they get re-used for new devices, which won't work if the old channel is
> still there when the new connection comes in.
>
> This patch fixes the double destroy when there are still spicevmc channels
> connected by not doing the red_channel_client_destroy from the spicevmc
> disconnect code when not just the channel, but the entire client is
> disconnecting.
>
Looks like the right thing.
ACK.
> Signed-off-by: Hans de Goede <hdego...@redhat.com>
> ---
> server/spicevmc.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/server/spicevmc.c b/server/spicevmc.c
> index 8580984..b1a7d8d 100644
> --- a/server/spicevmc.c
> +++ b/server/spicevmc.c
> @@ -99,7 +99,11 @@ static void
> spicevmc_red_channel_client_on_disconnect(RedChannelClient *rcc)
> sin = state->chardev_sin;
> sif = SPICE_CONTAINEROF(sin->base.sif, SpiceCharDeviceInterface, base);
>
> - red_channel_client_destroy(rcc);
> + /* Don't destroy the rcc if the entire client is disconnecting, as then
> + red_client_destroy will already do this! */
> + if (!rcc->client->disconnecting)
> + red_channel_client_destroy(rcc);
> +
> state->rcc = NULL;
> if (sif->state) {
> sif->state(sin, 0);
> --
> 1.7.7.4
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
