From patchwork Fri Apr 29 15:56:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 93451 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C11BEB6F57 for ; Sat, 30 Apr 2011 01:56:59 +1000 (EST) Received: from localhost ([::1]:43452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFq3s-0008Ar-CI for incoming@patchwork.ozlabs.org; Fri, 29 Apr 2011 11:56:56 -0400 Received: from eggs.gnu.org ([140.186.70.92]:35174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFq3k-0008Ab-7o for qemu-devel@nongnu.org; Fri, 29 Apr 2011 11:56:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFq3i-0003tV-Mn for qemu-devel@nongnu.org; Fri, 29 Apr 2011 11:56:48 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:50883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFq3h-0003tF-VW for qemu-devel@nongnu.org; Fri, 29 Apr 2011 11:56:46 -0400 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp02.in.ibm.com (8.14.4/8.13.1) with ESMTP id p3TFufcT009506 for ; Fri, 29 Apr 2011 21:26:41 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3TFufnD3776750 for ; Fri, 29 Apr 2011 21:26:41 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3TFufZW010230 for ; Sat, 30 Apr 2011 01:56:41 +1000 Received: from skywalker.linux.vnet.ibm.com ([9.124.88.194]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p3TFudZw010017; Sat, 30 Apr 2011 01:56:39 +1000 From: "Aneesh Kumar K.V" To: Anthony Liguori , Stefan Weil In-Reply-To: <87zkn9lab8.fsf@linux.vnet.ibm.com> References: <4DB84170.4010208@linux.vnet.ibm.com> <4DB9720E.3010705@codemonkey.ws> <4DB9A1FD.7090505@mail.berlios.de> <4DB9A661.2030306@codemonkey.ws> <87zkn9lab8.fsf@linux.vnet.ibm.com> User-Agent: Notmuch/0.5-66-g70c5e2c (http://notmuchmail.org) Emacs/23.2.1 (i686-pc-linux-gnu) Date: Fri, 29 Apr 2011 21:26:38 +0530 Message-ID: <87pqo5kq4p.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 122.248.162.2 Cc: Venkateswararao Jujjuri , qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PULL] Request for Pull X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Fri, 29 Apr 2011 14:10:43 +0530, "Aneesh Kumar K.V" wrote: > 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 ? > Updated one which is tested. From 454d36bf1bd7605637897bf87a93cd18c8d29b1b Mon Sep 17 00:00:00 2001 From: Aneesh Kumar K.V 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 --- 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 + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ +#include +#include +#include "qemu-fsdev.h" + +int qemu_fsdev_add(QemuOpts *opts) +{ + return 0; +} +