diff options
author | Chunyan Liu <cyliu@suse.com> | 2014-07-07 14:34:35 +0800 |
---|---|---|
committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2014-08-01 15:58:12 +0000 |
commit | b33a5bbfbaab6c1ce653a8e3665a18ca67de1456 (patch) | |
tree | 5befef70c0f64c002c1018854898d2bd4dd50fb4 /include/hw/i386/pc.h | |
parent | 8677de2b4d26f8878b7414d540a6b2e139bc4d91 (diff) | |
download | qemu-b33a5bbfbaab6c1ce653a8e3665a18ca67de1456.zip qemu-b33a5bbfbaab6c1ce653a8e3665a18ca67de1456.tar.gz qemu-b33a5bbfbaab6c1ce653a8e3665a18ca67de1456.tar.bz2 |
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 <cyliu@suse.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'include/hw/i386/pc.h')
-rw-r--r-- | include/hw/i386/pc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index f4b9b2b..863eefb 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -188,6 +188,11 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, MemoryRegion *pci_address_space); +FWCfgState *xen_load_linux(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + PcGuestInfo *guest_info); FWCfgState *pc_memory_init(MachineState *machine, MemoryRegion *system_memory, ram_addr_t below_4g_mem_size, |