New vmapple machine type and xhci fixes

[PATCH v17 03/11] hw: Add vmapple subdir

Posted by Phil Dennis-Jordan 2 months, 3 weeks ago

From: Alexander Graf <graf@amazon.com>

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>
---
 MAINTAINERS             | 7 +++++++
 hw/Kconfig              | 1 +
 hw/meson.build          | 1 +
 hw/vmapple/Kconfig      | 1 +
 hw/vmapple/meson.build  | 0
 hw/vmapple/trace-events | 2 ++
 hw/vmapple/trace.h      | 1 +
 meson.build             | 1 +
 8 files changed, 14 insertions(+)
 create mode 100644 hw/vmapple/Kconfig
 create mode 100644 hw/vmapple/meson.build
 create mode 100644 hw/vmapple/trace-events
 create mode 100644 hw/vmapple/trace.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 2101b51217..e220744abf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2785,6 +2785,13 @@ F: hw/hyperv/hv-balloon*.h
 F: include/hw/hyperv/dynmem-proto.h
 F: include/hw/hyperv/hv-balloon.h
 
+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 1b4e9bb07f..2871784cfd 100644
--- 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 b827c82c5d..9c4f6d0d63 100644
--- 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
index 0000000000..8b13789179
--- /dev/null
+++ b/hw/vmapple/Kconfig
@@ -0,0 +1 @@
+
diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hw/vmapple/trace-events b/hw/vmapple/trace-events
new file mode 100644
index 0000000000..9ccc579048
--- /dev/null
+++ b/hw/vmapple/trace-events
@@ -0,0 +1,2 @@
+# See docs/devel/tracing.rst for syntax documentation.
+
diff --git a/hw/vmapple/trace.h b/hw/vmapple/trace.h
new file mode 100644
index 0000000000..572adbefe0
--- /dev/null
+++ b/hw/vmapple/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_vmapple.h"
diff --git a/meson.build b/meson.build
index d06f59095c..812ef33550 100644
--- a/meson.build
+++ b/meson.build
@@ -3588,6 +3588,7 @@ if have_system
     'hw/usb',
     'hw/vfio',
     'hw/virtio',
+    'hw/vmapple',
     'hw/watchdog',
     'hw/xen',
     'hw/gpio',
-- 
2.39.5 (Apple Git-154)

Re: [PATCH v17 03/11] hw: Add vmapple subdir

Posted by Philippe Mathieu-Daudé 1 month ago

On 12/1/25 22:00, Phil Dennis-Jordan wrote:
> From: Alexander Graf <graf@amazon.com>
> 
> 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>
> ---
>   MAINTAINERS             | 7 +++++++
>   hw/Kconfig              | 1 +
>   hw/meson.build          | 1 +
>   hw/vmapple/Kconfig      | 1 +
>   hw/vmapple/meson.build  | 0
>   hw/vmapple/trace-events | 2 ++
>   hw/vmapple/trace.h      | 1 +
>   meson.build             | 1 +
>   8 files changed, 14 insertions(+)
>   create mode 100644 hw/vmapple/Kconfig
>   create mode 100644 hw/vmapple/meson.build
>   create mode 100644 hw/vmapple/trace-events
>   create mode 100644 hw/vmapple/trace.h


> diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig
> new file mode 100644
> index 0000000000..8b13789179
> --- /dev/null
> +++ b/hw/vmapple/Kconfig
> @@ -0,0 +1 @@
> +
> diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/hw/vmapple/trace-events b/hw/vmapple/trace-events
> new file mode 100644
> index 0000000000..9ccc579048
> --- /dev/null
> +++ b/hw/vmapple/trace-events
> @@ -0,0 +1,2 @@
> +# See docs/devel/tracing.rst for syntax documentation.
> +
> diff --git a/hw/vmapple/trace.h b/hw/vmapple/trace.h
> new file mode 100644
> index 0000000000..572adbefe0
> --- /dev/null
> +++ b/hw/vmapple/trace.h
> @@ -0,0 +1 @@
> +#include "trace/trace-hw_vmapple.h"
> diff --git a/meson.build b/meson.build
> index d06f59095c..812ef33550 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3588,6 +3588,7 @@ if have_system
>       'hw/usb',
>       'hw/vfio',
>       'hw/virtio',
> +    'hw/vmapple',
>       'hw/watchdog',
>       'hw/xen',
>       'hw/gpio',

Alex, Phil, we now mandate a SPDX tag. Due to the license used in
vmapple.c in this patch, are you OK with me squashing here:

-- >8 --
diff --git a/hw/vmapple/trace.h b/hw/vmapple/trace.h
index 572adbefe04..d099d5ecd9e 100644
--- a/hw/vmapple/trace.h
+++ b/hw/vmapple/trace.h
@@ -0,0 +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig
index 8b137891791..315c06b689c 100644
--- a/hw/vmapple/Kconfig
+++ b/hw/vmapple/Kconfig
@@ -1 +1 @@
-
+# SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build
index e69de29bb2d..315c06b689c 100644
--- a/hw/vmapple/meson.build
+++ 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
index 9ccc5790487..21125794121 100644
--- a/hw/vmapple/trace-events
+++ b/hw/vmapple/trace-events
@@ -2 +2 @@
-
+# SPDX-License-Identifier: GPL-2.0-or-later
---

?