Page MenuHomeFreeBSD
Files F137045988

D7259.id18618.diff
No OneTemporary
Actions

D7259.id18618.diff
View Options

Index: head/sys/dev/hyperv/include/hyperv.h
===================================================================
--- head/sys/dev/hyperv/include/hyperv.h
+++ head/sys/dev/hyperv/include/hyperv.h
@@ -58,23 +58,6 @@
#include <amd64/include/atomic.h>
#include <dev/hyperv/include/hyperv_busdma.h>
-/*
- * VMBUS version is 32 bit, upper 16 bit for major_number and lower
- * 16 bit for minor_number.
- *
- * 0.13 -- Windows Server 2008
- * 1.1 -- Windows 7
- * 2.4 -- Windows 8
- * 3.0 -- Windows 8.1
- */
-#define VMBUS_VERSION_WS2008 ((0 << 16) | (13))
-#define VMBUS_VERSION_WIN7 ((1 << 16) | (1))
-#define VMBUS_VERSION_WIN8 ((2 << 16) | (4))
-#define VMBUS_VERSION_WIN8_1 ((3 << 16) | (0))
-
-#define VMBUS_VERSION_MAJOR(ver) (((uint32_t)(ver)) >> 16)
-#define VMBUS_VERSION_MINOR(ver) (((uint32_t)(ver)) & 0xffff)
-
struct hyperv_guid {
uint8_t hv_guid[16];
} __packed;
@@ -83,8 +66,6 @@
int hyperv_guid2str(const struct hyperv_guid *, char *, size_t);
-struct hv_vmbus_channel;
-
/**
* @brief Get physical address from virtual
*/
@@ -96,10 +77,4 @@
return (ret);
}
-static __inline struct hv_vmbus_channel *
-vmbus_get_channel(device_t dev)
-{
- return device_get_ivars(dev);
-}
-
#endif /* __HYPERV_H__ */
Index: head/sys/dev/hyperv/include/vmbus.h
===================================================================
--- head/sys/dev/hyperv/include/vmbus.h
+++ head/sys/dev/hyperv/include/vmbus.h
@@ -32,6 +32,23 @@
#include <sys/param.h>
/*
+ * VMBUS version is 32 bit, upper 16 bit for major_number and lower
+ * 16 bit for minor_number.
+ *
+ * 0.13 -- Windows Server 2008
+ * 1.1 -- Windows 7
+ * 2.4 -- Windows 8
+ * 3.0 -- Windows 8.1
+ */
+#define VMBUS_VERSION_WS2008 ((0 << 16) | (13))
+#define VMBUS_VERSION_WIN7 ((1 << 16) | (1))
+#define VMBUS_VERSION_WIN8 ((2 << 16) | (4))
+#define VMBUS_VERSION_WIN8_1 ((3 << 16) | (0))
+
+#define VMBUS_VERSION_MAJOR(ver) (((uint32_t)(ver)) >> 16)
+#define VMBUS_VERSION_MINOR(ver) (((uint32_t)(ver)) & 0xffff)
+
+/*
* GPA stuffs.
*/
struct vmbus_gpa_range {
@@ -92,6 +109,12 @@
typedef void (*vmbus_chan_callback_t)(struct hv_vmbus_channel *, void *);
+static __inline struct hv_vmbus_channel *
+vmbus_get_channel(device_t dev)
+{
+ return device_get_ivars(dev);
+}
+
int vmbus_chan_open(struct hv_vmbus_channel *chan,
int txbr_size, int rxbr_size, const void *udata, int udlen,
vmbus_chan_callback_t cb, void *cbarg);
Index: head/sys/dev/hyperv/vmbus/vmbus_chanvar.h
===================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_chanvar.h
+++ head/sys/dev/hyperv/vmbus/vmbus_chanvar.h
@@ -181,4 +181,12 @@
#define VMBUS_CHAN_ST_OPENED_SHIFT 0
#define VMBUS_CHAN_ST_OPENED (1 << VMBUS_CHAN_ST_OPENED_SHIFT)
+struct vmbus_softc;
+struct vmbus_message;
+
+void vmbus_event_proc(struct vmbus_softc *, int);
+void vmbus_event_proc_compat(struct vmbus_softc *, int);
+void vmbus_chan_msgproc(struct vmbus_softc *, const struct vmbus_message *);
+void vmbus_chan_destroy_all(struct vmbus_softc *);
+
#endif /* !_VMBUS_CHANVAR_H_ */
Index: head/sys/dev/hyperv/vmbus/vmbus_var.h
===================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_var.h
+++ head/sys/dev/hyperv/vmbus/vmbus_var.h
@@ -143,16 +143,11 @@
struct vmbus_message;
struct vmbus_msghc;
-void vmbus_event_proc(struct vmbus_softc *, int);
-void vmbus_event_proc_compat(struct vmbus_softc *, int);
void vmbus_handle_intr(struct trapframe *);
int vmbus_add_child(struct hv_vmbus_channel *);
int vmbus_delete_child(struct hv_vmbus_channel *);
-
void vmbus_et_intr(struct trapframe *);
-
-void vmbus_chan_msgproc(struct vmbus_softc *, const struct vmbus_message *);
-void vmbus_chan_destroy_all(struct vmbus_softc *);
+uint32_t vmbus_gpadl_alloc(struct vmbus_softc *);
struct vmbus_msghc *vmbus_msghc_get(struct vmbus_softc *, size_t);
void vmbus_msghc_put(struct vmbus_softc *, struct vmbus_msghc *);
@@ -164,6 +159,4 @@
void vmbus_msghc_wakeup(struct vmbus_softc *, const struct vmbus_message *);
void vmbus_msghc_reset(struct vmbus_msghc *, size_t);
-uint32_t vmbus_gpadl_alloc(struct vmbus_softc *);
-
#endif /* !_VMBUS_VAR_H_ */

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 22, 1:14 AM (11 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25855833
Default Alt Text
D7259.id18618.diff (4 KB)

Event Timeline