Re: [Qemu-devel] [PULL] Request for Pull

["Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>]

On Fri, 29 Apr 2011 14:10:43 +0530, "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> wrote:
> On Thu, 28 Apr 2011 12:39:45 -0500, Anthony Liguori <anthony@codemonkey.ws> wrote:
> > On 04/28/2011 12:21 PM, Stefan Weil wrote:
> > > Am 28.04.2011 15:56, schrieb Anthony Liguori:
> > >> On 04/27/2011 11:16 AM, Venkateswararao Jujjuri wrote:
> > >>> The following changes since commit
> > >>> 661bfc80e876d32da8befe53ba0234d87fc0bcc2:
> > >>> Jan Kiszka (1):
> > >>> pflash: Restore & fix lazy ROMD switching
> > >>>
> > >>> are available in the git repository at:
> > >>>
> > >>> git://repo.or.cz/qemu/aliguori/jvrao.git for-anthony
> > >>
> > >> Pulled. Thanks.
> > >>
> > >> Regards,
> > >>
> > >> Anthony Liguori
> > >
> > >
> > > This pull breaks compilation and linkage of latest QEMU:
> > >
> > > * Compilation fails because of wrong include paths (caused by moved files).
> > > I just sent a patch to fix this issue.
> > >
> > > * The linker fails for all system emulations without virtio. Example:
> > >
> > > LINK cris-softmmu/qemu-system-cris
> > > ../fsdev/qemu-fsdev.o:(.data+0xc): undefined reference to `local_ops'
> > 
> > The use of CONFIG_REALLY_VIRTFS was wrong in the rename patch.  I'll 
> > push a fix.
> > 
> 
> The change you committed will pull in lot of 9p related code even
> when virtfs is not really enabled right ? why not ?
> 

Updated one which is tested.

>From 454d36bf1bd7605637897bf87a93cd18c8d29b1b Mon Sep 17 00:00:00 2001
From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Date: Fri, 29 Apr 2011 14:32:10 +0530
Subject: [PATCH] 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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 Makefile.objs            |    8 +++++---
 fsdev/qemu-fsdev-dummy.c |   21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 fsdev/qemu-fsdev-dummy.c

diff --git a/Makefile.objs b/Makefile.objs
index 9d8851e..0668e0a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -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/
 
 
diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c
new file mode 100644
index 0000000..6a51f60
--- /dev/null
+++ b/fsdev/qemu-fsdev-dummy.c
@@ -0,0 +1,21 @@
+/*
+ * 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;
+}
+
-- 
1.7.4.1