On 2026/05/09 0:24, Peter Maydell wrote:
We currently have exactly one subdirectory of tools, i386, which has
the qemu-vmsr-helper sources in it. An entire subdirectory isn't
really necessary here as we have only one i386-specific tool binary
and no expectation that we will have many more. Move it up a
directory level so it's in tools/ with all the other tools sources.
This was previously covered by the "X86 general architecture support"
section of MAINTAINERS under the tools/i386/ path; add both the
source file and the docs file to that section.
Signed-off-by: Peter Maydell <[email protected]>
---
MAINTAINERS | 3 ++-
meson.build | 2 +-
tools/{i386 => }/qemu-vmsr-helper.c | 0
tools/{i386 => }/rapl-msr-index.h | 0
4 files changed, 3 insertions(+), 2 deletions(-)
rename tools/{i386 => }/qemu-vmsr-helper.c (100%)
rename tools/{i386 => }/rapl-msr-index.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index f2c66d7cc3..88cc1516d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -153,7 +153,8 @@ F: stubs/hmp-cmds-target-i386.c
F: target/i386/*.[ch]
F: target/i386/Kconfig
F: target/i386/meson.build
-F: tools/i386/
+F: tools/qemu-vmsr-helper.c
+F: docs/tools/qemu-vmsr-helper.rst
F: tests/functional/i386/
F: tests/functional/x86_64/
diff --git a/meson.build b/meson.build
index 8164458eea..1dad3a2462 100644
--- a/meson.build
+++ b/meson.build
@@ -4569,7 +4569,7 @@ if have_tools
install: true)
if cpu == 'x86_64'
- executable('qemu-vmsr-helper', files('tools/i386/qemu-vmsr-helper.c'),
+ executable('qemu-vmsr-helper', files('tools/qemu-vmsr-helper.c'),
dependencies: [authz, crypto, io, qom, qemuutil,
libcap_ng, mpathpersist],
install: true)
diff --git a/tools/i386/qemu-vmsr-helper.c b/tools/qemu-vmsr-helper.c
similarity index 100%
rename from tools/i386/qemu-vmsr-helper.c
rename to tools/qemu-vmsr-helper.c
diff --git a/tools/i386/rapl-msr-index.h b/tools/rapl-msr-index.h
similarity index 100%
rename from tools/i386/rapl-msr-index.h
rename to tools/rapl-msr-index.h
tools/rapl-msr-index.h lost maintainer coverage when F: tools/i386/ was
narrowed to only tools/qemu-vmsr-helper.c
Regards,
Akihiko Odaki
