From: mrezanin@redhat.com
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, Miroslav Rezanina <mrezanin@redhat.com>,
armbru@redhat.com
Subject: [Qemu-devel] [PATCHv2] parallel: Allow to disable CONFIG_PARALLEL
Date: Mon, 11 May 2015 07:38:54 +0200 [thread overview]
Message-ID: <1431322734-12520-1-git-send-email-mrezanin@redhat.com> (raw)
From: Miroslav Rezanina <mrezanin@redhat.com>
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 <mrezanin@redhat.com>
---
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)
+{
+}
--
2.1.0
next reply other threads:[~2015-05-11 5:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 5:38 mrezanin [this message]
2015-05-11 6:46 ` [Qemu-devel] [PATCHv2] parallel: Allow to disable CONFIG_PARALLEL Markus Armbruster
2015-05-11 7:02 ` Miroslav Rezanina
2015-05-11 15:10 ` Markus Armbruster
2015-05-11 8:40 ` Paolo Bonzini
2015-05-11 9:36 ` Miroslav Rezanina
2015-05-11 10:11 ` Paolo Bonzini
2015-05-11 15:52 ` Markus Armbruster
2015-05-11 16:01 ` Paolo Bonzini
2015-05-11 16:34 ` Peter Maydell
2015-05-11 15:09 ` Markus Armbruster
2015-05-11 16:20 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431322734-12520-1-git-send-email-mrezanin@redhat.com \
--to=mrezanin@redhat.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).