Re: [PATCH v5 4/7] tests/qtest/libqos/virtio-blk: add support for vhost-user-blk

[Dima Stepanov]

On Mon, Sep 21, 2020 at 07:04:20PM -0400, Raphael Norwitz wrote:
> MST already sent a PR with all the patches :)

Thank you! )

> 
> On Wed, Sep 16, 2020 at 6:13 PM Dima Stepanov <dimastep@yandex-team.ru> wrote:
> >
> > On Mon, Sep 14, 2020 at 09:23:42PM -0400, Raphael Norwitz wrote:
> > > On Fri, Sep 11, 2020 at 4:43 AM Dima Stepanov <dimastep@yandex-team.ru> 
> > > wrote:
> > > >
> > > > Add support for the vhost-user-blk-pci device. This node can be used by
> > > > the vhost-user-blk tests. Tests for the vhost-user-blk device are added
> > > > in the following patches.
> > > >
> > > > Signed-off-by: Dima Stepanov <dimastep@yandex-team.ru>
> > >
> > > Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
> > Hi,
> >
> > Looks like that all the patch set is reviewed except 7/7. If it is an
> > issue, we can cut it from the set and merge other six commits.
> >
> > Raphael,
> >
> > Will you take it for merge?
> >
> > Thanks, Dima.
> >
> > >
> > > > ---
> > > >  tests/qtest/libqos/virtio-blk.c | 14 +++++++++++++-
> > > >  1 file changed, 13 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/tests/qtest/libqos/virtio-blk.c 
> > > > b/tests/qtest/libqos/virtio-blk.c
> > > > index 5da0259..c0fd9d2 100644
> > > > --- a/tests/qtest/libqos/virtio-blk.c
> > > > +++ b/tests/qtest/libqos/virtio-blk.c
> > > > @@ -30,7 +30,8 @@
> > > >  static void *qvirtio_blk_get_driver(QVirtioBlk *v_blk,
> > > >                                      const char *interface)
> > > >  {
> > > > -    if (!g_strcmp0(interface, "virtio-blk")) {
> > > > +    if (!g_strcmp0(interface, "virtio-blk") ||
> > > > +            !g_strcmp0(interface, "vhost-user-blk")) {
> > > >          return v_blk;
> > > >      }
> > > >      if (!g_strcmp0(interface, "virtio")) {
> > > > @@ -120,6 +121,17 @@ static void virtio_blk_register_nodes(void)
> > > >      qos_node_produces("virtio-blk-pci", "virtio-blk");
> > > >
> > > >      g_free(arg);
> > > > +
> > > > +    /* vhost-user-blk-pci */
> > > > +    arg = g_strdup_printf("id=drv0,chardev=chdev0,addr=%x.%x",
> > > > +                                PCI_SLOT, PCI_FN);
> > > > +    opts.extra_device_opts = arg;
> > > > +    add_qpci_address(&opts, &addr);
> > > > +    qos_node_create_driver("vhost-user-blk-pci", 
> > > > virtio_blk_pci_create);
> > > > +    qos_node_consumes("vhost-user-blk-pci", "pci-bus", &opts);
> > > > +    qos_node_produces("vhost-user-blk-pci", "vhost-user-blk");
> > > > +
> > > > +    g_free(arg);
> > > >  }
> > > >
> > > >  libqos_init(virtio_blk_register_nodes);
> > > > --
> > > > 2.7.4
> > > >
> > > >