Statistics
| Branch: | Revision:

root / Makefile @ ac72472b

History | View | Annotate | Download (11.2 kB)

# Date Author Comment
5ac1fad3 08/28/2009 03:33 am Paolo Bonzini

add file descriptor migration

Signed-off-by: Paolo Bonzini <>
Cc: Chris Lalancette <>
Signed-off-by: Anthony Liguori <>

4dd75c70 08/24/2009 04:46 pm Christoph Hellwig

make pthreads mandatory

As requested by Anthony make pthreads mandatory. This means we will always
have AIO available on posix hosts, and it will also allow enabling the I/O
thread unconditionally once it's ready.

Signed-off-by: Christoph Hellwig <>...

a25a0ef5 08/24/2009 04:02 pm Anthony Liguori

Only build osdep once

We no longer need hackery to work around kqemu

Signed-off-by: Anthony Liguori <>

4951f65b 08/24/2009 04:01 pm Chris Lalancette

Migration via unix sockets.

Implement migration via unix sockets. While you can fake this using
exec and netcat, this involves forking another process and is
generally not very nice. By doing this directly in qemu, we can avoid
the copy through the external nc command. This is useful for...

21d4e8e3 08/24/2009 04:01 pm Alexandre Bique

Makefile: fixed rule TAGS

- still works if the build dir is not the src dir
- use find instead of .c block/.c etc...

Signed-off-by: Alexandre Bique <>
Signed-off-by: Anthony Liguori <>

7ecd8df8 08/18/2009 08:01 pm Blue Swirl

Fix breakage of alpha, mips64, ppc64 and x86_64 targets on non-amd64 host

Signed-off-by: Blue Swirl <>

facd2857 08/16/2009 11:03 am Blue Swirl

user: compile host-utils.c only once

Signed-off-by: Blue Swirl <>

6af5a252 08/15/2009 11:47 am Blue Swirl

linux-user: compile envlist.c only once

Signed-off-by: Blue Swirl <>

37022086 08/15/2009 10:51 am Blue Swirl

user: compile path.c only once

Also merge bsd-user/path.c and linux-user/path.c.

Signed-off-by: Blue Swirl <>

f0302935 08/10/2009 09:05 pm Juan Quintela

CURL libs are used both by tools and softmmu

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

96d409eb 08/10/2009 09:05 pm Juan Quintela

CONFIG_POSIX makes more sense that not CONFIG_WIN32

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

3e2e0e6b 08/10/2009 09:05 pm Juan Quintela

Add libs_tools support

Libraries used by qemu-<tools>

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

8e02e54c 08/10/2009 09:05 pm Juan Quintela

VDE libs are used both by tools and softmmu

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

4de67f2f 08/10/2009 09:05 pm Juan Quintela

Make slirp include dir globlal in cflags

We already include it everywhere

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

98b068a9 08/10/2009 09:05 pm Juan Quintela

FMOD_CFLAGS is not set when CONFIG_FMOD is undef

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

611b0db5 08/10/2009 09:05 pm Juan Quintela

AUDIO_PT is not needed

AUDIO_PT only changes LDFLAGS to include -pthread, but it change it in
Makefile, and audio files are linked only on Makefile.target

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>...

67f86e8e 08/10/2009 09:05 pm Juan Quintela

Generate CONFIG_AUDIO_PT_INT in configure

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

264606b3 08/10/2009 09:05 pm Juan Quintela

Fold BRLAPI_LIBS into libs_softmmu

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

a558ee17 08/10/2009 09:05 pm Juan Quintela

Rename CPPFLAGS to QEMU_CFLAGS

Now we have to variables: QEMU_CFLAGS: flags without which we can't compile
CFLAGS: "-g -O2"

We can now run:

make CFLAGS="-fbar" foo.o
make CFLAGS="" foo.o
make CFLAGS="-O3" foo.o

And it all should work.

Signed-off-by: Juan Quintela <>...

6c90361a 08/10/2009 09:05 pm Juan Quintela

move common QEMU_CFLAGS to configure

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

9b86c953 08/10/2009 09:05 pm Juan Quintela

We use -lz for all binaries

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

fa5e22cf 08/10/2009 09:05 pm Juan Quintela

We want to pass LIB through configuration files now

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

5572b539 08/10/2009 09:05 pm Juan Quintela

PTHREADLIBS was used for all binaries

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

07ffa4bd 08/10/2009 09:05 pm Juan Quintela

CLOCKLIBS was used for all binaries

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

e174c0bb 08/10/2009 09:05 pm Juan Quintela

Move to configure CONFIG_SOLARIS libraries needed always

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

884044aa 08/10/2009 09:05 pm Juan Quintela

Move to configure CONFIG_WIN32 libraries needed always

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

b1d5a277 08/10/2009 09:05 pm Juan Quintela

Add CURL_CFLAGS

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>
Message-Id:

9aebd98a 08/10/2009 09:05 pm Stefan Weil

Add new block driver for the VDI format (only aio supported)

This is a new block driver written from scratch
to support the VDI format in QEMU.

VDI is the native format used by Innotek / SUN VirtualBox.

Latest changes:

  • stripped down version
    (code for synchronous operations and experimental code removed)...
c05ac895 07/31/2009 03:19 pm Paul Brook

Option rom makefile fixes

Fix toplevel option rom makefile rules.

Signed-off-by: Paul Brook <>

4bf6b55b 07/27/2009 10:10 pm Juan Quintela

set SEARCH_PATH for the linker script from output of ld --verbose -v

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

eb82284f 07/27/2009 10:09 pm Juan Quintela

simplify brlapi selection

Use same style that everythnig else

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

eeb6d45b 07/27/2009 10:09 pm Juan Quintela

Use CONFIG_POSIX to simplify Makefile

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

67c0f08d 07/27/2009 10:09 pm Juan Quintela

Add -static in configure if needed

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

ef7635ec 07/27/2009 10:09 pm Juan Quintela

remove CONFIG_ from BLUEZ_{LIBS,FLAGS}

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

7aac6cb1 07/27/2009 10:09 pm Juan Quintela

make fmod also use FMOD_{LIBS,CFLAGS}

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

525061bf 07/27/2009 10:09 pm Juan Quintela

remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

ffada369 07/17/2009 01:28 am Juan Quintela

We can wrap OS_CFLAGS/OS_LDFLAGS in CFLAGS/LDFLAGS at configure time

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

d80438aa 07/17/2009 01:28 am Juan Quintela

We can wrap ARCH_CFLAGS/ARCH_LDFLAGS in CFLAGS/LDFLAGS at configure time

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

1a65ba76 07/17/2009 01:28 am Juan Quintela

use block-nested-y for files inside block/

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

3b47612b 07/17/2009 01:28 am Juan Quintela

already defined several lines before in block-obj-y

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

ee6847d1 07/17/2009 01:28 am Gerd Hoffmann

qdev: rework device properties.

This patch is a major overhaul of the device properties. The properties
are saved directly in the device state struct now, the linked list of
property values is gone.

Advantages: * We don't have to maintain the list with the property values....

c6a5a71a 07/10/2009 12:06 am Anthony Liguori

Fix build for ESD audio

Signed-off-by: Anthony Liguori <>

22d091b3 07/01/2009 09:49 pm Blue Swirl

Fix sdl_zoom compile problems on OpenBSD

Signed-off-by: Blue Swirl <>

0e22fd2f 06/29/2009 10:18 pm Juan Quintela

Substitute ifdef CONFIG_FOO by obj-

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

ae95ade0 06/29/2009 10:18 pm Juan Quintela

make tags useful for block drivers and hardaware devices

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

319f08ea 06/29/2009 10:18 pm Juan Quintela

Rename BLOCK_OBJS to block-obj-y

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

eda959bd 06/29/2009 10:18 pm Juan Quintela

Rename AUDIO_OBJS to audio-obj-y

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

f835ed1c 06/29/2009 10:18 pm Juan Quintela

Rename SLIRP_OBJS to slirp-obj-y

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

78892528 06/29/2009 10:18 pm Juan Quintela

Rename XEN_OBJS to xen-obj-y

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

e11b1dce 06/29/2009 10:18 pm Juan Quintela

Rename USER_OBJS to user-obj-y

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

6ef859b3 06/29/2009 10:18 pm Juan Quintela

