| Message ID | 20231222090051.3265307-2-42.hyeyoo@gmail.com |
|---|---|
| State | New, archived |
| Headers | show |
| Series | A Followup for "QEMU: CXL mailbox rework and features (Part 1)" | expand |
On Fri, 22 Dec 2023 18:00:48 +0900 Hyeonggon Yoo <42.hyeyoo@gmail.com> wrote: > Fix build errors in cxl_type3_stubs.c due to a the incorrect definition > of the qmp_cxl_{add,release}_dynamic_capacity functions. > > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Fan, this one needs squashing into your hw/cxl/events: Add qmp interfaces to add/release dynamic capacity extents patch in the DCD series. I'll do that in my tree, but just wanted to make sure you noticed this so we don't end up reintroducing it again by accident! Thanks Hyeonggon, Jonathan > --- > hw/mem/cxl_type3_stubs.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/mem/cxl_type3_stubs.c b/hw/mem/cxl_type3_stubs.c > index 1b54ec028c..d913b11b4d 100644 > --- a/hw/mem/cxl_type3_stubs.c > +++ b/hw/mem/cxl_type3_stubs.c > @@ -68,14 +68,14 @@ void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type, > error_setg(errp, "CXL Type 3 support is not compiled in"); > } > > -void qmp_cxl_add_dynamic_capacity(const char *path, > +void qmp_cxl_add_dynamic_capacity(const char *path, uint8_t region_id, > CXLDCExtentRecordList *records, > Error **errp) > { > error_setg(errp, "CXL Type 3 support is not compiled in"); > } > > -void qmp_cxl_release_dynamic_capacity(const char *path, > +void qmp_cxl_release_dynamic_capacity(const char *path, uint8_t region_id, > CXLDCExtentRecordList *records, > Error **errp) > {
On Tue, Jan 09, 2024 at 05:40:26PM +0000, Jonathan Cameron wrote: > On Fri, 22 Dec 2023 18:00:48 +0900 > Hyeonggon Yoo <42.hyeyoo@gmail.com> wrote: > > > Fix build errors in cxl_type3_stubs.c due to a the incorrect definition > > of the qmp_cxl_{add,release}_dynamic_capacity functions. > > > > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > Fan, this one needs squashing into your > hw/cxl/events: Add qmp interfaces to add/release dynamic capacity extents > patch in the DCD series. I'll do that in my tree, but just wanted to > make sure you noticed this so we don't end up reintroducing it again by > accident! > > Thanks Hyeonggon, > > Jonathan Hi Jonathan, Thanks for the notice. I missed this series. I checked the last patch set I sent out in Nov., 2023, there is no issue there. https://lore.kernel.org/linux-cxl/20231107180907.553451-9-nifan.cxl@gmail.com/ So the following patch is actually not needed, maybe Hyeonggon's work was based on some of your local branch which does not have the latest DCD work. Thanks, Fan > > > --- > > hw/mem/cxl_type3_stubs.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/hw/mem/cxl_type3_stubs.c b/hw/mem/cxl_type3_stubs.c > > index 1b54ec028c..d913b11b4d 100644 > > --- a/hw/mem/cxl_type3_stubs.c > > +++ b/hw/mem/cxl_type3_stubs.c > > @@ -68,14 +68,14 @@ void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type, > > error_setg(errp, "CXL Type 3 support is not compiled in"); > > } > > > > -void qmp_cxl_add_dynamic_capacity(const char *path, > > +void qmp_cxl_add_dynamic_capacity(const char *path, uint8_t region_id, > > CXLDCExtentRecordList *records, > > Error **errp) > > { > > error_setg(errp, "CXL Type 3 support is not compiled in"); > > } > > > > -void qmp_cxl_release_dynamic_capacity(const char *path, > > +void qmp_cxl_release_dynamic_capacity(const char *path, uint8_t region_id, > > CXLDCExtentRecordList *records, > > Error **errp) > > { >
diff --git a/hw/mem/cxl_type3_stubs.c b/hw/mem/cxl_type3_stubs.c index 1b54ec028c..d913b11b4d 100644 --- a/hw/mem/cxl_type3_stubs.c +++ b/hw/mem/cxl_type3_stubs.c @@ -68,14 +68,14 @@ void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type, error_setg(errp, "CXL Type 3 support is not compiled in"); } -void qmp_cxl_add_dynamic_capacity(const char *path, +void qmp_cxl_add_dynamic_capacity(const char *path, uint8_t region_id, CXLDCExtentRecordList *records, Error **errp) { error_setg(errp, "CXL Type 3 support is not compiled in"); } -void qmp_cxl_release_dynamic_capacity(const char *path, +void qmp_cxl_release_dynamic_capacity(const char *path, uint8_t region_id, CXLDCExtentRecordList *records, Error **errp) {
Fix build errors in cxl_type3_stubs.c due to a the incorrect definition of the qmp_cxl_{add,release}_dynamic_capacity functions. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- hw/mem/cxl_type3_stubs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)