From a3aa2005f8183e93596121d321a2d4a05aca6497 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Thu, 21 Apr 2016 09:27:01 -0400 Subject: [PATCH] conf: Move virDomainControllerModelTypeToString Move virDomainControllerModelTypeToString closer to it's counterpart virDomainControllerModelTypeFromString. Signed-off-by: John Ferlan --- src/conf/domain_conf.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cd7019b1b5..81621b93d8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7813,6 +7813,22 @@ virDomainControllerModelTypeFromString(const virDomainControllerDef *def, return -1; } + +static const char * +virDomainControllerModelTypeToString(virDomainControllerDefPtr def, + int model) +{ + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + return virDomainControllerModelSCSITypeToString(model); + else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) + return virDomainControllerModelUSBTypeToString(model); + else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) + return virDomainControllerModelPCITypeToString(model); + + return NULL; +} + + /* Parse the XML definition for a controller * @param node XML nodeset to parse for controller definition */ @@ -19402,19 +19418,6 @@ virDomainDiskDefFormat(virBufferPtr buf, return 0; } -static const char * -virDomainControllerModelTypeToString(virDomainControllerDefPtr def, - int model) -{ - if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) - return virDomainControllerModelSCSITypeToString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) - return virDomainControllerModelUSBTypeToString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) - return virDomainControllerModelPCITypeToString(model); - - return NULL; -} static int virDomainControllerDefFormat(virBufferPtr buf, -- GitLab