[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 15/15] pc: leave more space for BIOS allocations
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 15/15] pc: leave more space for BIOS allocations |
Date: |
Thu, 18 Sep 2014 21:55:02 +0300 |
Since QEMU 2.1, we are allocating more space for ACPI tables, so no
space is left after initrd for the BIOS to allocate memory.
Besides ACPI tables, there are a few other uses of high memory in
SeaBIOS: SMBIOS tables and USB drivers use it in particular. These uses
allocate a very small amount of memory. Malloc metadata also lives
there. So we need _some_ extra padding there to avoid initrd breakage,
but not much.
John Snow found a case where RHEL5 was broken by the recent change to
ACPI_TABLE_SIZE; in his case 4KB of extra padding are fine, but just to
be safe I am adding 32KB, which is roughly the same amount of padding
that was left by QEMU 2.0 and earlier.
Move initrd to leave some space for the BIOS.
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
Reported-by: John Snow <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/pc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b6c9b61..9ac5bd2 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -72,8 +72,10 @@
#define DPRINTF(fmt, ...)
#endif
-/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables. */
-unsigned acpi_data_size = 0x20000;
+/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables
+ * (128K) and other BIOS datastructures (less than 4K reported to be used at
+ * the moment, 32K should be enough for a while). */
+unsigned acpi_data_size = 0x20000 + 0x8000;
void pc_set_legacy_acpi_data_size(void)
{
acpi_data_size = 0x10000;
--
MST
- [Qemu-devel] [PULL v3 04/15] test-qdev-global-props: Run tests on subprocess, (continued)
- [Qemu-devel] [PULL v3 04/15] test-qdev-global-props: Run tests on subprocess, Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 05/15] test-qdev-global-props: Initialize not_used=true for all props, Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 06/15] test-qdev-global-props: Test handling of hotpluggable and non-device types, Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 07/15] qdev: Rename qdev_prop_check_global() to qdev_prop_check_globals(), Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 08/15] qdev: Move global validation to a single function, Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 09/15] Revert "rng-egd: remove redundant free", Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 10/15] virtio-net: drop assert on vm stop, Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 11/15] Revert "virtio: don't call device on !vm_running", Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 13/15] vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation, Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 12/15] virtio-pci: enable bus master for old guests, Michael S. Tsirkin, 2014/09/18
- [Qemu-devel] [PULL v3 15/15] pc: leave more space for BIOS allocations,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 14/15] virtio-pci: fix migration for pci bus master, Michael S. Tsirkin, 2014/09/18
- Re: [Qemu-devel] [PULL v3 14/15] virtio-pci: fix migration for pci bus master, Michael S. Tsirkin, 2014/09/29
- Re: [Qemu-devel] [PULL v3 14/15] virtio-pci: fix migration for pci bus master, Greg Kurz, 2014/09/29
- Re: [Qemu-devel] [PULL v3 14/15] virtio-pci: fix migration for pci bus master, Nikunj A Dadhania, 2014/09/30
[Qemu-devel] [PULL v3 01/15] hw/machine: Free old values of string properties, Michael S. Tsirkin, 2014/09/18
Re: [Qemu-devel] [PULL v3 00/15] pci, pc, virtio, misc bugfixes, Peter Maydell, 2014/09/18