diff mbox

[PULL] Request for Pull

Message ID 87zkn9lab8.fsf@linux.vnet.ibm.com
State New
Headers show

Commit Message

Aneesh Kumar K.V April 29, 2011, 8:40 a.m. UTC 
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 ?
diff mbox

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 3833314..bbae9a4 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -51,7 +51,7 @@  ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy)
 CONFIG_REALLY_VIRTFS=y
 endif
 fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o
-fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
+fsdev-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
 
 ######################################################################
 # libqemu_common.a: Target independent part of system emulation. The
diff --git a/vl.c b/vl.c
index 14255c4..5a7810f 100644
--- a/vl.c
+++ b/vl.c
@@ -1607,7 +1607,7 @@  static int chardev_init_func(QemuOpts *opts, void *opaque)
     return 0;
 }
 
-#ifdef CONFIG_VIRTFS
+#ifdef CONFIG_REALLY_VIRTFS
 static int fsdev_init_func(QemuOpts *opts, void *opaque)
 {
     int ret;
@@ -2822,7 +2822,7 @@  int main(int argc, char **argv, char **envp)
 
     if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, 1) != 0)
         exit(1);
-#ifdef CONFIG_VIRTFS
+#ifdef CONFIG_REALLY_VIRTFS
     if (qemu_opts_foreach(qemu_find_opts("fsdev"), fsdev_init_func, NULL, 1) != 0) {
         exit(1);
     }