mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
Staging: hv: Move the contents of logging.h to hyperv.h
Move the contents of logging.h to hyperv.h. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Abhishek Kane <v-abkane@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
c35470b229
commit
f63c9149d0
17 changed files with 68 additions and 113 deletions
|
@ -34,7 +34,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus.h"
|
||||
#include "storvsc_api.h"
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus_private.h"
|
||||
|
||||
#define NUM_PAGES_SPANNED(addr, len) \
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus_private.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus_private.h"
|
||||
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus_private.h"
|
||||
|
||||
/* The one and only */
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <linux/workqueue.h>
|
||||
|
||||
#include "hyperv.h"
|
||||
#include "logging.h"
|
||||
#include "hv_api.h"
|
||||
#include "vmbus.h"
|
||||
#include "vmbus_private.h"
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus.h"
|
||||
#include "vmbus_api.h"
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include <linux/pci.h>
|
||||
|
||||
#include "hyperv.h"
|
||||
#include "logging.h"
|
||||
#include "hv_api.h"
|
||||
#include "vmbus.h"
|
||||
#include "vmbus_private.h"
|
||||
|
|
|
@ -689,4 +689,72 @@ extern void vmbus_get_debug_info(struct vmbus_channel *channel,
|
|||
|
||||
extern void vmbus_ontimer(unsigned long data);
|
||||
|
||||
|
||||
#define LOWORD(dw) ((unsigned short)(dw))
|
||||
#define HIWORD(dw) ((unsigned short)(((unsigned int) (dw) >> 16) & 0xFFFF))
|
||||
|
||||
|
||||
#define VMBUS 0x0001
|
||||
#define STORVSC 0x0002
|
||||
#define NETVSC 0x0004
|
||||
#define INPUTVSC 0x0008
|
||||
#define BLKVSC 0x0010
|
||||
#define VMBUS_DRV 0x0100
|
||||
#define STORVSC_DRV 0x0200
|
||||
#define NETVSC_DRV 0x0400
|
||||
#define INPUTVSC_DRV 0x0800
|
||||
#define BLKVSC_DRV 0x1000
|
||||
|
||||
#define ALL_MODULES (VMBUS |\
|
||||
STORVSC |\
|
||||
NETVSC |\
|
||||
INPUTVSC |\
|
||||
BLKVSC |\
|
||||
VMBUS_DRV |\
|
||||
STORVSC_DRV |\
|
||||
NETVSC_DRV |\
|
||||
INPUTVSC_DRV|\
|
||||
BLKVSC_DRV)
|
||||
|
||||
/* Logging Level */
|
||||
#define ERROR_LVL 3
|
||||
#define WARNING_LVL 4
|
||||
#define INFO_LVL 6
|
||||
#define DEBUG_LVL 7
|
||||
#define DEBUG_LVL_ENTEREXIT 8
|
||||
#define DEBUG_RING_LVL 9
|
||||
|
||||
extern unsigned int vmbus_loglevel;
|
||||
|
||||
#define DPRINT(mod, lvl, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(lvl <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_DBG(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(DEBUG_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_INFO(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(INFO_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_INFO #mod": " fmt "\n", ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_WARN(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(WARNING_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_WARNING #mod": WARNING! " fmt "\n", ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_ERR(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(ERROR_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_ERR #mod": %s() ERROR!! " fmt "\n", \
|
||||
__func__, ## args);\
|
||||
} while (0)
|
||||
|
||||
#endif /* _HYPERV_H */
|
||||
|
|
|
@ -1,98 +0,0 @@
|
|||
/*
|
||||
*
|
||||
* Copyright (c) 2009, Microsoft Corporation.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
||||
*
|
||||
* Authors:
|
||||
* Haiyang Zhang <haiyangz@microsoft.com>
|
||||
* Hank Janssen <hjanssen@microsoft.com>
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _LOGGING_H_
|
||||
#define _LOGGING_H_
|
||||
|
||||
#define LOWORD(dw) ((unsigned short)(dw))
|
||||
#define HIWORD(dw) ((unsigned short)(((unsigned int) (dw) >> 16) & 0xFFFF))
|
||||
|
||||
/* #include <linux/init.h> */
|
||||
/* #include <linux/module.h> */
|
||||
|
||||
|
||||
#define VMBUS 0x0001
|
||||
#define STORVSC 0x0002
|
||||
#define NETVSC 0x0004
|
||||
#define INPUTVSC 0x0008
|
||||
#define BLKVSC 0x0010
|
||||
#define VMBUS_DRV 0x0100
|
||||
#define STORVSC_DRV 0x0200
|
||||
#define NETVSC_DRV 0x0400
|
||||
#define INPUTVSC_DRV 0x0800
|
||||
#define BLKVSC_DRV 0x1000
|
||||
|
||||
#define ALL_MODULES (VMBUS |\
|
||||
STORVSC |\
|
||||
NETVSC |\
|
||||
INPUTVSC |\
|
||||
BLKVSC |\
|
||||
VMBUS_DRV |\
|
||||
STORVSC_DRV |\
|
||||
NETVSC_DRV |\
|
||||
INPUTVSC_DRV|\
|
||||
BLKVSC_DRV)
|
||||
|
||||
/* Logging Level */
|
||||
#define ERROR_LVL 3
|
||||
#define WARNING_LVL 4
|
||||
#define INFO_LVL 6
|
||||
#define DEBUG_LVL 7
|
||||
#define DEBUG_LVL_ENTEREXIT 8
|
||||
#define DEBUG_RING_LVL 9
|
||||
|
||||
extern unsigned int vmbus_loglevel;
|
||||
|
||||
#define DPRINT(mod, lvl, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(lvl <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_DBG(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(DEBUG_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_INFO(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(INFO_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_INFO #mod": " fmt "\n", ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_WARN(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(WARNING_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_WARNING #mod": WARNING! " fmt "\n", ## args);\
|
||||
} while (0)
|
||||
|
||||
#define DPRINT_ERR(mod, fmt, args...) do {\
|
||||
if ((mod & (HIWORD(vmbus_loglevel))) && \
|
||||
(ERROR_LVL <= LOWORD(vmbus_loglevel))) \
|
||||
printk(KERN_ERR #mod": %s() ERROR!! " fmt "\n", \
|
||||
__func__, ## args);\
|
||||
} while (0)
|
||||
|
||||
#endif /* _LOGGING_H_ */
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "netvsc.h"
|
||||
#include "rndis_filter.h"
|
||||
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus.h"
|
||||
#include "netvsc_api.h"
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include <linux/mm.h>
|
||||
|
||||
#include "hyperv.h"
|
||||
#include "logging.h"
|
||||
#include "ring_buffer.h"
|
||||
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <linux/netdevice.h>
|
||||
|
||||
#include "hyperv.h"
|
||||
#include "logging.h"
|
||||
#include "hv_api.h"
|
||||
#include "netvsc_api.h"
|
||||
#include "rndis_filter.h"
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "storvsc_api.h"
|
||||
#include "vstorage.h"
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus.h"
|
||||
#include "storvsc_api.h"
|
||||
#include "vstorage.h"
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
#include "hyperv.h"
|
||||
#include "hv_api.h"
|
||||
#include "logging.h"
|
||||
#include "vmbus.h"
|
||||
#include "vmbus_private.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue