diff --git a/ChangeLog b/ChangeLog index a94bb9f067..ab91d0b03f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 28 14:44:23 EST 2007 Daniel Berrange + + * sc/console.c, src/console.h, src/virsh.c: Rename the + virRunConsole method to vshRunConsole to avoid it getting + picked up in auto-generated python bindings + Fri Jan 26 07:59:52 EST 2007 Daniel Berrange * src/virshtest.c: Fixed up for new way test driver enumerates diff --git a/src/console.c b/src/console.c index 6968ef9757..1342887ad2 100644 --- a/src/console.c +++ b/src/console.c @@ -42,7 +42,7 @@ static void do_signal(int sig ATTRIBUTE_UNUSED) { got_signal = 1; } -int virRunConsole(const char *tty) { +int vshRunConsole(const char *tty) { int ttyfd, ret = -1; struct termios ttyattr, rawattr; void (*old_sigquit)(int); diff --git a/src/console.h b/src/console.h index da2616e3e8..7f146526b8 100644 --- a/src/console.h +++ b/src/console.h @@ -27,7 +27,7 @@ extern "C" { #endif - int virRunConsole(const char *tty); + int vshRunConsole(const char *tty); #ifdef __cplusplus } diff --git a/src/virsh.c b/src/virsh.c index 66225291c2..3c71a085be 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -359,7 +359,7 @@ cmdConsole(vshControl * ctl, vshCmd * cmd) obj = xmlXPathEval(BAD_CAST "string(/domain/devices/console/@tty)", ctxt); if ((obj != NULL) && ((obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0))) { - if (virRunConsole((const char *)obj->stringval) == 0) + if (vshRunConsole((const char *)obj->stringval) == 0) ret = TRUE; } else { vshPrintExtra(ctl, _("No console available for domain\n"));