xen-unstable stubdom build error version(3432abcf9380)

xen-unstable stubdom build error version(3432abcf9380)

[Michael A. Collins]

parent: 24691:3432abcf9380 tip
 Fix x86_32 build
branch: default
commit: 4 modified, 1439 unknown
update: (current)

/usr/src/xen-4.2/stubdom/ioemu/block-vbd.c: In function âqemu_aio_waitâ:
/usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:20: error: macro "remove_waiter" requires 2 arguments, but only 1 given
/usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:5: error: âremove_waiterâ undeclared (first use in this function)
/usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:5: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [block-vbd.o] Error 1

So I checked some simple stuff out and found this:
extras/mini-os/fbfront.c:572:    remove_waiter(w, fbfront_queue);
extras/mini-os/lib/sys.c:237:            remove_waiter(w, console_queue);
extras/mini-os/lib/sys.c:817:    remove_waiter(netfront_w, netfront_queue);
extras/mini-os/lib/sys.c:818:    remove_waiter(event_w, event_queue);
extras/mini-os/lib/sys.c:819:    remove_waiter(blkfront_w, blkfront_queue);
extras/mini-os/lib/sys.c:820:    remove_waiter(xenbus_watch_w, xenbus_watch_queue);
extras/mini-os/lib/sys.c:821:    remove_waiter(kbdfront_w, kbdfront_queue);
extras/mini-os/lib/sys.c:822:    remove_waiter(console_w, console_queue);
extras/mini-os/blkfront.c:326:  remove_waiter(w, blkfront_queue);
extras/mini-os/blkfront.c:417:    remove_waiter(w, blkfront_queue);
extras/mini-os/blkfront.c:473:    remove_waiter(w, blkfront_queue);
extras/mini-os/xenbus/xenbus.c:88:    remove_waiter(w, xenbus_watch_queue);
extras/mini-os/xenbus/xenbus.c:444:    remove_waiter(w, req_info[id].waitq);
extras/mini-os/include/wait.h:60:#define remove_waiter(w, wq) do {  \
stubdom/ioemu/block-vbd.c:147:    remove_waiter(w);
tools/qemu-xen-traditional-dir-remote/block-vbd.c:147:    remove_waiter(w);
tools/ioemu-remote/block-vbd.c:147:    remove_waiter(w);
tools/qemu-xen-traditional-dir/block-vbd.c:147:    remove_waiter(w);
tools/ioemu-dir/block-vbd.c:147:    remove_waiter(w);

It appears to me that possibly I need to either add a queue like the above sys.c calls, or define a new macro that does not need a queue?
Mike


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: xen-unstable stubdom build error version(3432abcf9380)

[Michael A. Collins]

> -----Original Message-----
> From: xen-devel-bounces@lists.xensource.com [mailto:xen-devel-
> bounces@lists.xensource.com] On Behalf Of Michael A. Collins
> Sent: Friday, February 03, 2012 9:57 PM
> To: xen-devel@lists.xensource.com
> Subject: [Xen-devel] xen-unstable stubdom build error
> version(3432abcf9380)
> 
> parent: 24691:3432abcf9380 tip
>  Fix x86_32 build
> branch: default
> commit: 4 modified, 1439 unknown
> update: (current)
> 
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c: In function
> âqemu_aio_waitâ:
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:20: error: macro
> "remove_waiter" requires 2 arguments, but only 1 given
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:5: error:
> âremove_waiterâ undeclared (first use in this function)
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:5: note: each undeclared
> identifier is reported only once for each function it appears in
> make[3]: *** [block-vbd.o] Error 1
> 

I went ahead and cloned into a new directory and all is right with the world again.
Mike


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: xen-unstable stubdom build error version(3432abcf9380)

[Ian Campbell]

On Fri, 2012-02-03 at 21:57 -0500, Michael A. Collins wrote:
> parent: 24691:3432abcf9380 tip
>  Fix x86_32 build
> branch: default
> commit: 4 modified, 1439 unknown
> update: (current)
> 
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c: In function âqemu_aio_waitâ:
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:20: error: macro "remove_waiter" requires 2 arguments, but only 1 given
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:5: error: âremove_waiterâ undeclared (first use in this function)
> /usr/src/xen-4.2/stubdom/ioemu/block-vbd.c:147:5: note: each undeclared identifier is reported only once for each function it appears in
> make[3]: *** [block-vbd.o] Error 1
> 
> [...]
> It appears to me that possibly I need to either add a queue like the
> above sys.c calls, or define a new macro that does not need a queue?

You needed to update your qemu tree with:
	$ make tools/qemu-xen-traditional-dir-force-update
We don't do this automatically because we are wary of blowing away
peoples local changes.

Of course cloning a new tree will have had the same effect.

Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel