From patchwork Tue May 12 06:22:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miroslav Rezanina X-Patchwork-Id: 471149 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E0463140D19 for ; Tue, 12 May 2015 16:23:27 +1000 (AEST) Received: from localhost ([::1]:41073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys3bB-0001OV-Ad for incoming@patchwork.ozlabs.org; Tue, 12 May 2015 02:23:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys3ah-0000TM-VY for qemu-devel@nongnu.org; Tue, 12 May 2015 02:22:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ys3ad-00033J-Ir for qemu-devel@nongnu.org; Tue, 12 May 2015 02:22:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys3ad-00033F-BN for qemu-devel@nongnu.org; Tue, 12 May 2015 02:22:51 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4C6Mo6v023814 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 12 May 2015 02:22:50 -0400 Received: from lws-ntb.brq.redhat.com (dhcp129-221.brq.redhat.com [10.34.129.221]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4C6MfJw025006; Tue, 12 May 2015 02:22:49 -0400 From: mrezanin@redhat.com To: qemu-devel@nongnu.org Date: Tue, 12 May 2015 08:22:36 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, Miroslav Rezanina , armbru@redhat.com Subject: [Qemu-devel] [PATCHv3 2/2] stubs: Provide parallel_mm_init stub version 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 From: Miroslav Rezanina mips build fail with link error in case PARALLEL_CONFIG is disabled as hw/mips/mips_jazz.c calls parallel_mm_init. Due to dependecies to content of parallel.c we can't simply move it to hw/isa/isa-devices.c. This patch adds stubs/parallel.c file that contains stub version of parallel_mm_init. This ensure successful build with PARALLEL_CONFIG disabled. Signed-off-by: Miroslav Rezanina --- stubs/Makefile.objs | 1 + stubs/parallel.c | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 stubs/parallel.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 8beff4c..ad4e110 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -24,6 +24,7 @@ stub-obj-y += mon-printf.o stub-obj-y += mon-set-error.o stub-obj-y += monitor-init.o stub-obj-y += notify-event.o +stub-obj-y += parallel.o stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o stub-obj-y += qtest.o stub-obj-y += reset.o diff --git a/stubs/parallel.c b/stubs/parallel.c new file mode 100644 index 0000000..8293d52 --- /dev/null +++ b/stubs/parallel.c @@ -0,0 +1,8 @@ +#include "hw/i386/pc.h" + +bool parallel_mm_init(MemoryRegion *address_space, + hwaddr base, int it_shift, qemu_irq irq, + CharDriverState *chr) +{ + return false; +}