* [PULL 1/3] exec/memory: Fix kernel-doc warning
2023-03-17 14:18 [PULL 0/3] Trivial branch for 8.0 patches Laurent Vivier
@ 2023-03-17 14:18 ` Laurent Vivier
2023-03-17 14:18 ` [PULL 2/3] target/sh4: Honor QEMU_LOG_FILENAME with QEMU_LOG=cpu Laurent Vivier
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2023-03-17 14:18 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Bernhard Beschow, Philippe Mathieu-Daudé,
Laurent Vivier
From: Bernhard Beschow <shentey@gmail.com>
During build the kernel-doc script complains about the following issue:
src/docs/../include/exec/memory.h:1741: warning: Function parameter or member 'n' not described in 'memory_region_unmap_iommu_notifier_range'
src/docs/../include/exec/memory.h:1741: warning: Excess function parameter 'notifier' description in 'memory_region_unmap_iommu_notifier_range'
Settle on "notifier" for consistency with other memory functions.
Fixes: 7caebbf9ea53
("memory: introduce memory_region_unmap_iommu_notifier_range()")
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230315072552.47117-1-shentey@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/exec/memory.h | 2 +-
softmmu/memory.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 6fa0b071f04d..15ade918baa4 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1738,7 +1738,7 @@ void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
*
* @notifier: the notifier to be notified
*/
-void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *n);
+void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *notifier);
/**
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 4699ba55ec80..5305aca7ca3d 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -1996,17 +1996,17 @@ void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
}
}
-void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *n)
+void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *notifier)
{
IOMMUTLBEvent event;
event.type = IOMMU_NOTIFIER_UNMAP;
event.entry.target_as = &address_space_memory;
- event.entry.iova = n->start;
+ event.entry.iova = notifier->start;
event.entry.perm = IOMMU_NONE;
- event.entry.addr_mask = n->end - n->start;
+ event.entry.addr_mask = notifier->end - notifier->start;
- memory_region_notify_iommu_one(n, &event);
+ memory_region_notify_iommu_one(notifier, &event);
}
void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr,
--
2.39.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PULL 2/3] target/sh4: Honor QEMU_LOG_FILENAME with QEMU_LOG=cpu
2023-03-17 14:18 [PULL 0/3] Trivial branch for 8.0 patches Laurent Vivier
2023-03-17 14:18 ` [PULL 1/3] exec/memory: Fix kernel-doc warning Laurent Vivier
@ 2023-03-17 14:18 ` Laurent Vivier
2023-03-17 14:18 ` [PULL 3/3] docs/sphinx/kerneldoc.py: Honour --enable-werror Laurent Vivier
2023-03-17 17:28 ` [PULL 0/3] Trivial branch for 8.0 patches Peter Maydell
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2023-03-17 14:18 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Ilya Leoshkevich, Peter Maydell, Yoshinori Sato,
Philippe Mathieu-Daudé, Laurent Vivier
From: Ilya Leoshkevich <iii@linux.ibm.com>
When using QEMU_LOG=cpu on sh4, QEMU_LOG_FILENAME is partially ignored.
Fix by using qemu_fprintf() instead of qemu_printf() in the respective
places.
Fixes: 90c84c560067 ("qom/cpu: Simplify how CPUClass:cpu_dump_state() prints")
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230316003411.129462-1-iii@linux.ibm.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/sh4/translate.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index 97da8bce488e..6e40d5dd6a1f 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -171,16 +171,16 @@ void superh_cpu_dump_state(CPUState *cs, FILE *f, int flags)
qemu_fprintf(f, "sgr=0x%08x dbr=0x%08x delayed_pc=0x%08x fpul=0x%08x\n",
env->sgr, env->dbr, env->delayed_pc, env->fpul);
for (i = 0; i < 24; i += 4) {
- qemu_printf("r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n",
- i, env->gregs[i], i + 1, env->gregs[i + 1],
- i + 2, env->gregs[i + 2], i + 3, env->gregs[i + 3]);
+ qemu_fprintf(f, "r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n",
+ i, env->gregs[i], i + 1, env->gregs[i + 1],
+ i + 2, env->gregs[i + 2], i + 3, env->gregs[i + 3]);
}
if (env->flags & TB_FLAG_DELAY_SLOT) {
- qemu_printf("in delay slot (delayed_pc=0x%08x)\n",
- env->delayed_pc);
+ qemu_fprintf(f, "in delay slot (delayed_pc=0x%08x)\n",
+ env->delayed_pc);
} else if (env->flags & TB_FLAG_DELAY_SLOT_COND) {
- qemu_printf("in conditional delay slot (delayed_pc=0x%08x)\n",
- env->delayed_pc);
+ qemu_fprintf(f, "in conditional delay slot (delayed_pc=0x%08x)\n",
+ env->delayed_pc);
} else if (env->flags & TB_FLAG_DELAY_SLOT_RTE) {
qemu_fprintf(f, "in rte delay slot (delayed_pc=0x%08x)\n",
env->delayed_pc);
--
2.39.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PULL 3/3] docs/sphinx/kerneldoc.py: Honour --enable-werror
2023-03-17 14:18 [PULL 0/3] Trivial branch for 8.0 patches Laurent Vivier
2023-03-17 14:18 ` [PULL 1/3] exec/memory: Fix kernel-doc warning Laurent Vivier
2023-03-17 14:18 ` [PULL 2/3] target/sh4: Honor QEMU_LOG_FILENAME with QEMU_LOG=cpu Laurent Vivier
@ 2023-03-17 14:18 ` Laurent Vivier
2023-03-17 17:28 ` [PULL 0/3] Trivial branch for 8.0 patches Peter Maydell
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2023-03-17 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Thomas Huth, Laurent Vivier
From: Peter Maydell <peter.maydell@linaro.org>
Currently, the kerneldoc Sphinx plugin doesn't honour the
--enable-werror configure option, so its warnings are never fatal.
This is because although we do pass sphinx-build the -W switch, the
warnings from kerneldoc are produced by the scripts/kernel-doc script
directly and don't go through Sphinx's "emit a warning" function.
When --enable-werror is in effect, pass sphinx-build an extra
argument -Dkerneldoc_werror=1. The kerneldoc plugin can then use
this to determine whether it should be passing the kernel-doc script
-Werror.
We do this because there is no documented mechanism for
a Sphinx plugin to determine whether sphinx-build was
passed -W or not; if one is provided then we can switch to
that at a later date:
https://github.com/sphinx-doc/sphinx/issues/11239
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230314114431.1096972-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
docs/meson.build | 2 +-
docs/sphinx/kerneldoc.py | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/docs/meson.build b/docs/meson.build
index bb72c10ea8c5..f220800e3e59 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -7,7 +7,7 @@ if sphinx_build.found()
SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build, '-q']
# If we're making warnings fatal, apply this to Sphinx runs as well
if get_option('werror')
- SPHINX_ARGS += [ '-W' ]
+ SPHINX_ARGS += [ '-W', '-Dkerneldoc_werror=1' ]
endif
# This is a bit awkward but works: create a trivial document and
diff --git a/docs/sphinx/kerneldoc.py b/docs/sphinx/kerneldoc.py
index bf442150165f..72c403a73798 100644
--- a/docs/sphinx/kerneldoc.py
+++ b/docs/sphinx/kerneldoc.py
@@ -74,6 +74,10 @@ def run(self):
# Sphinx versions
cmd += ['-sphinx-version', sphinx.__version__]
+ # Pass through the warnings-as-errors flag
+ if env.config.kerneldoc_werror:
+ cmd += ['-Werror']
+
filename = env.config.kerneldoc_srctree + '/' + self.arguments[0]
export_file_patterns = []
@@ -167,6 +171,7 @@ def setup(app):
app.add_config_value('kerneldoc_bin', None, 'env')
app.add_config_value('kerneldoc_srctree', None, 'env')
app.add_config_value('kerneldoc_verbosity', 1, 'env')
+ app.add_config_value('kerneldoc_werror', 0, 'env')
app.add_directive('kernel-doc', KernelDocDirective)
--
2.39.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PULL 0/3] Trivial branch for 8.0 patches
2023-03-17 14:18 [PULL 0/3] Trivial branch for 8.0 patches Laurent Vivier
` (2 preceding siblings ...)
2023-03-17 14:18 ` [PULL 3/3] docs/sphinx/kerneldoc.py: Honour --enable-werror Laurent Vivier
@ 2023-03-17 17:28 ` Peter Maydell
3 siblings, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2023-03-17 17:28 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, qemu-trivial
On Fri, 17 Mar 2023 at 14:19, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 652737c8090eb3792f8b4c4b22ab12d7cc32073f:
>
> Update version for v8.0.0-rc0 release (2023-03-14 19:25:05 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-8.0-pull-request
>
> for you to fetch changes up to 364206640c6b34bae3bb9e428817e51d23a794d0:
>
> docs/sphinx/kerneldoc.py: Honour --enable-werror (2023-03-16 14:39:10 +0100)
>
> ----------------------------------------------------------------
> Trivial branch pull request 20230317
>
> Fix doc
> Fix sh4 cpu log output
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread