Commit 297a0827 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/input-20190522-pull-request' into staging 



input: add vhost-user-input to contrib.

# gpg: Signature made Wed 22 May 2019 09:26:34 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/input-20190522-pull-request:
  contrib: add vhost-user-input
  libvhost-user: fix -Werror=format= on ppc64
  libvhost-user: fix cast warnings on 32 bits

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 542ad0eb 06914c97

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1532,6 +1532,7 @@ S: Maintained 
F: hw/input/vhost-user-input.c

F: hw/input/virtio-input*.c

F: include/hw/virtio/virtio-input.h

F: contrib/vhost-user-input/*



virtio-serial

M: Amit Shah <amit@kernel.org>

Makefile

+11 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ dummy := $(call unnest-vars,, \ 
                libvhost-user-obj-y \

                vhost-user-scsi-obj-y \

                vhost-user-blk-obj-y \

                vhost-user-input-obj-y \

                qga-vss-dll-obj-y \

                block-obj-y \

                block-obj-m \
@@ -618,6 +619,16 @@ rdmacm-mux$(EXESUF): LIBS += "-libumad" 
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)



ifdef CONFIG_VHOST_USER_INPUT

ifdef CONFIG_LINUX

vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a libqemuutil.a

	$(call LINK, $^)



# build by default, do not install

all: vhost-user-input$(EXESUF)

endif

endif



module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak

	$(call quiet-command,$(PYTHON) $< $@ \

	$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) 
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/

vhost-user-blk-obj-y = contrib/vhost-user-blk/

rdmacm-mux-obj-y = contrib/rdmacm-mux/

vhost-user-input-obj-y = contrib/vhost-user-input/



######################################################################

trace-events-subdirs =

contrib/libvhost-user/libvhost-user.c

+7 −5
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg) 
         * data that's already arrived in the shared process.

         * TODO: How to do hugepage

         */

        ret = madvise((void *)dev_region->mmap_addr,

        ret = madvise((void *)(uintptr_t)dev_region->mmap_addr,

                      dev_region->size + dev_region->mmap_offset,

                      MADV_DONTNEED);

        if (ret) {
@@ -633,7 +633,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg) 
         * in neighbouring pages.

         * TODO: Turn this backon later.

         */

        ret = madvise((void *)dev_region->mmap_addr,

        ret = madvise((void *)(uintptr_t)dev_region->mmap_addr,

                      dev_region->size + dev_region->mmap_offset,

                      MADV_NOHUGEPAGE);

        if (ret) {
@@ -663,10 +663,12 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg) 
                     __func__, i);

            return false;

        }

        DPRINT("%s: region %d: Registered userfault for %llx + %llx\n",

                __func__, i, reg_struct.range.start, reg_struct.range.len);

        DPRINT("%s: region %d: Registered userfault for %"

               PRIx64 " + %" PRIx64 "\n", __func__, i,

               (uint64_t)reg_struct.range.start,

               (uint64_t)reg_struct.range.len);

        /* Now it's registered we can let the client at it */

        if (mprotect((void *)dev_region->mmap_addr,

        if (mprotect((void *)(uintptr_t)dev_region->mmap_addr,

                     dev_region->size + dev_region->mmap_offset,

                     PROT_READ | PROT_WRITE)) {

            vu_panic(dev, "failed to mprotect region %d for postcopy (%s)",

contrib/vhost-user-input/Makefile.objs

0 → 100644
+1 −0
Original line number Diff line number Diff line 
vhost-user-input-obj-y = main.o