| Message ID | 20230904132806.6094-2-Jonathan.Cameron@huawei.com |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/cxl: Minor CXL emulation fixes and cleanup | expand |
On Mon, Sep 04, 2023 at 02:28:03PM +0100, Jonathan Cameron wrote: > From: Li Zhijian <lizhijian@cn.fujitsu.com> > > Allocate targets and targets[n] resources when all sanity checks are > passed to avoid memory leaks. > > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni <fan.ni@samsung.com> > --- > hw/cxl/cxl-host.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c > index 034c7805b3..f0920da956 100644 > --- a/hw/cxl/cxl-host.c > +++ b/hw/cxl/cxl-host.c > @@ -39,12 +39,6 @@ static void cxl_fixed_memory_window_config(CXLState *cxl_state, > return; > } > > - fw->targets = g_malloc0_n(fw->num_targets, sizeof(*fw->targets)); > - for (i = 0, target = object->targets; target; i++, target = target->next) { > - /* This link cannot be resolved yet, so stash the name for now */ > - fw->targets[i] = g_strdup(target->value); > - } > - > if (object->size % (256 * MiB)) { > error_setg(errp, > "Size of a CXL fixed memory window must be a multiple of 256MiB"); > @@ -64,6 +58,12 @@ static void cxl_fixed_memory_window_config(CXLState *cxl_state, > fw->enc_int_gran = 0; > } > > + fw->targets = g_malloc0_n(fw->num_targets, sizeof(*fw->targets)); > + for (i = 0, target = object->targets; target; i++, target = target->next) { > + /* This link cannot be resolved yet, so stash the name for now */ > + fw->targets[i] = g_strdup(target->value); > + } > + > cxl_state->fixed_windows = g_list_append(cxl_state->fixed_windows, > g_steal_pointer(&fw)); > > -- > 2.39.2 >
04.09.2023 16:28, Jonathan Cameron via: > From: Li Zhijian <lizhijian@cn.fujitsu.com> > > Allocate targets and targets[n] resources when all sanity checks are > passed to avoid memory leaks. > > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > hw/cxl/cxl-host.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) This one has been Cc'd qemu-stable, adding the tag. /mjt
diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c index 034c7805b3..f0920da956 100644 --- a/hw/cxl/cxl-host.c +++ b/hw/cxl/cxl-host.c @@ -39,12 +39,6 @@ static void cxl_fixed_memory_window_config(CXLState *cxl_state, return; } - fw->targets = g_malloc0_n(fw->num_targets, sizeof(*fw->targets)); - for (i = 0, target = object->targets; target; i++, target = target->next) { - /* This link cannot be resolved yet, so stash the name for now */ - fw->targets[i] = g_strdup(target->value); - } - if (object->size % (256 * MiB)) { error_setg(errp, "Size of a CXL fixed memory window must be a multiple of 256MiB"); @@ -64,6 +58,12 @@ static void cxl_fixed_memory_window_config(CXLState *cxl_state, fw->enc_int_gran = 0; } + fw->targets = g_malloc0_n(fw->num_targets, sizeof(*fw->targets)); + for (i = 0, target = object->targets; target; i++, target = target->next) { + /* This link cannot be resolved yet, so stash the name for now */ + fw->targets[i] = g_strdup(target->value); + } + cxl_state->fixed_windows = g_list_append(cxl_state->fixed_windows, g_steal_pointer(&fw));