Commit 6918ab25 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200123-4' into staging 



target-arm queue:
 * fix bug in PAuth emulation
 * add PMU to Cortex-R5, Cortex-R5F
 * qemu-nbd: Convert documentation to rST
 * qemu-block-drivers: Convert documentation to rST
 * Fix Exynos4210 UART DMA support
 * Various minor code cleanups

# gpg: Signature made Thu 23 Jan 2020 16:35:38 GMT
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20200123-4:
  hw/arm/exynos4210: Connect serial port DMA busy signals with pl330
  hw/char/exynos4210_uart: Add receive DMA support
  hw/char/exynos4210_uart: Implement Rx FIFO level triggers and timeouts
  hw/char/exynos4210_uart: Implement post_load function
  hw/char/exynos4210_uart: Convert to support tracing
  hw/arm/exynos4210: Fix DMA initialization
  hw/core/or-irq: Increase limit of or-lines to 48
  dma/pl330: Convert to support tracing
  hw/misc/stm32f4xx_syscfg: Fix copy/paste error
  target/arm/arch_dump: Add SVE notes
  qemu-block-drivers: Convert to rST
  docs: Create stub system manual
  qemu-nbd: Convert invocation documentation to rST
  hw/arm: Use helper function to trigger hotplug handler plug
  hw/acpi: Remove extra indent in ACPI GED hotplug cb
  tests/tcg/aarch64: Add pauth-4
  tests/tcg/aarch64: Add pauth-3
  tests/tcg/aarch64: Fix compilation parameters for pauth-%
  target/arm: Fix PAuth sbox functions
  target/arm: add PMU feature to cortex-r5 and cortex-r5f

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b7c359c7 e9d20b55

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2519,6 +2519,7 @@ F: include/block/nbd* 
F: qemu-nbd.*

F: blockdev-nbd.c

F: docs/interop/nbd.txt

F: docs/interop/qemu-nbd.rst

T: git https://repo.or.cz/qemu/ericb.git nbd



NFS

Makefile

+26 −11
Original line number Diff line number Diff line
@@ -339,10 +339,12 @@ MANUAL_BUILDDIR := docs 
endif



ifdef BUILD_DOCS

DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8

DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1

DOCS+=$(MANUAL_BUILDDIR)/interop/qemu-nbd.8

DOCS+=$(MANUAL_BUILDDIR)/interop/qemu-ga.8

DOCS+=$(MANUAL_BUILDDIR)/system/qemu-block-drivers.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

DOCS+=docs/qemu-block-drivers.7

DOCS+=docs/qemu-cpu-models.7

DOCS+=$(MANUAL_BUILDDIR)/index.html

ifdef CONFIG_VIRTFS
@@ -749,12 +751,12 @@ distclean: clean 
	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

	rm -f docs/qemu-block-drivers.7

	rm -f docs/qemu-cpu-models.7

	rm -rf .doctrees

	$(call clean-manual,devel)

	$(call clean-manual,interop)

	$(call clean-manual,specs)

	$(call clean-manual,system)

	for d in $(TARGET_DIRS); do \

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

        done
@@ -811,6 +813,7 @@ endef 
install-sphinxdocs: sphinxdocs

	$(call install-manual,interop)

	$(call install-manual,specs)

	$(call install-manual,system)



