On 11/01/2010 10:11 AM, Daniel P. Berrange wrote:
This provides an implementation of the virDomainOpenConsole
API for the remote driver client and server.
* daemon/remote.c: Server side impl
* src/remote/remote_driver.c: Client impl
* src/remote/remote_protocol.x: Wire definition
---
daemon/remote.c | 52 ++++++++++++++++++++++
daemon/remote_dispatch_args.h | 1 +
daemon/remote_dispatch_prototypes.h | 8 +++
daemon/remote_dispatch_table.h | 5 ++
src/lxc/lxc_driver.c | 3 -
src/remote/remote_driver.c | 82 +++++++++++++++++++++++++++--------
src/remote/remote_protocol.c | 13 ++++++
src/remote/remote_protocol.h | 10 ++++
src/remote/remote_protocol.x | 9 +++-
src/remote_protocol-structs | 5 ++
+++ b/src/lxc/lxc_driver.c
@@ -2842,12 +2842,9 @@ static virDriver lxcDriver = {
NULL, /* domainRevertToSnapshot */
NULL, /* domainSnapshotDelete */
NULL, /* qemuDomainMonitorCommand */
-<<<<<<< HEAD
lxcDomainSetMemoryParameters, /* domainSetMemoryParameters */
lxcDomainGetMemoryParameters, /* domainGetMemoryParameters */
-=======
NULL, /* domainOpenConsole */
->>>>>>> Introduce a virDomainOpenConsole API
};
This hunk should be floated up into 3/10.
ACK with that fixed.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org