| Message ID | CAJ+F1CJzchr6f9nfCsHyOUFmz-08e4R-8BLi4QWc3q0h0+9Quw@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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) >
Hi On Tue, Jan 31, 2017 at 11:00 PM Eric Blake <eblake@redhat.com> wrote: > 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). > > Thanks, patch updated, tag updated. Peter, let me know if you want me to resend the pull request.
On 31 January 2017 at 19:37, Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > Thanks, patch updated, tag updated. > > Peter, let me know if you want me to resend the pull request. I'll put it back on my list. NB that the guaranteed reliable way for me to spot that you want me to reprocess a respin is to send a new cover letter email (you need not resend all the individual patch mails if they're basically the same). That will cause my filters to spot the cover letter email and put it back in the folder of things to process. Doing anything else is relying on my happening to read your email informally asking for a re-run, which in this case I did but if you're unlucky I might miss it. TLDR: resending the cover letter entrusts your fate to the hands of an infallible unsleeping robot; informal requests leave you reliant on a careless human. The robot is your friend. thanks -- PMM
On 31 January 2017 at 19:37, Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > Hi > > On Tue, Jan 31, 2017 at 11:00 PM Eric Blake <eblake@redhat.com> wrote: >> >> 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). >> > > Thanks, patch updated, tag updated. > > Peter, let me know if you want me to resend the pull request. Now applied, thanks. -- PMM
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)