From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B05DEC7EE23 for ; Tue, 30 May 2023 12:34:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3ySy-0001Ts-PW; Tue, 30 May 2023 08:28:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3ySp-0001MT-SE for qemu-devel@nongnu.org; Tue, 30 May 2023 08:28:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3ySk-0000fy-0A for qemu-devel@nongnu.org; Tue, 30 May 2023 08:28:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685449707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M56eFowLFlHdg/kgdTQ9K+fHVrYtrKWrwr5Szf0KV1A=; b=RF0mKLiSoNj3uNSxEKSKxNcaUpTX86Way6lWtiG3JXnongvFFzR5tSZiCG7mfDNxVXIRum /41ccqOoyvYf729p25E0pwqmDg5lRl0Kj3UA7Yxp5lAyNyvprDpRLyrcQoZuwK+npWUAFZ FrXJHdjUTLLrBpJBUhuJi4qTludstO0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-81-fFGMcCe_OdKQ3UXrDHhH-g-1; Tue, 30 May 2023 08:28:23 -0400 X-MC-Unique: fFGMcCe_OdKQ3UXrDHhH-g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1ED1F101A52C; Tue, 30 May 2023 12:28:23 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 904C840CFD45; Tue, 30 May 2023 12:28:21 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Leonardo Bras , Hailiang Zhang , Peter Xu , Fam Zheng , Juan Quintela , Stefan Hajnoczi Subject: [PATCH 04/16] qemu-file: Don't call qemu_fflush() for read only files Date: Tue, 30 May 2023 14:28:01 +0200 Message-Id: <20230530122813.2674-5-quintela@redhat.com> In-Reply-To: <20230530122813.2674-1-quintela@redhat.com> References: <20230530122813.2674-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This was the only caller for read only files. So change the test for an assert in qemu_fflush(). Signed-off-by: Juan Quintela --- migration/qemu-file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 7a5c1a5e32..38984504ba 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -272,9 +272,7 @@ static void qemu_iovec_release_ram(QEMUFile *f) */ void qemu_fflush(QEMUFile *f) { - if (!qemu_file_is_writable(f)) { - return; - } + g_assert(qemu_file_is_writable(f)); if (qemu_file_get_error(f)) { return; @@ -363,7 +361,9 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f) int qemu_fclose(QEMUFile *f) { int ret, ret2; - qemu_fflush(f); + if (qemu_file_is_writable(f)) { + qemu_fflush(f); + } ret = qemu_file_get_error(f); ret2 = qio_channel_close(f->ioc, NULL); -- 2.40.1