]> git.proxmox.com Git - mirror_qemu.git/commit
net/colo: Match is-enabled probe to tracepoint
authorRoman Bolshakov <r.bolshakov@yadro.com>
Fri, 17 Jul 2020 09:35:17 +0000 (12:35 +0300)
committerStefan Hajnoczi <stefanha@redhat.com>
Wed, 9 Sep 2020 16:16:34 +0000 (17:16 +0100)
commit8c8ed03850208e486f20ee2902435f1c487792e8
tree8b470a8314c4ee3e4efaa8a43fe62e08908a826b
parent5e7477bc8222230d0675e643c9f8e385e1e6b503
net/colo: Match is-enabled probe to tracepoint

Build of QEMU with dtrace fails on macOS:

  LINK    x86_64-softmmu/qemu-system-x86_64
error: probe colo_compare_miscompare doesn't exist
error: Could not register probes
ld: error creating dtrace DOF section for architecture x86_64

The reason of the error is explained by Adam Leventhal [1]:

  Note that is-enabled probes don't have the stability magic so I'm not
  sure how things would work if only is-enabled probes were used.

net/colo code uses is-enabled probes to determine if other probes should
be used but colo_compare_miscompare itself is not used explicitly.
Linker doesn't include the symbol and build fails.

The issue can be resolved if is-enabled probe matches the actual trace
point that is used inside the test. Packet dump toggle is replaced with
a compile-time conditional definition.

1. http://markmail.org/message/6grq2ygr5nwdwsnb

Fixes: f4b618360e ("colo-compare: add TCP, UDP, ICMP packet comparison")
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Message-id: 20200717093517.73397-5-r.bolshakov@yadro.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
net/colo-compare.c
net/filter-rewriter.c
net/trace-events