f375e62ad9
Fix libvirt + seccomp combo (bz #855162) Fix scsi hotplug crash (bz #879657) Fix QOM refcount crash (bz #881486)
33 lines
927 B
Diff
33 lines
927 B
Diff
From b7b94b6016b89bf698d661ce4fd22139e771a835 Mon Sep 17 00:00:00 2001
|
|
From: Orit Wasserman <owasserm@redhat.com>
|
|
Date: Mon, 24 Sep 2012 13:11:10 +0200
|
|
Subject: [PATCH] Clear handler only for valid fd
|
|
|
|
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
|
|
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
(cherry picked from commit 3202becaa2b805497ce9e6faa6edfb83665f91b1)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
migration.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/migration.c b/migration.c
|
|
index 1edeec5..22a05c4 100644
|
|
--- a/migration.c
|
|
+++ b/migration.c
|
|
@@ -240,7 +240,9 @@ static int migrate_fd_cleanup(MigrationState *s)
|
|
{
|
|
int ret = 0;
|
|
|
|
- qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
|
|
+ if (s->fd != -1) {
|
|
+ qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
|
|
+ }
|
|
|
|
if (s->file) {
|
|
DPRINTF("closing file\n");
|
|
--
|
|
1.8.0.2
|
|
|