[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 00/41] Chr split patches
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PULL 00/41] Chr split patches |
Date: |
Tue, 31 Jan 2017 13:00:11 -0600 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 |
On 01/31/2017 12:55 PM, Marc-André Lureau wrote:
>> '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?
>
I'm okay ack'ing the interdiff (that is, squash this in, and you can
keep the R-b you already have).
> 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)
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-devel] [PULL 36/41] char: move console in its own file, (continued)
- [Qemu-devel] [PULL 36/41] char: move console in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 35/41] char: move stdio in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 37/41] char: move pipe chardev in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 38/41] char: move pty chardev in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 39/41] char: move serial chardev to its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 41/41] char: headers clean-up, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 40/41] char: move parallel chardev in its own file, Marc-André Lureau, 2017/01/31
- Re: [Qemu-devel] [PULL 00/41] Chr split patches, no-reply, 2017/01/31
- Re: [Qemu-devel] [PULL 00/41] Chr split patches, Peter Maydell, 2017/01/31