On 09/17/13 18:54, Olivier Martin wrote:
> OvmfPkg/Include/IndustryStandard/VirtioNet.h | 13 +-
> diff --git a/OvmfPkg/Include/IndustryStandard/VirtioNet.h
> b/OvmfPkg/Include/IndustryStandard/VirtioNet.h
> index 9f5291a..6bcb570 100644
> --- a/OvmfPkg/Include/IndustryStandard/VirtioNet.h
> +++ b/OvmfPkg/Include/IndustryStandard/VirtioNet.h
> @@ -25,14 +25,13 @@
> //
> #pragma pack(1)
> typedef struct {
> - VIRTIO_HDR Generic;
> - UINT8 VhdrMac[6];
> - UINT16 VhdrLinkStatus;
> -} VNET_HDR;
> + UINT8 Mac[6];
> + UINT16 LinkStatus;
> +} VIRTIO_NET_CONFIG;
> #pragma pack()
>
> -#define OFFSET_OF_VNET(Field) OFFSET_OF (VNET_HDR, Field)
> -#define SIZE_OF_VNET(Field) (sizeof ((VNET_HDR *) 0)->Field)
> +#define OFFSET_OF_VNET(Field) OFFSET_OF (VIRTIO_NET_CONFIG, Field)
> +#define SIZE_OF_VNET(Field) (sizeof ((VIRTIO_NET_CONFIG *) 0)->Field)
>
> //
> // Queue Identifiers
> @@ -91,7 +90,7 @@ typedef struct {
> #define VIRTIO_NET_HDR_GSO_ECN BIT7
>
> //
> -// Link Status Bits in VNET_HDR.VhdrLinkStatus
> +// Link Status Bits in VNET_HDR.LinkStatus
> //
> #define VIRTIO_NET_S_LINK_UP BIT0
> #define VIRTIO_NET_S_ANNOUNCE BIT1
Sigh. These hunks don't apply, and it's my fault. The file has LF line
endings, not CRLF ones.
The only commit touching "OvmfPkg/Include/IndustryStandard/VirtioNet.h"
before this series is
Author: Laszlo Ersek <[email protected]>
Date: Fri Jun 14 07:39:32 2013 +0000
OvmfPkg: VirtioNetDxe: declarations and macro definitions
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Stefan Hajnoczi <[email protected]>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14405
6f19259b-4bc3-4df7-8a09-765794883524
I preserve all my patch/series submissions in normal files as well (ie.
the output of git-format-patch), and I now verified that my original
submission for this commit:
http://thread.gmane.org/gmane.comp.bios.tianocore.devel/2993/focus=2996
had been made with wrong line endings (LF instead of CRLF).
I use an editor that recognizes and adapts to line endings when opening
an extant text file. However I had written this header file from
scratch, starting out with an empty buffer in the editor. In that case
the editor defaults to plain LF, and I forgot to switch it over when
saving the file. Mea culpa.
Olivier, can you please prepend a patch to your series that only effects
the equivalent of
unix2dos OvmfPkg/Include/IndustryStandard/VirtioNet.h
?
More comments to follow...
Thanks, and I'm sorry!
Laszlo
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel
