[Qemu-devel] [PATCH 0/3] Fixups for vhost-user

[Qemu-devel] [PATCH 0/3] Fixups for vhost-user

[Nikolay Nikolaev]

This is a series of fixups that replace 'memory-file' with 
'memory-backend-file'. This is the object type used in the newest (since v4)
NUMA series for the file based host memory backend.

The patches are against git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git 
branch 'vhost'. Tested after rebasing on same tree branch 'numa'.

---

Nikolay Nikolaev (3):
      fixup! Add vhost-user as a vhost backend.
      fixup! Add the vhost-user netdev backend to the command line
      fixup! Add qtest for vhost-user


 docs/specs/vhost-user.txt |  266 ++++++++++++++++++++++++++++++++++++++
 hmp-commands.hx           |    4 -
 hw/net/vhost_net.c        |   39 ++++++
 hw/virtio/vhost-user.c    |    2 
 include/net/vhost-user.h  |   17 ++
 net/Makefile.objs         |    2 
 net/clients.h             |    3 
 net/hub.c                 |    1 
 net/net.c                 |    3 
 net/vhost-user.c          |  258 +++++++++++++++++++++++++++++++++++++
 qapi-schema.json          |   19 +++
 qemu-options.hx           |   18 +++
 stubs/Makefile.objs       |    8 +
 stubs/bdrv-commit-all.c   |    7 +
 stubs/chr-msmouse.c       |    7 +
 stubs/get-next-serial.c   |    3 
 stubs/is-daemonized.c     |    7 +
 stubs/machine-init-done.c |    6 +
 stubs/monitor-init.c      |    6 +
 stubs/notify-event.c      |    6 +
 stubs/vc-init.c           |    7 +
 tests/Makefile            |    4 +
 tests/vhost-user-test.c   |  312 +++++++++++++++++++++++++++++++++++++++++++++
 23 files changed, 1000 insertions(+), 5 deletions(-)
 create mode 100644 docs/specs/vhost-user.txt
 create mode 100644 include/net/vhost-user.h
 create mode 100644 net/vhost-user.c
 create mode 100644 stubs/bdrv-commit-all.c
 create mode 100644 stubs/chr-msmouse.c
 create mode 100644 stubs/get-next-serial.c
 create mode 100644 stubs/is-daemonized.c
 create mode 100644 stubs/machine-init-done.c
 create mode 100644 stubs/monitor-init.c
 create mode 100644 stubs/notify-event.c
 create mode 100644 stubs/vc-init.c
 create mode 100644 tests/vhost-user-test.c

--
Signature

[Qemu-devel] [PATCH 1/3] fixup! Add vhost-user as a vhost backend.

[Nikolay Nikolaev]

Replace 'memory-file' with 'memory-backend-file'.

Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
---
 hw/virtio/vhost-user.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 3244ef8..0df6a93 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -227,7 +227,7 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request,
 
         if (!fd_num) {
             error_report("Failed initializing vhost-user memory map\n"
-                    "consider using -object memory-file share=on\n");
+                    "consider using -object memory-backend-file share=on\n");
             return -1;
         }
 

[Qemu-devel] [PATCH 2/3] fixup! Add the vhost-user netdev backend to the command line

[Nikolay Nikolaev]

Replace 'memory-file' with 'memory-backend-file'.

Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
---
 qemu-options.hx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 1ad2528..ab06df1 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1802,7 +1802,7 @@ end of the socket. On non-MSIX guests, the feature can be forced with
 
 Example:
 @example
-qemu -m 512 -object memory-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
+qemu -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
      -numa node,memdev=mem \
      -chardev socket,path=/path/to/socket \
      -netdev type=vhost-user,id=net0,chardev=chr0 \

[Qemu-devel] [PATCH 3/3] fixup! Add qtest for vhost-user

[Nikolay Nikolaev]

Replace 'memory-file' with 'memory-backend-file'.

Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
---
 tests/vhost-user-test.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 486e56b..7c826b4 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -20,7 +20,7 @@
 #include <qemu/sockets.h>
 
 #define QEMU_CMD_ACCEL  " -machine accel=tcg"
-#define QEMU_CMD_MEM    " -m 512 -object memory-file,id=mem,size=512M,"\
+#define QEMU_CMD_MEM    " -m 512 -object memory-backend-file,id=mem,size=512M,"\
                         "mem-path=%s,share=on -numa node,memdev=mem"
 #define QEMU_CMD_CHR    " -chardev socket,id=chr0,path=%s"
 #define QEMU_CMD_NETDEV " -netdev vhost-user,id=net0,chardev=chr0,vhostforce"

