diff options
author | Pavel Hrdina <phrdina@redhat.com> | 2015-09-21 16:36:05 +0200 |
---|---|---|
committer | Pavel Hrdina <phrdina@redhat.com> | 2015-10-05 08:34:55 +0200 |
commit | 46b950790565708733ac5b4e3938cf87bac24cbb (patch) | |
tree | 676fd301bd7abf687a17583d89c8c64da6cde983 | |
parent | adeeda2089b46a4eb21e6868b18e49d8fd33125e (diff) | |
download | libvirt-python-46b950790565708733ac5b4e3938cf87bac24cbb.tar.gz |
drop unnecessary goto
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-rw-r--r-- | libvirt-override.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/libvirt-override.c b/libvirt-override.c index 410c6b4..4274b76 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -476,27 +476,23 @@ cleanup: */ static int getPyNodeCPUCount(virConnectPtr conn) { - int i_retval = -1; - virNodeInfo nodeinfo; + int i_retval; #if LIBVIR_CHECK_VERSION(1, 0, 0) LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virNodeGetCPUMap(conn, NULL, NULL, 0); LIBVIRT_END_ALLOW_THREADS; -#endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ +#else /* fallback: use nodeinfo */ + virNodeInfo nodeinfo; - if (i_retval < 0) { - /* fallback: use nodeinfo */ - LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virNodeGetInfo(conn, &nodeinfo); - LIBVIRT_END_ALLOW_THREADS; - if (i_retval < 0) - goto cleanup; + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virNodeGetInfo(conn, &nodeinfo); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval >= 0) i_retval = VIR_NODEINFO_MAXCPUS(nodeinfo); - } +#endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ -cleanup: return i_retval; } |