Rename OBJS to obj-y

Signed-off-by: Juan Quintela <>
Signed-off-by: Anthony Liguori <>

253d0942 06/29/2009 10:17 pm Alexander Graf

Multiboot build system v4

In order to build the multiboot option rom, we need a Makefile and a tool
to sign the rom with.

Both are provided by this patch and mostly taken from the extboot source,
written by Anthony Liguori.

Once built, the resulting binary gets copied to pc-bios automatically....

9f349498 06/29/2009 04:52 pm Jan Kiszka

slirp: Cleanup and basic reanimation of debug code

Signed-off-by: Jan Kiszka <>
Signed-off-by: Anthony Liguori <>

c18a2c36 06/29/2009 04:52 pm Stefano Stabellini

sdl zooming

Hi all,
this patch implements zooming capabilities for the sdl interface.
A new sdl_zoom_blit function is added that is able to scale and blit a
portion of a surface into another.
This way we can enable SDL_RESIZABLE and have a real_screen surface with...

8c01c95a 06/22/2009 06:15 pm Stefan Weil

Win: Install keymaps for Windows, too (needed for VNC).

Signed-off-by: Stefan Weil <>
Signed-off-by: Anthony Liguori <>

4a244704 06/22/2009 06:10 pm Anthony Liguori

Disable _FORTIFY_SOURCE to fix Ubuntu build with -Werror

This eliminates the results unused warnings.

Signed-off-by: Anthony Liguori <>

f7d0fe02 06/16/2009 11:18 pm Kevin Wolf

qcow2: Split out refcount handling

qcow2-refcount.c contains all functions which are related to cluster
allocation and management in the image file. A large part of this is the
reference counting of these clusters.

Also a header file qcow2.h is introduced which will contain the interface of...

45aba42f 06/16/2009 11:18 pm Kevin Wolf

qcow2: Split out guest cluster functions

qcow2-cluster.c contains all functions related to the management of guest
clusters, i.e. what the guest sees on its virtual disk. This code is about
mapping these guest clusters to host clusters in the image file using the...

c142442b 06/16/2009 11:18 pm Kevin Wolf

qcow2: Split out snapshot functions

qcow2-snapshot.c contains the code related to snapshotting.

Signed-off-by: Kevin Wolf <>
Signed-off-by: Anthony Liguori <>

537fe2d6 06/16/2009 11:18 pm Anthony Liguori

Make sure to use SDL_CFLAGS everywhere we include SDL headers

Signed-off-by: Anthony Liguori <>

07b44ce9 06/09/2009 09:45 pm Blue Swirl

Clean up generated qemu-img-cmds.h

Signed-off-by: Blue Swirl <>

153859be 06/07/2009 09:59 am Stuart Brady

Use hxtool for qemu-img command list

Use hxtool to generate the 'command syntax' section of qemu-img's help
message, and the corresponding section of the texinfo documentation.

This has the side-effect of adding 'check' to this list of commands in
the texinfo documentation....

2313086a 06/06/2009 11:22 am Blue Swirl

Use hxtool to generate monitor documentation and C structures

Signed-off-by: Blue Swirl <>

4b0c7aa3 06/03/2009 10:54 pm Edgar E. Iglesias

microblaze: Fix loading of petalogix s3adsp1800 dtb.

Provide a petalogix-s3adsp1800.dtb blob.
Correct loading of the petalogix dtb.

Signed-off-by: Edgar E. Iglesias <>

79fd42aa 05/28/2009 11:11 am Anthony Liguori

Install keymaps from new location

Signed-off-by: Anthony Liguori <>

769ce76d 05/22/2009 06:50 pm Alexander Graf

Add HTTP protocol using curl v6

Currently Qemu can read from posix I/O and NBD. This patch adds a
third protocol to the game: HTTP.

In certain situations it can be useful to access HTTP data directly,
for example if you want to try out an http provided OS image, but...

d3f24367 05/22/2009 06:50 pm Kevin Wolf

Create qemu-option.h

This patch creates a new header file and the corresponding implementation file
for parsing of parameter strings for options (like used in -drive). Part of
this is code moved from vl.c (so qemu-img can use it later).

