From patchwork Fri Jan 5 15:42:48 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: 760198 Delivered-To: patch@linaro.org Received: by 2002:a5d:678d:0:b0:336:6142:bf13 with SMTP id v13csp107607wru; Fri, 5 Jan 2024 07:53:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHwi1pQFknAYW6kTfU/k0QWaalXPm6Gdeq45JzpPGFIDAiBYHIxg7ZMgsEYObRSIQ1efrsZ X-Received: by 2002:a05:622a:4cf:b0:427:a6c3:ec1d with SMTP id q15-20020a05622a04cf00b00427a6c3ec1dmr2224680qtx.90.1704470013266; Fri, 05 Jan 2024 07:53:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704470013; cv=none; d=google.com; s=arc-20160816; b=UF6sKdwwWczM4qR4rwemQRtDWqV9YWdAE3TMAdiKcG9+uIsGnYxuMujTxNnifr4u5N vzL/iApcMPCufPGy2KuVY7OACAa8Y9eKA/xHHF+/CST4B/Jc3HLuLCY40yEU25NNGI20 WMO0MKZ0Eh3fK2dXmn83adfTDJnbw+w40YiJjDu5nEd5nJFHmAgUC5b+NmfNjiuaOhOo piT5otqL7N3ytVXDXSGAxT5EqyUTOAdsUcrDplcqsPbysUwRHAkRHvBIJlzISLnldpfB eTncidOixMOmPgQykGFJQhAG+Xdw02cf0Jr90ZGcvpjv5H7w0oaHZWRVq5xGn8Y9zWxC 3+kQ== 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=Dn8kXCOFTNbdwpGvjXbfKLmnnB9Pg2Sf7+jbS80Xsv4=; fh=81NhLE2m/KZ6CtPYKaqP63dEzTQeY0b9aypae7xj+Rg=; b=0ukp/GOWXJuizAJls3WR6AjI5KlVWCkKirqxF/1kW1jhS3Ztrq7+TrnotTbhV/90VW dxgUKZoien8oTcW6asSr9Ikfwf6T7o5PK1ALKkcgYNkV5ZN5Zi5p3kFI4H3176ppPC8+ rEUJTQ//55TG7WhgMLH2ptDzmEtcqmhvfYbz180qviANrYEsSyOpwgqCNHZAvRmmulAN F2z+N8Hjm7C9sSEtgGSvtTH+hZm38r67o6IupJZXqUirkgkkb6jJbs+6qp7NehzUR/y4 /ELsHlt8uE/ec9bjz/YF3bncUUG2zy5vbWbYhigdj6r7LMNof65jvGuW5nJmVC5Vta0b b+dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yNiFcMBI; 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 v16-20020ac85790000000b004297595bc29si1973318qta.488.2024.01.05.07.53.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jan 2024 07:53:33 -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=yNiFcMBI; 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 1rLmSB-0007vn-Ny; Fri, 05 Jan 2024 10:49:48 -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 1rLmRN-0004lj-F1 for qemu-devel@nongnu.org; Fri, 05 Jan 2024 10:48:57 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLmRJ-0006pj-IN for qemu-devel@nongnu.org; Fri, 05 Jan 2024 10:48:57 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40d3c4bfe45so14948575e9.1 for ; Fri, 05 Jan 2024 07:48:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704469731; x=1705074531; 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=Dn8kXCOFTNbdwpGvjXbfKLmnnB9Pg2Sf7+jbS80Xsv4=; b=yNiFcMBIatYGftSM5AGjnqdqSpfEHnDy0FfkdPfkcA3QBAZqmMnGBqeBzlsFTr2uQA IhgxgWfVc9rCH7BBJTfpjlcrVGgw0l64eNy4TFI6L+8I+jpZV06K1GBtBYD98GkLEAXD qGT4HFCkKhvspbG5gm8GeP1CNPhSg9oX84gGMvSZl0n2UpdFYLMSLsMXCBtO0xGQnLut tYxq82Ldsg2P2ZwEwx3Tun/iuoVrz3Jp3iAtvaq4GRvpFtqJOf6FslqMHWfk7owGRQXb yVrdQQ6UKNKEmnCA18hpoqfl0yZKMi8BZCHQApcWUegyXfVju59biFNGDKnT3l6a/Td5 mJbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704469731; x=1705074531; 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=Dn8kXCOFTNbdwpGvjXbfKLmnnB9Pg2Sf7+jbS80Xsv4=; b=VE/s0+bCtObAlYZsoMQPINfnCZdVah/KZvIfMpuoXaCDla6G23uAK1yU4MkEbjquKZ A6logmrJONtdx+MGoWUF89gT+paxFnLn7urbNWNHGdoCaJo2Q+uDWhK5H1EhBSRw5sW+ ZEJ2mwDZJaSXtNPBnsm/Y8S3KhhqGi3lhi/TvSEo3NW34fuoC6eyPJVLP30dayaFL8y2 TLmnMJBH219IKSfyESFB4YvvDJHgQXdiItUYhmzVp3WjBHb+R6HUIJwsbO+GMtyEJdoG 8NQq0Kpye8NM7szhmHR3clKxK4AZHRlS0k4LAx96O01YK5Ja85MEVIvd5opYWg8tYg9m 6SRQ== X-Gm-Message-State: AOJu0Ywp9xYd7vTAvta3U0exKBLDWETCKp/JgOxL7IlMUUmHY7MSvV91 XGlkP1sXMIJis02hnRsSOBQlkGTOZdzwKV0wvFd/pj4zvLw= X-Received: by 2002:a05:600c:5188:b0:40e:375f:6929 with SMTP id fa8-20020a05600c518800b0040e375f6929mr311928wmb.40.1704469731598; Fri, 05 Jan 2024 07:48:51 -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 s7-20020a5d6a87000000b0033680f7be5fsm1610144wru.87.2024.01.05.07.48.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 05 Jan 2024 07:48:51 -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 55/71] memory: Have memory_region_init_ram_from_file() handler return a boolean Date: Fri, 5 Jan 2024 16:42:48 +0100 Message-ID: <20240105154307.21385-56-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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, RCVD_IN_DNSWL_NONE=-0.0001, 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_file 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-13-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 faddf8f073..c39819ec75 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1376,8 +1376,10 @@ bool memory_region_init_resizeable_ram(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_file(MemoryRegion *mr, +bool memory_region_init_ram_from_file(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, diff --git a/system/memory.c b/system/memory.c index 75303484e1..e05d88aa67 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1605,7 +1605,7 @@ bool memory_region_init_resizeable_ram(MemoryRegion *mr, } #ifdef CONFIG_POSIX -void memory_region_init_ram_from_file(MemoryRegion *mr, +bool memory_region_init_ram_from_file(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, @@ -1628,7 +1628,9 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, mr->size = int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); + return false; } + return true; } void memory_region_init_ram_from_fd(MemoryRegion *mr,