[PATCH 4/9] tools: Move qemu-img sources to tools/ directory

[Peter Maydell]

Move the qemu-img source files into the tools subdirectory.

Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
 MAINTAINERS                                | 2 +-
 docs/tools/qemu-img.rst                    | 2 +-
 meson.build                                | 4 ++--
 qemu-img-cmds.hx => tools/qemu-img-cmds.hx | 0
 qemu-img.c => tools/qemu-img.c             | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename qemu-img-cmds.hx => tools/qemu-img-cmds.hx (100%)
 rename qemu-img.c => tools/qemu-img.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index cd53604f92..2ef9655c94 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3106,7 +3106,7 @@ F: qapi/block*.json
 F: qapi/transaction.json
 F: include/block/
 F: include/system/block-*.h
-F: qemu-img*
+F: tools/qemu-img*
 F: docs/tools/qemu-img.rst
 F: qemu-io*
 F: tests/qemu-iotests/
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
index 558b0eb84d..52466759d2 100644
--- a/docs/tools/qemu-img.rst
+++ b/docs/tools/qemu-img.rst
@@ -39,7 +39,7 @@ Standard options:
 
 The following commands are supported:
 
-.. hxtool-doc:: qemu-img-cmds.hx
+.. hxtool-doc:: tools/qemu-img-cmds.hx
 
 Command parameters:
 
diff --git a/meson.build b/meson.build
index d4c16b394e..5d34ea39ed 100644
--- a/meson.build
+++ b/meson.build
@@ -3561,7 +3561,7 @@ genh += qemu_version
 hxdep = []
 hx_headers = [
   ['qemu-options.hx', 'qemu-options.def'],
-  ['qemu-img-cmds.hx', 'qemu-img-cmds.h'],
+  ['tools/qemu-img-cmds.hx', 'qemu-img-cmds.h'],
 ]
 if have_system
   hx_headers += [
@@ -4523,7 +4523,7 @@ endif
 
 if have_tools
   tools_link_args = enable_modules ? ['@block.syms'] : []
-  qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
+  qemu_img = executable('qemu-img', [files('tools/qemu-img.c'), hxdep],
              link_args: tools_link_args, link_depends: block_syms,
              dependencies: [authz, block, crypto, io, qom, qemuutil], install: 
true)
   qemu_io = executable('qemu-io', files('qemu-io.c'),
diff --git a/qemu-img-cmds.hx b/tools/qemu-img-cmds.hx
similarity index 100%
rename from qemu-img-cmds.hx
rename to tools/qemu-img-cmds.hx
diff --git a/qemu-img.c b/tools/qemu-img.c
similarity index 100%
rename from qemu-img.c
rename to tools/qemu-img.c
-- 
2.43.0