conf: fix build issue caused by shadowing global declaration

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-05-24 14:31:26 +02:00
parent 97863780e8
commit 065e89cf8b

View File

@ -3525,12 +3525,12 @@ void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info)
static bool static bool
virDomainSkipBackcompatConsole(virDomainDefPtr def, virDomainSkipBackcompatConsole(virDomainDefPtr def,
size_t index, size_t idx,
bool all) bool all)
{ {
virDomainChrDefPtr console = def->consoles[index]; virDomainChrDefPtr console = def->consoles[idx];
if (!all && index == 0 && if (!all && idx == 0 &&
(console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL || (console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ||
console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) && console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) &&
def->os.type == VIR_DOMAIN_OSTYPE_HVM) { def->os.type == VIR_DOMAIN_OSTYPE_HVM) {