Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-17 16:03:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

system: Replace arch_type global by qemu_arch_available() helper

Browse Source 
qemu_arch_available() is a bit simpler to understand while
reviewing than the undocumented arch_type variable.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20250305005225.95051-5-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-03-04 23:59:27 +01:00
parent 5dc4337f79
commit 44ac8eaff0
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/scsi/scsi-disk.c
View File

@ -3165,7 +3165,7 @@ static void scsi_property_add_specifics(DeviceClass *dc)
ObjectClass *oc = OBJECT_CLASS(dc); ObjectClass *oc = OBJECT_CLASS(dc);
/* The loadparm property is only supported on s390x */ /* The loadparm property is only supported on s390x */
if (arch_type & QEMU_ARCH_S390X) { if (qemu_arch_available(QEMU_ARCH_S390X)) {
object_class_property_add_str(oc, "loadparm", object_class_property_add_str(oc, "loadparm",
scsi_property_get_loadparm, scsi_property_get_loadparm,
scsi_property_set_loadparm); scsi_property_set_loadparm);

2
include/system/arch_init.h
View File

@ -25,6 +25,6 @@ enum {
QEMU_ARCH_LOONGARCH = (1 << 23), QEMU_ARCH_LOONGARCH = (1 << 23),
}; };
extern const uint32_t arch_type; bool qemu_arch_available(unsigned qemu_arch_mask);
#endif #endif

5
system/arch_init.c
View File

@ -24,4 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "system/arch_init.h" #include "system/arch_init.h"
const uint32_t arch_type = QEMU_ARCH; bool qemu_arch_available(unsigned qemu_arch_mask)
{
return qemu_arch_mask & QEMU_ARCH;
}

4
system/qdev-monitor.c
View File

@ -132,7 +132,7 @@ static const char *qdev_class_get_alias(DeviceClass *dc)
for (i = 0; qdev_alias_table[i].typename; i++) { for (i = 0; qdev_alias_table[i].typename; i++) {
if (qdev_alias_table[i].arch_mask && if (qdev_alias_table[i].arch_mask &&
!(qdev_alias_table[i].arch_mask & arch_type)) { !qemu_arch_available(qdev_alias_table[i].arch_mask)) {
continue; continue;
} }
@ -218,7 +218,7 @@ static const char *find_typename_by_alias(const char *alias)
for (i = 0; qdev_alias_table[i].alias; i++) { for (i = 0; qdev_alias_table[i].alias; i++) {
if (qdev_alias_table[i].arch_mask && if (qdev_alias_table[i].arch_mask &&
!(qdev_alias_table[i].arch_mask & arch_type)) { !qemu_arch_available(qdev_alias_table[i].arch_mask)) {
continue; continue;
} }

6
system/vl.c
View File

@ -878,11 +878,11 @@ static void help(int exitcode)
g_get_prgname()); g_get_prgname());
#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ #define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \
if ((arch_mask) & arch_type) \ if (qemu_arch_available(arch_mask)) \
fputs(opt_help, stdout); fputs(opt_help, stdout);
#define ARCHHEADING(text, arch_mask) \ #define ARCHHEADING(text, arch_mask) \
if ((arch_mask) & arch_type) \ if (qemu_arch_available(arch_mask)) \
puts(stringify(text)); puts(stringify(text));
#define DEFHEADING(text) ARCHHEADING(text, QEMU_ARCH_ALL) #define DEFHEADING(text) ARCHHEADING(text, QEMU_ARCH_ALL)
@ -2929,7 +2929,7 @@ void qemu_init(int argc, char **argv)
const QEMUOption *popt; const QEMUOption *popt;
popt = lookup_opt(argc, argv, &optarg, &optind); popt = lookup_opt(argc, argv, &optarg, &optind);
if (!(popt->arch_mask & arch_type)) { if (!qemu_arch_available(popt->arch_mask)) {
error_report("Option not supported for this target"); error_report("Option not supported for this target");
exit(1); exit(1);
} }