[libvirt] [PATCHv2 0/2] Boot options cleanup