diff options
| -rwxr-xr-x | generator.py | 3 | ||||
| -rw-r--r-- | libvirt-override-virConnect.py | 30 | ||||
| -rw-r--r-- | libvirt-override-virDomain.py | 38 | ||||
| -rw-r--r-- | libvirt-override.c | 89 |
4 files changed, 160 insertions, 0 deletions
diff --git a/generator.py b/generator.py index da642eb..427cebc 100755 --- a/generator.py +++ b/generator.py @@ -513,6 +513,9 @@ skip_function = ( 'virConnectUnregisterCloseCallback', # overriden in virConnect.py 'virConnectRegisterCloseCallback', # overriden in virConnect.py + 'virDomainCreateXMLWithFiles', # overriden in virConnect.py + 'virDomainCreateWithFiles', # overriden in virDomain.py + # 'Ref' functions have no use for bindings users. "virConnectRef", "virDomainRef", diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 5495b70..a0f579d 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -310,3 +310,33 @@ if ret == -1: raise libvirtError ('virConnectRegisterCloseCallback() failed', conn=self) return ret + + def createXMLWithFiles(self, xmlDesc, files, flags=0): + """Launch a new guest domain, based on an XML description similar + to the one returned by virDomainGetXMLDesc() + This function may require privileged access to the hypervisor. + The domain is not persistent, so its definition will disappear when it + is destroyed, or if the host is restarted (see virDomainDefineXML() to + define persistent domains). + + @files provides an array of file descriptors which will be + made available to the 'init' process of the guest. The file + handles exposed to the guest will be renumbered to start + from 3 (ie immediately following stderr). This is only + supported for guests which use container based virtualization + technology. + + If the VIR_DOMAIN_START_PAUSED flag is set, the guest domain + will be started, but its CPUs will remain paused. The CPUs + can later be manually started using virDomainResume. + + If the VIR_DOMAIN_START_AUTODESTROY flag is set, the guest + domain will be automatically destroyed when the virConnectPtr + object is finally released. This will also happen if the + client application crashes / loses its connection to the + libvirtd daemon. Any domains marked for auto destroy will + block attempts at migration, save-to-file, or snapshots. """ + ret = libvirtmod.virDomainCreateXMLWithFiles(self._o, xmlDesc, files, flags) + if ret is None:raise libvirtError('virDomainCreateXMLWithFiles() failed', conn=self) + __tmp = virDomain(self,_obj=ret) + return __tmp diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index 142b1d4..c96cc5e 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -9,3 +9,41 @@ retlist.append(virDomainSnapshot(self, _obj=snapptr)) return retlist + + + def createWithFiles(self, files, flags=0): + """Launch a defined domain. If the call succeeds the domain moves from the + defined to the running domains pools. + + @files provides an array of file descriptors which will be + made available to the 'init' process of the guest. The file + handles exposed to the guest will be renumbered to start + from 3 (ie immediately following stderr). This is only + supported for guests which use container based virtualization + technology. + + If the VIR_DOMAIN_START_PAUSED flag is set, or if the guest domain + has a managed save image that requested paused state (see + virDomainManagedSave()) the guest domain will be started, but its + CPUs will remain paused. The CPUs can later be manually started + using virDomainResume(). In all other cases, the guest domain will + be running. + + If the VIR_DOMAIN_START_AUTODESTROY flag is set, the guest + domain will be automatically destroyed when the virConnectPtr + object is finally released. This will also happen if the + client application crashes / loses its connection to the + libvirtd daemon. Any domains marked for auto destroy will + block attempts at migration, save-to-file, or snapshots. + + If the VIR_DOMAIN_START_BYPASS_CACHE flag is set, and there is a + managed save file for this domain (created by virDomainManagedSave()), + then libvirt will attempt to bypass the file system cache while restoring + the file, or fail if it cannot do so for the given system; this can allow + less pressure on file system cache, but also risks slowing loads from NFS. + + If the VIR_DOMAIN_START_FORCE_BOOT flag is set, then any managed save + file for this domain is discarded, and the domain boots from scratch. """ + ret = libvirtmod.virDomainCreateWithFiles(self._o, files, flags) + if ret == -1: raise libvirtError ('virDomainCreateWithFiles() failed', dom=self) + return ret diff --git a/libvirt-override.c b/libvirt-override.c index 01c941e..0a10887 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7025,6 +7025,93 @@ error: } +static PyObject * +libvirt_virDomainCreateWithFiles(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pyobj_files; + unsigned int flags; + unsigned int nfiles; + int *files = NULL; + size_t i; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainCreateWithFiles", + &pyobj_domain, &pyobj_files, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + nfiles = PyList_Size(pyobj_files); + + if (VIR_ALLOC_N_QUIET(files, nfiles) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nfiles; i++) { + PyObject *pyfd; + int fd; + + pyfd = PyList_GetItem(pyobj_files, i); + + if (libvirt_intUnwrap(pyfd, &fd) < 0) + goto cleanup; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainCreateWithFiles(domain, nfiles, files, flags); + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap((int) c_retval); + +cleanup: + VIR_FREE(files); + return py_retval; +} + + +static PyObject * +libvirt_virDomainCreateXMLWithFiles(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + virDomainPtr c_retval; + virConnectPtr conn; + PyObject *pyobj_conn; + char * xmlDesc; + PyObject *pyobj_files; + unsigned int flags; + unsigned int nfiles; + int *files = NULL; + size_t i; + + if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainCreateXMLWithFiles", + &pyobj_conn, &xmlDesc, &pyobj_files, &flags)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + nfiles = PyList_Size(pyobj_files); + + if (VIR_ALLOC_N_QUIET(files, nfiles) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nfiles; i++) { + PyObject *pyfd; + int fd; + + pyfd = PyList_GetItem(pyobj_files, i); + + if (libvirt_intUnwrap(pyfd, &fd) < 0) + goto cleanup; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainCreateXMLWithFiles(conn, xmlDesc, nfiles, files, flags); + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_virDomainPtrWrap((virDomainPtr) c_retval); + +cleanup: + VIR_FREE(files); + return py_retval; +} + + /************************************************************************ * * * The registration stuff * @@ -7150,6 +7237,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNodeGetMemoryParameters", libvirt_virNodeGetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virNodeSetMemoryParameters", libvirt_virNodeSetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virNodeGetCPUMap", libvirt_virNodeGetCPUMap, METH_VARARGS, NULL}, + {(char *) "virDomainCreateXMLWithFiles", libvirt_virDomainCreateXMLWithFiles, METH_VARARGS, NULL}, + {(char *) "virDomainCreateWithFiles", libvirt_virDomainCreateWithFiles, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; |