Page MenuHomeFreeBSD
Files F106215707

D7422.diff
No OneTemporary
Actions

D7422.diff
View Options

Index: head/sys/dev/hyperv/utilities/hv_heartbeat.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_heartbeat.c
+++ head/sys/dev/hyperv/utilities/hv_heartbeat.c
@@ -75,8 +75,7 @@
&buf[sizeof(struct hv_vmbus_pipe_hdr)];
if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_negotiate_version(icmsghdrp, NULL, buf);
-
+ hv_negotiate_version(icmsghdrp, buf);
} else {
heartbeat_msg =
(struct hv_vmbus_heartbeat_msg_data *)
Index: head/sys/dev/hyperv/utilities/hv_shutdown.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_shutdown.c
+++ head/sys/dev/hyperv/utilities/hv_shutdown.c
@@ -79,8 +79,7 @@
&buf[sizeof(struct hv_vmbus_pipe_hdr)];
if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_negotiate_version(icmsghdrp, NULL, buf);
-
+ hv_negotiate_version(icmsghdrp, buf);
} else {
shutdown_msg =
(struct hv_vmbus_shutdown_msg_data *)
Index: head/sys/dev/hyperv/utilities/hv_timesync.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_timesync.c
+++ head/sys/dev/hyperv/utilities/hv_timesync.c
@@ -155,7 +155,7 @@
sizeof(struct hv_vmbus_pipe_hdr)];
if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_negotiate_version(icmsghdrp, NULL, time_buf);
+ hv_negotiate_version(icmsghdrp, time_buf);
} else {
timedatap = (struct hv_ictimesync_data *) &time_buf[
sizeof(struct hv_vmbus_pipe_hdr) +
Index: head/sys/dev/hyperv/utilities/hv_util.h
===================================================================
--- head/sys/dev/hyperv/utilities/hv_util.h
+++ head/sys/dev/hyperv/utilities/hv_util.h
@@ -43,11 +43,9 @@
uint8_t *receive_buffer;
} hv_util_sc;
-void hv_negotiate_version(
- struct hv_vmbus_icmsg_hdr* icmsghdrp,
- struct hv_vmbus_icmsg_negotiate* negop,
- uint8_t* buf);
+void hv_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp, uint8_t *buf);
int hv_util_attach(device_t dev);
int hv_util_detach(device_t dev);
+
#endif
Index: head/sys/dev/hyperv/utilities/hv_util.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_util.c
+++ head/sys/dev/hyperv/utilities/hv_util.c
@@ -45,11 +45,10 @@
#include "hv_util.h"
void
-hv_negotiate_version(
- struct hv_vmbus_icmsg_hdr* icmsghdrp,
- struct hv_vmbus_icmsg_negotiate* negop,
- uint8_t* buf)
+hv_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp, uint8_t *buf)
{
+ struct hv_vmbus_icmsg_negotiate *negop;
+
icmsghdrp->icmsgsize = 0x10;
negop = (struct hv_vmbus_icmsg_negotiate *)&buf[

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 28, 8:12 AM (7 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15621315
Default Alt Text
D7422.diff (2 KB)

Event Timeline