[libvirt] [PATCH] When checking nttyFDs to see if it is != 1, be sure to use '1' and not '-1'
From: "Daniel P. Berrange" <berrange@redhat.com> * src/lxc/lxc_controller.c: Fix check for tty count --- src/lxc/lxc_controller.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 43414ba..bb936ee 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1388,9 +1388,9 @@ lxcControllerRun(virDomainDefPtr def, VIR_FREE(devptmx); } } else { - if (nttyFDs != -1) { - lxcError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Expected exactly one TTY fd")); + if (nttyFDs != 1) { + lxcError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Expected exactly one TTY fd, but got %zu"), nttyFDs); goto cleanup; } } -- 1.7.7.3
On 12/08/2011 08:00 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
* src/lxc/lxc_controller.c: Fix check for tty count --- src/lxc/lxc_controller.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 43414ba..bb936ee 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1388,9 +1388,9 @@ lxcControllerRun(virDomainDefPtr def, VIR_FREE(devptmx); } } else { - if (nttyFDs != -1) { - lxcError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Expected exactly one TTY fd")); + if (nttyFDs != 1) { + lxcError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Expected exactly one TTY fd, but got %zu"), nttyFDs);
ACK. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Daniel P. Berrange -
Eric Blake