From 1a4af67d32b1c39b73e09346203f3e12c00b9e41 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 31 Jan 2012 16:06:14 +0000 Subject: mini-os: use BSD sys/queue.h instead of Linux list.h The latter is GPL which makes the whole of mini-os GPL rather than BSD as intended. In tree users are all GPL or GPL-compatible but we should fix this so that mini-os is BSD. Do so by using the same BSD sys/queue.h as we use in libxl. Tested with the builtin mini-os test app and qemu stubdomain, both of which appear to still function as expected. Move tools/libxl/external and the associated sed script to tools/include/xen-external to allow more sensible access from mini-os. Also add s/NULL/0/ in the sed script due to NULL not always being defined in stubdom code when mini-os/wait.h is included. As well as the obvious ABI changes there are a few API updates associated with the change: - struct rw_semaphore.wait_list is unused - remove_waiter needs to take the wait_queue_head The latter requires a qemu update, so there is also a QEMU_TAG update in this changeset. I sprinkled some extra-emacs local variables around the files I edited which didn't have them. I think this should be backported to the stable branches since external users of mini-os may have been mislead into thinking they could safely link mini-os against GPL-incompatible code. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- Config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Config.mk') diff --git a/Config.mk b/Config.mk index 6d5b0c94b2..90a77286a1 100644 --- a/Config.mk +++ b/Config.mk @@ -222,9 +222,9 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.1 # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= bb36d632e4cabf47882adff07a45c6702c4a5b30 -# Thu Jan 5 17:16:46 2012 +0000 -# qemu-xen: adjust MSI-X related log messages +QEMU_TAG ?= de05447400930da4be216e4fb0fe52b8be81490e +# Tue Jan 31 15:42:38 2012 +0000 +# block-vbd: update to new mini-os wait queue API (new linked list API) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- cgit v1.2.3