leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: hv: coding style cleanups for HvPtApi.h

Browse Source 
Fix up the typedefs in there as well.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-08-20 12:09:34 -07:00
parent 462eeeca03
commit f80b3d51a6
2 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/hv/Hv.c
View File

@ -230,7 +230,7 @@ int HvInit (void)
{ {
int ret=0; int ret=0;
int maxLeaf; int maxLeaf;
HV_X64_MSR_HYPERCALL_CONTENTS hypercallMsr; union hv_x64_msr_hypercall_contents hypercallMsr;
void *virtAddr = NULL; void *virtAddr = NULL;
DPRINT_ENTER(VMBUS); DPRINT_ENTER(VMBUS);
@ -347,7 +347,7 @@ Description:
--*/ --*/
void HvCleanup (void) void HvCleanup (void)
{ {
HV_X64_MSR_HYPERCALL_CONTENTS hypercallMsr; union hv_x64_msr_hypercall_contents hypercallMsr;
DPRINT_ENTER(VMBUS); DPRINT_ENTER(VMBUS);

99
drivers/staging/hv/include/HvPtApi.h
View File

@ -21,66 +21,57 @@
* *
*/ */
#ifndef __HVVPTPI_H
#define __HVVPTPI_H
#pragma once /*
* Versioning definitions used for guests reporting themselves to the
* hypervisor, and visa versa.
/* Versioning definitions used for guests reporting themselves to the */ */
/* hypervisor, and visa versa. */
/* ================================================================== */
/* Version info reported by guest OS's */ /* Version info reported by guest OS's */
enum hv_guest_os_vendor {
HvGuestOsVendorMicrosoft = 0x0001
};
typedef enum _HV_GUEST_OS_VENDOR enum hv_guest_os_microsoft_ids {
{ HvGuestOsMicrosoftUndefined = 0x00,
HvGuestOsVendorMicrosoft = 0x0001 HvGuestOsMicrosoftMSDOS = 0x01,
HvGuestOsMicrosoftWindows3x = 0x02,
HvGuestOsMicrosoftWindows9x = 0x03,
HvGuestOsMicrosoftWindowsNT = 0x04,
HvGuestOsMicrosoftWindowsCE = 0x05
};
} HV_GUEST_OS_VENDOR, *PHV_GUEST_OS_VENDOR; /*
* Declare the MSR used to identify the guest OS.
*/
#define HV_X64_MSR_GUEST_OS_ID 0x40000000
typedef enum _HV_GUEST_OS_MICROSOFT_IDS union hv_x64_msr_guest_os_id_contents {
{ u64 AsUINT64;
HvGuestOsMicrosoftUndefined = 0x00, struct {
HvGuestOsMicrosoftMSDOS = 0x01, u64 BuildNumber:16;
HvGuestOsMicrosoftWindows3x = 0x02, u64 ServiceVersion:8; /* Service Pack, etc. */
HvGuestOsMicrosoftWindows9x = 0x03, u64 MinorVersion:8;
HvGuestOsMicrosoftWindowsNT = 0x04, u64 MajorVersion:8;
HvGuestOsMicrosoftWindowsCE = 0x05 u64 OsId:8; /* enum hv_guest_os_microsoft_ids (if Vendor=MS) */
u64 VendorId:16; /* enum hv_guest_os_vendor */
};
};
} HV_GUEST_OS_MICROSOFT_IDS, *PHV_GUEST_OS_MICROSOFT_IDS; /*
* Declare the MSR used to setup pages used to communicate with the hypervisor.
*/
#define HV_X64_MSR_HYPERCALL 0x40000001
union hv_x64_msr_hypercall_contents {
u64 AsUINT64;
struct {
u64 Enable:1;
u64 Reserved:11;
u64 GuestPhysicalAddress:52;
};
};
/* Declare the MSR used to identify the guest OS. */ #endif
#define HV_X64_MSR_GUEST_OS_ID 0x40000000
typedef union _HV_X64_MSR_GUEST_OS_ID_CONTENTS
{
u64 AsUINT64;
struct
{
u64 BuildNumber : 16;
u64 ServiceVersion : 8; /* Service Pack, etc. */
u64 MinorVersion : 8;
u64 MajorVersion : 8;
u64 OsId : 8; /* HV_GUEST_OS_MICROSOFT_IDS (If Vendor=MS) */
u64 VendorId : 16; /* HV_GUEST_OS_VENDOR */
};
} HV_X64_MSR_GUEST_OS_ID_CONTENTS, *PHV_X64_MSR_GUEST_OS_ID_CONTENTS;
/* Declare the MSR used to setup pages used to communicate with the hypervisor. */
#define HV_X64_MSR_HYPERCALL 0x40000001
typedef union _HV_X64_MSR_HYPERCALL_CONTENTS
{
u64 AsUINT64;
struct
{
u64 Enable : 1;
u64 Reserved : 11;
u64 GuestPhysicalAddress : 52;
};
} HV_X64_MSR_HYPERCALL_CONTENTS, *PHV_X64_MSR_HYPERCALL_CONTENTS;