[PATCH 0/5] OvmfPkg: Fix Bhyve code formatting and style problems


Rebecca Cran
 

There are several problems with the code style and formatting in Bhyve related files.
These include using structs without typedef'ing them, wrong indentation (e.g. three
spaces instead of two), and UINTN/UINT32 mix-ups which cause build errors when
using VS 2019.

I've taken this opportunity to also change the INF and DSC versions to decimal and
bump the version to 1.29 for INF files and 1.30 for the DSC.

Rebecca Cran (5):
OvmfPkg: Fix BhyveFwCtlLib build with VS2019
OvmfPkg: Improve code style/formatting in BhyveFwCtlLib.c
OvmfPkg: Fix style of BhyveFwCtlLib.inf
OvmfPkg: Improve style and formatting in BhyveFwCtlLib.h
OvmfPkg/Bhyve: Fix various style issues

OvmfPkg/Bhyve/BhyveX64.dsc | 2 +-
.../Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 +-
OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf | 10 +-
OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf | 8 +-
OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf | 12 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 10 +-
.../Library/BhyveFwCtlLib/BhyveFwCtlLib.inf | 5 +-
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h | 10 +-
OvmfPkg/Bhyve/AcpiTables/Platform.h | 2 +-
OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h | 6 +-
OvmfPkg/Bhyve/PlatformPei/Cmos.h | 6 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.h | 7 +-
OvmfPkg/Include/Library/BhyveFwCtlLib.h | 24 +--
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c | 3 +-
OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c | 2 +-
OvmfPkg/Bhyve/PlatformPei/Fv.c | 2 +-
OvmfPkg/Bhyve/PlatformPei/Platform.c | 2 +-
OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c | 162 +++++++++---------
18 files changed, 143 insertions(+), 148 deletions(-)

--
2.29.2.windows.2


Peter Grehan
 

Acked by: Peter Grehan <grehan@...>

There are several problems with the code style and formatting in Bhyve related files.
These include using structs without typedef'ing them, wrong indentation (e.g. three
spaces instead of two), and UINTN/UINT32 mix-ups which cause build errors when
using VS 2019.
I've taken this opportunity to also change the INF and DSC versions to decimal and
bump the version to 1.29 for INF files and 1.30 for the DSC.
Rebecca Cran (5):
OvmfPkg: Fix BhyveFwCtlLib build with VS2019
OvmfPkg: Improve code style/formatting in BhyveFwCtlLib.c
OvmfPkg: Fix style of BhyveFwCtlLib.inf
OvmfPkg: Improve style and formatting in BhyveFwCtlLib.h
OvmfPkg/Bhyve: Fix various style issues
OvmfPkg/Bhyve/BhyveX64.dsc | 2 +-
.../Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 +-
OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf | 10 +-
OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf | 8 +-
OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf | 12 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 10 +-
.../Library/BhyveFwCtlLib/BhyveFwCtlLib.inf | 5 +-
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h | 10 +-
OvmfPkg/Bhyve/AcpiTables/Platform.h | 2 +-
OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h | 6 +-
OvmfPkg/Bhyve/PlatformPei/Cmos.h | 6 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.h | 7 +-
OvmfPkg/Include/Library/BhyveFwCtlLib.h | 24 +--
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c | 3 +-
OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c | 2 +-
OvmfPkg/Bhyve/PlatformPei/Fv.c | 2 +-
OvmfPkg/Bhyve/PlatformPei/Platform.c | 2 +-
OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c | 162 +++++++++---------
18 files changed, 143 insertions(+), 148 deletions(-)


Rebecca Cran
 

On 11/29/2020 10:34 PM, Rebecca Cran wrote:

.../Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 +-
OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf | 10 +-
OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf | 8 +-
OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf | 12 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 10 +-
.../Library/BhyveFwCtlLib/BhyveFwCtlLib.inf | 5 +-
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h | 10 +-
Sorry, I thought I'd fixed the ".../" in my .gitconfig but apparently not.

Looks like I need to remember to pass it when running format-patch.


--
Rebecca Cran


Laszlo Ersek
 

On 11/30/20 06:48, Rebecca Cran wrote:
On 11/29/2020 10:34 PM, Rebecca Cran wrote:

  .../Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf |  18 +-
  OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf       |  10 +-
  OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf     |   8 +-
  OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf     |  12 +-
  .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |  10 +-
  .../Library/BhyveFwCtlLib/BhyveFwCtlLib.inf   |   5 +-
  OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h  |  10 +-
Sorry, I thought I'd fixed the ".../" in my .gitconfig but apparently not.

Looks like I need to remember to pass it when running format-patch.

Right, unfortunately I don't know a way to make the options "--stat=1000
--stat-graph-width=20" stick. (I guess a git alias command could work,
but I don't like using a different git command for formatting edk2
patches -- it should all be in the settings. Well, OTOH, now I get to
use different *options* when formatting edk2 patches :)))

Thanks
Laszlo


Laszlo Ersek
 

On 11/30/20 06:34, Rebecca Cran wrote:
There are several problems with the code style and formatting in Bhyve related files.
These include using structs without typedef'ing them, wrong indentation (e.g. three
spaces instead of two), and UINTN/UINT32 mix-ups which cause build errors when
using VS 2019.

I've taken this opportunity to also change the INF and DSC versions to decimal and
bump the version to 1.29 for INF files and 1.30 for the DSC.

Rebecca Cran (5):
OvmfPkg: Fix BhyveFwCtlLib build with VS2019
OvmfPkg: Improve code style/formatting in BhyveFwCtlLib.c
OvmfPkg: Fix style of BhyveFwCtlLib.inf
OvmfPkg: Improve style and formatting in BhyveFwCtlLib.h
OvmfPkg/Bhyve: Fix various style issues

OvmfPkg/Bhyve/BhyveX64.dsc | 2 +-
.../Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 +-
OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf | 10 +-
OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf | 8 +-
OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf | 12 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 10 +-
.../Library/BhyveFwCtlLib/BhyveFwCtlLib.inf | 5 +-
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h | 10 +-
OvmfPkg/Bhyve/AcpiTables/Platform.h | 2 +-
OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h | 6 +-
OvmfPkg/Bhyve/PlatformPei/Cmos.h | 6 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.h | 7 +-
OvmfPkg/Include/Library/BhyveFwCtlLib.h | 24 +--
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c | 3 +-
OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c | 2 +-
OvmfPkg/Bhyve/PlatformPei/Fv.c | 2 +-
OvmfPkg/Bhyve/PlatformPei/Platform.c | 2 +-
OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c | 162 +++++++++---------
18 files changed, 143 insertions(+), 148 deletions(-)
series
Acked-by: Laszlo Ersek <lersek@...>
Build-tested-by: Laszlo Ersek <lersek@...>

Merged as commit range 8501bb0c05ad..9fb629edd75e, via
<https://github.com/tianocore/edk2/pull/1157>.

Thanks,
Laszlo