From nobody Mon Feb 9 09:29:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594662815; cv=none; d=zohomail.com; s=zohoarc; b=GJMpivOT7zuvx2gzc12U8l+c1tLv+/CV3WFpJ3tJcHJGArtt8g4aXCA1zV+erngUbNqGFLr1rcu8fkBoGQ58wD2bL1pbgq5xWIvJXfrSPtJ3eZXqNZ7c8b2Vc96zpr2pjef13GknHCH+/VUwj2dOcrIPMaKHEQB4r7+2GydSeEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594662815; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nB/uzKuZZDiL83rkEbZGDB7cJ1ANtuAgCpQb5NzfACg=; b=nDySSNQiQw5M11RdUciPp7Ty1qB+OcaINHU9NqUfVQrIuI4lFuGXhU0dhjmnxTFKzPGrlNBpFwyINoTkra2T1omJ3hBWxlLonP0nO8nR91jSbVOlTkzQmQ7MUXzC6wnWmwVBcMEE2c6WDuza4EsHktTEPnrqpGn5FyPfzwAuDSM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594662815806860.7738833916534; Mon, 13 Jul 2020 10:53:35 -0700 (PDT) Received: from localhost ([::1]:55728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jv2dy-0006nO-BE for importer@patchew.org; Mon, 13 Jul 2020 13:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jv2ci-0005Wp-8Z for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22365 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jv2cf-0007R8-Qa for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:15 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-N5pqc-jHM1eUFvLaE6TTHA-1; Mon, 13 Jul 2020 13:52:11 -0400 Received: by mail-wm1-f69.google.com with SMTP id g187so318460wme.0 for ; Mon, 13 Jul 2020 10:52:10 -0700 (PDT) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id 59sm26487390wrj.37.2020.07.13.10.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594662733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nB/uzKuZZDiL83rkEbZGDB7cJ1ANtuAgCpQb5NzfACg=; b=ZFqZlXyVIxSMIf8Uh/mIL3BJfNoanUf9NdkA9iS46o2zSqiy7hiGS0VrqS4MrCHNam0VHg A5p3GgJzX972Fw9xQLyHleIBj1E8kUqbgWPBwVBDgUrSAx3e50/sIpKjWFwoAY6Hkf/d6+ 5hLWL5xbWVjFtE/+NLmCBl8s8/SKqyY= X-MC-Unique: N5pqc-jHM1eUFvLaE6TTHA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nB/uzKuZZDiL83rkEbZGDB7cJ1ANtuAgCpQb5NzfACg=; b=rw16p2O1otrCL10aODe2A7JkSOjO/05FWwIyTWsK/VLiacF/WiXfdZWyIzUqEz5u7Q jWNm9Iuw4jXgpsiBeNpxU0KIJZCjGTs1kb5K/Lq4S3mwjzbBFnuaUstFGtRT0bNpdEzc Kc5O3P5yepERbNRF5F1g+4wX1+Zj2a40mBAOp8KX7PGy3CyjyyXCskdwNYZZx9zlPkMA teYyxRRgej0okM+fLArGScZoFdhHgrWXcM8RlbvQEOO7DSQzTXWtKsyb4HL8GiATebTp Loc4pRWEZ5PyWDNLXJEoKaAQSpZiBkigLSTiEA25SGebcLZeBeWNM81ay3MKfFykEpby riRQ== X-Gm-Message-State: AOAM532ythVsPceMhMxoeOnRRv79zH0cOuO3XEHU88YSmhHMlbomF+Me A+Cil55xvZsCyjP4eKTS0ZJeqMdDUxWsWJxNYAFqV2/2U0bK/NkbXev3WpZa9DwabIq1rcGxweh JKrQh5vFb+hH5KXk= X-Received: by 2002:a5d:4b84:: with SMTP id b4mr606792wrt.334.1594662729652; Mon, 13 Jul 2020 10:52:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3i7CYXMEjudRRHopEweLyKQtciLOLpG/Mt0bGReR2KqW7O8VM4uniPuVNgVFZ4n82n9VbkA== X-Received: by 2002:a5d:4b84:: with SMTP id b4mr606768wrt.334.1594662729406; Mon, 13 Jul 2020 10:52:09 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 1/3] migration: fix memory leak in qmp_migrate_set_parameters Date: Mon, 13 Jul 2020 19:52:04 +0200 Message-Id: <20200713175206.13659-2-quintela@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200713175206.13659-1-quintela@redhat.com> References: <20200713175206.13659-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=quintela@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 02:19:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: HaiLiang , Juan Quintela , "Dr. David Alan Gilbert" , Zheng Chuan , quintela@trasno.org, KeQian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Zheng Chuan "tmp.tls_hostname" and "tmp.tls_creds" allocated by migrate_params_test_app= ly() is forgot to free at the end of qmp_migrate_set_parameters(). Fix that. The leak stack: Direct leak of 2 byte(s) in 2 object(s) allocated from: #0 0xffffb597c20b in __interceptor_malloc (/usr/lib64/libasan.so.4+0xd32= 0b) #1 0xffffb52dcb1b in g_malloc (/usr/lib64/libglib-2.0.so.0+0x58b1b) #2 0xffffb52f8143 in g_strdup (/usr/lib64/libglib-2.0.so.0+0x74143) #3 0xaaaac52447fb in migrate_params_test_apply (/usr/src/debug/qemu-4.1.= 0/migration/migration.c:1377) #4 0xaaaac52fdca7 in qmp_migrate_set_parameters (/usr/src/debug/qemu-4.1= .0/qapi/qapi-commands-migration.c:192) #5 0xaaaac551d543 in qmp_dispatch (/usr/src/debug/qemu-4.1.0/qapi/qmp-di= spatch.c:165) #6 0xaaaac52a0a8f in qmp_dispatch (/usr/src/debug/qemu-4.1.0/monitor/qmp= .c:125) #7 0xaaaac52a1c7f in monitor_qmp_dispatch (/usr/src/debug/qemu-4.1.0/mon= itor/qmp.c:214) #8 0xaaaac55cb0cf in aio_bh_call (/usr/src/debug/qemu-4.1.0/util/async.c= :117) #9 0xaaaac55d4543 in aio_bh_poll (/usr/src/debug/qemu-4.1.0/util/aio-pos= ix.c:459) #10 0xaaaac55cae0f in aio_dispatch (/usr/src/debug/qemu-4.1.0/util/async= .c:268) #11 0xffffb52d6a7b in g_main_context_dispatch (/usr/lib64/libglib-2.0.so= .0+0x52a7b) #12 0xaaaac55d1e3b(/usr/bin/qemu-kvm-4.1.0+0x1622e3b) #13 0xaaaac4e314bb(/usr/bin/qemu-kvm-4.1.0+0xe824bb) #14 0xaaaac47f45ef(/usr/bin/qemu-kvm-4.1.0+0x8455ef) #15 0xffffb4bfef3f in __libc_start_main (/usr/lib64/libc.so.6+0x23f3f) #16 0xaaaac47ffacb(/usr/bin/qemu-kvm-4.1.0+0x850acb) Direct leak of 2 byte(s) in 2 object(s) allocated from: #0 0xffffb597c20b in __interceptor_malloc (/usr/lib64/libasan.so.4+0xd32= 0b) #1 0xffffb52dcb1b in g_malloc (/usr/lib64/libglib-2.0.so.0+0x58b1b) #2 0xffffb52f8143 in g_strdup (/usr/lib64/libglib-2.0.so.0+0x74143) #3 0xaaaac5244893 in migrate_params_test_apply (/usr/src/debug/qemu-4.1.= 0/migration/migration.c:1382) #4 0xaaaac52fdca7 in qmp_migrate_set_parameters (/usr/src/debug/qemu-4.1= .0/qapi/qapi-commands-migration.c:192) #5 0xaaaac551d543 in qmp_dispatch (/usr/src/debug/qemu-4.1.0/qapi/qmp-di= spatch.c) #6 0xaaaac52a0a8f in qmp_dispatch (/usr/src/debug/qemu-4.1.0/monitor/qmp= .c:125) #7 0xaaaac52a1c7f in monitor_qmp_dispatch (/usr/src/debug/qemu-4.1.0/mon= itor/qmp.c:214) #8 0xaaaac55cb0cf in aio_bh_call (/usr/src/debug/qemu-4.1.0/util/async.c= :117) #9 0xaaaac55d4543 in aio_bh_poll (/usr/src/debug/qemu-4.1.0/util/aio-pos= ix.c:459) #10 0xaaaac55cae0f in in aio_dispatch (/usr/src/debug/qemu-4.1.0/util/as= ync.c:268) #11 0xffffb52d6a7b in g_main_context_dispatch (/usr/lib64/libglib-2.0.so= .0+0x52a7b) #12 0xaaaac55d1e3b(/usr/bin/qemu-kvm-4.1.0+0x1622e3b) #13 0xaaaac4e314bb(/usr/bin/qemu-kvm-4.1.0+0xe824bb) #14 0xaaaac47f45ef (/usr/bin/qemu-kvm-4.1.0+0x8455ef) #15 0xffffb4bfef3f in __libc_start_main (/usr/lib64/libc.so.6+0x23f3f) #16 0xaaaac47ffacb(/usr/bin/qemu-kvm-4.1.0+0x850acb) Signed-off-by: Chuan Zheng Reviewed-by: KeQian Zhu Reviewed-by: HaiLiang Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 4e658c397e..08519de56f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1343,12 +1343,12 @@ static void migrate_params_test_apply(MigrateSetPar= ameters *params, =20 if (params->has_tls_creds) { assert(params->tls_creds->type =3D=3D QTYPE_QSTRING); - dest->tls_creds =3D g_strdup(params->tls_creds->u.s); + dest->tls_creds =3D params->tls_creds->u.s; } =20 if (params->has_tls_hostname) { assert(params->tls_hostname->type =3D=3D QTYPE_QSTRING); - dest->tls_hostname =3D g_strdup(params->tls_hostname->u.s); + dest->tls_hostname =3D params->tls_hostname->u.s; } =20 if (params->has_max_bandwidth) { --=20 2.25.4 From nobody Mon Feb 9 09:29:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594662926; cv=none; d=zohomail.com; s=zohoarc; b=bI2LZyALgwppVOFvTXVQtRQF9T4y9A96N9UbY3LIvI42S1shyYs36ySWxiw2m2HOMiJ5btwz5Sp7tS4QKBjJ+5dSFvTdXk1yNRsG0d2MXx4seIcAExpZodjnLkGCXLU2t9SpVMgzKX1crDdfwcWSo4DIwjNjGEHZcUA3AdrXCxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594662926; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yfIb0WoSohr36CI5PC7CR58EVtgqFNPY3VFIqPoN2Bk=; b=AuVp+BoVVKxHfBvQ2miejMO/YRLmwK2Mba0jGjnf10a2bonZD72kjK6+82QWEffWvbc4sHiTyOqAoDrO2ys7V9VceAGmfu0FBPJ3dy31lHcLQr99r3ve15A5F7wJmSeakHWyFLsJHO6Jy0BXloSp21zQvCWjuHHr6fl0csTnec4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594662926926937.6226968552942; Mon, 13 Jul 2020 10:55:26 -0700 (PDT) Received: from localhost ([::1]:32812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jv2fl-0000cH-LP for importer@patchew.org; Mon, 13 Jul 2020 13:55:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jv2ci-0005X6-Fd for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:16 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:60964 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jv2cg-0007RH-Ku for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:16 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-Ia-HrFD1Nfm1t5ogk9_9Yg-1; Mon, 13 Jul 2020 13:52:12 -0400 Received: by mail-wm1-f69.google.com with SMTP id f68so378990wmf.1 for ; Mon, 13 Jul 2020 10:52:12 -0700 (PDT) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id o9sm24308346wrs.1.2020.07.13.10.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594662733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yfIb0WoSohr36CI5PC7CR58EVtgqFNPY3VFIqPoN2Bk=; b=YfJ5z18aVeJMuzoV4UnSh76FjT5HrU2gqf3h1KyBcV6gP180c1cI4Vz42KikZcM78Qnbn6 bQKq3NAaSMMpY5R/Y7cVFE6k67dRMk/M65QEJim5iP+I6MVa50Xg63urLtp+rrim4XyyRc 6IQi0PIaYZN4LZHjzWzjEfjUs6Yq/lk= X-MC-Unique: Ia-HrFD1Nfm1t5ogk9_9Yg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yfIb0WoSohr36CI5PC7CR58EVtgqFNPY3VFIqPoN2Bk=; b=P90DZpZ4zZ/Afak/kEt000Glyvt5n0J3YcKKeb6Ac6LXrgV9UQzIb7O6pSJD+rWd6w LuLpjCc8wH8KFVkY12LRtcoGjdMfKUvvbYaHkz7DcNWaTiHF2gT6qi8elCZ8EqVQps7d hsUNNVo880I+twFVvr/Kb2F7BglCpaLV8cZwYWp2AsSOjfJtXOuqY/U6h0lx2LnkKr6N YAF/QjylC1mrZFCILjE6MoKEv80d/EmWHHpEQkJgq04No2F7qI+goZJ8ljnv8SiWcu5U gtRquSaVviXo5YlTnmBoK7MdBpOaWI8MQ2WIR2t8k9Y7GiBSqsmlKwjFJom1NY2Zaik3 aVDw== X-Gm-Message-State: AOAM530fMLBMCflLc9ziJ7bm8sW0p4epsG8fz9gL7IiqsWmw6X1TF8ko buF3kR2yzQQnlKTMjlgPbC8gLi0e8juxRcnXN9Jh05ee462xArbQ3OGCqme+uOY+RjfLJkuvLOY M0w7DwFOU1OoqpjA= X-Received: by 2002:a1c:7d85:: with SMTP id y127mr534972wmc.181.1594662731086; Mon, 13 Jul 2020 10:52:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8ZHSSxvUnW14VOVhay51BUI2J9kmtKvDzwiwHAWmvd3Kl5O/n3T8iGVZTiuIufJoh3yKtYQ== X-Received: by 2002:a1c:7d85:: with SMTP id y127mr534951wmc.181.1594662730918; Mon, 13 Jul 2020 10:52:10 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 2/3] migration/savevm: respect qemu_fclose() error code in save_snapshot() Date: Mon, 13 Jul 2020 19:52:05 +0200 Message-Id: <20200713175206.13659-3-quintela@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200713175206.13659-1-quintela@redhat.com> References: <20200713175206.13659-1-quintela@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 02:19:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , Vladimir Sementsov-Ogievskiy , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Denis Plotnikov , quintela@trasno.org, Stefan Hajnoczi , "Denis V. Lunev" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: "Denis V. Lunev" qemu_fclose() could return error, f.e. if bdrv_co_flush() will return the error. This validation will become more important once we will start waiting of asynchronous IO operations, started from bdrv_write_vmstate(), which are coming soon. Signed-off-by: Denis V. Lunev Reviewed-by: "Dr. David Alan Gilbert" Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Juan Quintela CC: Kevin Wolf CC: Max Reitz CC: Stefan Hajnoczi CC: Fam Zheng CC: Juan Quintela CC: Denis Plotnikov Signed-off-by: Juan Quintela --- migration/savevm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6e01724605..45c9dd9d8a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2635,7 +2635,7 @@ int save_snapshot(const char *name, Error **errp) { BlockDriverState *bs, *bs1; QEMUSnapshotInfo sn1, *sn =3D &sn1, old_sn1, *old_sn =3D &old_sn1; - int ret =3D -1; + int ret =3D -1, ret2; QEMUFile *f; int saved_vm_running; uint64_t vm_state_size; @@ -2719,10 +2719,14 @@ int save_snapshot(const char *name, Error **errp) } ret =3D qemu_savevm_state(f, errp); vm_state_size =3D qemu_ftell(f); - qemu_fclose(f); + ret2 =3D qemu_fclose(f); if (ret < 0) { goto the_end; } + if (ret2 < 0) { + ret =3D ret2; + goto the_end; + } =20 /* The bdrv_all_create_snapshot() call that follows acquires the AioCo= ntext * for itself. BDRV_POLL_WHILE() does not support nested locking beca= use --=20 2.25.4 From nobody Mon Feb 9 09:29:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594662815; cv=none; d=zohomail.com; s=zohoarc; b=K0qKeby18Szxe+cEAvEcgVZpzbu1UUZr45gfdJcz+fzPFcYBKcVARNCIkyxMLzV+MNUu8yYte3CJ2fPDvy1tzYNrE8wkuAif5bXkniVle9fZ07YSqr+xcviMMdqddD0/AJqo1yN3SHGAZSOK2/W9FiywYRyWJo7sa1zucnzc2yI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594662815; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FSXs5uHMzPA+HV1XAvpWMRauXPt+1ol/OUGDFgw63qY=; b=h8hry04KnKkV1gqQ5txvnnTGCgSV4K34LfvrQkR4CXb4+esFuJNpuAzxz4z1ghWI4NBDwMyMy4x3oW1dOuExWJrvPtpjFaUSQBMM3DIlsXVwP0h6QTg8D8IX50y0vKAwoua1X3ndZLjf17FaGanxysYXRx4ulMeDsGmTZmLcF8k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594662815937234.52990099461385; Mon, 13 Jul 2020 10:53:35 -0700 (PDT) Received: from localhost ([::1]:55806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jv2dy-0006pL-Ly for importer@patchew.org; Mon, 13 Jul 2020 13:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jv2cj-0005Xp-I2 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:17 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:49455 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jv2ci-0007Rj-2N for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:17 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-193-YDGEhIfXOiqhMMwsyt0rHA-1; Mon, 13 Jul 2020 13:52:13 -0400 Received: by mail-wr1-f71.google.com with SMTP id j5so18269347wro.6 for ; Mon, 13 Jul 2020 10:52:13 -0700 (PDT) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id p29sm442463wmi.43.2020.07.13.10.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594662735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSXs5uHMzPA+HV1XAvpWMRauXPt+1ol/OUGDFgw63qY=; b=hjYGd63wYiB9YJBr6soR/7tHfETAp92aA2L8CtJeqRgboOcw4sNbOJbFxw+7efDzKYsdcU JRo9tL+zVWEbeB3JJeDF0JX5Iz8QDjOJkQ9HmO+vUVOYlrYz+XmMmVCY+PgElJzihpwiVY jxN5SfB1BOzW6Zw1WNcrHk///sOAuuE= X-MC-Unique: YDGEhIfXOiqhMMwsyt0rHA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FSXs5uHMzPA+HV1XAvpWMRauXPt+1ol/OUGDFgw63qY=; b=WVZwF/wsgywfm4jugieoN+bRD2tWBqRzCKRBRROsMTJZJMoQpX6AQrb91pb7TENXp8 AmSktlavcsNXxs4XEjxNrG4mjDYaYGz/b6PeaIW6wOzoy2REzJWppf8+WugjbejLfpBD tiN0uRs1RdKzKjrhbqUTLznPYoVwx48p5UVhKLq/sh4hn/UMgSBjY/RjKysUnktgPfsp xUrwfe64qlmCisuudVyUG1RrMslGPnc0yWadMT83MHAIQU/b0rGeShZz9Y/9km2hXnCp 96KfGJS1t46KGMOcwomeLZi7rwJGYQF+lUPPdG5y/xsqNdTuLg9pCiRtdddxvIpF8NV6 XXsg== X-Gm-Message-State: AOAM530k2P9/OLz22sfyX6qXUB8Qa4+3Csk7WVsumhG9yj1ERp6gO2ci yf08UmTkN4qdlih5DRkunphAl9SOzg0J5n+36+5xEzqgJMDsimnbkg/N0rqC/0RMA8Y2tzjcGtW AlxSyvOq5sUNUhkw= X-Received: by 2002:adf:e944:: with SMTP id m4mr611462wrn.252.1594662732594; Mon, 13 Jul 2020 10:52:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP7rPlRlUnk2sAaeqLgtKS1lklCmWrKjUzqz7luoyBtXeMzc3dhGDr7Bsbje1lRNpcEinWMg== X-Received: by 2002:adf:e944:: with SMTP id m4mr611446wrn.252.1594662732390; Mon, 13 Jul 2020 10:52:12 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 3/3] migration/migration.c: Remove superfluous breaks Date: Mon, 13 Jul 2020 19:52:06 +0200 Message-Id: <20200713175206.13659-4-quintela@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200713175206.13659-1-quintela@redhat.com> References: <20200713175206.13659-1-quintela@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 02:19:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yi Wang , Thomas Huth , Juan Quintela , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , quintela@trasno.org, Liao Pingfang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Liao Pingfang Remove superfluous breaks, as there is a "return" before them. Signed-off-by: Liao Pingfang Signed-off-by: Yi Wang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Juan Quintela Reviewed-by: Thomas Huth Signed-off-by: Juan Quintela --- migration/migration.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 08519de56f..2ed9923227 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -986,7 +986,6 @@ static void fill_source_migration_info(MigrationInfo *i= nfo) /* no migration has happened ever */ /* do not overwrite destination migration status */ return; - break; case MIGRATION_STATUS_SETUP: info->has_status =3D true; info->has_total_time =3D false; @@ -1105,7 +1104,6 @@ static void fill_destination_migration_info(Migration= Info *info) switch (mis->state) { case MIGRATION_STATUS_NONE: return; - break; case MIGRATION_STATUS_SETUP: case MIGRATION_STATUS_CANCELLING: case MIGRATION_STATUS_CANCELLED: --=20 2.25.4