Page MenuHomeFreeBSD
Files F146696319

D7344.id18864.diff
No OneTemporary
Actions

D7344.id18864.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
@@ -42,7 +42,7 @@
#define HYPERV_GUID_STRLEN 40
-int hyperv_guid2str(const struct hyperv_guid *, char *, size_t);
+int hyperv_guid2str(const struct hyperv_guid *, char *, size_t);
/**
* @brief Get physical address from virtual
Index: head/sys/dev/hyperv/include/hyperv_busdma.h
===================================================================
--- head/sys/dev/hyperv/include/hyperv_busdma.h
+++ head/sys/dev/hyperv/include/hyperv_busdma.h
@@ -39,11 +39,11 @@
bus_dmamap_t hv_dmap;
};
-void hyperv_dma_map_paddr(void *arg, bus_dma_segment_t *segs, int nseg,
- int error);
-void *hyperv_dmamem_alloc(bus_dma_tag_t parent_dtag, bus_size_t alignment,
- bus_addr_t boundary, bus_size_t size, struct hyperv_dma *dma,
- int flags);
-void hyperv_dmamem_free(struct hyperv_dma *dma, void *ptr);
+void hyperv_dma_map_paddr(void *arg, bus_dma_segment_t *segs,
+ int nseg, int error);
+void *hyperv_dmamem_alloc(bus_dma_tag_t parent_dtag,
+ bus_size_t alignment, bus_addr_t boundary, bus_size_t size,
+ struct hyperv_dma *dma, int flags);
+void hyperv_dmamem_free(struct hyperv_dma *dma, void *ptr);
#endif /* !_HYPERV_BUSDMA_H_ */
Index: head/sys/dev/hyperv/include/vmbus.h
===================================================================
--- head/sys/dev/hyperv/include/vmbus.h
+++ head/sys/dev/hyperv/include/vmbus.h
@@ -116,45 +116,47 @@
return device_get_ivars(dev);
}
-int vmbus_chan_open(struct vmbus_channel *chan,
- int txbr_size, int rxbr_size, const void *udata, int udlen,
- vmbus_chan_callback_t cb, void *cbarg);
-void vmbus_chan_close(struct vmbus_channel *chan);
-
-int vmbus_chan_gpadl_connect(struct vmbus_channel *chan,
- bus_addr_t paddr, int size, uint32_t *gpadl);
-int vmbus_chan_gpadl_disconnect(struct vmbus_channel *chan,
- uint32_t gpadl);
+int vmbus_chan_open(struct vmbus_channel *chan,
+ int txbr_size, int rxbr_size, const void *udata, int udlen,
+ vmbus_chan_callback_t cb, void *cbarg);
+void vmbus_chan_close(struct vmbus_channel *chan);
+
+int vmbus_chan_gpadl_connect(struct vmbus_channel *chan,
+ bus_addr_t paddr, int size, uint32_t *gpadl);
+int vmbus_chan_gpadl_disconnect(struct vmbus_channel *chan,
+ uint32_t gpadl);
-void vmbus_chan_cpu_set(struct vmbus_channel *chan, int cpu);
-void vmbus_chan_cpu_rr(struct vmbus_channel *chan);
+void vmbus_chan_cpu_set(struct vmbus_channel *chan, int cpu);
+void vmbus_chan_cpu_rr(struct vmbus_channel *chan);
struct vmbus_channel *
- vmbus_chan_cpu2chan(struct vmbus_channel *chan, int cpu);
-void vmbus_chan_set_readbatch(struct vmbus_channel *chan, bool on);
+ vmbus_chan_cpu2chan(struct vmbus_channel *chan, int cpu);
+void vmbus_chan_set_readbatch(struct vmbus_channel *chan, bool on);
struct vmbus_channel **
- vmbus_subchan_get(struct vmbus_channel *pri_chan, int subchan_cnt);
-void vmbus_subchan_rel(struct vmbus_channel **subchan, int subchan_cnt);
-void vmbus_subchan_drain(struct vmbus_channel *pri_chan);
-
-int vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen,
- uint64_t *xactid);
-int vmbus_chan_recv_pkt(struct vmbus_channel *chan,
- struct vmbus_chanpkt_hdr *pkt, int *pktlen);
-
-int vmbus_chan_send(struct vmbus_channel *chan, uint16_t type,
- uint16_t flags, void *data, int dlen, uint64_t xactid);
-int vmbus_chan_send_sglist(struct vmbus_channel *chan,
- struct vmbus_gpa sg[], int sglen, void *data, int dlen,
- uint64_t xactid);
-int vmbus_chan_send_prplist(struct vmbus_channel *chan,
- struct vmbus_gpa_range *prp, int prp_cnt, void *data, int dlen,
- uint64_t xactid);
-
-uint32_t vmbus_chan_id(const struct vmbus_channel *chan);
-uint32_t vmbus_chan_subidx(const struct vmbus_channel *chan);
-bool vmbus_chan_is_primary(const struct vmbus_channel *chan);
+ vmbus_subchan_get(struct vmbus_channel *pri_chan,
+ int subchan_cnt);
+void vmbus_subchan_rel(struct vmbus_channel **subchan,
+ int subchan_cnt);
+void vmbus_subchan_drain(struct vmbus_channel *pri_chan);
+
+int vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen,
+ uint64_t *xactid);
+int vmbus_chan_recv_pkt(struct vmbus_channel *chan,
+ struct vmbus_chanpkt_hdr *pkt, int *pktlen);
+
+int vmbus_chan_send(struct vmbus_channel *chan, uint16_t type,
+ uint16_t flags, void *data, int dlen, uint64_t xactid);
+int vmbus_chan_send_sglist(struct vmbus_channel *chan,
+ struct vmbus_gpa sg[], int sglen, void *data, int dlen,
+ uint64_t xactid);
+int vmbus_chan_send_prplist(struct vmbus_channel *chan,
+ struct vmbus_gpa_range *prp, int prp_cnt, void *data,
+ int dlen, uint64_t xactid);
+
+uint32_t vmbus_chan_id(const struct vmbus_channel *chan);
+uint32_t vmbus_chan_subidx(const struct vmbus_channel *chan);
+bool vmbus_chan_is_primary(const struct vmbus_channel *chan);
const struct hyperv_guid *
- vmbus_chan_guid_inst(const struct vmbus_channel *chan);
+ vmbus_chan_guid_inst(const struct vmbus_channel *chan);
#endif /* !_VMBUS_H_ */
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
@@ -155,9 +155,10 @@
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 *);
+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
@@ -142,20 +142,23 @@
struct vmbus_message;
struct vmbus_msghc;
-void vmbus_handle_intr(struct trapframe *);
-int vmbus_add_child(struct vmbus_channel *);
-int vmbus_delete_child(struct vmbus_channel *);
-void vmbus_et_intr(struct trapframe *);
-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 *);
-void *vmbus_msghc_dataptr(struct vmbus_msghc *);
-int vmbus_msghc_exec_noresult(struct vmbus_msghc *);
-int vmbus_msghc_exec(struct vmbus_softc *, struct vmbus_msghc *);
-const struct vmbus_message *vmbus_msghc_wait_result(struct vmbus_softc *,
- struct vmbus_msghc *);
-void vmbus_msghc_wakeup(struct vmbus_softc *, const struct vmbus_message *);
-void vmbus_msghc_reset(struct vmbus_msghc *, size_t);
+void vmbus_handle_intr(struct trapframe *);
+int vmbus_add_child(struct vmbus_channel *);
+int vmbus_delete_child(struct vmbus_channel *);
+void vmbus_et_intr(struct trapframe *);
+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 *);
+void *vmbus_msghc_dataptr(struct vmbus_msghc *);
+int vmbus_msghc_exec_noresult(struct vmbus_msghc *);
+int vmbus_msghc_exec(struct vmbus_softc *, struct vmbus_msghc *);
+const struct vmbus_message *
+ vmbus_msghc_wait_result(struct vmbus_softc *,
+ struct vmbus_msghc *);
+void vmbus_msghc_wakeup(struct vmbus_softc *,
+ const struct vmbus_message *);
+void vmbus_msghc_reset(struct vmbus_msghc *, size_t);
#endif /* !_VMBUS_VAR_H_ */

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 5, 7:20 PM (16 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29296411
Default Alt Text
D7344.id18864.diff (7 KB)

Event Timeline