Commit 1c88c715 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Venkateswararao Jujjuri (JV)
Browse files

virtio-9p: Don't link to 9p if virtio is not enabled 



If virtio is not enabled then we should not pull in
virtfs files

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>
parent 936532a4

Makefile.objs

+5 −3
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy) 
# 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))



######################################################################
@@ -285,11 +287,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-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))

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

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

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;

}