From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFjFs-0007XJ-10 for qemu-devel@nongnu.org; Fri, 29 Apr 2011 04:40:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFjFq-0008Mu-Nn for qemu-devel@nongnu.org; Fri, 29 Apr 2011 04:40:51 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:35050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFjFq-0008Mk-1Q for qemu-devel@nongnu.org; Fri, 29 Apr 2011 04:40:50 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp02.in.ibm.com (8.14.4/8.13.1) with ESMTP id p3T8ej45009123 for ; Fri, 29 Apr 2011 14:10:45 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3T8eiq03436728 for ; Fri, 29 Apr 2011 14:10:44 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3T8eiE9005419 for ; Fri, 29 Apr 2011 14:10:44 +0530 From: "Aneesh Kumar K.V" In-Reply-To: <4DB9A661.2030306@codemonkey.ws> References: <4DB84170.4010208@linux.vnet.ibm.com> <4DB9720E.3010705@codemonkey.ws> <4DB9A1FD.7090505@mail.berlios.de> <4DB9A661.2030306@codemonkey.ws> Date: Fri, 29 Apr 2011 14:10:43 +0530 Message-ID: <87zkn9lab8.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PULL] Request for Pull List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , Stefan Weil Cc: Venkateswararao Jujjuri , qemu-devel@nongnu.org On Thu, 28 Apr 2011 12:39:45 -0500, Anthony Liguori 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 --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); }