mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/ppc/mac.h: Remove MAX_CPUS macro

Browse Source 
The mac.h header defines a MAX_CPUS macro. This is confusingly named,
because it suggests it's a generic setting, but in fact it's used
by only the g3beige and mac99 machines. It's also using a single
macro for two values which aren't inherently the same -- if one
of these two machines was updated to support SMP configurations
then it would want a different max_cpus value to the other.

Since the macro is used in only two places, just expand it out
and get rid of it. If hypothetical future work to support SMP
in these boards needs a compile-time-known limit on the number
of CPUs, we can give it a suitable name at that point.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20211105184216.120972-1-peter.maydell@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Peter Maydell 2021-12-17 17:57:12 +01:00 committed by Cédric Le Goater
parent 2307ddc15b
commit 83234b8289
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/ppc/mac.h
View File

@ -36,9 +36,6 @@
#include "hw/pci-host/uninorth.h" #include "hw/pci-host/uninorth.h"
#include "qom/object.h" #include "qom/object.h"
/* SMP is not enabled, for now */
#define MAX_CPUS 1
#define NVRAM_SIZE 0x2000 #define NVRAM_SIZE 0x2000
#define PROM_FILENAME "openbios-ppc" #define PROM_FILENAME "openbios-ppc"

3
hw/ppc/mac_newworld.c
View File

@ -581,7 +581,8 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Mac99 based PowerMAC"; mc->desc = "Mac99 based PowerMAC";
mc->init = ppc_core99_init; mc->init = ppc_core99_init;
mc->block_default_type = IF_IDE; mc->block_default_type = IF_IDE;
mc->max_cpus = MAX_CPUS; /* SMP is not supported currently */
mc->max_cpus = 1;
mc->default_boot_order = "cd"; mc->default_boot_order = "cd";
mc->default_display = "std"; mc->default_display = "std";
mc->kvm_type = core99_kvm_type; mc->kvm_type = core99_kvm_type;

3
hw/ppc/mac_oldworld.c
View File

@ -423,7 +423,8 @@ static void heathrow_class_init(ObjectClass *oc, void *data)
mc->desc = "Heathrow based PowerMAC"; mc->desc = "Heathrow based PowerMAC";
mc->init = ppc_heathrow_init; mc->init = ppc_heathrow_init;
mc->block_default_type = IF_IDE; mc->block_default_type = IF_IDE;
mc->max_cpus = MAX_CPUS; /* SMP is not supported currently */
mc->max_cpus = 1;
#ifndef TARGET_PPC64 #ifndef TARGET_PPC64
mc->is_default = true; mc->is_default = true;
#endif #endif