On Tue, Aug 14, 2012 at 01:43:12PM +0200, Jan Kiszka wrote:
> We need at least 1M of RAM to map the option ROM. Otherwise, we will
> corrupt host memory or even crash:
>
> $ qemu-system-x86_64 -nodefaults --enable-kvm -vnc :0 -m 640k
> Segmentation fault (core dumped)
>
> Reported-and-tested-by: Markus Armbruster <armbru@xxxxxxxxxx>
> Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
> ---
> hw/apic_common.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/hw/apic_common.c b/hw/apic_common.c
> index 58e63b0..371f95d 100644
> --- a/hw/apic_common.c
> +++ b/hw/apic_common.c
> @@ -299,7 +299,9 @@ static int apic_init_common(SysBusDevice *dev)
>
> sysbus_init_mmio(dev, &s->io_memory);
>
> - if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK) {
> + /* Note: We need at least 1M to map the VAPIC option ROM */
> + if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&
> + ram_size >= 1024 * 1024) {
> vapic = sysbus_create_simple("kvmvapic", -1, NULL);
> }
> s->vapic = vapic;
> --
> 1.7.3.4
Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
