On Tue, Nov 19, 2013 at 9:35 AM, Eric Blake <eblake@redhat.com> wrote:
On 11/18/2013 03:44 PM, Doug Goldstein wrote:
The functions virDomainMigrate3 and virDomainMigrateToURI3 were not added to libvirt until v1.1.0.
Is there a method to how you picked which functions to work around? It would be nicer to rearrange this series from newest to oldest (1.1.3 [virConnectGetCPUModelNames], 1.1.1 [virDomainCreateWithFiles, virDomainCreateXMLWithFiles, virDomainSetMemoryStatsPeriod], 1.1.0 ...) rather than ad hoc.
There was no method to my madness. It was actually APIs that I remembered off the top of my head and how to quickly find when they went in until I started using git describe --contains for later commits. You're right though, I'll reorder the whole series.
As to this patch:
+#if LIBVIR_CHECK_VERSION(1,1,0)
Still the style question.
@@ -7337,14 +7339,18 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainSendKey", libvirt_virDomainSendKey, METH_VARARGS, NULL}, {(char *) "virDomainMigrateGetCompressionCache", libvirt_virDomainMigrateGetCompressionCache, METH_VARARGS, NULL}, {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, +#if LIBVIR_CHECK_VERSION(1,1,0) {(char *) "virDomainMigrate3", libvirt_virDomainMigrate3, METH_VARARGS, NULL}, {(char *) "virDomainMigrateToURI3", libvirt_virDomainMigrateToURI3, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1,1,0) */
Looks reasonable.
{(char *) "virDomainBlockPeek", libvirt_virDomainBlockPeek, METH_VARARGS, NULL}, {(char *) "virDomainMemoryPeek", libvirt_virDomainMemoryPeek, METH_VARARGS, NULL}, {(char *) "virDomainGetDiskErrors", libvirt_virDomainGetDiskErrors, METH_VARARGS, NULL}, {(char *) "virNodeGetMemoryParameters", libvirt_virNodeGetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virNodeSetMemoryParameters", libvirt_virNodeSetMemoryParameters, METH_VARARGS, NULL}, +#if LIBVIR_CHECK_VERSION(1,0,0) {(char *) "virNodeGetCPUMap", libvirt_virNodeGetCPUMap, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1,0,0) */
Oops, looks like this hunk belongs in 9/18.
Whoops. Thanks. -- Doug Goldstein