1
0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-08-03 08:21:58 +03:00

Fix build with older libvirt versions

The libvirt python module is supposed to build with historical versions
of the API back to 0.9.1, which means all constants / methods must be
wrapped in conditionals. This was accidentally forgotten in:

  commit 314b2346df
  Author: Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com>
  Date:   Wed Feb 7 17:49:30 2018 +0300

    Set hints for virPyDictToTypedParams

    Predefine hints for all parameters possible to avoid wrong type
    convert.

This broke the build against any libvirt < 2.0.0

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé
2018-04-19 15:33:21 +01:00
parent 899dc23352
commit c99ed22847

View File

@ -7740,22 +7740,54 @@ libvirt_virDomainMigrateGetMaxDowntime(PyObject *self ATTRIBUTE_UNUSED,
#if LIBVIR_CHECK_VERSION(1, 1, 0)
static virPyTypedParamsHint virPyDomainMigrate3Params[] = {
# ifdef VIR_MIGRATE_PARAM_URI
{ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_DEST_NAME
{ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_DEST_XML
{ VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_PERSIST_XML
{ VIR_MIGRATE_PARAM_PERSIST_XML, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_BANDWIDTH
{ VIR_MIGRATE_PARAM_BANDWIDTH, VIR_TYPED_PARAM_ULLONG },
# endif
# ifdef VIR_MIGRATE_PARAM_GRAPHICS_URI
{ VIR_MIGRATE_PARAM_GRAPHICS_URI, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_LISTEN_ADDRESS
{ VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_MIGRATE_DISKS
{ VIR_MIGRATE_PARAM_MIGRATE_DISKS, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_DISKS_PORT
{ VIR_MIGRATE_PARAM_DISKS_PORT, VIR_TYPED_PARAM_INT },
# endif
# ifdef VIR_MIGRATE_PARAM_COMPRESSION
{ VIR_MIGRATE_PARAM_COMPRESSION, VIR_TYPED_PARAM_STRING },
# endif
# ifdef VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL
{ VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL, VIR_TYPED_PARAM_INT },
# endif
# ifdef VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS
{ VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS, VIR_TYPED_PARAM_INT },
# endif
# ifdef VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS
{ VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS, VIR_TYPED_PARAM_INT },
# endif
# ifdef VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE
{ VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE, VIR_TYPED_PARAM_ULLONG },
# endif
# ifdef VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL
{ VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL, VIR_TYPED_PARAM_INT },
# endif
# ifdef VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT
{ VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT, VIR_TYPED_PARAM_INT },
# endif
};