Revision: 13923
http://edk2.svn.sourceforge.net/edk2/?rev=13923&view=rev
Author: jljusten
Date: 2012-11-02 18:28:17 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
OvmfPkg: Add support for qemu's -kernel parameter
If QEMU's -kernel parameter was used, then download the
kernel from the FwCfg interface, and launch it. (See -kernel,
-initrd, -append) The application uses the LoadLinuxLib to boot
the kernel image.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
trunk/edk2/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
Added Paths:
-----------
trunk/edk2/OvmfPkg/Library/PlatformBdsLib/QemuKernel.c
Modified: trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c 2012-11-02
18:27:55 UTC (rev 13922)
+++ trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c 2012-11-02
18:28:17 UTC (rev 13923)
@@ -1128,6 +1128,11 @@
PlatformBdsConnectSequence ();
//
+ // Process QEMU's -kernel command line option
+ //
+ TryRunningQemuKernel ();
+
+ //
// Give one chance to enter the setup if we
// have the time out
//
Modified: trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
===================================================================
--- trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h 2012-11-02
18:27:55 UTC (rev 13922)
+++ trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h 2012-11-02
18:28:17 UTC (rev 13923)
@@ -295,4 +295,15 @@
IN BOOLEAN ConnectAllHappened
);
+/**
+ Loads and boots UEFI Linux via the FwCfg interface.
+
+ @retval EFI_NOT_FOUND - The Linux kernel was not found
+
+**/
+EFI_STATUS
+TryRunningQemuKernel (
+ VOID
+ );
+
#endif // _PLATFORM_SPECIFIC_BDS_PLATFORM_H_
Modified: trunk/edk2/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
===================================================================
--- trunk/edk2/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
2012-11-02 18:27:55 UTC (rev 13922)
+++ trunk/edk2/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
2012-11-02 18:28:17 UTC (rev 13923)
@@ -18,7 +18,7 @@
FILE_GUID = F844172E-9985-44f2-BADE-0DD783462E95
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
- LIBRARY_CLASS = PlatformBdsLib|DXE_DRIVER
+ LIBRARY_CLASS = PlatformBdsLib|DXE_DRIVER
#
# The following information is for reference only and not required by the
build tools.
@@ -30,6 +30,7 @@
BdsPlatform.c
PlatformData.c
QemuBootOrder.c
+ QemuKernel.c
BdsPlatform.h
QemuBootOrder.h
@@ -50,6 +51,7 @@
PciLib
NvVarsFileLib
QemuFwCfgLib
+ LoadLinuxLib
[Pcd]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
Added: trunk/edk2/OvmfPkg/Library/PlatformBdsLib/QemuKernel.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/PlatformBdsLib/QemuKernel.c
(rev 0)
+++ trunk/edk2/OvmfPkg/Library/PlatformBdsLib/QemuKernel.c 2012-11-02
18:28:17 UTC (rev 13923)
@@ -0,0 +1,159 @@
+/** @file
+
+ Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD
License
+ which accompanies this distribution. The full text of the license may be
found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include <Uefi.h>
+
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+#include <Library/LoadLinuxLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/QemuFwCfgLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+
+
+EFI_STATUS
+TryRunningQemuKernel (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+ UINTN KernelSize;
+ UINTN KernelInitialSize;
+ VOID *KernelBuf;
+ UINTN SetupSize;
+ VOID *SetupBuf;
+ UINTN CommandLineSize;
+ CHAR8 *CommandLine;
+ UINTN InitrdSize;
+ VOID* InitrdData;
+
+ SetupBuf = NULL;
+ SetupSize = 0;
+ KernelBuf = NULL;
+ KernelInitialSize = 0;
+ CommandLine = NULL;
+ CommandLineSize = 0;
+ InitrdData = NULL;
+ InitrdSize = 0;
+
+ if (!QemuFwCfgIsAvailable ()) {
+ return EFI_NOT_FOUND;
+ }
+
+ QemuFwCfgSelectItem (QemuFwCfgItemKernelSize);
+ KernelSize = (UINTN) QemuFwCfgRead64 ();
+
+ QemuFwCfgSelectItem (QemuFwCfgItemKernelSetupSize);
+ SetupSize = (UINTN) QemuFwCfgRead64 ();
+
+ if (KernelSize == 0 || SetupSize == 0) {
+ DEBUG ((EFI_D_INFO, "qemu -kernel was not used.\n"));
+ return EFI_NOT_FOUND;
+ }
+
+ SetupBuf = LoadLinuxAllocateKernelSetupPages (EFI_SIZE_TO_PAGES (SetupSize));
+ if (SetupBuf == NULL) {
+ DEBUG ((EFI_D_ERROR, "Unable to allocate memory for kernel setup!\n"));
+ return EFI_OUT_OF_RESOURCES;
+ }
+
+ DEBUG ((EFI_D_INFO, "Setup size: 0x%x\n", (UINT32) SetupSize));
+ DEBUG ((EFI_D_INFO, "Reading kernel setup image ..."));
+ QemuFwCfgSelectItem (QemuFwCfgItemKernelSetupData);
+ QemuFwCfgReadBytes (SetupSize, SetupBuf);
+ DEBUG ((EFI_D_INFO, " [done]\n"));
+
+ Status = LoadLinuxCheckKernelSetup (SetupBuf, SetupSize);
+ if (EFI_ERROR (Status)) {
+ goto FreeAndReturn;
+ }
+
+ KernelInitialSize = LoadLinuxGetKernelSize (SetupBuf, KernelSize);
+ if (KernelInitialSize == 0) {
+ Status = EFI_UNSUPPORTED;
+ goto FreeAndReturn;
+ }
+
+ KernelBuf = LoadLinuxAllocateKernelPages (
+ SetupBuf,
+ EFI_SIZE_TO_PAGES (KernelInitialSize));
+ if (KernelBuf == NULL) {
+ DEBUG ((EFI_D_ERROR, "Unable to allocate memory for kernel!\n"));
+ Status = EFI_OUT_OF_RESOURCES;
+ goto FreeAndReturn;
+ }
+
+ DEBUG ((EFI_D_INFO, "Kernel size: 0x%x\n", (UINT32) KernelSize));
+ DEBUG ((EFI_D_INFO, "Reading kernel image ..."));
+ QemuFwCfgSelectItem (QemuFwCfgItemKernelData);
+ QemuFwCfgReadBytes (KernelSize, KernelBuf);
+ DEBUG ((EFI_D_INFO, " [done]\n"));
+
+ QemuFwCfgSelectItem (QemuFwCfgItemCommandLineSize);
+ CommandLineSize = (UINTN) QemuFwCfgRead64 ();
+
+ if (CommandLineSize > 0) {
+ CommandLine = LoadLinuxAllocateCommandLinePages (
+ EFI_SIZE_TO_PAGES (CommandLineSize));
+ QemuFwCfgSelectItem (QemuFwCfgItemCommandLineData);
+ QemuFwCfgReadBytes (CommandLineSize, CommandLine);
+ } else {
+ CommandLine = NULL;
+ }
+
+ Status = LoadLinuxSetCommandLine (SetupBuf, CommandLine);
+ if (EFI_ERROR (Status)) {
+ goto FreeAndReturn;
+ }
+
+ QemuFwCfgSelectItem (QemuFwCfgItemInitrdSize);
+ InitrdSize = (UINTN) QemuFwCfgRead64 ();
+
+ if (InitrdSize > 0) {
+ InitrdData = LoadLinuxAllocateInitrdPages (
+ SetupBuf,
+ EFI_SIZE_TO_PAGES (InitrdSize)
+ );
+ DEBUG ((EFI_D_INFO, "Initrd size: 0x%x\n", (UINT32) InitrdSize));
+ DEBUG ((EFI_D_INFO, "Reading initrd image ..."));
+ QemuFwCfgSelectItem (QemuFwCfgItemInitrdData);
+ QemuFwCfgReadBytes (InitrdSize, InitrdData);
+ DEBUG ((EFI_D_INFO, " [done]\n"));
+ } else {
+ InitrdData = NULL;
+ }
+
+ Status = LoadLinuxSetInitrd (SetupBuf, InitrdData, InitrdSize);
+ if (EFI_ERROR (Status)) {
+ goto FreeAndReturn;
+ }
+
+ Status = LoadLinux (KernelBuf, SetupBuf);
+
+FreeAndReturn:
+ if (SetupBuf != NULL) {
+ FreePages (SetupBuf, EFI_SIZE_TO_PAGES (SetupSize));
+ }
+ if (KernelBuf != NULL) {
+ FreePages (KernelBuf, EFI_SIZE_TO_PAGES (KernelInitialSize));
+ }
+ if (CommandLine != NULL) {
+ FreePages (CommandLine, EFI_SIZE_TO_PAGES (CommandLineSize));
+ }
+ if (InitrdData != NULL) {
+ FreePages (InitrdData, EFI_SIZE_TO_PAGES (InitrdSize));
+ }
+
+ return Status;
+}
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
