docs/_templates/editpage.html | 5 - docs/conf.py | 51 +++--- docs/devel/_templates/editpage.html | 5 - docs/devel/index.rst | 4 +- docs/interop/_templates/editpage.html | 5 - docs/interop/index.rst | 4 +- docs/meson.build | 5 +- docs/specs/_templates/editpage.html | 5 - docs/specs/index.rst | 4 +- docs/sphinx-static/theme_overrides.css | 161 +++++++++++++++++ docs/system/_templates/editpage.html | 5 - docs/system/index.rst | 4 +- docs/tools/_templates/editpage.html | 5 - docs/tools/index.rst | 4 +- docs/user/_templates/editpage.html | 5 - docs/user/index.rst | 4 +- include/chardev/char.h | 3 + include/qemu/yank.h | 10 -- migration/yank_functions.h | 17 ++ backends/dbus-vmstate.c | 20 ++- chardev/char-socket.c | 41 +++-- chardev/char.c | 77 +++++--- migration/channel.c | 6 +- migration/multifd.c | 3 +- migration/qemu-file-channel.c | 3 +- migration/yank_functions.c | 20 +++ stubs/yank.c | 29 --- tests/unit/test-yank.c | 200 +++++++++++++++++++++ util/module.c | 3 +- util/yank.c | 8 - MAINTAINERS | 3 +- migration/meson.build | 1 + stubs/meson.build | 1 - tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/debian10.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/ubuntu.docker | 1 + tests/docker/dockerfiles/ubuntu1804.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/unit/meson.build | 3 +- util/meson.build | 2 +- 41 files changed, 567 insertions(+), 165 deletions(-) delete mode 100644 docs/_templates/editpage.html delete mode 100644 docs/devel/_templates/editpage.html delete mode 100644 docs/interop/_templates/editpage.html delete mode 100644 docs/specs/_templates/editpage.html create mode 100644 docs/sphinx-static/theme_overrides.css delete mode 100644 docs/system/_templates/editpage.html delete mode 100644 docs/tools/_templates/editpage.html delete mode 100644 docs/user/_templates/editpage.html create mode 100644 migration/yank_functions.h create mode 100644 migration/yank_functions.c delete mode 100644 stubs/yank.c create mode 100644 tests/unit/test-yank.c
From: Marc-André Lureau <marcandre.lureau@redhat.com> The following changes since commit 7b9a3c9f94bcac23c534bc9f42a9e914b433b299: Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20210326-pull-request' into staging (2021-03-26 12:58:58 +0000) are available in the Git repository at: git@gitlab.com:marcandre.lureau/qemu.git tags/for-6.0-pull-request for you to fetch changes up to f57d44b452e11d8b7c9743476c30a8d0f80926de: tests: Add tests for yank with the chardev-change case (2021-03-27 13:57:40 +0400) ---------------------------------------------------------------- For 6.0 misc patches under my radar. Peter, let me know if you would rather split that PR. ---------------------------------------------------------------- Lukas Straub (6): yank: Remove dependency on qiochannel yank: Always link full yank code chardev/char.c: Move object_property_try_add_child out of chardev_new chardev/char.c: Always pass id to chardev_new chardev: Fix yank with the chardev-change case tests: Add tests for yank with the chardev-change case Marc-André Lureau (3): util: fix use-after-free in module_load_one sphinx: adopt kernel readthedoc theme docs: simplify each section title Priyankar Jain (1): dbus-vmstate: Increase the size of input stream buffer used during load docs/_templates/editpage.html | 5 - docs/conf.py | 51 +++--- docs/devel/_templates/editpage.html | 5 - docs/devel/index.rst | 4 +- docs/interop/_templates/editpage.html | 5 - docs/interop/index.rst | 4 +- docs/meson.build | 5 +- docs/specs/_templates/editpage.html | 5 - docs/specs/index.rst | 4 +- docs/sphinx-static/theme_overrides.css | 161 +++++++++++++++++ docs/system/_templates/editpage.html | 5 - docs/system/index.rst | 4 +- docs/tools/_templates/editpage.html | 5 - docs/tools/index.rst | 4 +- docs/user/_templates/editpage.html | 5 - docs/user/index.rst | 4 +- include/chardev/char.h | 3 + include/qemu/yank.h | 10 -- migration/yank_functions.h | 17 ++ backends/dbus-vmstate.c | 20 ++- chardev/char-socket.c | 41 +++-- chardev/char.c | 77 +++++--- migration/channel.c | 6 +- migration/multifd.c | 3 +- migration/qemu-file-channel.c | 3 +- migration/yank_functions.c | 20 +++ stubs/yank.c | 29 --- tests/unit/test-yank.c | 200 +++++++++++++++++++++ util/module.c | 3 +- util/yank.c | 8 - MAINTAINERS | 3 +- migration/meson.build | 1 + stubs/meson.build | 1 - tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/debian10.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/ubuntu.docker | 1 + tests/docker/dockerfiles/ubuntu1804.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/unit/meson.build | 3 +- util/meson.build | 2 +- 41 files changed, 567 insertions(+), 165 deletions(-) delete mode 100644 docs/_templates/editpage.html delete mode 100644 docs/devel/_templates/editpage.html delete mode 100644 docs/interop/_templates/editpage.html delete mode 100644 docs/specs/_templates/editpage.html create mode 100644 docs/sphinx-static/theme_overrides.css delete mode 100644 docs/system/_templates/editpage.html delete mode 100644 docs/tools/_templates/editpage.html delete mode 100644 docs/user/_templates/editpage.html create mode 100644 migration/yank_functions.h create mode 100644 migration/yank_functions.c delete mode 100644 stubs/yank.c create mode 100644 tests/unit/test-yank.c -- 2.29.0
Patchew URL: https://patchew.org/QEMU/20210328184533.752840-1-marcandre.lureau@redhat.com/ Hi, This series seems to have some coding style problems. See output below for more information: Type: series Message-id: 20210328184533.752840-1-marcandre.lureau@redhat.com Subject: [PULL 00/10] For 6.0 patches === TEST SCRIPT BEGIN === #!/bin/bash git rev-parse base > /dev/null || exit 0 git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback base.. === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 From https://github.com/patchew-project/qemu * [new tag] patchew/20210328184533.752840-1-marcandre.lureau@redhat.com -> patchew/20210328184533.752840-1-marcandre.lureau@redhat.com Switched to a new branch 'test' cd52ca9 tests: Add tests for yank with the chardev-change case 442c7e4 chardev: Fix yank with the chardev-change case fa90829 chardev/char.c: Always pass id to chardev_new 0ee1fbc chardev/char.c: Move object_property_try_add_child out of chardev_new 0bb8f82 yank: Always link full yank code 6bcc10f yank: Remove dependency on qiochannel a15a59f docs: simplify each section title cfd08be sphinx: adopt kernel readthedoc theme 0295885 dbus-vmstate: Increase the size of input stream buffer used during load 8e43270 util: fix use-after-free in module_load_one === OUTPUT BEGIN === 1/10 Checking commit 8e43270ef1f8 (util: fix use-after-free in module_load_one) 2/10 Checking commit 029588549aba (dbus-vmstate: Increase the size of input stream buffer used during load) 3/10 Checking commit cfd08be5e0ab (sphinx: adopt kernel readthedoc theme) Use of uninitialized value $acpi_testexpected in string eq at ./scripts/checkpatch.pl line 1529. WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #44: deleted file mode 100644 total: 0 errors, 1 warnings, 283 lines checked Patch 3/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 4/10 Checking commit a15a59f66a52 (docs: simplify each section title) 5/10 Checking commit 6bcc10f20e5a (yank: Remove dependency on qiochannel) 6/10 Checking commit 0bb8f82e839a (yank: Always link full yank code) 7/10 Checking commit 0ee1fbce3458 (chardev/char.c: Move object_property_try_add_child out of chardev_new) 8/10 Checking commit fa9082938228 (chardev/char.c: Always pass id to chardev_new) 9/10 Checking commit 442c7e4ebee8 (chardev: Fix yank with the chardev-change case) 10/10 Checking commit cd52ca9c1c1d (tests: Add tests for yank with the chardev-change case) ERROR: Macros with multiple statements should be enclosed in a do - while loop #231: FILE: tests/unit/test-yank.c:180: +#define CHAR_CHANGE_TEST(name, _old_yank, _new_yank) \ + g_test_add_data_func("/yank/char_change/success/" # name, \ + &(CharChangeTestConfig) { .addr = &tcpaddr, \ + .old_yank = (_old_yank),\ + .new_yank = (_new_yank),\ + .fail = false }, \ + char_change_test); \ + g_test_add_data_func("/yank/char_change/fail/" # name, \ + &(CharChangeTestConfig) { .addr = &tcpaddr, \ + .old_yank = (_old_yank),\ + .new_yank = (_new_yank),\ + .fail = true }, \ + char_change_test); total: 1 errors, 0 warnings, 216 lines checked Patch 10/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20210328184533.752840-1-marcandre.lureau@redhat.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
On Sun, 28 Mar 2021 at 19:45, <marcandre.lureau@redhat.com> wrote: > > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > The following changes since commit 7b9a3c9f94bcac23c534bc9f42a9e914b433b299: > > Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20210326-pull-request' into staging (2021-03-26 12:58:58 +0000) > > are available in the Git repository at: > > git@gitlab.com:marcandre.lureau/qemu.git tags/for-6.0-pull-request > > for you to fetch changes up to f57d44b452e11d8b7c9743476c30a8d0f80926de: > > tests: Add tests for yank with the chardev-change case (2021-03-27 13:57:40 +0400) > > ---------------------------------------------------------------- > For 6.0 misc patches under my radar. > > Peter, let me know if you would rather split that PR. > > ---------------------------------------------------------------- This produces a backtrace from sphinx-build which nonetheless doesn't cause a build failure: Program sphinx-build found: YES ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build: Configuration error: There is a programable error in your configuration file: Traceback (most recent call last): File "conf.py", line 154, in <module> import sphinx_rtd_theme ModuleNotFoundError: No module named 'sphinx_rtd_theme' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/lib/python3/dist-packages/sphinx/config.py", line 157, in __init__ execfile_(filename, config) File "/usr/lib/python3/dist-packages/sphinx/util/pycompat.py", line 150, in execfile_ exec_(code, _globals) File "conf.py", line 157, in <module> 'The Sphinx \'sphinx_rtd_theme\' HTML theme was not found.\n' sphinx.errors.ConfigError: The Sphinx 'sphinx_rtd_theme' HTML theme was not found. Program python3 found: YES (/usr/bin/python3) In particular I see that on all the BSD VMs. If we're going to require rtd that means we need to ensure it's present on all the VM configs, docker configs, everything the CI uses, etc. You should also flag up new build-deps in the pullreq cover letter. I dunno if we can get the error message neater (I know sphinx-build, especially older versions, is a bit unhelpful about what it lets us report.) The test-yank stuff also failed on OSX: Unexpected error in inet_connect_addr() at ../../util/qemu-sockets.c:380: Failed to connect to '127.0.0.1:63820': Operation timed out ERROR test-yank - too few tests run (expected 6, got 1) thanks -- PMM
Hi On Mon, Mar 29, 2021 at 5:54 PM Peter Maydell <peter.maydell@linaro.org> wrote: > On Sun, 28 Mar 2021 at 19:45, <marcandre.lureau@redhat.com> wrote: > > > > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > > > The following changes since commit > 7b9a3c9f94bcac23c534bc9f42a9e914b433b299: > > > > Merge remote-tracking branch > 'remotes/kraxel/tags/fixes-20210326-pull-request' into staging (2021-03-26 > 12:58:58 +0000) > > > > are available in the Git repository at: > > > > git@gitlab.com:marcandre.lureau/qemu.git tags/for-6.0-pull-request > > > > for you to fetch changes up to f57d44b452e11d8b7c9743476c30a8d0f80926de: > > > > tests: Add tests for yank with the chardev-change case (2021-03-27 > 13:57:40 +0400) > > > > ---------------------------------------------------------------- > > For 6.0 misc patches under my radar. > > > > Peter, let me know if you would rather split that PR. > > > > ---------------------------------------------------------------- > > This produces a backtrace from sphinx-build which nonetheless doesn't > cause a build failure: > > > Program sphinx-build found: YES > ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build: > Configuration error: > There is a programable error in your configuration file: > > Traceback (most recent call last): > File "conf.py", line 154, in <module> > import sphinx_rtd_theme > ModuleNotFoundError: No module named 'sphinx_rtd_theme' > > During handling of the above exception, another exception occurred: > > Traceback (most recent call last): > File "/usr/lib/python3/dist-packages/sphinx/config.py", line 157, in > __init__ > execfile_(filename, config) > File "/usr/lib/python3/dist-packages/sphinx/util/pycompat.py", line > 150, in execfile_ > exec_(code, _globals) > File "conf.py", line 157, in <module> > 'The Sphinx \'sphinx_rtd_theme\' HTML theme was not found.\n' > sphinx.errors.ConfigError: The Sphinx 'sphinx_rtd_theme' HTML theme > was not found. > > ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: Configuration error: The Sphinx 'sphinx_rtd_theme' HTML theme was not found. ../docs/meson.build:32:6: ERROR: Problem encountered: Install a Python 3 version of python-sphinx and the readthedoc theme It's only fatal if you explicitely enabled docs. Otherwise, it just prints a warning and disable it (just like sphinx 3.6 version requirement). > > > Program python3 found: YES (/usr/bin/python3) > > > In particular I see that on all the BSD VMs. If we're going to > require rtd that means we need to ensure it's present on all > the VM configs, docker configs, everything the CI uses, etc. > You should also flag up new build-deps in the pullreq cover > letter. > I updated all docker configs. We don't have sphinx in the BSD VMs apparently, am I wrong? > I dunno if we can get the error message neater (I know sphinx-build, > especially older versions, is a bit unhelpful about what it lets us > report.) > > The test-yank stuff also failed on OSX: > > Unexpected error in inet_connect_addr() at ../../util/qemu-sockets.c:380: > Failed to connect to '127.0.0.1:63820': Operation timed out > ERROR test-yank - too few tests run (expected 6, got 1) > > Lukas, can you have a look too? thanks -- Marc-André Lureau
On Mon, 29 Mar 2021 18:16:59 +0400 Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > Hi > > On Mon, Mar 29, 2021 at 5:54 PM Peter Maydell <peter.maydell@linaro.org> > wrote: > > [...] > > > > I dunno if we can get the error message neater (I know sphinx-build, > > especially older versions, is a bit unhelpful about what it lets us > > report.) > > > > The test-yank stuff also failed on OSX: > > > > Unexpected error in inet_connect_addr() at ../../util/qemu-sockets.c:380: > > Failed to connect to '127.0.0.1:63820': Operation timed out > > ERROR test-yank - too few tests run (expected 6, got 1) > > > > > Lukas, can you have a look too? I guess OSX is waiting for a accept() from the other side (I have no OSX here to test though). I'll fix it. Regards, Lukas Straub --
On Mon, 29 Mar 2021 at 15:17, Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > > Hi > > On Mon, Mar 29, 2021 at 5:54 PM Peter Maydell <peter.maydell@linaro.org> wrote: >> >> This produces a backtrace from sphinx-build which nonetheless doesn't >> cause a build failure: >> >> >> Program sphinx-build found: YES >> ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build: >> Configuration error: >> There is a programable error in your configuration file: >> >> Traceback (most recent call last): >> File "conf.py", line 154, in <module> >> import sphinx_rtd_theme >> ModuleNotFoundError: No module named 'sphinx_rtd_theme' >> >> During handling of the above exception, another exception occurred: >> >> Traceback (most recent call last): >> File "/usr/lib/python3/dist-packages/sphinx/config.py", line 157, in __init__ >> execfile_(filename, config) >> File "/usr/lib/python3/dist-packages/sphinx/util/pycompat.py", line >> 150, in execfile_ >> exec_(code, _globals) >> File "conf.py", line 157, in <module> >> 'The Sphinx \'sphinx_rtd_theme\' HTML theme was not found.\n' >> sphinx.errors.ConfigError: The Sphinx 'sphinx_rtd_theme' HTML theme >> was not found. >> > > > ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: > Configuration error: > The Sphinx 'sphinx_rtd_theme' HTML theme was not found. > > ../docs/meson.build:32:6: ERROR: Problem encountered: Install a Python 3 version of python-sphinx and the readthedoc theme So why do you get that message, and I see the above? Older sphinx-build ? Also, if this isn't fatal (the build does continue), meson shouldn't print ERROR here, ideally. >> Program python3 found: YES (/usr/bin/python3) >> >> >> In particular I see that on all the BSD VMs. If we're going to >> require rtd that means we need to ensure it's present on all >> the VM configs, docker configs, everything the CI uses, etc. >> You should also flag up new build-deps in the pullreq cover >> letter. > > > I updated all docker configs. We don't have sphinx in the BSD VMs apparently, am I wrong? We must do, because trying to build this merge in the VMs produces errors from sphinx-build... -- PMM
Hi On Mon, Mar 29, 2021 at 7:56 PM Peter Maydell <peter.maydell@linaro.org> wrote: > On Mon, 29 Mar 2021 at 15:17, Marc-André Lureau > <marcandre.lureau@gmail.com> wrote: > > > > Hi > > > > On Mon, Mar 29, 2021 at 5:54 PM Peter Maydell <peter.maydell@linaro.org> > wrote: > >> > >> This produces a backtrace from sphinx-build which nonetheless doesn't > >> cause a build failure: > >> > >> > >> Program sphinx-build found: YES > >> ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build: > >> Configuration error: > >> There is a programable error in your configuration file: > >> > >> Traceback (most recent call last): > >> File "conf.py", line 154, in <module> > >> import sphinx_rtd_theme > >> ModuleNotFoundError: No module named 'sphinx_rtd_theme' > >> > >> During handling of the above exception, another exception occurred: > >> > >> Traceback (most recent call last): > >> File "/usr/lib/python3/dist-packages/sphinx/config.py", line 157, in > __init__ > >> execfile_(filename, config) > >> File "/usr/lib/python3/dist-packages/sphinx/util/pycompat.py", line > >> 150, in execfile_ > >> exec_(code, _globals) > >> File "conf.py", line 157, in <module> > >> 'The Sphinx \'sphinx_rtd_theme\' HTML theme was not found.\n' > >> sphinx.errors.ConfigError: The Sphinx 'sphinx_rtd_theme' HTML theme > >> was not found. > >> > > > > > > ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: > > Configuration error: > > The Sphinx 'sphinx_rtd_theme' HTML theme was not found. > > > > ../docs/meson.build:32:6: ERROR: Problem encountered: Install a Python 3 > version of python-sphinx and the readthedoc theme > > > So why do you get that message, and I see the above? Older > sphinx-build ? > It's strange, it's like ModuleNotFoundError was not catched by the "except ImportError". What's the version of python? > Also, if this isn't fatal (the build does continue), meson > shouldn't print ERROR here, ideally. > Something is again unexpected here. If you have the meson error, it should stop the build there with an error. And the error is only raised when docs is enabled. For me it doesn't continue: $ make ... ../docs/meson.build:32:6: ERROR: Problem encountered: Install a Python 3 version of python-sphinx and the readthedoc theme A full log can be found at /home/elmarco/src/qemu/build/meson-logs/meson-log.txt ninja: error: rebuilding 'build.ninja': subcommand failed FAILED: build.ninja /usr/bin/meson --internal regenerate /home/elmarco/src/qemu /home/elmarco/src/qemu/build --backend ninja make: *** [Makefile:152: run-ninja] Error 1 > >> Program python3 found: YES (/usr/bin/python3) > >> > >> > >> In particular I see that on all the BSD VMs. If we're going to > >> require rtd that means we need to ensure it's present on all > >> the VM configs, docker configs, everything the CI uses, etc. > >> You should also flag up new build-deps in the pullreq cover > >> letter. > > > > > > I updated all docker configs. We don't have sphinx in the BSD VMs > apparently, am I wrong? > > We must do, because trying to build this merge in the VMs produces > errors from sphinx-build... > > I am trying to reproduce.. I tried with vm-build-openbsd, but it reaches console read timeout error... Now trying with freebsd (looking for a mirror for iso, because 40kb/s atm for me) -- Marc-André Lureau
On Mon, 29 Mar 2021 at 17:30, Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > > Hi > > On Mon, Mar 29, 2021 at 7:56 PM Peter Maydell <peter.maydell@linaro.org> wrote: >> >> On Mon, 29 Mar 2021 at 15:17, Marc-André Lureau >> <marcandre.lureau@gmail.com> wrote: >> > ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: >> > Configuration error: >> > The Sphinx 'sphinx_rtd_theme' HTML theme was not found. >> > >> > ../docs/meson.build:32:6: ERROR: Problem encountered: Install a Python 3 version of python-sphinx and the readthedoc theme >> >> >> So why do you get that message, and I see the above? Older >> sphinx-build ? > > > > It's strange, it's like ModuleNotFoundError was not catched by the "except ImportError". > > What's the version of python? It's whatever's in the BSD VMs. I also saw the same error on the aarch64 CI machine, which has python 3.8.5 and sphinx-build 1.8.5. My guess is that it might be the sphinx-build version here. I vaguely recall that Sphinx is kind of picky about exceptions within the conf file but that there was a change in what it allowed at some point. It's possible we just can't do much with the old versions. I'm inclined to suggest we should postpone switching to the rtd theme until after the 6.0 release -- there isn't a strong need to get it in this release, is there ? thanks -- PMM
Hi On Mon, Mar 29, 2021 at 9:54 PM Peter Maydell <peter.maydell@linaro.org> wrote: > On Mon, 29 Mar 2021 at 17:30, Marc-André Lureau > <marcandre.lureau@gmail.com> wrote: > > > > Hi > > > > On Mon, Mar 29, 2021 at 7:56 PM Peter Maydell <peter.maydell@linaro.org> > wrote: > >> > >> On Mon, 29 Mar 2021 at 15:17, Marc-André Lureau > >> <marcandre.lureau@gmail.com> wrote: > >> > ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: > >> > Configuration error: > >> > The Sphinx 'sphinx_rtd_theme' HTML theme was not found. > >> > > >> > ../docs/meson.build:32:6: ERROR: Problem encountered: Install a > Python 3 version of python-sphinx and the readthedoc theme > >> > >> > >> So why do you get that message, and I see the above? Older > >> sphinx-build ? > > > > > > > > It's strange, it's like ModuleNotFoundError was not catched by the > "except ImportError". > > > > What's the version of python? > > It's whatever's in the BSD VMs. I also saw the same error on the > I built successfully with vm-build-openbsd, vm-build-freebsd, and vm-build-netbsd. None have sphinx installed, thus simply print: Program sphinx-build-3 sphinx-build found: NO Am I missing something? aarch64 CI machine, which has python 3.8.5 and sphinx-build 1.8.5. > My guess is that it might be the sphinx-build version here. I vaguely > recall that Sphinx is kind of picky about exceptions within the conf > file but that there was a change in what it allowed at some point. > It's possible we just can't do much with the old versions. > How do you run the build? Running make from an existing configured or build state? If so, I have seen sphinx errors that don't stop the build (and actually building the docs without sphinx-rtd). I don't know why this happens, "regenerate"/reconfigure errors should stop the build. It seems like a minor issue to me. A clean build will error correctly. > I'm inclined to suggest we should postpone switching to the rtd theme > until after the 6.0 release -- there isn't a strong need to get it > in this release, is there ? > > There is no hurry, but let's try to make some progress. If it's ready, I'll let you decide if this is acceptable during freeze period or not. Now I am not sure what should be fixed... I will try to find the cause of the non-fatal error on incremental build. thanks -- Marc-André Lureau
On Tue, 30 Mar 2021 at 09:29, Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > > Hi > > On Mon, Mar 29, 2021 at 9:54 PM Peter Maydell <peter.maydell@linaro.org> wrote: >> aarch64 CI machine, which has python 3.8.5 and sphinx-build 1.8.5. >> My guess is that it might be the sphinx-build version here. I vaguely >> recall that Sphinx is kind of picky about exceptions within the conf >> file but that there was a change in what it allowed at some point. >> It's possible we just can't do much with the old versions. > > > How do you run the build? Running make from an existing configured or build state? If so, I have seen sphinx errors that don't stop the build (and actually building the docs without sphinx-rtd). I don't know why this happens, "regenerate"/reconfigure errors should stop the build. On that machine, yes, it's an incremental build. thanks -- PMM
Hi On Tue, Mar 30, 2021 at 4:12 PM Peter Maydell <peter.maydell@linaro.org> wrote: > On Tue, 30 Mar 2021 at 09:29, Marc-André Lureau > <marcandre.lureau@gmail.com> wrote: > > > > Hi > > > > On Mon, Mar 29, 2021 at 9:54 PM Peter Maydell <peter.maydell@linaro.org> > wrote: > >> aarch64 CI machine, which has python 3.8.5 and sphinx-build 1.8.5. > >> My guess is that it might be the sphinx-build version here. I vaguely > >> recall that Sphinx is kind of picky about exceptions within the conf > >> file but that there was a change in what it allowed at some point. > >> It's possible we just can't do much with the old versions. > > > > > > How do you run the build? Running make from an existing configured or > build state? If so, I have seen sphinx errors that don't stop the build > (and actually building the docs without sphinx-rtd). I don't know why this > happens, "regenerate"/reconfigure errors should stop the build. > > On that machine, yes, it's an incremental build. > > Could you check if --enable-docs was enabled? It turns out I wasn't always checking things properly, and it works as expected for me. Without the rtd theme installed and: - Without --enable-docs, ./docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: Configuration error: The Sphinx 'sphinx_rtd_theme' HTML theme was not found. On incremental build, extra warnings and the build continues, disabling docs as necessary. - With --enable-docs, ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: Configuration error: The Sphinx 'sphinx_rtd_theme' HTML theme was not found. ../docs/meson.build:32:6: ERROR: Problem encountered: Install a Python 3 version of python-sphinx and the readthedoc theme A full log can be found at /home/elmarco/src/qemu/build/meson-logs/meson-log.txt ERROR: meson setup failed On incremental build, it correctly stops: ../docs/meson.build:30: WARNING: /usr/bin/sphinx-build-3: Configuration error: The Sphinx 'sphinx_rtd_theme' HTML theme was not found. ../docs/meson.build:32:6: ERROR: Problem encountered: Install a Python 3 version of python-sphinx and the readthedoc theme A full log can be found at /home/elmarco/src/qemu/build/meson-logs/meson-log.txt ninja: error: FAILED: build.ninja /usr/bin/meson --internal regenerate /home/elmarco/src/qemu /home/elmarco/src/qemu/build --backend ninja rebuilding 'build.ninja': subcommand failed make: *** [Makefile:152: run-ninja] Error 1 -- Marc-André Lureau
© 2016 - 2024 Red Hat, Inc.