Rename virRunConsole to vshRunConsole

diff --git a/ChangeLog b/ChangeLog
index a94bb9f06710a09a33cb20679c6c4d4f1b1accee..ab91d0b03ff97e0eaf6c753cc1641cb4d0d7706c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan 28 14:44:23 EST 2007 Daniel Berrange <berrange@redhat.com>
+
+       * 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 <berrange@redhat.com>
 
        * src/virshtest.c: Fixed up for new way test driver enumerates

diff --git a/src/console.c b/src/console.c
index 6968ef97570ffec4d960d5c99562971b579af3ec..1342887ad2406ce70f4e7e55376015504b58953e 100644 (file)
--- 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 da2616e3e835a5ba5a4b3d7e9adaa726480f79b2..7f146526b8152758d78cb33fe65f0d814203737a 100644 (file)
--- 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 66225291c2f738317531b3f1cc0f761526066218..3c71a085beba51fa4ad577f94903f334beb12e3e 100644 (file)
--- 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"));