Commit 43985468 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by David S. Miller
Browse files

VSOCK: fix header include in vsock_diag_test 



The vsock_diag_test program directly included ../../../include/uapi/
headers from the source tree.  Tests are supposed to use the
usr/include/linux/ headers that have been prepared with make
headers_install instead.

Suggested-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a706a042

tools/testing/vsock/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ all: test 
test: vsock_diag_test

vsock_diag_test: vsock_diag_test.o timeout.o control.o



CFLAGS += -g -O2 -Werror -Wall -I. -I../../include/uapi -I../../include -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE -D_GNU_SOURCE

CFLAGS += -g -O2 -Werror -Wall -I. -I../../include -I../../../usr/include -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE -D_GNU_SOURCE

.PHONY: all test clean

clean:

	${RM} *.o *.d vsock_diag_test

tools/testing/vsock/README

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ The following tests are available: 
The following prerequisite steps are not automated and must be performed prior

to running tests:



1. Build the kernel and these tests.

1. Build the kernel, make headers_install, and build these tests.

2. Install the kernel and tests on the host.

3. Install the kernel and tests inside the guest.

4. Boot the guest and ensure that the AF_VSOCK transport is enabled.

tools/testing/vsock/vsock_diag_test.c

+2 −3
Original line number Diff line number Diff line
@@ -21,12 +21,11 @@ 
#include <linux/list.h>

#include <linux/net.h>

#include <linux/netlink.h>

#include <linux/vm_sockets.h>

#include <linux/sock_diag.h>

#include <linux/vm_sockets_diag.h>

#include <netinet/tcp.h>



#include "../../../include/uapi/linux/vm_sockets.h"

#include "../../../include/uapi/linux/vm_sockets_diag.h"



#include "timeout.h"

#include "control.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE