[libvirt] [PATCH] daemon: cleanup state drivers in order reverse to init order

Cole Robinson crobinso at redhat.com
Tue May 17 23:46:22 UTC 2016


On 05/17/2016 07:44 AM, Nikolay Shirokovskiy wrote:
> This patch aims to fix observed crash on daemon shutdown. Main thread is in
> the process of state drivers cleanup, network driver is cleaned up and
> qemu driver is not yet. Meanwhile eof event from qemu process triggers
> qemuProcessStop -> networkReleaseActualDevice and crash happens as
> network driver is already cleaned up.
> 
> Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy at virtuozzo.com>
> ---
>  src/libvirt.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/libvirt.c b/src/libvirt.c
> index 114e88c..d79fe75 100644
> --- a/src/libvirt.c
> +++ b/src/libvirt.c
> @@ -800,12 +800,12 @@ virStateInitialize(bool privileged,
>  int
>  virStateCleanup(void)
>  {
> -    size_t i;
> +    int r;
>      int ret = 0;
>  
> -    for (i = 0; i < virStateDriverTabCount; i++) {
> -        if (virStateDriverTab[i]->stateCleanup &&
> -            virStateDriverTab[i]->stateCleanup() < 0)
> +    for (r = virStateDriverTabCount - 1; r >= 0; r--) {
> +        if (virStateDriverTab[r]->stateCleanup &&
> +            virStateDriverTab[r]->stateCleanup() < 0)
>              ret = -1;
>      }
>      return ret;
> 

ACK, looks/sounds reasonable to me

- Cole




More information about the libvir-list mailing list