@@ -276,9 +276,13 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o
adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
-hw-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p-debug.o
-hw-obj-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o
-hw-obj-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
+9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p-debug.o
+9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o
+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/
+
######################################################################
# libdis
@@ -194,7 +194,7 @@ obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial
obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
obj-y += vhost_net.o
obj-$(CONFIG_VHOST_NET) += vhost.o
-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o
+obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o
obj-y += rwhandler.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
obj-$(CONFIG_NO_KVM) += kvm-stub.o
@@ -356,9 +356,11 @@ 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.o: CFLAGS += -I$(SRC_PATH)/hw/
+
clean:
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
- rm -f *.d */*.d tcg/*.o ide/*.o
+ rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o
rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c
ifdef CONFIG_SYSTEMTAP_TRACE
rm -f *.stp
@@ -2872,6 +2872,7 @@ mkdir -p $target_dir
mkdir -p $target_dir/fpu
mkdir -p $target_dir/tcg
mkdir -p $target_dir/ide
+mkdir -p $target_dir/9pfs
if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
mkdir -p $target_dir/nwfpe
fi
@@ -3262,6 +3263,7 @@ for hwlib in 32 64; do
mkdir -p $d
mkdir -p $d/ide
symlink $source_path/Makefile.hw $d/Makefile
+ mkdir -p $d/9pfs
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
done
similarity index 100%
rename from hw/file-op-9p.h
rename to fsdev/file-op-9p.h
@@ -13,7 +13,7 @@
#ifndef QEMU_FSDEV_H
#define QEMU_FSDEV_H
#include "qemu-option.h"
-#include "hw/file-op-9p.h"
+#include "file-op-9p.h"
/*
similarity index 100%
rename from hw/virtio-9p-debug.c
rename to hw/9pfs/virtio-9p-debug.c
similarity index 100%
rename from hw/virtio-9p-debug.h
rename to hw/9pfs/virtio-9p-debug.h
similarity index 100%
rename from hw/virtio-9p-local.c
rename to hw/9pfs/virtio-9p-local.c
similarity index 99%
rename from hw/virtio-9p-posix-acl.c
rename to hw/9pfs/virtio-9p-posix-acl.c
@@ -15,7 +15,7 @@
#include <attr/xattr.h>
#include "virtio.h"
#include "virtio-9p.h"
-#include "file-op-9p.h"
+#include "fsdev/file-op-9p.h"
#include "virtio-9p-xattr.h"
#define MAP_ACL_ACCESS "user.virtfs.system.posix_acl_access"
similarity index 98%
rename from hw/virtio-9p-xattr-user.c
rename to hw/9pfs/virtio-9p-xattr-user.c
@@ -14,7 +14,7 @@
#include <sys/types.h>
#include "virtio.h"
#include "virtio-9p.h"
-#include "file-op-9p.h"
+#include "fsdev/file-op-9p.h"
#include "virtio-9p-xattr.h"
similarity index 99%
rename from hw/virtio-9p-xattr.c
rename to hw/9pfs/virtio-9p-xattr.c
@@ -13,7 +13,7 @@
#include "virtio.h"
#include "virtio-9p.h"
-#include "file-op-9p.h"
+#include "fsdev/file-op-9p.h"
#include "virtio-9p-xattr.h"
similarity index 100%
rename from hw/virtio-9p-xattr.h
rename to hw/9pfs/virtio-9p-xattr.h
similarity index 100%
rename from hw/virtio-9p.c
rename to hw/9pfs/virtio-9p.c
similarity index 99%
rename from hw/virtio-9p.h
rename to hw/9pfs/virtio-9p.h
@@ -6,7 +6,7 @@
#include <sys/time.h>
#include <utime.h>
-#include "file-op-9p.h"
+#include "fsdev/file-op-9p.h"
/* The feature bitmap for virtio 9P */
/* The mount point is specified in a config variable */
Now that we start adding more files related to 9pfs it make sense to move them to a separate directory Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- Makefile.objs | 10 +++++++--- Makefile.target | 6 ++++-- configure | 2 ++ {hw => fsdev}/file-op-9p.h | 0 fsdev/qemu-fsdev.h | 2 +- hw/{ => 9pfs}/virtio-9p-debug.c | 0 hw/{ => 9pfs}/virtio-9p-debug.h | 0 hw/{ => 9pfs}/virtio-9p-local.c | 0 hw/{ => 9pfs}/virtio-9p-posix-acl.c | 2 +- hw/{ => 9pfs}/virtio-9p-xattr-user.c | 2 +- hw/{ => 9pfs}/virtio-9p-xattr.c | 2 +- hw/{ => 9pfs}/virtio-9p-xattr.h | 0 hw/{ => 9pfs}/virtio-9p.c | 0 hw/{ => 9pfs}/virtio-9p.h | 2 +- 14 files changed, 18 insertions(+), 10 deletions(-) rename {hw => fsdev}/file-op-9p.h (100%) rename hw/{ => 9pfs}/virtio-9p-debug.c (100%) rename hw/{ => 9pfs}/virtio-9p-debug.h (100%) rename hw/{ => 9pfs}/virtio-9p-local.c (100%) rename hw/{ => 9pfs}/virtio-9p-posix-acl.c (99%) rename hw/{ => 9pfs}/virtio-9p-xattr-user.c (98%) rename hw/{ => 9pfs}/virtio-9p-xattr.c (99%) rename hw/{ => 9pfs}/virtio-9p-xattr.h (100%) rename hw/{ => 9pfs}/virtio-9p.c (100%) rename hw/{ => 9pfs}/virtio-9p.h (99%)