qemu-trivial
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-trivial] [PATCH] migration: Remove unneeded NULL check from migrat


From: Peter Maydell
Subject: [Qemu-trivial] [PATCH] migration: Remove unneeded NULL check from migrate_fd_error()
Date: Fri, 21 Oct 2016 18:41:45 +0100

All the callers of migrate_fd_error() pass a non-NULL
error parameter, and if any did pass NULL then we would
segfault in error_copy(), so remove the unnecessary
NULL check earlier in the function.
(Spotted by Coverity.)

Signed-off-by: Peter Maydell <address@hidden>
---
This seems better than making migrate_fd_error() allow
a NULL pointer, which doesn't seem like a useful thing.
I'm guessing a bit though, because there's no doc comment
for this function in the header file...
---
 migration/migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index 4d417b7..d216b93 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -922,7 +922,7 @@ static void migrate_fd_cleanup(void *opaque)
 
 void migrate_fd_error(MigrationState *s, const Error *error)
 {
-    trace_migrate_fd_error(error ? error_get_pretty(error) : "");
+    trace_migrate_fd_error(error_get_pretty(error));
     assert(s->to_dst_file == NULL);
     migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
                       MIGRATION_STATUS_FAILED);
-- 
2.7.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]