From patchwork Fri Jan 5 15:42:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 760192 Delivered-To: patch@linaro.org Received: by 2002:a5d:678d:0:b0:336:6142:bf13 with SMTP id v13csp107179wru; Fri, 5 Jan 2024 07:52:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrNFDe64jUK53aXK9fU1GBKUJAb0V4/clShNsLsmrWlUU7XyKZGHcVRTRgKx5hBSU9A1ID X-Received: by 2002:a37:c449:0:b0:781:5750:1c8b with SMTP id h9-20020a37c449000000b0078157501c8bmr2219259qkm.92.1704469962055; Fri, 05 Jan 2024 07:52:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704469962; cv=none; d=google.com; s=arc-20160816; b=EoIGm/2heUe4PllPGg0yIMVOfGCkxN/U3K4MjN4JhGfYFmqeykA5bvIdxKEKiRClMO gE+TRviS2NZS+6hBaB0g0NcY/gjljsLR7zRXpQ8OvykBipcmqxu1zkXQRI/hEZrw2PKE LBAO9mkZ2CTvOzWlZNyjs8FsruvSVGM8zfPJjubAdRO5iw7C4cWchCHiQ8JyMeJtmBkm /1efPON7EvdqyySZ5uj3iBzrHVzG7GFOjPMls8SDuQBwqk5u0SI4F6wjLm4PPRd9Bsua RvOrtnLseyhLLZ++uEM/rRXKlWYrrIAPvFbT5I/cMb4gxWlsvGA80+xr/XEIOP7fmsWX 2g4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c9DCMj7pY2pO17D+FqBvL8kwEDleUW00T3E/JGiYz/k=; fh=81NhLE2m/KZ6CtPYKaqP63dEzTQeY0b9aypae7xj+Rg=; b=xboZXWvzMU8EISw3iBUhYTIXEenhMTbZgpakjgV3n9MszNIXtQOgZ1sr5E6ogYhUNB 4DaPzmURRGtW7DnTDkJhYgMDsYneMOMQNoY7VuRkpMaeWspG7PKZTGy+gBUpZl+Ojz84 FLhIe22Gay2nmzsuecYpYDoQss0Z8e3EPX0qqiywneEVwrUaxnp4HH+yNjOa0UekEjiX l+cS8lG3mgCXVbfhv47tSg6vxr48bqdwCtUmHnJXFEH+Voj3k1qs2LLBQP16vGLTpBFG Njfi/GrrwErOBIqMgiV7Agl2qNo+gvc0/B7k7PJAx7SRktsnWe0t07pKfRvUO7h+irkO JqGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U54if9m0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id os47-20020a05620a812f00b007811ac158fasi1891661qkn.214.2024.01.05.07.52.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jan 2024 07:52:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U54if9m0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLmT2-0001mb-3l; Fri, 05 Jan 2024 10:50:44 -0500 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 1rLmRg-00076c-81 for qemu-devel@nongnu.org; Fri, 05 Jan 2024 10:49:17 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLmRO-00075k-OG for qemu-devel@nongnu.org; Fri, 05 Jan 2024 10:49:14 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40d8902da73so12882625e9.2 for ; Fri, 05 Jan 2024 07:48:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704469737; x=1705074537; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c9DCMj7pY2pO17D+FqBvL8kwEDleUW00T3E/JGiYz/k=; b=U54if9m0B4jYXM4rDTogAYwijQfmaWRbyeNV7pFxhFHddn9l0IDHgqC9Cilhz5VgDl bQn7UZX+V4CFJNfZFyhm7isRTf7+aIu9AXB1alsa3icILbPnLv1oyhOXMhzZlLSgi9Z4 BOIBinMngYba1t1jnPZP805CP73T5tad2dPqgWOzkksGNGezv2eUco/wmNgY5R9a5+Uf Mw9BuSBNuYOTc3qGMWOsOFjZwi/mP8UC7zcUgSnJnKoRS9LWQdnr5npbPDzoa6j4EkLG x32opXu7JdXwIg70Uivz7cchEEeQIGslAjeCFyDb0zRXUTRYb6/WZszJ0vKSj10N1atN ouFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704469737; x=1705074537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c9DCMj7pY2pO17D+FqBvL8kwEDleUW00T3E/JGiYz/k=; b=l9viSW/ap+y1D8WleuMeROaMG8xcMNKJ6p4BAn/GMO8S5HvS5r2KX4s11WbfMrWe+1 I4hsjBra6G5hmZGszb1Mg8Ye+3802BgakXM45Zx4Xz440sLt77/NBDUY2M9v/0AvBxiF IlKKxZUB33FKoBNVRU4iVvxzYzzuqWtCEwkGYwks8x76uw5201kzluz2dM3RqhSA+gkf dsWgyh1CKQdAVa17bj5/x5Udbql+5ewjPbN3cJvgkzvTEkfk5hvDe0yq10O++7bv9Fzv HF+w0h1TyNyuPGHT32Dnsxe/HDoJUN3KqUw/STvGCdgqGkBc1uTJkPydBFQar7NnSOxJ KEaA== X-Gm-Message-State: AOJu0Yxmyqh6hxQP8cy1GzTgjWVfGpnX82pSH5K+4aPx+QneG0bI7gMm dNu4wU/TPMHWiXtF2FTsRKSU2guukRHIgYTABDWgRtY1pR0= X-Received: by 2002:a05:600c:4a13:b0:40d:8ddc:b443 with SMTP id c19-20020a05600c4a1300b0040d8ddcb443mr1540873wmp.50.1704469737001; Fri, 05 Jan 2024 07:48:57 -0800 (PST) Received: from m1x-phil.lan (juv34-h02-176-184-26-1.dsl.sta.abo.bbox.fr. [176.184.26.1]) by smtp.gmail.com with ESMTPSA id az29-20020a05600c601d00b0040d87b5a87csm1965144wmb.48.2024.01.05.07.48.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 05 Jan 2024 07:48:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , Gavin Shan , Paolo Bonzini , David Hildenbrand Subject: [PULL 56/71] memory: Have memory_region_init_ram_from_fd() handler return a boolean Date: Fri, 5 Jan 2024 16:42:49 +0100 Message-ID: <20240105154307.21385-57-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240105154307.21385-1-philmd@linaro.org> References: <20240105154307.21385-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Following the example documented since commit e3fe3988d7 ("error: Document Error API usage rules"), have memory_region_init_ram_from_fd return a boolean indicating whether an error is set or not. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Xu Reviewed-by: Gavin Shan Message-Id: <20231120213301.24349-14-philmd@linaro.org> --- include/exec/memory.h | 4 +++- system/memory.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index c39819ec75..48c11ca743 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1406,8 +1406,10 @@ bool memory_region_init_ram_from_file(MemoryRegion *mr, * * Note that this function does not do anything to cause the data in the * RAM memory region to be migrated; that is the responsibility of the caller. + * + * Return: true on success, else false setting @errp with error. */ -void memory_region_init_ram_from_fd(MemoryRegion *mr, +bool memory_region_init_ram_from_fd(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, diff --git a/system/memory.c b/system/memory.c index e05d88aa67..9ceb229d28 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1633,7 +1633,7 @@ bool memory_region_init_ram_from_file(MemoryRegion *mr, return true; } -void memory_region_init_ram_from_fd(MemoryRegion *mr, +bool memory_region_init_ram_from_fd(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, @@ -1654,7 +1654,9 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->size = int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); + return false; } + return true; } #endif