| Message ID | 20240715082155.28771-5-zhao1.liu@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | trivial: Replace some qemu_open_old() with qemu_open() | expand |
On 15/7/24 10:21, Zhao Liu wrote: > For qemu_open_old(), osdep.h said: > >> Don't introduce new usage of this function, prefer the following >> qemu_open/qemu_create that take an "Error **errp". > > So replace qemu_open_old() with qemu_open(). > > Cc: Alex Williamson <alex.williamson@redhat.com> > Cc: "Cédric Le Goater" <clg@redhat.com> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> > --- > hw/vfio/container.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 7/15/24 10:21, Zhao Liu wrote: > For qemu_open_old(), osdep.h said: > >> Don't introduce new usage of this function, prefer the following >> qemu_open/qemu_create that take an "Error **errp". > > So replace qemu_open_old() with qemu_open(). > > Cc: Alex Williamson <alex.williamson@redhat.com> > Cc: "Cédric Le Goater" <clg@redhat.com> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/vfio/container.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/vfio/container.c b/hw/vfio/container.c > index 425db1a14c07..38a9df34964a 100644 > --- a/hw/vfio/container.c > +++ b/hw/vfio/container.c > @@ -600,9 +600,8 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as, > } > } > > - fd = qemu_open_old("/dev/vfio/vfio", O_RDWR); > + fd = qemu_open("/dev/vfio/vfio", O_RDWR, errp); > if (fd < 0) { > - error_setg_errno(errp, errno, "failed to open /dev/vfio/vfio"); > goto put_space_exit; > } > > @@ -743,9 +742,8 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp) > group = g_malloc0(sizeof(*group)); > > snprintf(path, sizeof(path), "/dev/vfio/%d", groupid); > - group->fd = qemu_open_old(path, O_RDWR); > + group->fd = qemu_open(path, O_RDWR, errp); > if (group->fd < 0) { > - error_setg_errno(errp, errno, "failed to open %s", path); > goto free_group_exit; > } >
diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 425db1a14c07..38a9df34964a 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -600,9 +600,8 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as, } } - fd = qemu_open_old("/dev/vfio/vfio", O_RDWR); + fd = qemu_open("/dev/vfio/vfio", O_RDWR, errp); if (fd < 0) { - error_setg_errno(errp, errno, "failed to open /dev/vfio/vfio"); goto put_space_exit; } @@ -743,9 +742,8 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp) group = g_malloc0(sizeof(*group)); snprintf(path, sizeof(path), "/dev/vfio/%d", groupid); - group->fd = qemu_open_old(path, O_RDWR); + group->fd = qemu_open(path, O_RDWR, errp); if (group->fd < 0) { - error_setg_errno(errp, errno, "failed to open %s", path); goto free_group_exit; }