> +static void del_original_boot_device(DeviceState *dev, const char *suffix)
Hmm, now we have two simliar delete functions. One which deletes all entries belonging to a device, and one deleting only in case the suffix matches (the later being needed to handle the floppy case I guess?). Can't we combine the two into one, to avoid code duplication? For example by deleting all entries for a device in case suffix == NULL? cheers, Gerd