The idea is to have a data structure describing all accepted parameters. When...

2567f579 05/21/2009 06:54 pm Blue Swirl

Compile most Xen files only once

Signed-off-by: Blue Swirl <>

1ad2134f 05/19/2009 06:17 pm Paul Brook

Hardware convenience library

The only target dependency for most hardware is sizeof(target_phys_addr_t).
Build these files into a convenience library, and use that instead of
building for every target.

Remove and poison various target specific macros to avoid bogus target...

90d37239 05/15/2009 12:35 am Paul Brook

SSP bus framework

Signed-off-by: Paul Brook <>

aae9460e 05/15/2009 12:35 am Paul Brook

Basic qdev infrastructure.

Signed-off-by: Paul Brook <>

019d6b8f 05/15/2009 12:13 am Anthony Liguori

Move block drivers into their own directory

Signed-off-by: Anthony Liguori <>

0bfe3ca5 05/14/2009 09:29 pm Anthony Liguori

Constructor support

Allow devices/drivers to register themselves via constructors.
Destructors are not needed (can be registered from a constructor)
and "priority" has been renamed and changed to an enum for clarity.

Signed-off-by: Paul Brook <>...

88ca2a59 05/14/2009 12:21 am Paul Brook

Add tool_osdep.c

osdep.c is built in both as a toplevel target independant object, and
as a per-target object because of kqemu dependencies. Under some
circumstances make picks up the wrong one.

Build the former as tool-osdep to avoid this conflict.

Signed-off-by: Paul Brook <>

0087375e 05/07/2009 04:00 am Paul Brook

Suppress make directory messages.

We already print a directory prefix in non-verbose mode, so there's no
point printing a messages when recursive make enters/leaves a directory.

Signed-off-by: Paul Brook <>

451c4abd 05/01/2009 05:44 pm Mark McLoughlin

ppc: include cache-utils.o in BLOCK_OBJS

On ppc, cutils.o needs cache-utils.o or an undefined reference to
qemu_cache_conf results.

Signed-off-by: Mark McLoughlin <>
Signed-off-by: Anthony Liguori <>

e5d355d1 04/24/2009 09:03 pm aliguori

qemu: mutex/thread/cond wrappers and configure tweaks (Marcelo Tosatti)

Signed-off-by: Marcelo Tosatti <>
Signed-off-by: Anthony Liguori <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7237 c046a42c-6fe2-441c-8c8c-71466251a162

7545668b 04/19/2009 01:25 pm blueswir1

Build system: Fix dependency of qemu.1

Signed-off-by: Jan Kiszka <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7190 c046a42c-6fe2-441c-8c8c-71466251a162

58f8aead 04/18/2009 06:36 pm aliguori

buildsytem: consistently use install (Christoph Egger)

attached patch makes qemu use install consistently.

Signed-off-by: Christoph Egger <>
Signed-off-by: Anthony Liguori <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7177 c046a42c-6fe2-441c-8c8c-71466251a162

052ff921 04/17/2009 11:01 pm blueswir1

Make the sed script also work with OpenBSD and OpenSolaris seds

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7164 c046a42c-6fe2-441c-8c8c-71466251a162

a3a1e0fc 04/15/2009 07:04 pm malc

Simplify reconfiguration

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7113 c046a42c-6fe2-441c-8c8c-71466251a162

55d7e8f6 04/15/2009 05:42 pm aurel32

Call configure automatically when needed

Automatically rerun configure when it is needed.

Signed-off-by: Stefan Weil <>
Signed-off-by: Aurelien Jarno <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7110 c046a42c-6fe2-441c-8c8c-71466251a162

e9c28334 04/11/2009 12:04 pm blueswir1

Compile target independent files only once

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7083 c046a42c-6fe2-441c-8c8c-71466251a162

0a8e1acd 04/05/2009 09:41 pm aliguori

qemu-io - an I/O path exerciser (Christoph Hellwig)

This patch adds a new qemu-io tool that links against the block layer and
image formats and allow to exercise them without needing a guest image.
It is inspired by the xfs_io tool which does the same for plain file I/O....

1625af87 04/05/2009 08:41 pm aliguori

Make binary stripping conditional (Riku Voipio)

