Re: [Qemu-devel] [PULL 00/41] Chr split patches

[Marc-André Lureau]

Hi!

On Tue, Jan 31, 2017 at 10:42 PM Peter Maydell <address@hidden>
wrote:

> On 31 January 2017 at 16:20, Marc-André Lureau
> <address@hidden> wrote:
> > The following changes since commit
> a0def594286d9110a6035e02eef558cf3cf5d847:
> >
> >   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into
> staging (2017-01-30 10:23:20 +0000)
> >
> > are available in the git repository at:
> >
> >   https://github.com/elmarco/qemu.git tags/chr-split-pull-request
> >
> > for you to fetch changes up to 3766519be2843e0947425cafd1e7e205dd63f0fd:
> >
> >   char: headers clean-up (2017-01-31 13:03:48 +0400)
> >
> > ----------------------------------------------------------------
> >
>
> 'make check' fails on a linux-user-targets-only build:
>
> tests/test-char.o: In function `char_stdio_test_subprocess':
> /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:47: undefined
> reference to `qemu_chr_new'
> /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:50: undefined
> reference to `qemu_chr_fe_init'
> /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:51: undefined
> reference to `qemu_chr_fe_set_open'
> /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:52: undefined
> reference to `qemu_chr_fe_write'
> [etc etc etc]
>
>
Oh good catch. We want to have chardev-obj-y defined globally, but only
linked with -softmmu target.

A possible fix to squash with chardev-obj-j patch is:

Eric, do you want me to resend the patch for review or is that enough for
you to ack?

diff --git a/Makefile.objs b/Makefile.objs
index 91a4794f28..b09a9588fc 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -4,6 +4,8 @@ stub-obj-y = stubs/ crypto/
 util-obj-y = util/ qobject/ qapi/
 util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o

+chardev-obj-y = chardev/
+
 #######################################################################
 # block-obj-y is code used by both qemu system emulation and qemu-img

@@ -78,8 +80,6 @@ common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o

 common-obj-$(CONFIG_FDT) += device_tree.o

-chardev-obj-y = chardev/
-
 ######################################################################
 # qapi

diff --git a/Makefile.target b/Makefile.target
index 5a487b5187..054db85e9e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -188,10 +188,9 @@ dummy := $(call unnest-vars,.., \
                common-obj-m)
 target-obj-y := $(target-obj-y-save)
 all-obj-y += $(common-obj-y)
-all-obj-y += $(chardev-obj-y)
 all-obj-y += $(target-obj-y)
 all-obj-y += $(qom-obj-y)
-all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
+all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y)
 all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y)
 all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)
 all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)
-- 
Marc-André Lureau