[libvirt] [PATCH 1/2] qemu: fix nwfilter deadlock while reverting to snapshot

Pavel Hrdina posted 2 patches 7 years, 9 months ago
[libvirt] [PATCH 1/2] qemu: fix nwfilter deadlock while reverting to snapshot
Posted by Pavel Hrdina 7 years, 9 months ago
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/qemu/qemu_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b3f65f440d..0b549f20da 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15325,7 +15325,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
     virNWFilterReadLockFilterUpdates();
 
     if (!(vm = qemuDomObjFromSnapshot(snapshot)))
-        return -1;
+        goto cleanup;
 
     cfg = virQEMUDriverGetConfig(driver);
 
-- 
2.13.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 1/2] qemu: fix nwfilter deadlock while reverting to snapshot
Posted by Ján Tomko 7 years, 9 months ago
On Mon, Aug 07, 2017 at 04:31:30PM +0200, Pavel Hrdina wrote:
>Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
>---
> src/qemu/qemu_driver.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
>index b3f65f440d..0b549f20da 100644
>--- a/src/qemu/qemu_driver.c
>+++ b/src/qemu/qemu_driver.c
>@@ -15325,7 +15325,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
>     virNWFilterReadLockFilterUpdates();
>
>     if (!(vm = qemuDomObjFromSnapshot(snapshot)))
>-        return -1;
>+        goto cleanup;
>
>     cfg = virQEMUDriverGetConfig(driver);
>

ACK

Introduced by commit 41127244fb90f08cf5032a5d7553f5f0390d925e

Jan
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 1/2] qemu: fix nwfilter deadlock while reverting to snapshot
Posted by Pavel Hrdina 7 years, 9 months ago
On Mon, Aug 14, 2017 at 05:51:59PM +0200, Ján Tomko wrote:
> On Mon, Aug 07, 2017 at 04:31:30PM +0200, Pavel Hrdina wrote:
> > Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> > ---
> > src/qemu/qemu_driver.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> > index b3f65f440d..0b549f20da 100644
> > --- a/src/qemu/qemu_driver.c
> > +++ b/src/qemu/qemu_driver.c
> > @@ -15325,7 +15325,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
> >     virNWFilterReadLockFilterUpdates();
> > 
> >     if (!(vm = qemuDomObjFromSnapshot(snapshot)))
> > -        return -1;
> > +        goto cleanup;
> > 
> >     cfg = virQEMUDriverGetConfig(driver);
> > 
> 
> ACK
> 
> Introduced by commit 41127244fb90f08cf5032a5d7553f5f0390d925e

Sigh :) I was hoping that nobody finds out.  Anyway I've blamed myself
in the commit message and pushed it, thanks.

Pavel
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list