[PATCH v2 16/23] qemuxml2xmltest: Remove 'NONE' macro