[for-6.2,8/8] stubs: Remove unused arch_type.c stub

Message ID 20210730105947.28215-9-peter.maydell@linaro.org
State Superseded
Headers show
Series
  • softmmu: Clean up arch_init.c
Related show

Commit Message

Peter Maydell July 30, 2021, 10:59 a.m.
We added a stub for the arch_type global in commit 5964ed56d9a1 so
that we could compile blockdev.c into the tools.  However, in commit
9db1d3a2be9bf we removed the only use of arch_type from blockdev.c.
The stub is therefore no longer needed, and we can delete it again,
together with the QEMU_ARCH_NONE value that only the stub was using.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 include/sysemu/arch_init.h | 2 --
 stubs/arch_type.c          | 4 ----
 stubs/meson.build          | 1 -
 3 files changed, 7 deletions(-)
 delete mode 100644 stubs/arch_type.c

-- 
2.20.1

Comments

Philippe Mathieu-Daudé July 30, 2021, 1:23 p.m. | #1
On 7/30/21 12:59 PM, Peter Maydell wrote:
> We added a stub for the arch_type global in commit 5964ed56d9a1 so

> that we could compile blockdev.c into the tools.  However, in commit

> 9db1d3a2be9bf we removed the only use of arch_type from blockdev.c.

> The stub is therefore no longer needed, and we can delete it again,

> together with the QEMU_ARCH_NONE value that only the stub was using.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

>  include/sysemu/arch_init.h | 2 --

>  stubs/arch_type.c          | 4 ----

>  stubs/meson.build          | 1 -

>  3 files changed, 7 deletions(-)

>  delete mode 100644 stubs/arch_type.c


Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Richard Henderson July 30, 2021, 6:46 p.m. | #2
On 7/30/21 12:59 AM, Peter Maydell wrote:
> We added a stub for the arch_type global in commit 5964ed56d9a1 so

> that we could compile blockdev.c into the tools.  However, in commit

> 9db1d3a2be9bf we removed the only use of arch_type from blockdev.c.

> The stub is therefore no longer needed, and we can delete it again,

> together with the QEMU_ARCH_NONE value that only the stub was using.

> 

> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>

> ---


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

Patch

diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index e7789399508..70c579560ad 100644
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -24,8 +24,6 @@  enum {
     QEMU_ARCH_RX = (1 << 20),
     QEMU_ARCH_AVR = (1 << 21),
     QEMU_ARCH_HEXAGON = (1 << 22),
-
-    QEMU_ARCH_NONE = (1 << 31),
 };
 
 extern const uint32_t arch_type;
diff --git a/stubs/arch_type.c b/stubs/arch_type.c
deleted file mode 100644
index fc5423bc98a..00000000000
--- a/stubs/arch_type.c
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#include "qemu/osdep.h"
-#include "sysemu/arch_init.h"
-
-const uint32_t arch_type = QEMU_ARCH_NONE;
diff --git a/stubs/meson.build b/stubs/meson.build
index d3fa8646b38..717bfa9a999 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -1,4 +1,3 @@ 
-stub_ss.add(files('arch_type.c'))
 stub_ss.add(files('bdrv-next-monitor-owned.c'))
 stub_ss.add(files('blk-commit-all.c'))
 stub_ss.add(files('blk-exp-close-all.c'))