| Message ID | 20231012073458.860187-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm: Move raspberrypi-fw-defs.h to the include/hw/arm/ folder | expand |
Thomas Huth <thuth@redhat.com> writes: > The file is obviously related to the raspberrypi machine, so > it should reside in hw/arm/ instead of hw/misc/. And while we're > at it, also adjust the wildcard in MAINTAINERS so that it covers > this file, too. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
On 12/10/23 09:34, Thomas Huth wrote: > The file is obviously related to the raspberrypi machine, so > it should reside in hw/arm/ instead of hw/misc/. Not quite. These are the VideoCore DSP definitions. Firmware running on SoC including a VC can use this syscall-like interface. FWIW there are a pair of QEMU VC implementations on GitHub. Anyhow, preferably rewording the description, Acked-by: Philippe Mathieu-Daudé <philmd@linaro.org> > And while we're > at it, also adjust the wildcard in MAINTAINERS so that it covers > this file, too. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > MAINTAINERS | 2 +- > include/hw/{misc => arm}/raspberrypi-fw-defs.h | 0 > hw/misc/bcm2835_property.c | 2 +- > 3 files changed, 2 insertions(+), 2 deletions(-) > rename include/hw/{misc => arm}/raspberrypi-fw-defs.h (100%)
On 12/10/2023 10.22, Philippe Mathieu-Daudé wrote: > On 12/10/23 09:34, Thomas Huth wrote: >> The file is obviously related to the raspberrypi machine, so >> it should reside in hw/arm/ instead of hw/misc/. > > Not quite. These are the VideoCore DSP definitions. Firmware > running on SoC including a VC can use this syscall-like interface. > > FWIW there are a pair of QEMU VC implementations on GitHub. > > Anyhow, preferably rewording the description, So could you suggest a different wording instead? It's still "related to the raspberypi machine", isn't it? > Acked-by: Philippe Mathieu-Daudé <philmd@linaro.org> Thanks, Thomas
On Thu, 12 Oct 2023 at 08:35, Thomas Huth <thuth@redhat.com> wrote: > > The file is obviously related to the raspberrypi machine, so > it should reside in hw/arm/ instead of hw/misc/. And while we're > at it, also adjust the wildcard in MAINTAINERS so that it covers > this file, too. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Applied to target-arm.next, thanks. -- PMM
diff --git a/MAINTAINERS b/MAINTAINERS index 71af9633c6..b55aaa2fe2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -897,7 +897,7 @@ S: Odd Fixes F: hw/arm/raspi.c F: hw/arm/raspi_platform.h F: hw/*/bcm283* -F: include/hw/arm/raspi* +F: include/hw/arm/rasp* F: include/hw/*/bcm283* F: docs/system/arm/raspi.rst diff --git a/include/hw/misc/raspberrypi-fw-defs.h b/include/hw/arm/raspberrypi-fw-defs.h similarity index 100% rename from include/hw/misc/raspberrypi-fw-defs.h rename to include/hw/arm/raspberrypi-fw-defs.h diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 4ed9faa54a..ff55a4e2cd 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -12,7 +12,7 @@ #include "migration/vmstate.h" #include "hw/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" -#include "hw/misc/raspberrypi-fw-defs.h" +#include "hw/arm/raspberrypi-fw-defs.h" #include "sysemu/dma.h" #include "qemu/log.h" #include "qemu/module.h"
The file is obviously related to the raspberrypi machine, so it should reside in hw/arm/ instead of hw/misc/. And while we're at it, also adjust the wildcard in MAINTAINERS so that it covers this file, too. Signed-off-by: Thomas Huth <thuth@redhat.com> --- MAINTAINERS | 2 +- include/hw/{misc => arm}/raspberrypi-fw-defs.h | 0 hw/misc/bcm2835_property.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename include/hw/{misc => arm}/raspberrypi-fw-defs.h (100%)