Re: [Qemu-devel] [PATCH 0/3] Fixups for vhost-user

[Michael S. Tsirkin]

On Fri, Jun 13, 2014 at 09:49:38AM +0300, Nikolay Nikolaev wrote:
> This is a series of fixups that replace 'memory-file' with 
> 'memory-backend-file'. This is the object type used in the newest (since v4)
> NUMA series for the file based host memory backend.
> 
> The patches are against git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git 
> branch 'vhost'. Tested after rebasing on same tree branch 'numa'.

Will apply Sunday.
>From now on pls work on top of the pci branch.
Thanks!

> ---
> 
> Nikolay Nikolaev (3):
>       fixup! Add vhost-user as a vhost backend.
>       fixup! Add the vhost-user netdev backend to the command line
>       fixup! Add qtest for vhost-user
> 
> 
>  docs/specs/vhost-user.txt |  266 ++++++++++++++++++++++++++++++++++++++
>  hmp-commands.hx           |    4 -
>  hw/net/vhost_net.c        |   39 ++++++
>  hw/virtio/vhost-user.c    |    2 
>  include/net/vhost-user.h  |   17 ++
>  net/Makefile.objs         |    2 
>  net/clients.h             |    3 
>  net/hub.c                 |    1 
>  net/net.c                 |    3 
>  net/vhost-user.c          |  258 +++++++++++++++++++++++++++++++++++++
>  qapi-schema.json          |   19 +++
>  qemu-options.hx           |   18 +++
>  stubs/Makefile.objs       |    8 +
>  stubs/bdrv-commit-all.c   |    7 +
>  stubs/chr-msmouse.c       |    7 +
>  stubs/get-next-serial.c   |    3 
>  stubs/is-daemonized.c     |    7 +
>  stubs/machine-init-done.c |    6 +
>  stubs/monitor-init.c      |    6 +
>  stubs/notify-event.c      |    6 +
>  stubs/vc-init.c           |    7 +
>  tests/Makefile            |    4 +
>  tests/vhost-user-test.c   |  312 +++++++++++++++++++++++++++++++++++++++++++++
>  23 files changed, 1000 insertions(+), 5 deletions(-)
>  create mode 100644 docs/specs/vhost-user.txt
>  create mode 100644 include/net/vhost-user.h
>  create mode 100644 net/vhost-user.c
>  create mode 100644 stubs/bdrv-commit-all.c
>  create mode 100644 stubs/chr-msmouse.c
>  create mode 100644 stubs/get-next-serial.c
>  create mode 100644 stubs/is-daemonized.c
>  create mode 100644 stubs/machine-init-done.c
>  create mode 100644 stubs/monitor-init.c
>  create mode 100644 stubs/notify-event.c
>  create mode 100644 stubs/vc-init.c
>  create mode 100644 tests/vhost-user-test.c
> 
> --
> Signature

Re: [Qemu-devel] [PATCH 0/3] Fixups for vhost-user

[Michael S. Tsirkin]

On Fri, Jun 13, 2014 at 09:49:38AM +0300, Nikolay Nikolaev wrote:
> This is a series of fixups that replace 'memory-file' with 
> 'memory-backend-file'. This is the object type used in the newest (since v4)
> NUMA series for the file based host memory backend.
> 
> The patches are against git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git 
> branch 'vhost'. Tested after rebasing on same tree branch 'numa'.

mingw builds seem to be broken by these
pls check out pci tree and fix vhost user related
mingw breakage.

Thanks!

