From nobody Tue Feb 10 05:41:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=126.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547388690009373.3557647206212; Sun, 13 Jan 2019 06:11:30 -0800 (PST) Received: from localhost ([127.0.0.1]:43771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gigTz-0004Ba-Ti for importer@patchew.org; Sun, 13 Jan 2019 09:11:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gigRk-0002uJ-Mc for qemu-devel@nongnu.org; Sun, 13 Jan 2019 09:09:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gigRj-00031A-Vl for qemu-devel@nongnu.org; Sun, 13 Jan 2019 09:09:04 -0500 Received: from m50-110.126.com ([123.125.50.110]:42736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gigRj-0002vN-D5 for qemu-devel@nongnu.org; Sun, 13 Jan 2019 09:09:03 -0500 Received: from localhost.localdomain (unknown [122.14.241.95]) by smtp4 (Coremail) with SMTP id jdKowABnTrN1RjtcH+piAA--.2722S7; Sun, 13 Jan 2019 22:08:55 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=OfoeFZ3vl0gm+RMwHg rYS6AGK5vOmNAlVqpLbeEcNIE=; b=Ak6IaKMLFY8AKHWHlgPMoh1o62rBnUp/4X Y2qnpPcuY+/iUl61DIweoHLorcCurulolP9JVPXon+FHTXetgrPuXhkLFlBy7umH qQn8XLdZqvquKIpOQuFv0/+iwrBgt+Odo6c4DHeJvQ13ungSrVoT4zI7QY/mFfVN AsXhLoCMM= From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Sun, 13 Jan 2019 22:08:49 +0800 Message-Id: <20190113140849.38339-6-lifei1214@126.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20190113140849.38339-1-lifei1214@126.com> References: <20190113140849.38339-1-lifei1214@126.com> X-CM-TRANSID: jdKowABnTrN1RjtcH+piAA--.2722S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zr47KF1UCrWrWw4xJF43ZFb_yoW8tFW7pF yxW3s7Wa97WFy2qa13A397Zrn5Zw18Wa9rZrZxJr1SkrsxJF1jyw1UKryxXFZ5tr95t3yF 9FyqgasrGF4DArJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jB0P-UUUUU= X-Originating-IP: [122.14.241.95] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbi6xc7IVpD7gm3YgAAsN X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.110 Subject: [Qemu-devel] [PATCH for-4.0 5/5] migration: unify error handling for process_incoming_migration_co X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fei Li , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fei Li In the current code, if process_incoming_migration_co() fails we do the same error handing: set the error state, close the source file, do the cleanup for multifd, and then exit(EXIT_FAILURE). To make the code clearer, add a "goto fail" to unify the error handling. Cc: Dr. David Alan Gilbert Signed-off-by: Fei Li Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 5d322eb9d6..ded151b1bf 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -438,15 +438,13 @@ static void process_incoming_migration_co(void *opaqu= e) /* Make sure all file formats flush their mutable metadata */ bdrv_invalidate_cache_all(&local_err); if (local_err) { - migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, - MIGRATION_STATUS_FAILED); error_report_err(local_err); - exit(EXIT_FAILURE); + goto fail; } =20 if (colo_init_ram_cache() < 0) { error_report("Init ram cache failed"); - exit(EXIT_FAILURE); + goto fail; } =20 qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming", @@ -461,20 +459,22 @@ static void process_incoming_migration_co(void *opaqu= e) } =20 if (ret < 0) { - Error *local_err =3D NULL; - - migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, - MIGRATION_STATUS_FAILED); error_report("load of migration failed: %s", strerror(-ret)); - qemu_fclose(mis->from_src_file); - if (multifd_load_cleanup(&local_err) !=3D 0) { - error_report_err(local_err); - } - exit(EXIT_FAILURE); + goto fail; } mis->bh =3D qemu_bh_new(process_incoming_migration_bh, mis); qemu_bh_schedule(mis->bh); mis->migration_incoming_co =3D NULL; + return; +fail: + local_err =3D NULL; + migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_FAILED); + qemu_fclose(mis->from_src_file); + if (multifd_load_cleanup(&local_err) !=3D 0) { + error_report_err(local_err); + } + exit(EXIT_FAILURE); } =20 static void migration_incoming_setup(QEMUFile *f) --=20 2.17.2 (Apple Git-113)