diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-04 11:17:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-04 11:17:24 +0100 |
| commit | 7b13ff3f156b98c3183dfa30edfd6473e8660374 (patch) | |
| tree | b5ff0ee807688f810025a540129de130c61f2d81 /hw/i386/pc_piix.c | |
| parent | c79805802ba0463713c253307d99ebef56436b8c (diff) | |
| parent | b33a5bbfbaab6c1ce653a8e3665a18ca67de1456 (diff) | |
| download | focaccia-qemu-7b13ff3f156b98c3183dfa30edfd6473e8660374.tar.gz focaccia-qemu-7b13ff3f156b98c3183dfa30edfd6473e8660374.zip | |
Merge remote-tracking branch 'remotes/sstabellini/xen-20140801' into staging
* remotes/sstabellini/xen-20140801: qemu: support xen hvm direct kernel boot tap-bsd: implement a FreeBSD only version of tap_open xen: fix usage of ENODATA Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 9694f88057..4f22be85da 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -182,6 +182,13 @@ static void pc_init1(MachineState *machine, fw_cfg = pc_memory_init(machine, system_memory, below_4g_mem_size, above_4g_mem_size, rom_memory, &ram_memory, guest_info); + } else if (machine->kernel_filename != NULL) { + /* For xen HVM direct kernel boot, load linux here */ + fw_cfg = xen_load_linux(machine->kernel_filename, + machine->kernel_cmdline, + machine->initrd_filename, + below_4g_mem_size, + guest_info); } gsi_state = g_malloc0(sizeof(*gsi_state)); |