> ---
> 
> Nikolay Nikolaev (3):
>       fixup! Add vhost-user as a vhost backend.
>       fixup! Add the vhost-user netdev backend to the command line
>       fixup! Add qtest for vhost-user
> 
> 
>  docs/specs/vhost-user.txt |  266 ++++++++++++++++++++++++++++++++++++++
>  hmp-commands.hx           |    4 -
>  hw/net/vhost_net.c        |   39 ++++++
>  hw/virtio/vhost-user.c    |    2 
>  include/net/vhost-user.h  |   17 ++
>  net/Makefile.objs         |    2 
>  net/clients.h             |    3 
>  net/hub.c                 |    1 
>  net/net.c                 |    3 
>  net/vhost-user.c          |  258 +++++++++++++++++++++++++++++++++++++
>  qapi-schema.json          |   19 +++
>  qemu-options.hx           |   18 +++
>  stubs/Makefile.objs       |    8 +
>  stubs/bdrv-commit-all.c   |    7 +
>  stubs/chr-msmouse.c       |    7 +
>  stubs/get-next-serial.c   |    3 
>  stubs/is-daemonized.c     |    7 +
>  stubs/machine-init-done.c |    6 +
>  stubs/monitor-init.c      |    6 +
>  stubs/notify-event.c      |    6 +
>  stubs/vc-init.c           |    7 +
>  tests/Makefile            |    4 +
>  tests/vhost-user-test.c   |  312 +++++++++++++++++++++++++++++++++++++++++++++
>  23 files changed, 1000 insertions(+), 5 deletions(-)
>  create mode 100644 docs/specs/vhost-user.txt
>  create mode 100644 include/net/vhost-user.h
>  create mode 100644 net/vhost-user.c
>  create mode 100644 stubs/bdrv-commit-all.c
>  create mode 100644 stubs/chr-msmouse.c
>  create mode 100644 stubs/get-next-serial.c
>  create mode 100644 stubs/is-daemonized.c
>  create mode 100644 stubs/machine-init-done.c
>  create mode 100644 stubs/monitor-init.c
>  create mode 100644 stubs/notify-event.c
>  create mode 100644 stubs/vc-init.c
>  create mode 100644 tests/vhost-user-test.c
> 
> --
> Signature

Re: [Qemu-devel] [PATCH 0/3] Fixups for vhost-user

[Michael S. Tsirkin]

On Wed, Jun 18, 2014 at 10:15:11PM +0300, Michael S. Tsirkin wrote:
> On Fri, Jun 13, 2014 at 09:49:38AM +0300, Nikolay Nikolaev wrote:
> > This is a series of fixups that replace 'memory-file' with 
> > 'memory-backend-file'. This is the object type used in the newest (since v4)
> > NUMA series for the file based host memory backend.
> > 
> > The patches are against git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git 
> > branch 'vhost'. Tested after rebasing on same tree branch 'numa'.
> 
> mingw builds seem to be broken by these
> pls check out pci tree and fix vhost user related
> mingw breakage.
> 
> Thanks!

specifically link fails with
../net/net.o:net.c:(.rdata+0x4a8): undefined reference to `net_init_vhost_user'


> > ---
> > 
> > Nikolay Nikolaev (3):
> >       fixup! Add vhost-user as a vhost backend.
> >       fixup! Add the vhost-user netdev backend to the command line
> >       fixup! Add qtest for vhost-user
> > 
> > 
> >  docs/specs/vhost-user.txt |  266 ++++++++++++++++++++++++++++++++++++++
> >  hmp-commands.hx           |    4 -
> >  hw/net/vhost_net.c        |   39 ++++++
> >  hw/virtio/vhost-user.c    |    2 
> >  include/net/vhost-user.h  |   17 ++
> >  net/Makefile.objs         |    2 
> >  net/clients.h             |    3 
> >  net/hub.c                 |    1 
> >  net/net.c                 |    3 
> >  net/vhost-user.c          |  258 +++++++++++++++++++++++++++++++++++++
> >  qapi-schema.json          |   19 +++
> >  qemu-options.hx           |   18 +++
> >  stubs/Makefile.objs       |    8 +
> >  stubs/bdrv-commit-all.c   |    7 +
> >  stubs/chr-msmouse.c       |    7 +
> >  stubs/get-next-serial.c   |    3 
> >  stubs/is-daemonized.c     |    7 +
> >  stubs/machine-init-done.c |    6 +
> >  stubs/monitor-init.c      |    6 +
> >  stubs/notify-event.c      |    6 +
> >  stubs/vc-init.c           |    7 +
> >  tests/Makefile            |    4 +
> >  tests/vhost-user-test.c   |  312 +++++++++++++++++++++++++++++++++++++++++++++
> >  23 files changed, 1000 insertions(+), 5 deletions(-)
> >  create mode 100644 docs/specs/vhost-user.txt
> >  create mode 100644 include/net/vhost-user.h
> >  create mode 100644 net/vhost-user.c
> >  create mode 100644 stubs/bdrv-commit-all.c
> >  create mode 100644 stubs/chr-msmouse.c
> >  create mode 100644 stubs/get-next-serial.c
> >  create mode 100644 stubs/is-daemonized.c
> >  create mode 100644 stubs/machine-init-done.c
> >  create mode 100644 stubs/monitor-init.c
> >  create mode 100644 stubs/notify-event.c
> >  create mode 100644 stubs/vc-init.c
> >  create mode 100644 tests/vhost-user-test.c
> > 
> > --
> > Signature