summaryrefslogtreecommitdiffstats
path: root/hw/intc
diff options
context:
space:
mode:
authorPaolo Bonzini2020-10-28 11:22:23 +0100
committerPaolo Bonzini2020-12-10 18:15:08 +0100
commit86378b29fa22a9854a084241bf51515e149133e4 (patch)
tree06faf85e7ccbaff47062b038dc26bf7ee6a2cab1 /hw/intc
parenthppa: do not use ram_size global (diff)
downloadqemu-86378b29fa22a9854a084241bf51515e149133e4.tar.gz
qemu-86378b29fa22a9854a084241bf51515e149133e4.tar.xz
qemu-86378b29fa22a9854a084241bf51515e149133e4.zip
i386: do not use ram_size global
Use the loader parameters instead. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/intc')
-rw-r--r--hw/intc/apic_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 502e94effc..97dd96dffa 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -27,6 +27,7 @@
#include "hw/i386/apic.h"
#include "hw/i386/apic_internal.h"
#include "trace.h"
+#include "hw/boards.h"
#include "sysemu/hax.h"
#include "sysemu/kvm.h"
#include "hw/qdev-properties.h"
@@ -297,7 +298,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp)
/* Note: We need at least 1M to map the VAPIC option ROM */
if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&
- !hax_enabled() && ram_size >= 1024 * 1024) {
+ !hax_enabled() && current_machine->ram_size >= 1024 * 1024) {
vapic = sysbus_create_simple("kvmvapic", -1, NULL);
}
s->vapic = vapic;