Currently qemu unconditionally strips binaries on install. This
is a problem for packagers who may want to store/ship debug symbols
of compiled packages for debugging purposes.

Keep stripping as default for the oldtimers and add a...

016c62c8 04/05/2009 08:40 pm aliguori

build system: clean qemu-options.texi and gdbstub-xml.c (Jan Kiszka)

Signed-off-by: Jan Kiszka <>
Signed-off-by: Anthony Liguori <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6980 c046a42c-6fe2-441c-8c8c-71466251a162

0d00e563 04/05/2009 08:40 pm aliguori

build system: silent generation of doc files and qemu-options.h (Jan Kiszka)

Signed-off-by: Jan Kiszka <>
Signed-off-by: Anthony Liguori <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6979 c046a42c-6fe2-441c-8c8c-71466251a162

de5e5781 03/28/2009 10:14 am blueswir1

Fix out of tree compilation

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6886 c046a42c-6fe2-441c-8c8c-71466251a162

5824d651 03/28/2009 08:44 am blueswir1

Syncing documentation vs. -help vs. qemu_options table

Try to keep documentation about command line switches, -help text and
qemu_options table synchronized.

In true Qemu tradition, an include file is generated from single .hx file
containing all relevant information in one place. The include file is...

72fcd388 03/08/2009 09:26 pm blueswir1

Call Perl directly instead of relying on shebang

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6785 c046a42c-6fe2-441c-8c8c-71466251a162

76655d6d 03/06/2009 10:27 pm aliguori

Support ACLs for controlling VNC access ("Daniel P. Berrange")

This patch introduces a generic internal API for access control lists
to be used by network servers in QEMU. It adds support for checking
these ACL in the VNC server, in two places. The first ACL is for the...

2f9606b3 03/06/2009 10:27 pm aliguori

Add SASL authentication support ("Daniel P. Berrange")

This patch adds the new SASL authentication protocol to the VNC server.

It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism...

5fb6c7a8 03/06/2009 10:27 pm aliguori

Move TLS auth into separate file ("Daniel P. Berrange")

This patch refactors the existing TLS code to make the main VNC code
more managable. The code moves to two new files

- vnc-tls.c: generic helpers for TLS handshake & credential setup
- vnc-auth-vencrypt.c: the actual VNC TLS authentication mechanism....
0483755a 03/06/2009 10:27 pm aliguori

Refactor keymap code to avoid duplication ("Daniel P. Berrange")

Each of the graphical frontends #include a .c file, for keymap code
resulting in duplicated definitions & duplicated compiled code. A
couple of small changes allowed this to be sanitized, so instead of...

28c699a2 01/26/2009 07:07 pm aliguori

build system: Further improve quiet mode (Jan Kiszka)

Derived from Stuart Brady's patch: Show the target directory as prefix
to the current module when building in quiet mode. This helps to gain
overview of the current build progress, specifically when running...

6473e68f 01/22/2009 07:15 pm aliguori

install man-pages as non-executables (Andre Przywara)

make install-doc omits an explicit permission mask for the man-pages. This
defaults to have the executable bits set. Adding "-m 644" (for rw-r--r--)
fixes that.

Signed-off-by: Andre Przywara <>...

93a0dba7 01/21/2009 08:13 pm aliguori

Consolidate library creation (Avi Kivity)

Put archive utility (ar) invocations into a rule, and have it generate
quiet output by default.

Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6381 c046a42c-6fe2-441c-8c8c-71466251a162

4f188f88 01/21/2009 08:13 pm aliguori

Make make output quieter (Avi Kivity)

Spew out less noise when compiling. This helps review make output for
information such as compilation warnings, rather than extra long compiler
invocations.

The full output can be generated by supplying a 'V=1' parameter to make....

3aa892d7 01/21/2009 08:13 pm aliguori

Consolidate linker rules (Avi Kivity)

Use generic rules where posssible, and a LINK macro where not.

Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6379 c046a42c-6fe2-441c-8c8c-71466251a162

17759187 01/21/2009 08:12 pm aliguori

Introduce rules.mak (Avi Kivity)

Add a file for common makefile rules.

Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6378 c046a42c-6fe2-441c-8c8c-71466251a162