Commit 7e56accd authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* nbd and qemu-nbd fixes (Eric, Max)
* nbd refactoring (Vladimir)
* vhost-user-scsi, take N+1 (Felipe)
* replace memory_region_set_fd with memory_region_init_ram_from_fd (Marc-André)
* docs/ movement (Paolo)
* megasas TOCTOU fixes (Paolo)
* make async_safe_run_on_cpu work on kvm/hax accelerators (Paolo)
* Build system and poison.h improvements (Thomas)
* -accel thread=xxx fix (Thomas)
* move files to accel/ (Yang Zhong)

# gpg: Signature made Thu 15 Jun 2017 10:51:55 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (41 commits)
  vhost-user-scsi: Introduce a vhost-user-scsi sample application
  vhost-user-scsi: Introduce vhost-user-scsi host device
  qemu-doc: include version number
  docs: create interop/ subdirectory
  include/exec/poison: Mark some CONFIG defines as poisoned, too
  include/exec/poison: Add missing TARGET defines
  nbd/server: refactor nbd_trip
  nbd/server: rename rc to ret
  nbd/server: get rid of fail: return rc
  nbd/server: nbd_negotiate: fix error path
  nbd/server: remove NBDClientNewData
  nbd/server: refactor nbd_co_receive_request
  nbd/server: get rid of EAGAIN dead code
  nbd/server: refactor nbd_co_send_reply
  nbd/server: get rid of ssize_t
  nbd/server: get rid of nbd_negotiate_read and friends
  nbd: make nbd_drop public
  nbd: rename read_sync and friends
  accel: move kvm related accelerator files into accel/
  tcg: move tcg backend files into accel/tcg/
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5135a105 49cc0340

.gitignore

+9 −8
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
/qemu-version.h.tmp

/module_block.h

/vscclient

/vhost-user-scsi

/fsdev/virtfs-proxy-helper

*.[1-9]

*.a
@@ -99,14 +100,14 @@ 
/pc-bios/optionrom/kvmvapic.img

/pc-bios/s390-ccw/s390-ccw.elf

/pc-bios/s390-ccw/s390-ccw.img

/docs/qemu-ga-qapi.texi

/docs/qemu-ga-ref.html

/docs/qemu-ga-ref.info*

/docs/qemu-ga-ref.txt

/docs/qemu-qmp-qapi.texi

/docs/qemu-qmp-ref.html

/docs/qemu-qmp-ref.info*

/docs/qemu-qmp-ref.txt

/docs/interop/qemu-ga-qapi.texi

/docs/interop/qemu-ga-ref.html

/docs/interop/qemu-ga-ref.info*

/docs/interop/qemu-ga-ref.txt

/docs/interop/qemu-qmp-qapi.texi

/docs/interop/qemu-qmp-ref.html

/docs/interop/qemu-qmp-ref.info*

/docs/interop/qemu-qmp-ref.txt

/docs/version.texi

*.tps

.stgit-*

Makefile

+43 −34
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) 


ifdef BUILD_DOCS

DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8

DOCS+=docs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7

DOCS+=docs/qemu-ga-ref.html docs/qemu-ga-ref.txt docs/qemu-ga-ref.7

DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7

DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7

ifdef CONFIG_VIRTFS

DOCS+=fsdev/virtfs-proxy-helper.1

endif
@@ -269,6 +269,7 @@ dummy := $(call unnest-vars,, \ 
                ivshmem-client-obj-y \

                ivshmem-server-obj-y \

                libvhost-user-obj-y \

                vhost-user-scsi-obj-y \

                qga-vss-dll-obj-y \

                block-obj-y \

                block-obj-m \
@@ -473,6 +474,8 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) 
	$(call LINK, $^)

ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)

vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y)

	$(call LINK, $^)



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

	$(call quiet-command,$(PYTHON) $< $@ \
@@ -519,11 +522,12 @@ distclean: clean 
	rm -f qemu-doc.vr qemu-doc.txt

	rm -f config.log

	rm -f linux-headers/asm

	rm -f docs/qemu-ga-qapi.texi docs/qemu-qmp-qapi.texi docs/version.texi

	rm -f docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7

	rm -f docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt

	rm -f docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf

	rm -f docs/qemu-qmp-ref.html docs/qemu-ga-ref.html

	rm -f docs/version.texi

	rm -f docs/interop/qemu-ga-qapi.texi docs/interop/qemu-qmp-qapi.texi

	rm -f docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7

	rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt

	rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf

	rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html

	for d in $(TARGET_DIRS); do \

	rm -rf $$d || exit 1 ; \

        done
@@ -562,13 +566,13 @@ install-doc: $(DOCS) 
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"

ifdef CONFIG_POSIX

	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"

	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"

	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"

	$(INSTALL_DATA) docs/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"

	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"

ifneq ($(TOOLS),)

	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"

	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
@@ -576,9 +580,9 @@ ifneq ($(TOOLS),) 
endif

ifneq (,$(findstring qemu-ga,$(TOOLS)))

	$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8"

	$(INSTALL_DATA) docs/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"

	$(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"

endif

endif

ifdef CONFIG_VIRTFS
@@ -666,28 +670,27 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ 


# documentation

MAKEINFO=makeinfo

MAKEINFOFLAGS=--no-split --number-sections -I docs

TEXIFLAG=$(if $(V),,--quiet)

MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)

MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)

TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"

TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)



docs/version.texi: $(SRC_PATH)/VERSION

	$(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")



%.html: %.texi

%.html: %.texi docs/version.texi

	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \

	--html $< -o $@,"GEN","$@")



