Hi,

This patch follows a patch I sent on 2008-03-31:
http://lists.gnu.org/archive/html/qemu-devel/2008-03/msg00510.html
Previous patch is required before applying this one.

This patch prevents duplication of quite similar code, and so, removes 
300 lines and 8KB of code.

Hervé