hw: Add vmapple subdir

We will introduce a number of devices that are specific to the vmapple
target machine. To keep them all tidily together, let's put them into
a single target directory.

Signed-off-by: Alexander Graf <graf@amazon.com>
Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20241223221645.29911-7-phil@philjordan.eu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2e7fc6fa912ab339e1ad4024f02ac8fbe710647c..0e1603609183a3f14750e6757cf823aab1b19209 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2820,6 +2820,13 @@ F: hw/misc/ivshmem-flat.c
 F: include/hw/misc/ivshmem-flat.h
 F: docs/system/devices/ivshmem-flat.rst
 
+VMapple
+M: Alexander Graf <agraf@csgraf.de>
+M: Phil Dennis-Jordan <phil@philjordan.eu>
+S: Maintained
+F: hw/vmapple/*
+F: include/hw/vmapple/*
+
 Subsystems
 ----------
 Overall Audio backends

diff --git a/hw/Kconfig b/hw/Kconfig
index 1b4e9bb07f7d57a349e16146ed5e58745f38f87a..2871784cfdc9716d2f846575b1b9dfd09d537d88 100644 (file)
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -41,6 +41,7 @@ source ufs/Kconfig
 source usb/Kconfig
 source virtio/Kconfig
 source vfio/Kconfig
+source vmapple/Kconfig
 source xen/Kconfig
 source watchdog/Kconfig
 

diff --git a/hw/meson.build b/hw/meson.build
index b827c82c5d7b90980c09d4738223ee95c6b892de..9c4f6d0d6367c56ef939a1cfee81736f33dd7c91 100644 (file)
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -39,6 +39,7 @@ subdir('ufs')
 subdir('usb')
 subdir('vfio')
 subdir('virtio')
+subdir('vmapple')
 subdir('watchdog')
 subdir('xen')
 subdir('xenpv')

diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig
new file mode 100644 (file)
index 0000000..315c06b
--- /dev/null
+++ b/hw/vmapple/Kconfig
@@ -0,0 +1 @@
+# SPDX-License-Identifier: GPL-2.0-or-later

diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build
new file mode 100644 (file)
index 0000000..315c06b
--- /dev/null
+++ b/hw/vmapple/meson.build
@@ -0,0 +1 @@
+# SPDX-License-Identifier: GPL-2.0-or-later

diff --git a/hw/vmapple/trace-events b/hw/vmapple/trace-events
new file mode 100644 (file)
index 0000000..2112579
--- /dev/null
+++ b/hw/vmapple/trace-events
@@ -0,0 +1,2 @@
+# See docs/devel/tracing.rst for syntax documentation.
+# SPDX-License-Identifier: GPL-2.0-or-later

diff --git a/hw/vmapple/trace.h b/hw/vmapple/trace.h
new file mode 100644 (file)
index 0000000..d099d5e
--- /dev/null
+++ b/hw/vmapple/trace.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include "trace/trace-hw_vmapple.h"

diff --git a/meson.build b/meson.build
index 0a2c61d2bfa08cc452591ec734317fad27ac641f..d1b807aa53f9328c38590b3138f113fafa067371 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3605,6 +3605,7 @@ if have_system
     'hw/usb',
     'hw/vfio',
     'hw/virtio',
+    'hw/vmapple',
     'hw/watchdog',
     'hw/xen',
     'hw/gpio',