OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/cxl/cxl-cdat: Fix type of buf in ct3_load_cdat()

Browse Source 
When setting GLIB_VERSION_MAX_ALLOWED to GLIB_VERSION_2_58 or higher
(which we'll certainly do in the not too distant future), glib adds
type safety checks to the g_steal_pointer() macro. This trigger an
error in the ct3_load_cdat() function: The local char *buf variable is
assigned to uint8_t *buf in CDATObject, i.e. a pointer of a different
type. Change the local variable to the same type as buf in CDATObject
to avoid the error.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Thomas Huth 2024-03-04 11:44:04 +01:00 committed by Michael Tokarev
parent b1614f795f
commit c4e898d502
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/cxl/cxl-cdat.c
View File

@ -114,7 +114,7 @@ static void ct3_build_cdat(CDATObject *cdat, Error **errp)
static void ct3_load_cdat(CDATObject *cdat, Error **errp) static void ct3_load_cdat(CDATObject *cdat, Error **errp)
{ {
g_autofree CDATEntry *cdat_st = NULL; g_autofree CDATEntry *cdat_st = NULL;
g_autofree char *buf = NULL; g_autofree uint8_t *buf = NULL;
uint8_t sum = 0; uint8_t sum = 0;
int num_ent; int num_ent;
int i = 0, ent = 1; int i = 0, ent = 1;
@ -171,7 +171,7 @@ static void ct3_load_cdat(CDATObject *cdat, Error **errp)
cdat_st[ent].base = hdr; cdat_st[ent].base = hdr;
cdat_st[ent].length = hdr->length; cdat_st[ent].length = hdr->length;
while (buf + i < (char *)cdat_st[ent].base + cdat_st[ent].length) { while (buf + i < (uint8_t *)cdat_st[ent].base + cdat_st[ent].length) {
assert(i < file_size); assert(i < file_size);
sum += buf[i++]; sum += buf[i++];
} }