Commit 93e0597e authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'jvrao/for-anthony' into staging

parents ac779fe2 5c3234c6

Makefile.objs

+6 −5
Original line number Diff line number Diff line
@@ -45,12 +45,14 @@ net-nested-$(CONFIG_SLIRP) += slirp.o 
net-nested-$(CONFIG_VDE) += vde.o

net-obj-y += $(addprefix net/, $(net-nested-y))



ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy)

ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)

# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.

# only pull in the actual virtio-9p device if we also enabled virtio.

CONFIG_REALLY_VIRTFS=y

fsdev-nested-y = qemu-fsdev.o

else

fsdev-nested-y = qemu-fsdev-dummy.o

endif

fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o

fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))



######################################################################
@@ -286,12 +288,11 @@ 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)



9pfs-nested-$(CONFIG_REALLY_VIRTFS) = virtio-9p-debug.o

9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o 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_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y))

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

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





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

Makefile.target

+1 −3
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ obj-$(CONFIG_NO_PCI) += pci-stub.o 
obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o

obj-y += vhost_net.o

obj-$(CONFIG_VHOST_NET) += vhost.o

obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o

obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o

obj-y += rwhandler.o

obj-$(CONFIG_KVM) += kvm.o kvm-all.o

obj-$(CONFIG_NO_KVM) += kvm-stub.o
@@ -411,8 +411,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.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

fsdev/file-op-9p.h

+0 −7
Original line number Diff line number Diff line
@@ -97,11 +97,4 @@ typedef struct FileOperations 
    void *opaque;

} FileOperations;



static inline const char *rpath(FsContext *ctx, const char *path)

{

    /* FIXME: so wrong... */

    static char buffer[4096];

    snprintf(buffer, sizeof(buffer), "%s/%s", ctx->fs_root, path);

    return buffer;

}

#endif

fsdev/qemu-fsdev-dummy.c

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * Virtio 9p

 *

 * Copyright IBM, Corp. 2010

 *

 * Authors:

 *  Gautham R Shenoy <ego@in.ibm.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 *

 */

#include <stdio.h>

#include <string.h>

#include "qemu-fsdev.h"



int qemu_fsdev_add(QemuOpts *opts)

{

    return 0;

}

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"