%.info: %.texi

%.info: %.texi docs/version.texi

	$(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@")



%.txt: %.texi

%.txt: %.texi docs/version.texi

	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \

	--plaintext $< -o $@,"GEN","$@")



%.pdf: %.texi

	$(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I docs $< -o $@,"GEN","$@")



docs/qemu-ga-ref.html docs/qemu-ga-ref.info docs/qemu-ga-ref.txt docs/qemu-ga-ref.pdf docs/qemu-ga-ref.7.pod: docs/version.texi

docs/qemu-qmp-ref.html docs/qemu-qmp-ref.info docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.pdf docs/qemu-qmp-ref.pod: docs/version.texi

%.pdf: %.texi docs/version.texi

	$(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@")



qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@")
@@ -701,12 +704,12 @@ qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxt 
qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@")



docs/qemu-qmp-qapi.texi docs/qemu-ga-qapi.texi: $(SRC_PATH)/scripts/qapi2texi.py $(qapi-py)

docs/interop/qemu-qmp-qapi.texi docs/interop/qemu-ga-qapi.texi: $(SRC_PATH)/scripts/qapi2texi.py $(qapi-py)



docs/qemu-qmp-qapi.texi: $(qapi-modules)

docs/interop/qemu-qmp-qapi.texi: $(qapi-modules)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")



docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json

docs/interop/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")



qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi
@@ -716,21 +719,25 @@ fsdev/virtfs-proxy-helper.1: fsdev/virtfs-proxy-helper.texi 
qemu-nbd.8: qemu-nbd.texi qemu-option-trace.texi

qemu-ga.8: qemu-ga.texi



html: qemu-doc.html docs/qemu-qmp-ref.html docs/qemu-ga-ref.html

info: qemu-doc.info docs/qemu-qmp-ref.info docs/qemu-ga-ref.info

pdf: qemu-doc.pdf docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf

txt: qemu-doc.txt docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt

html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html

info: qemu-doc.info docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info

pdf: qemu-doc.pdf docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf

txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt



qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \

	qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \

	qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \

	qemu-monitor-info.texi



docs/qemu-ga-ref.dvi docs/qemu-ga-ref.html docs/qemu-ga-ref.info docs/qemu-ga-ref.pdf docs/qemu-ga-ref.txt docs/qemu-ga-ref.7: \

docs/qemu-ga-ref.texi docs/qemu-ga-qapi.texi

docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \

    docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \

    docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7: \

	docs/interop/qemu-ga-ref.texi docs/interop/qemu-ga-qapi.texi



docs/qemu-qmp-ref.dvi docs/qemu-qmp-ref.html docs/qemu-qmp-ref.info docs/qemu-qmp-ref.pdf docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7: \

docs/qemu-qmp-ref.texi docs/qemu-qmp-qapi.texi

docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \

    docs/interop/qemu-qmp-ref.info docs/interop/qemu-qmp-ref.pdf \

    docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \

	docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi





ifdef CONFIG_WIN32
@@ -791,9 +798,11 @@ endif # CONFIG_WIN 


# Add a dependency on the generated files, so that they are always

# rebuilt before other object files

ifneq ($(wildcard config-host.mak),)

ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))

Makefile: $(GENERATED_FILES)

endif

endif



.SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=%-timestamp) \

	$(TRACE_SOURCES) $(TRACE_SOURCES:%=%-timestamp) \

Makefile.objs

+6 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ common-obj-y += migration/ 


common-obj-y += audio/

common-obj-y += hw/

common-obj-y += accel.o



common-obj-y += replay/
@@ -111,6 +110,10 @@ qga-vss-dll-obj-y = qga/ 
ivshmem-client-obj-y = contrib/ivshmem-client/

ivshmem-server-obj-y = contrib/ivshmem-server/

libvhost-user-obj-y = contrib/libvhost-user/

vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)

vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)

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

vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o



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

trace-events-subdirs =
@@ -163,6 +166,8 @@ trace-events-subdirs += target/ppc 
trace-events-subdirs += qom

trace-events-subdirs += linux-user

trace-events-subdirs += qapi

trace-events-subdirs += accel/tcg

trace-events-subdirs += accel/kvm



trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)

Makefile.target

+4 −8
Original line number Diff line number Diff line
@@ -88,20 +88,17 @@ all: $(PROGS) stap 


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

# cpu emulator library

obj-y = exec.o translate-all.o cpu-exec.o

obj-y += translate-common.o

obj-y += cpu-exec-common.o

obj-y += exec.o

obj-y += accel/

obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o

obj-y += tcg/tcg-common.o tcg/tcg-runtime.o

obj-$(CONFIG_TCG_INTERPRETER) += tci.o

obj-y += tcg/tcg-common.o

obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o

obj-y += fpu/softfloat.o

obj-y += target/$(TARGET_BASE_ARCH)/

obj-y += disas.o

obj-y += tcg-runtime.o

obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o

obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o

obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o



obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o
@@ -142,8 +139,7 @@ ifdef CONFIG_SOFTMMU 
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o

obj-y += qtest.o bootdevice.o

obj-y += hw/

obj-$(CONFIG_KVM) += kvm-all.o

obj-y += memory.o cputlb.o

obj-y += memory.o

obj-y += memory_mapping.o

obj-y += dump.o

obj-y += migration/ram.o

accel/Makefile.objs

0 → 100644
+4 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SOFTMMU) += accel.o

obj-y += kvm/

obj-y += tcg/

obj-y += stubs/