install-doc: $(DOCS) install-sphinxdocs

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
@@ -824,12 +827,12 @@ ifdef CONFIG_POSIX 
	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"

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

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

	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"

	$(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"

	$(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"

ifeq ($(CONFIG_TOOLS),y)

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

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

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

	$(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"

endif

ifdef CONFIG_TRACE_SYSTEMTAP

	$(INSTALL_DATA) scripts/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1"
@@ -998,7 +1001,10 @@ docs/version.texi: $(SRC_PATH)/VERSION config-host.mak 
# and handles "don't rebuild things unless necessary" itself.

# The '.doctrees' files are cached information to speed this up.

.PHONY: sphinxdocs

sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html $(MANUAL_BUILDDIR)/interop/index.html $(MANUAL_BUILDDIR)/specs/index.html

sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \

            $(MANUAL_BUILDDIR)/interop/index.html \

            $(MANUAL_BUILDDIR)/specs/index.html \

            $(MANUAL_BUILDDIR)/system/index.html



# Canned command to build a single manual

# Arguments: $1 = manual name, $2 = Sphinx builder ('html' or 'man')
@@ -1007,7 +1013,9 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html $(MANUAL_BUILDDIR)/interop/index 
# a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946

build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" sphinx-build $(if $(V),,-q) -W -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1")

# We assume all RST files in the manual's directory are used in it

manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py

manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) \

              $(wildcard $(SRC_PATH)/docs/$1/*.rst.inc) \

              $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py



$(MANUAL_BUILDDIR)/devel/index.html: $(call manual-deps,devel)

	$(call build-manual,devel,html)
@@ -1018,9 +1026,18 @@ $(MANUAL_BUILDDIR)/interop/index.html: $(call manual-deps,interop) 
$(MANUAL_BUILDDIR)/specs/index.html: $(call manual-deps,specs)

	$(call build-manual,specs,html)



$(MANUAL_BUILDDIR)/system/index.html: $(call manual-deps,system)

	$(call build-manual,system,html)



$(MANUAL_BUILDDIR)/interop/qemu-ga.8: $(call manual-deps,interop)

	$(call build-manual,interop,man)



$(MANUAL_BUILDDIR)/interop/qemu-nbd.8: $(call manual-deps,interop)

	$(call build-manual,interop,man)



$(MANUAL_BUILDDIR)/system/qemu-block-drivers.7: $(call manual-deps,system)

	$(call build-manual,system,man)



$(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version.h

	@mkdir -p "$(MANUAL_BUILDDIR)"

	$(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \
@@ -1048,8 +1065,6 @@ qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi 
qemu.1: qemu-option-trace.texi

qemu-img.1: qemu-img.texi qemu-option-trace.texi qemu-img-cmds.texi

fsdev/virtfs-proxy-helper.1: fsdev/virtfs-proxy-helper.texi

qemu-nbd.8: qemu-nbd.texi qemu-option-trace.texi

docs/qemu-block-drivers.7: docs/qemu-block-drivers.texi

docs/qemu-cpu-models.7: docs/qemu-cpu-models.texi

scripts/qemu-trace-stap.1: scripts/qemu-trace-stap.texi
@@ -1059,10 +1074,10 @@ 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-img.texi qemu-options.texi \

	qemu-tech.texi qemu-option-trace.texi \

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

	qemu-monitor-info.texi docs/qemu-block-drivers.texi \

	qemu-monitor-info.texi \

	docs/qemu-cpu-models.texi docs/security.texi



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

docs/index.html.in

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
            <li><a href="qemu-ga-ref.html">Guest Agent Protocol Reference</a></li>

            <li><a href="interop/index.html">System Emulation Management and Interoperability Guide</a></li>

            <li><a href="specs/index.html">System Emulation Guest Hardware Specifications</a></li>

            <li><a href="system/index.html">System Emulation User's Guide</a></li>

        </ul>

    </body>

</html>

docs/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ Welcome to QEMU's documentation! 
   interop/index

   devel/index

   specs/index

   system/index

docs/interop/conf.py

+3 −1
Original line number Diff line number Diff line
@@ -18,5 +18,7 @@ html_theme_options['description'] = u'System Emulation Management and Interopera 
# (source start file, name, description, authors, manual section).

man_pages = [

    ('qemu-ga', 'qemu-ga', u'QEMU Guest Agent',

     ['Michael Roth <mdroth@linux.vnet.ibm.com>'], 8)

     ['Michael Roth <mdroth@linux.vnet.ibm.com>'], 8),

    ('qemu-nbd', 'qemu-nbd', u'QEMU Disk Network Block Device Server',

     ['Anthony Liguori <anthony@codemonkey.ws>'], 8)

]