1. Patchew
  2. QEMU
  3. [PATCH 0/6] or1k: Rename the architecture from openrisc
  4. View patch

[PATCH 2/6] include/hw/or1k: Rename from openrisc

Richard Henderson posted 6 patches 5 days ago
Maintainers: Laurent Vivier <laurent@vivier.eu>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Stafford Horne <shorne@gmail.com>, Riku Voipio <riku.voipio@iki.fi>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>
[PATCH 2/6] include/hw/or1k: Rename from openrisc
Posted by Richard Henderson 5 days ago 
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/hw/{openrisc => or1k}/boot.h | 6 +++---
 hw/openrisc/boot.c                   | 2 +-
 hw/openrisc/openrisc_sim.c           | 2 +-
 hw/openrisc/virt.c                   | 2 +-
 MAINTAINERS                          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename include/hw/{openrisc => or1k}/boot.h (93%)

diff --git a/include/hw/openrisc/boot.h b/include/hw/or1k/boot.h
similarity index 93%
rename from include/hw/openrisc/boot.h
rename to include/hw/or1k/boot.h
index 3c481bdea6..2e6131580c 100644
--- a/include/hw/openrisc/boot.h
+++ b/include/hw/or1k/boot.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OPENRISC_BOOT_H
-#define OPENRISC_BOOT_H
+#ifndef OR1K_BOOT_H
+#define OR1K_BOOT_H
 
 #include "exec/cpu-defs.h"
 #include "hw/core/boards.h"
@@ -32,4 +32,4 @@ hwaddr openrisc_load_initrd(void *fdt, const char *filename,
 uint32_t openrisc_load_fdt(MachineState *ms, void *fdt, hwaddr load_start,
                            uint64_t mem_size);
 
-#endif /* OPENRISC_BOOT_H */
+#endif /* OR1K_BOOT_H */
diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c
index 6256babc42..c18f4a6a9f 100644
--- a/hw/openrisc/boot.c
+++ b/hw/openrisc/boot.c
@@ -12,7 +12,7 @@
 #include "exec/target_page.h"
 #include "elf.h"
 #include "hw/core/loader.h"
-#include "hw/openrisc/boot.h"
+#include "hw/or1k/boot.h"
 #include "system/device_tree.h"
 #include "system/qtest.h"
 #include "system/reset.h"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 603d8ca0d9..f1b1f63274 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -26,7 +26,7 @@
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
-#include "hw/openrisc/boot.h"
+#include "hw/or1k/boot.h"
 #include "hw/core/qdev-properties.h"
 #include "system/address-spaces.h"
 #include "system/device_tree.h"
diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
index 54ce96666e..39f54058ab 100644
--- a/hw/openrisc/virt.c
+++ b/hw/openrisc/virt.c
@@ -16,7 +16,7 @@
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/core/split-irq.h"
-#include "hw/openrisc/boot.h"
+#include "hw/or1k/boot.h"
 #include "hw/misc/sifive_test.h"
 #include "hw/pci/pci.h"
 #include "hw/pci-host/gpex.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index a0422936ad..508d37ab7a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -305,7 +305,7 @@ S: Odd Fixes
 F: docs/system/openrisc/cpu-features.rst
 F: target/or1k/
 F: hw/openrisc/
-F: include/hw/openrisc/
+F: include/hw/or1k/
 F: tests/functional/or1k/meson.build
 F: tests/tcg/openrisc/
 
-- 
2.43.0
Re: [PATCH 2/6] include/hw/or1k: Rename from openrisc
Posted by Stafford Horne 3 days, 16 hours ago 
Hi Richard,

On Thu, Feb 05, 2026 at 01:02:40PM +1000, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

This looks fine to me.

Acked-by: Stafford Horne <shorne@gmail.com>

> ---
>  include/hw/{openrisc => or1k}/boot.h | 6 +++---
>  hw/openrisc/boot.c                   | 2 +-
>  hw/openrisc/openrisc_sim.c           | 2 +-
>  hw/openrisc/virt.c                   | 2 +-
>  MAINTAINERS                          | 2 +-
>  5 files changed, 7 insertions(+), 7 deletions(-)
>  rename include/hw/{openrisc => or1k}/boot.h (93%)
> 
> diff --git a/include/hw/openrisc/boot.h b/include/hw/or1k/boot.h
> similarity index 93%
> rename from include/hw/openrisc/boot.h
> rename to include/hw/or1k/boot.h
> index 3c481bdea6..2e6131580c 100644
> --- a/include/hw/openrisc/boot.h
> +++ b/include/hw/or1k/boot.h
> @@ -16,8 +16,8 @@
>   * this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -#ifndef OPENRISC_BOOT_H
> -#define OPENRISC_BOOT_H
> +#ifndef OR1K_BOOT_H
> +#define OR1K_BOOT_H
>  
>  #include "exec/cpu-defs.h"
>  #include "hw/core/boards.h"
> @@ -32,4 +32,4 @@ hwaddr openrisc_load_initrd(void *fdt, const char *filename,
>  uint32_t openrisc_load_fdt(MachineState *ms, void *fdt, hwaddr load_start,
>                             uint64_t mem_size);
>  
> -#endif /* OPENRISC_BOOT_H */
> +#endif /* OR1K_BOOT_H */
> diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c
> index 6256babc42..c18f4a6a9f 100644
> --- a/hw/openrisc/boot.c
> +++ b/hw/openrisc/boot.c
> @@ -12,7 +12,7 @@
>  #include "exec/target_page.h"
>  #include "elf.h"
>  #include "hw/core/loader.h"
> -#include "hw/openrisc/boot.h"
> +#include "hw/or1k/boot.h"
>  #include "system/device_tree.h"
>  #include "system/qtest.h"
>  #include "system/reset.h"
> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
> index 603d8ca0d9..f1b1f63274 100644
> --- a/hw/openrisc/openrisc_sim.c
> +++ b/hw/openrisc/openrisc_sim.c
> @@ -26,7 +26,7 @@
>  #include "hw/core/boards.h"
>  #include "hw/char/serial-mm.h"
>  #include "net/net.h"
> -#include "hw/openrisc/boot.h"
> +#include "hw/or1k/boot.h"
>  #include "hw/core/qdev-properties.h"
>  #include "system/address-spaces.h"
>  #include "system/device_tree.h"
> diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
> index 54ce96666e..39f54058ab 100644
> --- a/hw/openrisc/virt.c
> +++ b/hw/openrisc/virt.c
> @@ -16,7 +16,7 @@
>  #include "hw/core/boards.h"
>  #include "hw/char/serial-mm.h"
>  #include "hw/core/split-irq.h"
> -#include "hw/openrisc/boot.h"
> +#include "hw/or1k/boot.h"
>  #include "hw/misc/sifive_test.h"
>  #include "hw/pci/pci.h"
>  #include "hw/pci-host/gpex.h"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a0422936ad..508d37ab7a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -305,7 +305,7 @@ S: Odd Fixes
>  F: docs/system/openrisc/cpu-features.rst
>  F: target/or1k/
>  F: hw/openrisc/
> -F: include/hw/openrisc/
> +F: include/hw/or1k/
>  F: tests/functional/or1k/meson.build
>  F: tests/tcg/openrisc/
>  
> -- 
> 2.43.0
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.