[Libguestfs] [PATCH 1/8 v2] generator: Rearrange argt logically