From patchwork Mon May 11 05:38:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miroslav Rezanina X-Patchwork-Id: 470601 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 79269140157 for ; Mon, 11 May 2015 15:39:33 +1000 (AEST) Received: from localhost ([::1]:35498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrgR6-0004YX-LB for incoming@patchwork.ozlabs.org; Mon, 11 May 2015 01:39:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrgQr-0004IE-VD for qemu-devel@nongnu.org; Mon, 11 May 2015 01:39:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrgQo-0000jg-Mj for qemu-devel@nongnu.org; Mon, 11 May 2015 01:39:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrgQo-0000iw-H1 for qemu-devel@nongnu.org; Mon, 11 May 2015 01:39:10 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id E933A8E3DE for ; Mon, 11 May 2015 05:39:08 +0000 (UTC) Received: from lws-ntb.brq.redhat.com (dhcp129-221.brq.redhat.com [10.34.129.221]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4B5d6mm005954; Mon, 11 May 2015 01:39:07 -0400 From: mrezanin@redhat.com To: qemu-devel@nongnu.org Date: Mon, 11 May 2015 07:38:54 +0200 Message-Id: <1431322734-12520-1-git-send-email-mrezanin@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: thuth@redhat.com, Miroslav Rezanina , armbru@redhat.com Subject: [Qemu-devel] [PATCHv2] parallel: Allow to disable CONFIG_PARALLEL 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 Disabling CONFIG_PARALLEL cause build failure as commit 07dc788 factored out initialization to parallel_hds_isa_init function in hw/char/parallel.c that is not build. Stub file is added to be able to disable CONFIG_PARALLEL. This file is used in targets using parallel_hds_isa_init and provide empty definition of this function. Signed-off-by: Miroslav Rezanina --- hw/i386/Makefile.objs | 1 + hw/mips/Makefile.objs | 2 ++ hw/sparc64/Makefile.objs | 2 ++ stubs/parallel-stub.c | 7 +++++++ 4 files changed, 12 insertions(+) create mode 100644 stubs/parallel-stub.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index e058a39..2b7131a 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -4,6 +4,7 @@ obj-y += pc.o pc_piix.o pc_q35.o obj-y += pc_sysfw.o obj-y += intel_iommu.o obj-$(CONFIG_XEN) += ../xenpv/ xen/ +obj-$(call lnot,$(CONFIG_PARALLEL)) += ../../stubs/parallel-stub.o obj-y += kvmvapic.o obj-y += acpi-build.o diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 0a652f8..2e65305 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -2,3 +2,5 @@ obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-y += addr.o cputimer.o mips_int.o obj-$(CONFIG_FULONG) += mips_fulong2e.o obj-y += gt64xxx_pci.o +obj-$(call lnot,$(CONFIG_PARALLEL)) += ../../stubs/parallel-stub.o + diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs index a84cfe3..7696611 100644 --- a/hw/sparc64/Makefile.objs +++ b/hw/sparc64/Makefile.objs @@ -1 +1,3 @@ obj-y += sun4u.o +obj-$(call lnot,$(CONFIG_PARALLEL)) += ../../stubs/parallel-stub.o + diff --git a/stubs/parallel-stub.c b/stubs/parallel-stub.c new file mode 100644 index 0000000..949c1b2 --- /dev/null +++ b/stubs/parallel-stub.c @@ -0,0 +1,7 @@ +#include "qemu/typedefs.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" + +void parallel_hds_isa_init(ISABus *bus, int n) +{ +}