| Message ID | 20240124124100.8218-4-Jonathan.Cameron@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | CXL emulation fixes and minor cleanup. | expand |
On Wed, Jan 24, 2024 at 12:40:51PM +0000, Jonathan Cameron wrote: > As a failure of g_malloc0() will result in QEMU exiting, it s/g_malloc0/g_malloc/ Fan > won't return a NULL to check. As such, drop the incorrect handling > of such NULL returns in the cdat table building code. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > hw/pci-bridge/cxl_upstream.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c > index 36737189c6..d5341b530f 100644 > --- a/hw/pci-bridge/cxl_upstream.c > +++ b/hw/pci-bridge/cxl_upstream.c > @@ -228,9 +228,6 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv) > > sslbis_size = sizeof(CDATSslbis) + sizeof(*sslbis_latency->sslbe) * count; > sslbis_latency = g_malloc(sslbis_size); > - if (!sslbis_latency) { > - return -ENOMEM; > - } > *sslbis_latency = (CDATSslbis) { > .sslbis_header = { > .header = { > @@ -251,9 +248,6 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv) > } > > sslbis_bandwidth = g_malloc(sslbis_size); > - if (!sslbis_bandwidth) { > - return 0; > - } > *sslbis_bandwidth = (CDATSslbis) { > .sslbis_header = { > .header = { > -- > 2.39.2 >
diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c index 36737189c6..d5341b530f 100644 --- a/hw/pci-bridge/cxl_upstream.c +++ b/hw/pci-bridge/cxl_upstream.c @@ -228,9 +228,6 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv) sslbis_size = sizeof(CDATSslbis) + sizeof(*sslbis_latency->sslbe) * count; sslbis_latency = g_malloc(sslbis_size); - if (!sslbis_latency) { - return -ENOMEM; - } *sslbis_latency = (CDATSslbis) { .sslbis_header = { .header = { @@ -251,9 +248,6 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv) } sslbis_bandwidth = g_malloc(sslbis_size); - if (!sslbis_bandwidth) { - return 0; - } *sslbis_bandwidth = (CDATSslbis) { .sslbis_header = { .header = {
As a failure of g_malloc0() will result in QEMU exiting, it won't return a NULL to check. As such, drop the incorrect handling of such NULL returns in the cdat table building code. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- hw/pci-bridge/cxl_upstream.c | 6 ------ 1 file changed, 6 deletions(-)