Message ID | 20240917002212.330893-1-dave@treblig.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | hw/xen: Remove deadcode | expand |
On Tue, Sep 17, 2024 at 01:22:12AM +0100, dave@treblig.org wrote: > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > xen_be_copy_grant_refs is unused since 2019's > 19f87870ba ("xen: remove the legacy 'xen_disk' backend") > > xen_config_dev_console is unused since 2018's > 6d7c06c213 ("Remove broken Xen PV domain builder") > > Remove them. > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> Acked-by: Anthony PERARD <anthony.perard@vates.tech> Thanks,
On Tue, Sep 17, 2024 at 09:03:09AM +0000, Anthony PERARD wrote: > On Tue, Sep 17, 2024 at 01:22:12AM +0100, dave@treblig.org wrote: > > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > > > xen_be_copy_grant_refs is unused since 2019's > > 19f87870ba ("xen: remove the legacy 'xen_disk' backend") > > > > xen_config_dev_console is unused since 2018's > > 6d7c06c213 ("Remove broken Xen PV domain builder") > > > > Remove them. > > > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> > > Acked-by: Anthony PERARD <anthony.perard@vates.tech> > > Thanks, Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com> Cheers, Edgar
On 17/09/2024 02.22, dave@treblig.org wrote: > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > xen_be_copy_grant_refs is unused since 2019's > 19f87870ba ("xen: remove the legacy 'xen_disk' backend") > > xen_config_dev_console is unused since 2018's > 6d7c06c213 ("Remove broken Xen PV domain builder") > > Remove them. > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> > --- > hw/xen/xen-legacy-backend.c | 18 ------------------ > hw/xen/xen_devconfig.c | 8 -------- > include/hw/xen/xen-legacy-backend.h | 5 ----- > 3 files changed, 31 deletions(-) > > diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c > index 5514184f9c..e8e1ee4f7d 100644 > --- a/hw/xen/xen-legacy-backend.c > +++ b/hw/xen/xen-legacy-backend.c > @@ -147,24 +147,6 @@ void xen_be_unmap_grant_refs(struct XenLegacyDevice *xendev, void *ptr, > } > } > > -int xen_be_copy_grant_refs(struct XenLegacyDevice *xendev, > - bool to_domain, > - XenGrantCopySegment segs[], > - unsigned int nr_segs) > -{ > - int rc; > - > - assert(xendev->ops->flags & DEVOPS_FLAG_NEED_GNTDEV); > - > - rc = qemu_xen_gnttab_grant_copy(xendev->gnttabdev, to_domain, xen_domid, > - segs, nr_segs, NULL); > - if (rc) { > - xen_pv_printf(xendev, 0, "xengnttab_grant_copy failed: %s\n", > - strerror(-rc)); > - } > - return rc; > -} > - > /* > * get xen backend device, allocate a new one if it doesn't exist. > */ > diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c > index 2150869f60..45ae134b84 100644 > --- a/hw/xen/xen_devconfig.c > +++ b/hw/xen/xen_devconfig.c > @@ -66,11 +66,3 @@ int xen_config_dev_vkbd(int vdev) > xen_config_dev_dirs("vkbd", "vkbd", vdev, fe, be, sizeof(fe)); > return xen_config_dev_all(fe, be); > } > - > -int xen_config_dev_console(int vdev) > -{ > - char fe[256], be[256]; > - > - xen_config_dev_dirs("console", "console", vdev, fe, be, sizeof(fe)); > - return xen_config_dev_all(fe, be); > -} > diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h > index 943732b8d1..e198b120c5 100644 > --- a/include/hw/xen/xen-legacy-backend.h > +++ b/include/hw/xen/xen-legacy-backend.h > @@ -50,10 +50,6 @@ void *xen_be_map_grant_refs(struct XenLegacyDevice *xendev, uint32_t *refs, > void xen_be_unmap_grant_refs(struct XenLegacyDevice *xendev, void *ptr, > uint32_t *refs, unsigned int nr_refs); > > -int xen_be_copy_grant_refs(struct XenLegacyDevice *xendev, > - bool to_domain, XenGrantCopySegment segs[], > - unsigned int nr_segs); > - > static inline void *xen_be_map_grant_ref(struct XenLegacyDevice *xendev, > uint32_t ref, int prot) > { > @@ -70,6 +66,5 @@ static inline void xen_be_unmap_grant_ref(struct XenLegacyDevice *xendev, > void xen_config_cleanup(void); > int xen_config_dev_vfb(int vdev, const char *type); > int xen_config_dev_vkbd(int vdev); > -int xen_config_dev_console(int vdev); > > #endif /* HW_XEN_LEGACY_BACKEND_H */ Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 5514184f9c..e8e1ee4f7d 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -147,24 +147,6 @@ void xen_be_unmap_grant_refs(struct XenLegacyDevice *xendev, void *ptr, } } -int xen_be_copy_grant_refs(struct XenLegacyDevice *xendev, - bool to_domain, - XenGrantCopySegment segs[], - unsigned int nr_segs) -{ - int rc; - - assert(xendev->ops->flags & DEVOPS_FLAG_NEED_GNTDEV); - - rc = qemu_xen_gnttab_grant_copy(xendev->gnttabdev, to_domain, xen_domid, - segs, nr_segs, NULL); - if (rc) { - xen_pv_printf(xendev, 0, "xengnttab_grant_copy failed: %s\n", - strerror(-rc)); - } - return rc; -} - /* * get xen backend device, allocate a new one if it doesn't exist. */ diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c index 2150869f60..45ae134b84 100644 --- a/hw/xen/xen_devconfig.c +++ b/hw/xen/xen_devconfig.c @@ -66,11 +66,3 @@ int xen_config_dev_vkbd(int vdev) xen_config_dev_dirs("vkbd", "vkbd", vdev, fe, be, sizeof(fe)); return xen_config_dev_all(fe, be); } - -int xen_config_dev_console(int vdev) -{ - char fe[256], be[256]; - - xen_config_dev_dirs("console", "console", vdev, fe, be, sizeof(fe)); - return xen_config_dev_all(fe, be); -} diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h index 943732b8d1..e198b120c5 100644 --- a/include/hw/xen/xen-legacy-backend.h +++ b/include/hw/xen/xen-legacy-backend.h @@ -50,10 +50,6 @@ void *xen_be_map_grant_refs(struct XenLegacyDevice *xendev, uint32_t *refs, void xen_be_unmap_grant_refs(struct XenLegacyDevice *xendev, void *ptr, uint32_t *refs, unsigned int nr_refs); -int xen_be_copy_grant_refs(struct XenLegacyDevice *xendev, - bool to_domain, XenGrantCopySegment segs[], - unsigned int nr_segs); - static inline void *xen_be_map_grant_ref(struct XenLegacyDevice *xendev, uint32_t ref, int prot) { @@ -70,6 +66,5 @@ static inline void xen_be_unmap_grant_ref(struct XenLegacyDevice *xendev, void xen_config_cleanup(void); int xen_config_dev_vfb(int vdev, const char *type); int xen_config_dev_vkbd(int vdev); -int xen_config_dev_console(int vdev); #endif /* HW_XEN_LEGACY_BACKEND_H */