From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-riscv@nongnu.org, qemu-arm@nongnu.org,
"Zhao Liu" <zhao1.liu@intel.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Jonathan Cameron" <jonathan.cameron@huawei.com>,
"Fan Ni" <fan.ni@samsung.com>
Subject: [PULL 12/22] hw/cxl/cxl-cdat: Make ct3_load_cdat() return boolean
Date: Thu, 25 Apr 2024 13:01:45 +0200 [thread overview]
Message-ID: <20240425110157.20328-13-philmd@linaro.org> (raw)
In-Reply-To: <20240425110157.20328-1-philmd@linaro.org>
From: Zhao Liu <zhao1.liu@intel.com>
As error.h suggested, the best practice for callee is to return
something to indicate success / failure.
So make ct3_load_cdat() return boolean, and this is the preparation for
cxl_doe_cdat_init() returning boolean.
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Message-ID: <20240418100433.1085447-2-zhao1.liu@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/cxl/cxl-cdat.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/cxl/cxl-cdat.c b/hw/cxl/cxl-cdat.c
index 551545f782..b3e496857a 100644
--- a/hw/cxl/cxl-cdat.c
+++ b/hw/cxl/cxl-cdat.c
@@ -111,7 +111,7 @@ static void ct3_build_cdat(CDATObject *cdat, Error **errp)
cdat->entry = g_steal_pointer(&cdat_st);
}
-static void ct3_load_cdat(CDATObject *cdat, Error **errp)
+static bool ct3_load_cdat(CDATObject *cdat, Error **errp)
{
g_autofree CDATEntry *cdat_st = NULL;
g_autofree uint8_t *buf = NULL;
@@ -127,11 +127,11 @@ static void ct3_load_cdat(CDATObject *cdat, Error **errp)
&file_size, &error)) {
error_setg(errp, "CDAT: File read failed: %s", error->message);
g_error_free(error);
- return;
+ return false;
}
if (file_size < sizeof(CDATTableHeader)) {
error_setg(errp, "CDAT: File too short");
- return;
+ return false;
}
i = sizeof(CDATTableHeader);
num_ent = 1;
@@ -139,19 +139,19 @@ static void ct3_load_cdat(CDATObject *cdat, Error **errp)
hdr = (CDATSubHeader *)(buf + i);
if (i + sizeof(CDATSubHeader) > file_size) {
error_setg(errp, "CDAT: Truncated table");
- return;
+ return false;
}
cdat_len_check(hdr, errp);
i += hdr->length;
if (i > file_size) {
error_setg(errp, "CDAT: Truncated table");
- return;
+ return false;
}
num_ent++;
}
if (i != file_size) {
error_setg(errp, "CDAT: File length mismatch");
- return;
+ return false;
}
cdat_st = g_new0(CDATEntry, num_ent);
@@ -185,6 +185,7 @@ static void ct3_load_cdat(CDATObject *cdat, Error **errp)
cdat->entry_len = num_ent;
cdat->entry = g_steal_pointer(&cdat_st);
cdat->buf = g_steal_pointer(&buf);
+ return true;
}
void cxl_doe_cdat_init(CXLComponentState *cxl_cstate, Error **errp)
--
2.41.0
next prev parent reply other threads:[~2024-04-25 11:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 11:01 [PULL 00/22] Misc HW patches for 2024-04-25 Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 01/22] qom: add default value Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 02/22] qmp: add dump machine type compatibility properties Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 03/22] python/qemu/machine: add method to retrieve QEMUMachine::binary field Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 04/22] scripts: add script to compare compatibility properties Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 05/22] hw/core: Remove check on NEED_CPU_H in tcg-cpu-ops.h Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 06/22] target/i386: Move APIC related code to cpu-apic.c Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 07/22] hw/misc/applesmc: Simplify DeviceReset handler Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 08/22] hw/misc/imx: Replace sprintf() by snprintf() Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 09/22] hw/riscv/virt: Replace sprintf by g_strdup_printf Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 10/22] hw: Fix problem with the A*MPCORE switches in the Kconfig files Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 11/22] hw: Add a Kconfig switch for the TYPE_CPU_CLUSTER device Philippe Mathieu-Daudé
2024-04-25 11:01 ` Philippe Mathieu-Daudé [this message]
2024-04-25 11:01 ` [PULL 13/22] hw/cxl/cxl-cdat: Make ct3_build_cdat() return boolean Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 14/22] hw/cxl/cxl-cdat: Make cxl_doe_cdat_init() " Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 15/22] hw/elf_ops: Rename elf_ops.h -> elf_ops.h.inc Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 16/22] hw/xtensa: Include missing 'exec/cpu-common.h' in 'bootparam.h' Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 17/22] hw/misc : Correct 5 spaces indents in stm32l4x5_exti Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 18/22] hw/i386/pc_sysfw: Remove unused parameter from pc_isa_bios_init() Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 19/22] hw/core/machine: Introduce the module as a CPU topology level Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 20/22] hw/core/machine: Support modules in -smp Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 21/22] hw/core: Introduce module-id as the topology subindex Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 22/22] hw/core: Support module-id in numa configuration Philippe Mathieu-Daudé
2024-04-26 2:40 ` [PULL 00/22] Misc HW patches for 2024-04-25 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425110157.20328-13-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=armbru@redhat.com \
--cc=fan.ni@samsung.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).