screenshot: Defining the internal API

* src/driver.h: Stub code for new API
* src/esx/esx_driver.c, src/libxl/libxl_driver.c,
  src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
  src/phyp/phyp_driver.c, src/qemu/qemu_driver.c,
  rc/remote/remote_driver.c, rc/test/test_driver.c,
  src/uml/uml_driver.c, src/vbox/vbox_tmpl.c,
  src/vmware/vmware_driver.c, src/xen/xen_driver.c,
  src/xen/xen_driver.h, src/xen/xen_hypervisor.c,
  src/xen/xen_inotify.c, src/xen/xend_internal.c,
  src/xen/xm_internal.c, src/xen/xs_internal.c,
  src/xenapi/xenapi_driver.c: Add dummy entries in driver
  table for new APIs

diff --git a/src/driver.h b/src/driver.h
index ea807018d9d76e34a574651d34b980e8567b78c2..b800f351b70d97cf3d0e661e0d2400f1f638e2e6 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -175,6 +175,11 @@ typedef int
         (*virDrvDomainCoreDump)                (virDomainPtr domain,
                                          const char *to,
                                          int flags);
+typedef char *
+        (*virDrvDomainScreenshot)   (virDomainPtr domain,
+                                         virStreamPtr stream,
+                                         unsigned int screen,
+                                         unsigned int flags);
 typedef char *
         (*virDrvDomainGetXMLDesc)              (virDomainPtr dom,
                                          int flags);
