Commit 873c3213 authored by Stefan Weil's avatar Stefan Weil Committed by Venkateswararao Jujjuri (JV)
Browse files

virtio-9p: Use relative includes for files in hw 



Commit 353ac78d moved the files
without fixing the include paths. It used a modified CFLAGS
to add hw to the include search path, but this breaks builds
where the user wants to set special CFLAGS. Long include paths
also increase compilation time.

Therefore this patch removes the special CFLAGS for virtio
and fixes the include statements by using relative include paths.

v2: Remove special CFLAGS.
v3: Update needed for latest QEMU.

Signed-off-by: default avatarStefan Weil <weil@mail.berlios.de>
Signed-off-by: default avatarVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>
parent f4f61d27

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) 
9pfs-nested-$(CONFIG_VIRTFS) +=   virtio-9p-xattr-user.o virtio-9p-posix-acl.o



hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y))

$(addprefix 9pfs/, $(9pfs-nested-y)): CFLAGS +=  -I$(SRC_PATH)/hw/





######################################################################

Makefile.target

+0 −2
Original line number Diff line number Diff line
@@ -413,8 +413,6 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx 
qmp-commands.h: $(SRC_PATH)/qmp-commands.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")



9pfs/virtio-9p-device.o: CFLAGS +=  -I$(SRC_PATH)/hw/



clean:

	rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o

	rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o

hw/9pfs/virtio-9p-debug.c

+3 −2
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ 
 * the COPYING file in the top-level directory.

 *

 */

#include "virtio.h"

#include "pc.h"



#include "hw/virtio.h"

#include "hw/pc.h"

#include "virtio-9p.h"

#include "virtio-9p-debug.h"

hw/9pfs/virtio-9p-device.c

+3 −3
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
 *

 */



#include "virtio.h"

#include "pc.h"

#include "hw/virtio.h"

#include "hw/pc.h"

#include "qemu_socket.h"

#include "virtio-pci.h"

#include "hw/virtio-pci.h"

#include "virtio-9p.h"

#include "fsdev/qemu-fsdev.h"

#include "virtio-9p-xattr.h"

hw/9pfs/virtio-9p-local.c

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 
 * the COPYING file in the top-level directory.

 *

 */

#include "virtio.h"



#include "hw/virtio.h"

#include "virtio-9p.h"

#include "virtio-9p-xattr.h"

#include <arpa/inet.h>