From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>
Subject: [PATCH for-6.2 8/8] stubs: Remove unused arch_type.c stub
Date: Fri, 30 Jul 2021 11:59:47 +0100 [thread overview]
Message-ID: <20210730105947.28215-9-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210730105947.28215-1-peter.maydell@linaro.org>
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
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'))
--
2.20.1
next prev parent reply other threads:[~2021-07-30 11:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 10:59 [PATCH for-6.2 0/8] softmmu: Clean up arch_init.c Peter Maydell
2021-07-30 10:59 ` [PATCH for-6.2 1/8] softmmu: Use accel_find("xen") instead of xen_available() Peter Maydell
2021-07-30 18:41 ` Richard Henderson
2021-07-30 10:59 ` [PATCH for-6.2 2/8] monitor: Use accel_find("kvm") instead of kvm_available() Peter Maydell
2021-07-30 18:41 ` Richard Henderson
2021-07-30 10:59 ` [PATCH for-6.2 3/8] softmmu/arch_init.c: Trim down include list Peter Maydell
2021-07-30 18:42 ` Richard Henderson
2021-07-30 10:59 ` [PATCH for-6.2 4/8] meson.build: Define QEMU_ARCH in config-target.h Peter Maydell
2021-07-30 13:19 ` Philippe Mathieu-Daudé
2021-07-30 18:43 ` Richard Henderson
2021-07-30 10:59 ` [PATCH for-6.2 5/8] arch_init.h: Add QEMU_ARCH_HEXAGON Peter Maydell
2021-07-30 13:20 ` Philippe Mathieu-Daudé
2021-07-30 18:44 ` Richard Henderson
2021-07-30 19:36 ` Taylor Simpson
2021-07-30 10:59 ` [PATCH for-6.2 6/8] arch_init.h: Move QEMU_ARCH_VIRTIO_* to qdev-monitor.c Peter Maydell
2021-07-30 18:46 ` Richard Henderson
2021-08-26 14:41 ` Markus Armbruster
2021-07-30 10:59 ` [PATCH for-6.2 7/8] arch_init.h: Don't include arch_init.h unnecessarily Peter Maydell
2021-07-30 13:21 ` Philippe Mathieu-Daudé
2021-07-30 18:45 ` Richard Henderson
2021-08-01 0:54 ` Alistair Francis
2021-07-30 10:59 ` Peter Maydell [this message]
2021-07-30 13:23 ` [PATCH for-6.2 8/8] stubs: Remove unused arch_type.c stub Philippe Mathieu-Daudé
2021-07-30 18:46 ` Richard Henderson
2021-08-26 14:33 ` [PATCH for-6.2 0/8] softmmu: Clean up arch_init.c Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210730105947.28215-9-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=armbru@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).