From 5d9169e4dc4e946eadfbc0ffc197f4260e5f0456 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 20 Feb 2013 14:06:52 +0100 Subject: [PATCH] conf: Make virDomainDeviceInfoIterate usable without os type Make the iterator function usable in the next patches. Also refactor some parts to avoid strcmp if not necessary. This commit tweaks and shadows the change that was done in commit babe7dada0f90bfde74a716e8fc963b049d76f96 and was needed after the support for multiple console devices was added. Historically the first element is alias for the device. --- src/conf/domain_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 81b6abb80e..dc1bd6e6eb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2299,8 +2299,9 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, return -1; } for (i = 0; i < def->nconsoles ; i++) { - if ((STREQ(def->os.type, "hvm")) && i == 0 && - def->consoles[i]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) + if (i == 0 && + def->consoles[i]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL && + STREQ_NULLABLE(def->os.type, "hvm")) continue; device.data.chr = def->consoles[i]; if (cb(def, &device, &def->consoles[i]->info, opaque) < 0)