[PATCH 0/2] vdpa: Check for existence of opts.vhostdev

[PATCH 0/2] vdpa: Check for existence of opts.vhostdev

[Eugenio Pérez]

Since net_init_vhost_vdpa is trying to open it. Not specifying it in the
command line crash qemu.

While we're at it, stop using qemu_open_old.

Eugenio Pérez (2):
  vdpa: Replace qemu_open_old by qemu_open at
  vdpa: Check for existence of opts.vhostdev

 net/vhost-vdpa.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.27.0

[PATCH 1/2] vdpa: Replace qemu_open_old by qemu_open at

[Eugenio Pérez]

There is no reason to keep using the old one, since we neither use the
variadics arguments nor open it with O_DIRECT.

Also, net_client_init1, the caller of net_init_vhost_vdpa, wants all
net_client_init_fun to use Error API, so it's a good step in that
direction.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 net/vhost-vdpa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 49ab322511..6ffb29f4da 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -261,7 +261,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
     assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
     opts = &netdev->u.vhost_vdpa;
 
-    vdpa_device_fd = qemu_open_old(opts->vhostdev, O_RDWR);
+    vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR, errp);
     if (vdpa_device_fd == -1) {
         return -errno;
     }
-- 
2.27.0

[PATCH 2/2] vdpa: Check for existence of opts.vhostdev

[Eugenio Pérez]

Since net_init_vhost_vdpa is trying to open it. Not specifying it in the
command line crash qemu.

Fixes: 7327813d17 ("vhost-vdpa: open device fd in net_init_vhost_vdpa()")
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 net/vhost-vdpa.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 6ffb29f4da..bbd3576f23 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -260,6 +260,10 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
 
     assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
     opts = &netdev->u.vhost_vdpa;
+    if (!opts->vhostdev) {
+        error_setg(errp, "vdpa character device not specified with vhostdev");
+        return -1;
+    }
 
     vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR, errp);
     if (vdpa_device_fd == -1) {
-- 
2.27.0

Re: [PATCH 1/2] vdpa: Replace qemu_open_old by qemu_open at

[Jason Wang]

On Sat, Nov 13, 2021 at 3:34 AM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> There is no reason to keep using the old one, since we neither use the
> variadics arguments nor open it with O_DIRECT.
>
> Also, net_client_init1, the caller of net_init_vhost_vdpa, wants all
> net_client_init_fun to use Error API, so it's a good step in that
> direction.
>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Acked-by: Jason Wang <jasowang@redhat.com>

> ---
>  net/vhost-vdpa.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 49ab322511..6ffb29f4da 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -261,7 +261,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
>      assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
>      opts = &netdev->u.vhost_vdpa;
>
> -    vdpa_device_fd = qemu_open_old(opts->vhostdev, O_RDWR);
> +    vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR, errp);
>      if (vdpa_device_fd == -1) {
>          return -errno;
>      }
> --
> 2.27.0
>

Re: [PATCH 2/2] vdpa: Check for existence of opts.vhostdev

[Jason Wang]

On Sat, Nov 13, 2021 at 3:35 AM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> Since net_init_vhost_vdpa is trying to open it. Not specifying it in the
> command line crash qemu.
>
> Fixes: 7327813d17 ("vhost-vdpa: open device fd in net_init_vhost_vdpa()")
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Acked-by: Jason Wang <jasowang@redhat.com>

> ---
>  net/vhost-vdpa.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 6ffb29f4da..bbd3576f23 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -260,6 +260,10 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
>
>      assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
>      opts = &netdev->u.vhost_vdpa;
> +    if (!opts->vhostdev) {
> +        error_setg(errp, "vdpa character device not specified with vhostdev");
> +        return -1;
> +    }
>
>      vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR, errp);
>      if (vdpa_device_fd == -1) {
> --
> 2.27.0
>