From b33a5bbfbaab6c1ce653a8e3665a18ca67de1456 Mon Sep 17 00:00:00 2001 From: Chunyan Liu Date: Mon, 7 Jul 2014 14:34:35 +0800 Subject: qemu: support xen hvm direct kernel boot qemu side patch to support xen HVM direct kernel boot: if -kernel exists, calls xen_load_linux(), which will read kernel/initrd and add a linuxboot.bin or multiboot.bin option rom. The linuxboot.bin/multiboot.bin will load kernel/initrd and jump to execute kernel directly. It's working when xen uses seabios. During this work, found the 'kvmvapic' is in option_rom list, it should not be there in xen case. Set s->vapic_control = 0 in xen_apic_realize() to handle that. Signed-off-by: Chunyan Liu Acked-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/xen/xen_apic.c | 1 + 1 file changed, 1 insertion(+) (limited to 'hw/i386/xen/xen_apic.c') diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c index 63bb7f77c6..f5acd6a096 100644 --- a/hw/i386/xen/xen_apic.c +++ b/hw/i386/xen/xen_apic.c @@ -40,6 +40,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp) { APICCommonState *s = APIC_COMMON(dev); + s->vapic_control = 0; memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s, "xen-apic-msi", APIC_SPACE_SIZE); -- cgit v1.2.3-55-g7522