On 02/16/15 03:06, Jordan Justen wrote: > Having this entry point in QemuFwCfgAcpi.c should not cause a problem > for the other driver which supports Xen and older QEMU versions. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jordan Justen <[email protected]> > --- > OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 38 ++++++++++++++++ > OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c | 52 > ---------------------- > .../AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf | 1 - > 3 files changed, 38 insertions(+), 53 deletions(-) > delete mode 100644 OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c > > diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > index 70df284..d75394c 100644 > --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > @@ -683,3 +683,41 @@ FreeLoader: > > return Status; > } > + > + > +/** > + Entrypoint of QEMU fw-cfg Acpi Platform driver. > + > + @param ImageHandle > + @param SystemTable > + > + @return EFI_SUCCESS > + @return EFI_LOAD_ERROR > + @return EFI_OUT_OF_RESOURCES > + > +**/ > +EFI_STATUS > +EFIAPI > +QemuFwCfgAcpiPlatformEntryPoint ( > + IN EFI_HANDLE ImageHandle, > + IN EFI_SYSTEM_TABLE *SystemTable > + ) > +{ > + EFI_STATUS Status; > + EFI_ACPI_TABLE_PROTOCOL *AcpiTable; > + > + // > + // Find the AcpiTable protocol > + // > + Status = gBS->LocateProtocol ( > + &gEfiAcpiTableProtocolGuid, > + NULL, > + (VOID**)&AcpiTable > + ); > + if (EFI_ERROR (Status)) { > + return EFI_ABORTED; > + } > + > + Status = InstallAllQemuLinkedTables (AcpiTable); > + return Status; > +} > diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c > b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c > deleted file mode 100644 > index 88512ba..0000000 > --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c > +++ /dev/null > @@ -1,52 +0,0 @@ > -/** @file > - OVMF ACPI Platform Driver using QEMU's fw-cfg interface > - > - Copyright (c) 2008 - 2014, 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 "AcpiPlatform.h" > - > -/** > - Entrypoint of Acpi Platform driver. > - > - @param ImageHandle > - @param SystemTable > - > - @return EFI_SUCCESS > - @return EFI_LOAD_ERROR > - @return EFI_OUT_OF_RESOURCES > - > -**/ > -EFI_STATUS > -EFIAPI > -QemuFwCfgAcpiPlatformEntryPoint ( > - IN EFI_HANDLE ImageHandle, > - IN EFI_SYSTEM_TABLE *SystemTable > - ) > -{ > - EFI_STATUS Status; > - EFI_ACPI_TABLE_PROTOCOL *AcpiTable; > - > - // > - // Find the AcpiTable protocol > - // > - Status = gBS->LocateProtocol ( > - &gEfiAcpiTableProtocolGuid, > - NULL, > - (VOID**)&AcpiTable > - ); > - if (EFI_ERROR (Status)) { > - return EFI_ABORTED; > - } > - > - Status = InstallAllQemuLinkedTables (AcpiTable); > - return Status; > -} > diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > index 56f9510..5dab3ba 100644 > --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > @@ -27,7 +27,6 @@ > # > > [Sources] > - QemuFwCfgAcpiPlatform.c > QemuFwCfgAcpi.c > > [Packages] >
So this patch moves the fw-cfg-only driver's entry point into that fw-cfg-only C file that is also included by the "other stuff too" driver. In *that* driver *this* entry point function will simply be an unused function. I agree it shouldn't cause problems, but I'm not sure you would have liked this patch if I had proposed it a few weeks back! ;) Reviewed-by: Laszlo Ersek <[email protected]> ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
