* Re: [PATCH-for-5.1] net/colo: Remove unused trace event
2020-07-15 14:31 [PATCH-for-5.1] net/colo: Remove unused trace event Philippe Mathieu-Daudé
@ 2020-07-15 14:56 ` no-reply
2020-07-15 15:02 ` Philippe Mathieu-Daudé
2020-07-15 15:02 ` no-reply
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: no-reply @ 2020-07-15 14:56 UTC (permalink / raw)
To: philmd
Cc: zhangchen.fnst, lizhijian, jasowang, qemu-devel, chen.zhang,
r.bolshakov, stefanha, philmd
Patchew URL: https://patchew.org/QEMU/20200715143130.11164-1-philmd@redhat.com/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===
In file included from /tmp/qemu-test/build/net/trace.h:6:0,
from /tmp/qemu-test/src/net/colo-compare.c:18:
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_compare_packet_payload':
/tmp/qemu-test/src/net/colo-compare.c:330:40: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function)
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
^
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
---
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
((id ##_ENABLED) && id ##_BACKEND_DSTATE())
^
/tmp/qemu-test/src/net/colo-compare.c:330:5: error: implicit declaration of function 'TRACE_COLO_COMPARE_MISCOMPARE_BACKEND_DSTATE' [-Werror=implicit-function-declaration]
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
^
/tmp/qemu-test/src/net/colo-compare.c:330:5: error: nested extern declaration of 'TRACE_COLO_COMPARE_MISCOMPARE_BACKEND_DSTATE' [-Werror=nested-externs]
In file included from /tmp/qemu-test/build/net/trace.h:6:0,
from /tmp/qemu-test/src/net/colo-compare.c:18:
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_compare_tcp':
/tmp/qemu-test/src/net/colo-compare.c:495:44: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function)
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
^
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
((id ##_ENABLED) && id ##_BACKEND_DSTATE())
^
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_packet_compare_udp':
/tmp/qemu-test/src/net/colo-compare.c:536:44: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function)
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
^
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
((id ##_ENABLED) && id ##_BACKEND_DSTATE())
^
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_packet_compare_icmp':
/tmp/qemu-test/src/net/colo-compare.c:579:44: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function)
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
^
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
((id ##_ENABLED) && id ##_BACKEND_DSTATE())
^
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_packet_compare_other':
/tmp/qemu-test/src/net/colo-compare.c:600:40: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function)
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
^
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
((id ##_ENABLED) && id ##_BACKEND_DSTATE())
^
cc1: all warnings being treated as errors
make: *** [net/colo-compare.o] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 702, in <module>
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=b363c566c212463d89fc6bc47ef60cf9', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-5pyfl0_w/src/docker-src.2020-07-15-10.53.32.10761:/var/tmp/qemu:z,ro', 'qemu/centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=b363c566c212463d89fc6bc47ef60cf9
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-5pyfl0_w/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 2m59.692s
user 0m7.889s
The full log is available at
http://patchew.org/logs/20200715143130.11164-1-philmd@redhat.com/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH-for-5.1] net/colo: Remove unused trace event
2020-07-15 14:56 ` no-reply
@ 2020-07-15 15:02 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-15 15:02 UTC (permalink / raw)
To: qemu-devel
Cc: zhangchen.fnst, lizhijian, jasowang, chen.zhang, r.bolshakov,
stefanha
On 7/15/20 4:56 PM, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20200715143130.11164-1-philmd@redhat.com/
>
> In file included from /tmp/qemu-test/build/net/trace.h:6:0,
> from /tmp/qemu-test/src/net/colo-compare.c:18:
> /tmp/qemu-test/src/net/colo-compare.c: In function 'colo_compare_packet_payload':
> /tmp/qemu-test/src/net/colo-compare.c:330:40: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function)
> if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
> ^
> /tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
> ---
> /tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
> ((id ##_ENABLED) && id ##_BACKEND_DSTATE())
> ^
> /tmp/qemu-test/src/net/colo-compare.c:330:5: error: implicit declaration of function 'TRACE_COLO_COMPARE_MISCOMPARE_BACKEND_DSTATE' [-Werror=implicit-function-declaration]
> if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
Ah, interesting :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH-for-5.1] net/colo: Remove unused trace event
2020-07-15 14:31 [PATCH-for-5.1] net/colo: Remove unused trace event Philippe Mathieu-Daudé
2020-07-15 14:56 ` no-reply
@ 2020-07-15 15:02 ` no-reply
2020-07-15 15:13 ` Daniel P. Berrangé
2020-07-15 18:36 ` Roman Bolshakov
3 siblings, 0 replies; 7+ messages in thread
From: no-reply @ 2020-07-15 15:02 UTC (permalink / raw)
To: philmd
Cc: zhangchen.fnst, lizhijian, jasowang, qemu-devel, chen.zhang,
r.bolshakov, stefanha, philmd
Patchew URL: https://patchew.org/QEMU/20200715143130.11164-1-philmd@redhat.com/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===
In file included from /tmp/qemu-test/build/net/trace.h:6,
from /tmp/qemu-test/src/net/colo-compare.c:18:
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_compare_packet_payload':
/tmp/qemu-test/src/net/colo-compare.c:330:40: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function); did you mean 'TRACE_COLO_COMPARE_UDP_MISCOMPARE_ENABLED'?
330 | if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
---
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
120 | ((id ##_ENABLED) && id ##_BACKEND_DSTATE())
| ^~
/tmp/qemu-test/src/net/colo-compare.c:330:40: error: implicit declaration of function 'TRACE_COLO_COMPARE_MISCOMPARE_BACKEND_DSTATE'; did you mean 'TRACE_COLO_COMPARE_UDP_MISCOMPARE_BACKEND_DSTATE'? [-Werror=implicit-function-declaration]
330 | if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.h:120:25: note: in definition of macro 'trace_event_get_state_backends'
120 | ((id ##_ENABLED) && id ##_BACKEND_DSTATE())
| ^~
/tmp/qemu-test/src/net/colo-compare.c:330:40: error: nested extern declaration of 'TRACE_COLO_COMPARE_MISCOMPARE_BACKEND_DSTATE' [-Werror=nested-externs]
330 | if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.h:120:25: note: in definition of macro 'trace_event_get_state_backends'
120 | ((id ##_ENABLED) && id ##_BACKEND_DSTATE())
| ^~
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_compare_tcp':
/tmp/qemu-test/src/net/colo-compare.c:495:44: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function); did you mean 'TRACE_COLO_COMPARE_UDP_MISCOMPARE_ENABLED'?
495 | if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
120 | ((id ##_ENABLED) && id ##_BACKEND_DSTATE())
| ^~
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_packet_compare_udp':
/tmp/qemu-test/src/net/colo-compare.c:536:44: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function); did you mean 'TRACE_COLO_COMPARE_UDP_MISCOMPARE_ENABLED'?
536 | if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
120 | ((id ##_ENABLED) && id ##_BACKEND_DSTATE())
| ^~
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_packet_compare_icmp':
/tmp/qemu-test/src/net/colo-compare.c:579:44: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function); did you mean 'TRACE_COLO_COMPARE_UDP_MISCOMPARE_ENABLED'?
579 | if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
120 | ((id ##_ENABLED) && id ##_BACKEND_DSTATE())
| ^~
/tmp/qemu-test/src/net/colo-compare.c: In function 'colo_packet_compare_other':
/tmp/qemu-test/src/net/colo-compare.c:600:40: error: 'TRACE_COLO_COMPARE_MISCOMPARE_ENABLED' undeclared (first use in this function); did you mean 'TRACE_COLO_COMPARE_UDP_MISCOMPARE_ENABLED'?
600 | if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.h:120:7: note: in definition of macro 'trace_event_get_state_backends'
---
SIGN pc-bios/optionrom/kvmvapic.bin
CC qga/qapi-generated/qga-qapi-types.o
CC qga/qapi-generated/qga-qapi-visit.o
make: *** [/tmp/qemu-test/src/rules.mak:69: net/colo-compare.o] Error 1
make: *** Waiting for unfinished jobs....
SIGN pc-bios/optionrom/multiboot.bin
SIGN pc-bios/optionrom/linuxboot.bin
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=d253cd2557254b8686728ca825dba52b', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-zfmfzb8k/src/docker-src.2020-07-15-10.59.34.13555:/var/tmp/qemu:z,ro', 'qemu/fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=d253cd2557254b8686728ca825dba52b
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-zfmfzb8k/src'
make: *** [docker-run-test-mingw@fedora] Error 2
real 3m12.653s
user 0m9.122s
The full log is available at
http://patchew.org/logs/20200715143130.11164-1-philmd@redhat.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH-for-5.1] net/colo: Remove unused trace event
2020-07-15 14:31 [PATCH-for-5.1] net/colo: Remove unused trace event Philippe Mathieu-Daudé
2020-07-15 14:56 ` no-reply
2020-07-15 15:02 ` no-reply
@ 2020-07-15 15:13 ` Daniel P. Berrangé
2020-07-15 19:27 ` Roman Bolshakov
2020-07-15 18:36 ` Roman Bolshakov
3 siblings, 1 reply; 7+ messages in thread
From: Daniel P. Berrangé @ 2020-07-15 15:13 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: zhangchen.fnst, Li Zhijian, Jason Wang, qemu-devel, Zhang Chen,
Roman Bolshakov, Stefan Hajnoczi
On Wed, Jul 15, 2020 at 04:31:30PM +0200, Philippe Mathieu-Daudé wrote:
> Unused trace event cause build failure when using the dtrace backend:
>
> "probe colo_compare_miscompare doesn't exist"
>
> Fixes: f4b618360e ("colo-compare: add TCP, UDP, ICMP packet comparison")
> Reported-by: Roman Bolshakov <r.bolshakov@yadro.com>
Note Roman indicated on IRC that this is seen with dtrace on macOS and
there were other problems too.
Unless someone knows that QEMU's dtrace support worked on macOS in the
past, I think we don't need and simply consider dtrace unsupported on
macOS right now until someone can get it into more robust shape on
macOS.
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: zhangchen.fnst@cn.fujitsu.com
> ---
> net/trace-events | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/trace-events b/net/trace-events
> index fa49c71533..c3f623d40c 100644
> --- a/net/trace-events
> +++ b/net/trace-events
> @@ -17,7 +17,6 @@ colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d"
> colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
> colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
> colo_old_packet_check_found(int64_t old_time) "%" PRId64
> -colo_compare_miscompare(void) ""
> colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdlen, int pdlen, int offset, int flags) "%s: seq/ack= %u/%u hdlen= %d pdlen= %d offset= %d flags=%d"
>
> # filter-rewriter.c
> --
> 2.21.3
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH-for-5.1] net/colo: Remove unused trace event
2020-07-15 15:13 ` Daniel P. Berrangé
@ 2020-07-15 19:27 ` Roman Bolshakov
0 siblings, 0 replies; 7+ messages in thread
From: Roman Bolshakov @ 2020-07-15 19:27 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: zhangchen.fnst, Li Zhijian, Jason Wang, qemu-devel, Zhang Chen,
Stefan Hajnoczi, Philippe Mathieu-Daudé
On Wed, Jul 15, 2020 at 04:13:02PM +0100, Daniel P. Berrangé wrote:
> On Wed, Jul 15, 2020 at 04:31:30PM +0200, Philippe Mathieu-Daudé wrote:
> > Unused trace event cause build failure when using the dtrace backend:
> >
> > "probe colo_compare_miscompare doesn't exist"
> >
> > Fixes: f4b618360e ("colo-compare: add TCP, UDP, ICMP packet comparison")
> > Reported-by: Roman Bolshakov <r.bolshakov@yadro.com>
>
> Note Roman indicated on IRC that this is seen with dtrace on macOS and
> there were other problems too.
>
> Unless someone knows that QEMU's dtrace support worked on macOS in the
> past, I think we don't need and simply consider dtrace unsupported on
> macOS right now until someone can get it into more robust shape on
> macOS.
>
Hi Daniel,
I've got it working and I can see qemu trace points from
sudo dtrace -m qemu-system-x86_64 -l
I'm wrapping a series that resolves all the issues along the way.
Thanks,
Roman
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH-for-5.1] net/colo: Remove unused trace event
2020-07-15 14:31 [PATCH-for-5.1] net/colo: Remove unused trace event Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-07-15 15:13 ` Daniel P. Berrangé
@ 2020-07-15 18:36 ` Roman Bolshakov
3 siblings, 0 replies; 7+ messages in thread
From: Roman Bolshakov @ 2020-07-15 18:36 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Li Zhijian, zhangchen.fnst, Jason Wang, qemu-devel, Zhang Chen,
Stefan Hajnoczi
On Wed, Jul 15, 2020 at 04:31:30PM +0200, Philippe Mathieu-Daudé wrote:
> Unused trace event cause build failure when using the dtrace backend:
>
> "probe colo_compare_miscompare doesn't exist"
>
> Fixes: f4b618360e ("colo-compare: add TCP, UDP, ICMP packet comparison")
> Reported-by: Roman Bolshakov <r.bolshakov@yadro.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: zhangchen.fnst@cn.fujitsu.com
> ---
> net/trace-events | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/trace-events b/net/trace-events
> index fa49c71533..c3f623d40c 100644
> --- a/net/trace-events
> +++ b/net/trace-events
> @@ -17,7 +17,6 @@ colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d"
> colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
> colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
> colo_old_packet_check_found(int64_t old_time) "%" PRId64
> -colo_compare_miscompare(void) ""
> colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdlen, int pdlen, int offset, int flags) "%s: seq/ack= %u/%u hdlen= %d pdlen= %d offset= %d flags=%d"
>
> # filter-rewriter.c
> --
> 2.21.3
>
Hi Philippe,
Thanks for submitting it but this is not enough, here's the patch that
works (but this is only one of the patches that enables dtrace on macOS):
diff --git a/net/trace-events b/net/trace-events
index fa49c71533..c3f623d40c 100644
--- a/net/trace-events
+++ b/net/trace-events
@@ -17,7 +17,6 @@ colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d"
colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
colo_old_packet_check_found(int64_t old_time) "%" PRId64
-colo_compare_miscompare(void) ""
colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdlen, int pdlen, int offset, int flags) "%s: seq/ack= %u/%u hdlen= %d pdlen= %d offset= %d flags=%d"
# filter-rewriter.c
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 398b7546ff..9525ed703b 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -327,7 +327,7 @@ static int colo_compare_packet_payload(Packet *ppkt,
uint16_t len)
{
- if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+ if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) {
char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src));
@@ -492,7 +492,7 @@ sec:
g_queue_push_head(&conn->primary_list, ppkt);
g_queue_push_head(&conn->secondary_list, spkt);
- if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+ if (trace_event_get_state_backends(TRACE_COLO_COMPARE_TCP_INFO)) {
qemu_hexdump((char *)ppkt->data, stderr,
"colo-compare ppkt", ppkt->size);
qemu_hexdump((char *)spkt->data, stderr,
@@ -533,7 +533,8 @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
ppkt->size - offset)) {
trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size);
trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size);
- if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+ if (trace_event_get_state_backends(
+ TRACE_COLO_COMPARE_UDP_MISCOMPARE)) {
qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",
ppkt->size);
qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
@@ -576,7 +577,8 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
ppkt->size);
trace_colo_compare_icmp_miscompare("Secondary pkt size",
spkt->size);
- if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+ if (trace_event_get_state_backends(
+ TRACE_COLO_COMPARE_ICMP_MISCOMPARE)) {
qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",
ppkt->size);
qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
@@ -597,7 +599,7 @@ static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
uint16_t offset = ppkt->vnet_hdr_len;
trace_colo_compare_main("compare other");
- if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+ if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) {
char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src));
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 1aaad101b6..875a9ad7a4 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -76,7 +76,8 @@ static int handle_primary_tcp_pkt(RewriterState *rf,
struct tcp_hdr *tcp_pkt;
tcp_pkt = (struct tcp_hdr *)pkt->transport_header;
- if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) {
+ if (trace_event_get_state_backends(
+ TRACE_COLO_FILTER_REWRITER_CONN_OFFSET)) {
trace_colo_filter_rewriter_pkt_info(__func__,
inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst),
ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack),
@@ -180,7 +181,8 @@ static int handle_secondary_tcp_pkt(RewriterState *rf,
tcp_pkt = (struct tcp_hdr *)pkt->transport_header;
- if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) {
+ if (trace_event_get_state_backends(
+ TRACE_COLO_FILTER_REWRITER_CONN_OFFSET)) {
trace_colo_filter_rewriter_pkt_info(__func__,
inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst),
ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack),
^ permalink raw reply related [flat|nested] 7+ messages in thread