[libvirt] [PATCH 09/16] 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. --- 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 8024bff..421492f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2311,8 +2311,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) -- 1.8.1.1