@@ -568,7 +573,8 @@ struct _virDriver {
     virDrvDomainGetInfo                domainGetInfo;
     virDrvDomainSave           domainSave;
     virDrvDomainRestore                domainRestore;
-    virDrvDomainCoreDump               domainCoreDump;
+    virDrvDomainCoreDump        domainCoreDump;
+    virDrvDomainScreenshot      domainScreenshot;
     virDrvDomainSetVcpus               domainSetVcpus;
     virDrvDomainSetVcpusFlags          domainSetVcpusFlags;
     virDrvDomainGetVcpusFlags          domainGetVcpusFlags;

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 2e0e9a118b74623c3ffab4fd933ae8a8e9ae7d0d..ef7838a757310827e9835a6f825b07e181c3cf63 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -4626,6 +4626,7 @@ static virDriver esxDriver = {
     NULL,                            /* domainSave */
     NULL,                            /* domainRestore */
     NULL,                            /* domainCoreDump */
+    NULL,                            /* domainScreenshot */
     esxDomainSetVcpus,               /* domainSetVcpus */
     esxDomainSetVcpusFlags,          /* domainSetVcpusFlags */
     esxDomainGetVcpusFlags,          /* domainGetVcpusFlags */

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index d7ff0c6e8bd8073925bd0131aad58351399a1330..7e2e7c0e2f38c17ab6584479265a94680a72676f 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -2716,6 +2716,7 @@ static virDriver libxlDriver = {
     NULL,                       /* domainSave */
     NULL,                       /* domainRestore */
     NULL,                       /* domainCoreDump */
+    NULL,                       /* domainScreenshot */
     libxlDomainSetVcpus,        /* domainSetVcpus */
     libxlDomainSetVcpusFlags,   /* domainSetVcpusFlags */
     libxlDomainGetVcpusFlags,   /* domainGetVcpusFlags */

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 7a3e33d1be3b7967875a67ae59c20af252427ad1..1aadb027c019681c9ceab24e7c64d3e6d1437187 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2742,6 +2742,7 @@ static virDriver lxcDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     NULL, /* domainSetVcpus */
     NULL, /* domainSetVcpusFlags */
     NULL, /* domainGetVcpusFlags */

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 60f2dc292b512a831b618720b949d0c0cfdc9395..fbb8800e3650e3e296ce9853605609bdcee06710 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1594,6 +1594,7 @@ static virDriver openvzDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     openvzDomainSetVcpus, /* domainSetVcpus */
     openvzDomainSetVcpusFlags, /* domainSetVcpusFlags */
     openvzDomainGetVcpusFlags, /* domainGetVcpusFlags */

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 5e48b98d83a86e5fb6344e3d31f1edac8355228e..cc9ace3439af0dbda00982092e6a18fc15abe109 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -3755,6 +3755,7 @@ static virDriver phypDriver = {
     NULL,                       /* domainSave */
     NULL,                       /* domainRestore */
     NULL,                       /* domainCoreDump */
+    NULL,                       /* domainScreenshot */
     phypDomainSetCPU,           /* domainSetVcpus */
     phypDomainSetVcpusFlags,    /* domainSetVcpusFlags */
     phypDomainGetVcpusFlags,    /* domainGetVcpusFlags */

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 732c187cbdf993ee0d31b2895de3b121f17be695..7a3556f3296e32b8e3bb5f783bf7a9b5bf0b7db3 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7170,6 +7170,7 @@ static virDriver qemuDriver = {
     qemudDomainSave, /* domainSave */
     qemuDomainRestore, /* domainRestore */
     qemudDomainCoreDump, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     qemudDomainSetVcpus, /* domainSetVcpus */
     qemudDomainSetVcpusFlags, /* domainSetVcpusFlags */
     qemudDomainGetVcpusFlags, /* domainGetVcpusFlags */

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c50ff25086f9b3f79dd1afeee326ecb567a72741..328ef62f149e0776020bca5c9b8f8ac94e396df6 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -6425,6 +6425,7 @@ static virDriver remote_driver = {
     remoteDomainSave, /* domainSave */
     remoteDomainRestore, /* domainRestore */
     remoteDomainCoreDump, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     remoteDomainSetVcpus, /* domainSetVcpus */
     remoteDomainSetVcpusFlags, /* domainSetVcpusFlags */
     remoteDomainGetVcpusFlags, /* domainGetVcpusFlags */

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index bf33d13e88b549054467c4659e824b00b024ef4d..0f0d77bc5eee5fdcdb60e9fe53205c772550aa44 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5374,6 +5374,7 @@ static virDriver testDriver = {
     testDomainSave, /* domainSave */
     testDomainRestore, /* domainRestore */
     testDomainCoreDump, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     testSetVcpus, /* domainSetVcpus */
     testDomainSetVcpusFlags, /* domainSetVcpusFlags */
     testDomainGetVcpusFlags, /* domainGetVcpusFlags */

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 9460eb2a9cd99fd70043170f62549bbceec77386..baef86c8345d78119c070cb626f68462929d58db 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -2180,6 +2180,7 @@ static virDriver umlDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     NULL, /* domainSetVcpus */
     NULL, /* domainSetVcpusFlags */
     NULL, /* domainGetVcpusFlags */

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 2c3efdec79e5a839c7d26aa6f4998ea3862b8948..dc912407defaad0ad3c0e4fb84e877d5a0bde4b5 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -8569,6 +8569,7 @@ virDriver NAME(Driver) = {
     vboxDomainSave, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     vboxDomainSetVcpus, /* domainSetVcpus */
     vboxDomainSetVcpusFlags, /* domainSetVcpusFlags */
     vboxDomainGetVcpusFlags, /* domainGetVcpusFlags */

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index a3a13c1e2bdd53cf359dc82b56f821b1752b5ffd..b920f79a50562961356f0b0eb6ebea1830de1d43 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -934,6 +934,7 @@ static virDriver vmwareDriver = {
     NULL,                       /* domainSave */
     NULL,                       /* domainRestore */
     NULL,                       /* domainCoreDump */
+    NULL,                       /* domainScreenshot */
     NULL,                       /* domainSetVcpus */
     NULL,                       /* domainSetVcpusFlags */
     NULL,                       /* domainGetVcpusFlags */

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 3d8c2dd0ff11d32411954a94cdea88963939e6c7..0f19d2779995056ae3c21f7e065df265a1f33faa 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2135,6 +2135,7 @@ static virDriver xenUnifiedDriver = {
     xenUnifiedDomainSave, /* domainSave */
     xenUnifiedDomainRestore, /* domainRestore */
     xenUnifiedDomainCoreDump, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     xenUnifiedDomainSetVcpus, /* domainSetVcpus */
     xenUnifiedDomainSetVcpusFlags, /* domainSetVcpusFlags */
     xenUnifiedDomainGetVcpusFlags, /* domainGetVcpusFlags */

diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
index 58b8561922577a845c827f8b1ff1ad8628d2987c..8fb58320f6928740b0884b6dc76ca3a4dab38a35 100644 (file)
--- a/src/xen/xen_driver.h
+++ b/src/xen/xen_driver.h
@@ -93,6 +93,7 @@ struct xenUnifiedDriver {
         virDrvDomainSave               domainSave;
         virDrvDomainRestore            domainRestore;
         virDrvDomainCoreDump           domainCoreDump;
+        virDrvDomainScreenshot      domainScreenshot;
         virDrvDomainPinVcpu            domainPinVcpu;
         virDrvDomainGetVcpus           domainGetVcpus;
         virDrvListDefinedDomains       listDefinedDomains;

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index ac1b6858daf4043e0dd738369f3d1396e7b741d3..f442cfdb0110f8f424908f024d05a999abff408e 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -824,6 +824,7 @@ struct xenUnifiedDriver xenHypervisorDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     xenHypervisorPinVcpu, /* domainPinVcpu */
     xenHypervisorGetVcpus, /* domainGetVcpus */
     NULL, /* listDefinedDomains */

diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 6ef5359284a8548c662fa703670f071744e56639..71bb6bee28cd124b71d66de17f577babb5efcbfd 100644 (file)
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -72,6 +72,7 @@ struct xenUnifiedDriver xenInotifyDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     NULL, /* domainPinVcpu */
     NULL, /* domainGetVcpus */
     NULL, /* listDefinedDomains */

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 64f65e7d8e5e989d14ad8aa6eb8306bfcf315a97..8bd5ddfb6d86d0b4b932f487d380e9d78fbe456a 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -3864,6 +3864,7 @@ struct xenUnifiedDriver xenDaemonDriver = {
     xenDaemonDomainSave,         /* domainSave */
     xenDaemonDomainRestore,      /* domainRestore */
     xenDaemonDomainCoreDump,     /* domainCoreDump */
+    NULL,                        /* domainScreenshot */
     xenDaemonDomainPinVcpu,      /* domainPinVcpu */
     xenDaemonDomainGetVcpus,     /* domainGetVcpus */
     xenDaemonListDefinedDomains, /* listDefinedDomains */

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 69e14c3bafc6bcd7c34361a0380b097579f556a5..642a5ee33ba16d5c74427a03f37b7113ab5117f3 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -103,6 +103,7 @@ struct xenUnifiedDriver xenXMDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     xenXMDomainPinVcpu, /* domainPinVcpu */
     NULL, /* domainGetVcpus */
     xenXMListDefinedDomains, /* listDefinedDomains */

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 5d8dc3db6213345c9206f7b108ea6f2a35a50a43..4529ef4bd6b125a2409a90199a5231123a8bf7d5 100644 (file)
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -65,6 +65,7 @@ struct xenUnifiedDriver xenStoreDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     NULL, /* domainPinVcpu */
     NULL, /* domainGetVcpus */
     NULL, /* listDefinedDomains */

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 7e863accd5564adacfdc8bf6b9cd39447c4f366f..136356d30a2b66c0ff5019d978d9c2b4933ce2d8 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -1816,6 +1816,7 @@ static virDriver xenapiDriver = {
     NULL, /* domainSave */
     NULL, /* domainRestore */
     NULL, /* domainCoreDump */
+    NULL, /* domainScreenshot */
     xenapiDomainSetVcpus, /* domainSetVcpus */
     xenapiDomainSetVcpusFlags, /* domainSetVcpusFlags */
     xenapiDomainGetVcpusFlags, /* domainGetVcpusFlags */