Merge tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw...

[linux-2.6-microblaze.git] / drivers / hv / hv_trace.h

diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index f9d14db..6063bb2 100644 (file)
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -44,10 +44,8 @@ TRACE_EVENT(vmbus_onoffer,
                           __entry->monitorid = offer->monitorid;
                           __entry->is_ddc_int = offer->is_dedicated_interrupt;
                           __entry->connection_id = offer->connection_id;
-                          memcpy(__entry->if_type,
-                                 &offer->offer.if_type.b, 16);
-                          memcpy(__entry->if_instance,
-                                 &offer->offer.if_instance.b, 16);
+                          export_guid(__entry->if_type, &offer->offer.if_type);
+                          export_guid(__entry->if_instance, &offer->offer.if_instance);
                           __entry->chn_flags = offer->offer.chn_flags;
                           __entry->mmio_mb = offer->offer.mmio_megabytes;
                           __entry->sub_idx = offer->offer.sub_channel_index;
@@ -296,6 +294,25 @@ TRACE_EVENT(vmbus_send_tl_connect_request,
                    )
        );
 
+TRACE_EVENT(vmbus_send_modifychannel,
+           TP_PROTO(const struct vmbus_channel_modifychannel *msg,
+                    int ret),
+           TP_ARGS(msg, ret),
+           TP_STRUCT__entry(
+                   __field(u32, child_relid)
+                   __field(u32, target_vp)
+                   __field(int, ret)
+                   ),
+           TP_fast_assign(
+                   __entry->child_relid = msg->child_relid;
+                   __entry->target_vp = msg->target_vp;
+                   __entry->ret = ret;
+                   ),
+           TP_printk("binding child_relid 0x%x to target_vp 0x%x, ret %d",
+                     __entry->child_relid, __entry->target_vp, __entry->ret
+                   )
+       );
+
 DECLARE_EVENT_CLASS(vmbus_channel,
        TP_PROTO(const struct vmbus_channel *channel),
        TP_ARGS(channel),