Commit 353ac78d authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Venkateswararao Jujjuri
Browse files

virtio-9p: move 9p files around 



Now that we start adding more files related to 9pfs
it make sense to move them to a separate directory

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
parent 661bfc80

Makefile.objs

+7 −3
Original line number Diff line number Diff line
@@ -285,9 +285,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

Makefile.target

+4 −2
Original line number Diff line number Diff line
@@ -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
@@ -401,9 +401,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

configure

+2 −0
Original line number Diff line number Diff line
@@ -3062,6 +3062,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
@@ -3488,6 +3489,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

hw/file-op-9p.h→fsdev/file-op-9p.h

+0 −0

File moved.

View file

fsdev/qemu-fsdev.h

+1 −1
Original line number Diff line number Diff line
@@ -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"





/*