Fix segfault with console device back compat.

This commit is contained in:
Cole Robinson 2009-01-16 16:50:11 +00:00
parent dd9b3fb594
commit 46d4a5e047
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,7 @@
Fri Jan 16 11:48:41 EST 2009 Cole Robinson <crobinso@redhat.com>
* src/domain_conf.c: Fix segfault with console device back compat.
Thu Jan 15 20:12:19 GMT 2009 Daniel P. Berrange <berrange@redhat.com> Thu Jan 15 20:12:19 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
* src/remote_internal.c: Fix bug when fork isn't available (Win32) * src/remote_internal.c: Fix bug when fork isn't available (Win32)

View File

@ -3328,8 +3328,9 @@ char *virDomainDefFormat(virConnectPtr conn,
if (virDomainChrDefFormat(conn, &buf, def->console, "console") < 0) if (virDomainChrDefFormat(conn, &buf, def->console, "console") < 0)
goto cleanup; goto cleanup;
} else if (def->nserials != 0) { } else if (def->nserials != 0) {
/* ..else for legacy compat duplicate the serial device as a console */ /* ..else for legacy compat duplicate the first serial device as a
if (virDomainChrDefFormat(conn, &buf, def->serials[n], "console") < 0) * console */
if (virDomainChrDefFormat(conn, &buf, def->serials[0], "console") < 0)
goto cleanup; goto cleanup;
} }