[Qemu-devel] changeset b0cb0a66d broken - missing QEMU_OPTION_enable_hax

[Qemu-devel] changeset b0cb0a66d broken - missing QEMU_OPTION_enable_hax

[James Hanley]

Changeset fails to compile:

qemu/vl.c:3683:18: error: ‘QEMU_OPTION_enable_hax’ undeclared (first use in
this function)
             case QEMU_OPTION_enable_hax:
                  ^
I assume that there is details in

./qemu-options.def
./qemu-options.hx

that were not included with the commit?

http://git.qemu.org/?p=qemu.git;a=commit;h=b0cb0a66d6d535112aa513568ef21dcb1ad283ed

-Jim

Re: [Qemu-devel] changeset b0cb0a66d broken - missing QEMU_OPTION_enable_hax

[Peter Maydell]

On 23 January 2017 at 19:32, James Hanley <jhanley@dgtlrift.com> wrote:
> Changeset fails to compile:
>
> qemu/vl.c:3683:18: error: ‘QEMU_OPTION_enable_hax’ undeclared (first use in
> this function)
>              case QEMU_OPTION_enable_hax:
>                   ^
> I assume that there is details in
>
> ./qemu-options.def
> ./qemu-options.hx
>
> that were not included with the commit?

Your source tree probably has a stale qemu-options.def in it
from an attempt to do an in-tree build at some point in the
past (and now you are doing out-of-tree builds). If you do a
'make distclean' in the source tree this will get rid of the
stale junk and the build should work. (Or you can just git
clone a fresh tree; or attempt to more carefully remove
individual stale stuff, but that risks leaving some other
stale file around.)

(The change to qemu-options.hx is sufficient, because we
generate qemu-options.def from it in the build tree; but
if you have a stale .def file in the source tree then
gcc will pick that one up before the one in the build tree;
which works until something requires a change that postdates
the stale stuff.)

thanks
-- PMM

Re: [Qemu-devel] changeset b0cb0a66d broken - missing QEMU_OPTION_enable_hax

[James Hanley]

That did it - Thanks, and my apologies to Vincent for the false alarm.
-Jim

On Mon, Jan 23, 2017 at 2:41 PM, Peter Maydell <peter.maydell@linaro.org>
wrote:

> On 23 January 2017 at 19:32, James Hanley <jhanley@dgtlrift.com> wrote:
> > Changeset fails to compile:
> >
> > qemu/vl.c:3683:18: error: ‘QEMU_OPTION_enable_hax’ undeclared (first use
> in
> > this function)
> >              case QEMU_OPTION_enable_hax:
> >                   ^
> > I assume that there is details in
> >
> > ./qemu-options.def
> > ./qemu-options.hx
> >
> > that were not included with the commit?
>
> Your source tree probably has a stale qemu-options.def in it
> from an attempt to do an in-tree build at some point in the
> past (and now you are doing out-of-tree builds). If you do a
> 'make distclean' in the source tree this will get rid of the
> stale junk and the build should work. (Or you can just git
> clone a fresh tree; or attempt to more carefully remove
> individual stale stuff, but that risks leaving some other
> stale file around.)
>
> (The change to qemu-options.hx is sufficient, because we
> generate qemu-options.def from it in the build tree; but
> if you have a stale .def file in the source tree then
> gcc will pick that one up before the one in the build tree;
> which works until something requires a change that postdates
> the stale stuff.)
>
> thanks
> -- PMM
>

Re: [Qemu-devel] changeset b0cb0a66d broken - missing QEMU_OPTION_enable_hax

[Michael S. Tsirkin]

On Mon, Jan 23, 2017 at 07:41:48PM +0000, Peter Maydell wrote:
> On 23 January 2017 at 19:32, James Hanley <jhanley@dgtlrift.com> wrote:
> > Changeset fails to compile:
> >
> > qemu/vl.c:3683:18: error: ‘QEMU_OPTION_enable_hax’ undeclared (first use in
> > this function)
> >              case QEMU_OPTION_enable_hax:
> >                   ^
> > I assume that there is details in
> >
> > ./qemu-options.def
> > ./qemu-options.hx
> >
> > that were not included with the commit?
> 
> Your source tree probably has a stale qemu-options.def in it
> from an attempt to do an in-tree build at some point in the
> past (and now you are doing out-of-tree builds). If you do a
> 'make distclean' in the source tree this will get rid of the
> stale junk and the build should work. (Or you can just git
> clone a fresh tree; or attempt to more carefully remove
> individual stale stuff, but that risks leaving some other
> stale file around.)
> 
> (The change to qemu-options.hx is sufficient, because we
> generate qemu-options.def from it in the build tree; but
> if you have a stale .def file in the source tree then
> gcc will pick that one up before the one in the build tree;
> which works until something requires a change that postdates
> the stale stuff.)
> 
> thanks
> -- PMM

Maybe we should change the include order to always prefer
the build tree files if there?
An alternative is to do what Linux does, create a
file in tree when doing a build, and then make an
out of tree one fail and suggest distclean.

-- 
MST

Re: [Qemu-devel] changeset b0cb0a66d broken - missing QEMU_OPTION_enable_hax

[Peter Maydell]

On 24 January 2017 at 17:28, Michael S. Tsirkin <mst@redhat.com> wrote:
> Maybe we should change the include order to always prefer
> the build tree files if there?

If we can do that it would be nice.

> An alternative is to do what Linux does, create a
> file in tree when doing a build, and then make an
> out of tree one fail and suggest distclean.

We already try to do that -- Makefile looks for
config-host.mak in the source tree and suggests a
rune involving distclean. The check isn't perfect,
though (and nor is the Linux kernel's -- I lost an
hour or so the other week to a problem that turned
out to be stale junk in the kernel source tree that I
fixed with a 'make mrproper').

thanks
-- PMM