dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Staging: hv: make the Hyper-V virtual bus code build

Browse source 
The #define KERNEL_2_6_27 needs to be set, and I adjusted the include
directories a bit to get things to build properly.

I also fixed up the direct access of bus_id, as that field is now gone.

The hv_vmbus code should now build properly, with no errors.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-07-13 17:09:34 -07:00
parent 51b671f2f4
commit 09d50ff8a2
16 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/hv/Channel.c
View file

@ -22,8 +22,8 @@
*/ */
#include "osd.h" #include "include/osd.h"
#include "logging.h" #include "include/logging.h"
#include "VmbusPrivate.h" #include "VmbusPrivate.h"

2
drivers/staging/hv/Channel.h
View file

@ -25,7 +25,7 @@
#ifndef _CHANNEL_H_ #ifndef _CHANNEL_H_
#define _CHANNEL_H_ #define _CHANNEL_H_
#include "osd.h" #include "include/osd.h"
#include "ChannelMgmt.h" #include "ChannelMgmt.h"
#pragma pack(push,1) #pragma pack(push,1)

2
drivers/staging/hv/ChannelInterface.h
View file

@ -25,7 +25,7 @@
#ifndef _CHANNEL_INTERFACE_H_ #ifndef _CHANNEL_INTERFACE_H_
#define _CHANNEL_INTERFACE_H_ #define _CHANNEL_INTERFACE_H_
#include "VmbusApi.h" #include "include/VmbusApi.h"
INTERNAL void INTERNAL void
GetChannelInterface( GetChannelInterface(

4
drivers/staging/hv/ChannelMgmt.c
View file

@ -22,8 +22,8 @@
*/ */
#include "osd.h" #include "include/osd.h"
#include "logging.h" #include "include/logging.h"
#include "VmbusPrivate.h" #include "VmbusPrivate.h"

8
drivers/staging/hv/ChannelMgmt.h
View file

@ -25,12 +25,12 @@
#ifndef _CHANNEL_MGMT_H_ #ifndef _CHANNEL_MGMT_H_
#define _CHANNEL_MGMT_H_ #define _CHANNEL_MGMT_H_
#include "osd.h" #include "include/osd.h"
#include "List.h" #include "include/List.h"
#include "RingBuffer.h" #include "RingBuffer.h"
#include "VmbusChannelInterface.h" #include "include/VmbusChannelInterface.h"
#include "ChannelMessages.h" #include "include/ChannelMessages.h"

2
drivers/staging/hv/Connection.c
View file

@ -22,7 +22,7 @@
*/ */
#include "logging.h" #include "include/logging.h"
#include "VmbusPrivate.h" #include "VmbusPrivate.h"

2
drivers/staging/hv/Hv.c
View file

@ -22,7 +22,7 @@
*/ */
#include "logging.h" #include "include/logging.h"
#include "VmbusPrivate.h" #include "VmbusPrivate.h"
// //

16
drivers/staging/hv/Hv.h
View file

@ -25,23 +25,23 @@
#ifndef __HV_H__ #ifndef __HV_H__
#define __HV_H__ #define __HV_H__
#include "osd.h" #include "include/osd.h"
#include "HvTypes.h" #include "include/HvTypes.h"
#include "HvStatus.h" #include "include/HvStatus.h"
//#include "HvVmApi.h" //#include "HvVmApi.h"
//#include "HvKeApi.h" //#include "HvKeApi.h"
//#include "HvMmApi.h" //#include "HvMmApi.h"
//#include "HvCpuApi.h" //#include "HvCpuApi.h"
#include "HvHalApi.h" #include "include/HvHalApi.h"
#include "HvVpApi.h" #include "include/HvVpApi.h"
//#include "HvTrApi.h" //#include "HvTrApi.h"
#include "HvSynicApi.h" #include "include/HvSynicApi.h"
//#include "HvAmApi.h" //#include "HvAmApi.h"
//#include "HvHkApi.h" //#include "HvHkApi.h"
//#include "HvValApi.h" //#include "HvValApi.h"
#include "HvHcApi.h" #include "include/HvHcApi.h"
#include "HvPtApi.h" #include "include/HvPtApi.h"
enum enum
{ {

2
drivers/staging/hv/RingBuffer.c
View file

@ -22,7 +22,7 @@
*/ */
#include "logging.h" #include "include/logging.h"
#include "RingBuffer.h" #include "RingBuffer.h"
// //

2
drivers/staging/hv/RingBuffer.h
View file

@ -25,7 +25,7 @@
#ifndef _RING_BUFFER_H_ #ifndef _RING_BUFFER_H_
#define _RING_BUFFER_H_ #define _RING_BUFFER_H_
#include "osd.h" #include "include/osd.h"
typedef struct _SG_BUFFER_LIST { typedef struct _SG_BUFFER_LIST {
PVOID Data; PVOID Data;

1
drivers/staging/hv/Sources.c
View file

@ -21,6 +21,7 @@
* *
*/ */
#define KERNEL_2_6_27
#include "Vmbus.c" #include "Vmbus.c"
#include "Hv.c" #include "Hv.c"

2
drivers/staging/hv/Vmbus.c
View file

@ -22,7 +22,7 @@
*/ */
#include "logging.h" #include "include/logging.h"
#include "VersionInfo.h" #include "VersionInfo.h"
#include "VmbusPrivate.h" #include "VmbusPrivate.h"

4
drivers/staging/hv/VmbusPrivate.h
View file

@ -30,14 +30,14 @@
#endif #endif
#include "Hv.h" #include "Hv.h"
#include "VmbusApi.h" #include "include/VmbusApi.h"
#include "Channel.h" #include "Channel.h"
#include "ChannelMgmt.h" #include "ChannelMgmt.h"
#include "ChannelInterface.h" #include "ChannelInterface.h"
//#include "ChannelMessages.h" //#include "ChannelMessages.h"
#include "RingBuffer.h" #include "RingBuffer.h"
//#include "Packet.h" //#include "Packet.h"
#include "List.h" #include "include/List.h"
// //
// Defines // Defines

2
drivers/staging/hv/include/ChannelMessages.h
View file

@ -24,7 +24,7 @@
#pragma once #pragma once
#include <VmbusPacketFormat.h> #include "VmbusPacketFormat.h"
#define C_ASSERT(x) #define C_ASSERT(x)
typedef UINT32 NTSTATUS; typedef UINT32 NTSTATUS;

3
drivers/staging/hv/osd.c
View file

@ -21,6 +21,7 @@
* *
*/ */
#define KERNEL_2_6_27
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@ -46,7 +47,7 @@
#include <asm/kmap_types.h> #include <asm/kmap_types.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include "osd.h" #include "include/osd.h"
// //
// Data types // Data types

15
drivers/staging/hv/vmbus_drv.c
View file

@ -21,6 +21,7 @@
* *
*/ */
#define KERNEL_2_6_27
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
@ -29,8 +30,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include "logging.h" #include "include/logging.h"
#include "vmbus.h" #include "include/vmbus.h"
// //
// Defines // Defines
@ -451,7 +452,7 @@ int vmbus_bus_init(PFN_DRIVERINITIALIZE pfn_drv_init)
goto cleanup; goto cleanup;
} }
//strcpy(dev_ctx->device.bus_id, dev_ctx->device_obj.name); //strcpy(dev_ctx->device.bus_id, dev_ctx->device_obj.name);
sprintf(dev_ctx->device.bus_id, "vmbus_0_0"); dev_set_name(&dev_ctx->device, "vmbus_0_0");
memcpy(&dev_ctx->class_id, &dev_ctx->device_obj.deviceType, sizeof(GUID)); memcpy(&dev_ctx->class_id, &dev_ctx->device_obj.deviceType, sizeof(GUID));
memcpy(&dev_ctx->device_id, &dev_ctx->device_obj.deviceInstance, sizeof(GUID)); memcpy(&dev_ctx->device_id, &dev_ctx->device_obj.deviceInstance, sizeof(GUID));
@ -656,16 +657,16 @@ static int vmbus_child_device_register(DEVICE_OBJECT* root_device_obj, DEVICE_OB
// //
// Make sure we are not registered already // Make sure we are not registered already
// //
if (child_device_ctx->device.bus_id[0] != '\0') if (strlen(dev_name(&child_device_ctx->device)) != 0)
{ {
DPRINT_ERR(VMBUS_DRV, "child device (%p) already registered - busid %s", child_device_ctx, child_device_ctx->device.bus_id); DPRINT_ERR(VMBUS_DRV, "child device (%p) already registered - busid %s", child_device_ctx, dev_name(&child_device_ctx->device));
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
// Set the device bus id. Otherwise, device_register()will fail. // Set the device bus id. Otherwise, device_register()will fail.
sprintf(child_device_ctx->device.bus_id, "vmbus_0_%d", InterlockedIncrement(&device_num)); dev_set_name(&child_device_ctx->device, "vmbus_0_%d", InterlockedIncrement(&device_num));
// The new device belongs to this bus // The new device belongs to this bus
child_device_ctx->device.bus = &g_vmbus_drv.bus; //device->dev.bus; child_device_ctx->device.bus = &g_vmbus_drv.bus; //device->dev.bus;
@ -924,7 +925,7 @@ static int vmbus_probe(struct device *child_device)
ret = device_ctx->probe_error = driver_ctx->probe(child_device); ret = device_ctx->probe_error = driver_ctx->probe(child_device);
if (ret != 0) if (ret != 0)
{ {
DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s (%p) on driver %s (%d)...", child_device->bus_id, child_device, child_device->driver->name, ret); DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s (%p) on driver %s (%d)...", dev_name(child_device), child_device, child_device->driver->name, ret);
#ifdef KERNEL_2_6_27 #ifdef KERNEL_2_6_27
INIT_WORK(&device_ctx->probe_failed_work_item, vmbus_probe_failed_cb); INIT_WORK(&device_ctx->probe_failed_work_item, vmbus_probe_failed_cb);