Make the component list a bit more readable.

Also, add commented-out virtio components.