On 11/01/2010 10:11 AM, Daniel P. Berrange wrote:
To enable virsh console (or equivalent) to be used remotely it is necessary to provide remote access to the /dev/pts/XXX pseudo-TTY associated with the console/serial/parallel device in the guest. The virStream API provide a bi-directional I/O stream capability that can be used for this purpose. This patch thus introduces a virDomainOpenConsole API that uses the stream APIs.
* src/libvirt.c, src/libvirt_public.syms, include/libvirt/libvirt.h.in, src/driver.h: Define the new virDomainOpenConsole API * src/esx/esx_driver.c, src/lxc/lxc_driver.c, src/opennebula/one_driver.c, src/openvz/openvz_driver.c, src/phyp/phyp_driver.c, src/qemu/qemu_driver.c, src/remote/remote_driver.c, src/test/test_driver.c, src/uml/uml_driver.c, src/vbox/vbox_tmpl.c, src/xen/xen_driver.c, src/xenapi/xenapi_driver.c: Stub API entry point
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index a8091b1..5cc6ae2 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -411,6 +411,7 @@ LIBVIRT_0.8.5 { virDomainGetMemoryParameters; virDomainGetVcpusFlags; virDomainSetVcpusFlags; + virDomainOpenConsole; } LIBVIRT_0.8.2;
You need to fix this to refer to 0.8.6 based on 0.8.5.
# .... define new API here using predicted next version number .... diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d39b60e..b36d8d8 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2842,8 +2842,12 @@ static virDriver lxcDriver = { NULL, /* domainRevertToSnapshot */ NULL, /* domainSnapshotDelete */ NULL, /* qemuDomainMonitorCommand */ +<<<<<<< HEAD lxcDomainSetMemoryParameters, /* domainSetMemoryParameters */ lxcDomainGetMemoryParameters, /* domainGetMemoryParameters */ +======= + NULL, /* domainOpenConsole */ +>>>>>>> Introduce a virDomainOpenConsole API
And fix these rebase merge conflicts. ACK with those fixes. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org