| Message ID | 20200814160241.7915-9-pannengyuan@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix some error memleaks | expand |
Pan Nengyuan <pannengyuan@huawei.com> 于2020年8月14日周五 下午6:52写道： > > 'local_err' forgot to free in colo_process_incoming_thread error path. > Fix that. > > Reported-by: Euler Robot <euler.robot@huawei.com> > Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com> > --- > Cc: Hailiang Zhang <zhang.zhanghailiang@huawei.com> > Cc: Juan Quintela <quintela@redhat.com> > Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > --- > migration/colo.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/migration/colo.c b/migration/colo.c > index ea7d1e9d4e..17b5afc6b5 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -870,6 +870,7 @@ void *colo_process_incoming_thread(void *opaque) > replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); > if (local_err) { > qemu_mutex_unlock_iothread(); > + error_report_err(local_err); > goto out; > } > #else > @@ -882,6 +883,7 @@ void *colo_process_incoming_thread(void *opaque) > colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, > &local_err); > if (local_err) { > + error_report_err(local_err); > goto out; > } > Could we arrange 'error_report_err' in 'out' label? Like this: if (local_err) { error_report_err(local_err); } Thanks, Li Qiang > -- > 2.18.2 > >
On 2020/8/26 20:37, Li Qiang wrote: > Pan Nengyuan <pannengyuan@huawei.com> 于2020年8月14日周五 下午6:52写道： >> >> 'local_err' forgot to free in colo_process_incoming_thread error path. >> Fix that. >> >> Reported-by: Euler Robot <euler.robot@huawei.com> >> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com> >> --- >> Cc: Hailiang Zhang <zhang.zhanghailiang@huawei.com> >> Cc: Juan Quintela <quintela@redhat.com> >> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> >> --- >> migration/colo.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/migration/colo.c b/migration/colo.c >> index ea7d1e9d4e..17b5afc6b5 100644 >> --- a/migration/colo.c >> +++ b/migration/colo.c >> @@ -870,6 +870,7 @@ void *colo_process_incoming_thread(void *opaque) >> replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); >> if (local_err) { >> qemu_mutex_unlock_iothread(); >> + error_report_err(local_err); >> goto out; >> } >> #else >> @@ -882,6 +883,7 @@ void *colo_process_incoming_thread(void *opaque) >> colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, >> &local_err); >> if (local_err) { >> + error_report_err(local_err); >> goto out; >> } >> > > Could we arrange 'error_report_err' in 'out' label? > Like this: > > if (local_err) { > error_report_err(local_err); > } Similar to the other place in the same function, I didn't arrange them in 'out' label: while (mis->state == MIGRATION_STATUS_COLO) { colo_wait_handle_message(mis, fb, bioc, &local_err); if (local_err) { error_report_err(local_err); break; } But I think it's a good idea to arrange them in 'out' label. I will change it. Thanks. > > Thanks, > Li Qiang > > > >> -- >> 2.18.2 >> >> > . >
diff --git a/migration/colo.c b/migration/colo.c index ea7d1e9d4e..17b5afc6b5 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -870,6 +870,7 @@ void *colo_process_incoming_thread(void *opaque) replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); if (local_err) { qemu_mutex_unlock_iothread(); + error_report_err(local_err); goto out; } #else @@ -882,6 +883,7 @@ void *colo_process_incoming_thread(void *opaque) colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, &local_err); if (local_err) { + error_report_err(local_err); goto out; }
'local_err' forgot to free in colo_process_incoming_thread error path. Fix that. Reported-by: Euler Robot <euler.robot@huawei.com> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com> --- Cc: Hailiang Zhang <zhang.zhanghailiang@huawei.com> Cc: Juan Quintela <quintela@redhat.com> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> --- migration/colo.c | 2 ++ 1 file changed, 2 insertions(+)