- Devel - libvirt List Archives

[libvirt] [PATCH v2 1/2] conf: add xml element devices/pvpanic
by Hu Tao 05 Dec '13

05 Dec '13

This patch adds a new xml element devices/pvpanic to support qemu device pvpanic. It can be used to receive guest panic notification. Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 25 +++++++++++++++++ src/conf/domain_conf.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 9 +++++++ 3 files changed, 102 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1850a2b..0a72baa 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5080,6 +5080,31 @@ qemu-kvm -net nic,model=? /dev/null </dd> </dl> + <h4><a name="elementsPvpanic">pvpanic device</a></h4> + <p> + pvpanic device enables libvirt to receive panic notification from a QEMU + guest. + <span class="since">Since 1.3.0, QEMU and KVM only</span> + </p> + <p> + Example: usage of pvpanic configuration + </p> +<pre> + ... + <devices> + <pvpanic ioport='0x505'/> + </devices> + ... +</pre> + <dl> + <dt><code>ioport</code></dt> + <dd> + <p> + ioport used by pvpanic. + </p> + </dd> + </dl> + <h3><a name="seclabel">Security label</a></h3> <p> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 140eb80..1b8f66f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1876,6 +1876,11 @@ virDomainResourceDefFree(virDomainResourceDefPtr resource) VIR_FREE(resource); } +void +virDomainPvpanicDefFree(virDomainPvpanicDefPtr pvpanic) +{ + VIR_FREE(pvpanic); +} void virDomainDefFree(virDomainDefPtr def) { @@ -1964,6 +1969,8 @@ void virDomainDefFree(virDomainDefPtr def) virDomainTPMDefFree(def->tpm); + virDomainPvpanicDefFree(def->pvpanic); + VIR_FREE(def->idmap.uidmap); VIR_FREE(def->idmap.gidmap); @@ -10626,6 +10633,31 @@ cleanup: return idmap; } +static virDomainPvpanicDefPtr +virDomainPvpanicDefParseXML(xmlNodePtr node) +{ + char *ioport = NULL; + virDomainPvpanicDefPtr pvpanic; + + if (VIR_ALLOC(pvpanic) < 0) + return NULL; + + ioport = virXMLPropString(node, "ioport"); + if (!ioport) { + pvpanic->ioport = -1; + } else { + if (virStrToLong_i(ioport, NULL, 0, &pvpanic->ioport) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot parse <pvpanic> 'ioport' attribute")); + goto error; + } + } + + return pvpanic; +error: + virDomainPvpanicDefFree(pvpanic); + return NULL; +} /* Parse the XML definition for a vcpupin or emulatorpin. * @@ -12453,6 +12485,27 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); + /* analysis of the pvpanic devices */ + def->pvpanic = NULL; + if ((n = virXPathNodeSet("./devices/pvpanic", ctxt, &nodes)) < 0) { + goto error; + } + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single pvpanic device is supported")); + goto error; + } + if (n > 0) { + virDomainPvpanicDefPtr pvpanic = + virDomainPvpanicDefParseXML(nodes[0]); + if (!pvpanic) + goto error; + + def->pvpanic = pvpanic; + VIR_FREE(nodes); + } + + /* analysis of the user namespace mapping */ if ((n = virXPathNodeSet("./idmap/uid", ctxt, &nodes)) < 0) goto error; @@ -15715,6 +15768,18 @@ virDomainWatchdogDefFormat(virBufferPtr buf, return 0; } +static int virDomainPvpanicDefFormat(virBufferPtr buf, + virDomainPvpanicDefPtr def) +{ + if (def->ioport > 0) { + virBufferAsprintf(buf, " <pvpanic ioport='%#x'/>\n", + def->ioport); + } else { + virBufferAsprintf(buf, " <pvpanic/>\n"); + } + + return 0; +} static int virDomainRNGDefFormat(virBufferPtr buf, @@ -17138,6 +17203,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->nvram) virDomainNVRAMDefFormat(buf, def->nvram, flags); + if (def->pvpanic) + virDomainPvpanicDefFormat(buf, def->pvpanic); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4561ccc..9395852 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -126,6 +126,9 @@ typedef virDomainIdMapEntry *virDomainIdMapEntryPtr; typedef struct _virDomainIdMapDef virDomainIdMapDef; typedef virDomainIdMapDef *virDomainIdMapDefPtr; +typedef struct _virDomainPvpanicDef virDomainPvpanicDef; +typedef virDomainPvpanicDef *virDomainPvpanicDefPtr; + /* Flags for the 'type' field in virDomainDeviceDef */ typedef enum { VIR_DOMAIN_DEVICE_NONE = 0, @@ -1910,6 +1913,10 @@ struct _virDomainIdMapDef { }; +struct _virDomainPvpanicDef { + int ioport; +}; + void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, int ndevices); @@ -2061,6 +2068,7 @@ struct _virDomainDef { virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; virDomainRNGDefPtr rng; + virDomainPvpanicDefPtr pvpanic; void *namespaceData; virDomainXMLNamespace ns; @@ -2204,6 +2212,7 @@ virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, bool virDomainObjTaint(virDomainObjPtr obj, enum virDomainTaintFlags taint); +void virDomainPvpanicDefFree(virDomainPvpanicDefPtr pvpanic); void virDomainResourceDefFree(virDomainResourceDefPtr resource); void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def); void virDomainInputDefFree(virDomainInputDefPtr def); -- 1.7.11.7

4 19

[libvirt] [PATCH] qemu: Fix indentation in qemuTranslateDiskSourcePool
by Peter Krempa 05 Dec '13

05 Dec '13

Commit e1a4d08baf9a8cc86c8b5ca27da9aeedb34b5908 was pushed with bad indentation the iSCSI pool translation code. --- Notes: Pushing under the trivial rule. src/qemu/qemu_conf.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 44e4320..4378791 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1416,28 +1416,28 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } switch (def->srcpool->mode) { - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT: - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST: - def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; - /* fallthrough */ - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST: - def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; - if (!(def->src = virStorageVolGetPath(vol))) - goto cleanup; - break; - - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT: - def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; - def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; - - if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0) - goto cleanup; - - if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) - goto cleanup; - break; - } - break; + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT: + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST: + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; + /* fallthrough */ + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; + if (!(def->src = virStorageVolGetPath(vol))) + goto cleanup; + break; + + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; + + if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0) + goto cleanup; + + if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) + goto cleanup; + break; + } + break; case VIR_STORAGE_POOL_MPATH: case VIR_STORAGE_POOL_RBD: -- 1.8.4.3

1 0

[libvirt] [PATCHv3 0/3] Implement RBD storage pool support
by Adam Walters 05 Dec '13

05 Dec '13

I have re-written the RBD storage pool patch to work properly under the re-organized QEMU disk argument generation structure. The patch is largely the same as last time, just using the new switch statement and not modifying qemu_command.c anymore. Also of note in this set of patches is a fix to a bug in configure.ac introduced in a recent commit. I had to fix it in order to get my Archlinux package to compile on another machine so I could test the code before submission, so I figured that I would go ahead and share it with everyone, too. Adam Walters (3): qemu: conf: Add qemuAddRBDPoolSourceHost helper function qemu: conf: Implement RBD storage pool support configure: Resolve compile issue in configure.ac configure.ac | 1 - src/qemu/qemu_conf.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) -- 1.8.4.2

3 6

[libvirt] [PATCH 0/5] Fix snapshot xml test suite and add new test
by Peter Krempa 05 Dec '13

05 Dec '13

To cover the case fixed in 5a66c667ff5cae61c2ad2e646c8eb3eedc67f925 we need to upgrade the testsuite first. Peter Krempa (5): domainsnapshotxml2xmltest: Clean up labels and use bool instead of int domainsnapshotxml2xmltest: Allow for better testing of snapshots domainsnapshotxml2xml: Move files with conflicting names domainsnapshotxml2xmltest: Add existing files as new tests domainsnapshotxml2xmltest: Add test case for empty driver element .../disk_driver_name_null.xml | 10 ++ tests/domainsnapshotxml2xmlin/external_vm.xml | 1 - tests/domainsnapshotxml2xmlin/noparent.xml | 1 + .../disk_driver_name_null.xml | 9 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 67 +------- .../disk_snapshot_redefine.xml | 80 +++++++++ tests/domainsnapshotxml2xmlout/empty.xml | 8 + tests/domainsnapshotxml2xmlout/external_vm.xml | 39 ----- .../external_vm_redefine.xml | 44 +++++ .../name_and_description.xml | 5 + tests/domainsnapshotxml2xmlout/noparent.xml | 2 +- tests/domainsnapshotxml2xmltest.c | 190 ++++++++++++++++----- 12 files changed, 309 insertions(+), 147 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/disk_driver_name_null.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_driver_name_null.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml create mode 100644 tests/domainsnapshotxml2xmlout/empty.xml create mode 100644 tests/domainsnapshotxml2xmlout/external_vm_redefine.xml create mode 100644 tests/domainsnapshotxml2xmlout/name_and_description.xml -- 1.8.4.3

2 11

[libvirt] [PATCH] qemuAgentDispose: Reset lastError
by Wangyufei (James) 05 Dec '13

05 Dec '13

When an error occurred in qemuAgentIO, it will be saved in mon->lastError, but it will not be freed at last. So I add the following code to fix it. ==22219== 54 bytes in 1 blocks are definitely lost in loss record 982 of 1,379 ==22219== at 0x4C26B9B: malloc (vg_replace_malloc.c:263) ==22219== by 0x8520521: strdup (in /lib64/libc-2.11.3.so) ==22219== by 0x52E99CB: virStrdup (virstring.c:554) ==22219== by 0x52B44C4: virCopyError (virerror.c:195) ==22219== by 0x52B5123: virCopyLastError (virerror.c:312) ==22219== by 0x10905877: qemuAgentIO (qemu_agent.c:660) ==22219== by 0x52B6122: virEventPollDispatchHandles (vireventpoll.c:501) ==22219== by 0x52B7AEA: virEventPollRunOnce (vireventpoll.c:647) ==22219== by 0x52B5C1B: virEventRunDefaultImpl (virevent.c:274) ==22219== by 0x54181FD: virNetServerRun (virnetserver.c:1112) ==22219== by 0x11EF4D: main (libvirtd.c:1513) Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/qemu/qemu_agent.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 2cd0ccc..4a3820c 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -161,6 +161,7 @@ static void qemuAgentDispose(void *obj) (mon->cb->destroy)(mon, mon->vm); virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); + virResetError(&mon->lastError); } static int -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 3

[libvirt] [PATCH v2] Fix memory leak in qemuBuildDriveStr()
by Nehal J Wani 04 Dec '13

04 Dec '13

This patch fixes memory leaks reported by valgrind on running qemuxml2argvtest Most of them are of the form: ==24777== 15 bytes in 1 blocks are definitely lost in loss record 39 of 129 ==24777== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==24777== by 0x341F485E21: strdup (strdup.c:42) ==24777== by 0x4CADE5F: virStrdup (virstring.c:554) ==24777== by 0x4362B6: qemuBuildDriveStr (qemu_command.c:3848) ==24777== by 0x43EF73: qemuBuildCommandLine (qemu_command.c:8500) ==24777== by 0x426670: testCompareXMLToArgvHelper (qemuxml2argvtest.c:350) ==24777== by 0x427C01: virtTestRun (testutils.c:138) ==24777== by 0x41DDB5: mymain (qemuxml2argvtest.c:658) ==24777== by 0x4282A2: virtTestMain (testutils.c:593) ==24777== by 0x341F421A04: (below main) (libc-start.c:225) ==24777== --- v2: Modified according to Eric's comments. src/qemu/qemu_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 768fdc4..9539be7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4063,6 +4063,7 @@ qemuBuildDriveStr(virConnectPtr conn, virBufferEscape(&opt, ',', ",", "%s,", source); } + VIR_FREE(source); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) virBufferAddLit(&opt, "if=none"); @@ -4274,6 +4275,7 @@ qemuBuildDriveStr(virConnectPtr conn, return virBufferContentAndReset(&opt); error: + VIR_FREE(source); virBufferFreeAndReset(&opt); return NULL; } -- 1.8.1.4

2 1

[libvirt] [PATCH] Fix memory leak in qemuBuildDriveStr()
by Nehal J Wani 04 Dec '13

04 Dec '13

This patch fixes memory leaks reported by valgrind on running qemuxml2argvtest Most of them are of the form: ==24777== 15 bytes in 1 blocks are definitely lost in loss record 39 of 129 ==24777== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==24777== by 0x341F485E21: strdup (strdup.c:42) ==24777== by 0x4CADE5F: virStrdup (virstring.c:554) ==24777== by 0x4362B6: qemuBuildDriveStr (qemu_command.c:3848) ==24777== by 0x43EF73: qemuBuildCommandLine (qemu_command.c:8500) ==24777== by 0x426670: testCompareXMLToArgvHelper (qemuxml2argvtest.c:350) ==24777== by 0x427C01: virtTestRun (testutils.c:138) ==24777== by 0x41DDB5: mymain (qemuxml2argvtest.c:658) ==24777== by 0x4282A2: virtTestMain (testutils.c:593) ==24777== by 0x341F421A04: (below main) (libc-start.c:225) ==24777== --- src/qemu/qemu_command.c | 74 +++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 768fdc4..6a30a29 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4016,52 +4016,54 @@ qemuBuildDriveStr(virConnectPtr conn, if (qemuDomainDiskGetSourceString(conn, disk, &source) < 0) goto error; - if (source && - !((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || - disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && - disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { + if (source) { + if(!((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || + disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && + disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { - virBufferAddLit(&opt, "file="); + virBufferAddLit(&opt, "file="); - switch (actualType) { - case VIR_DOMAIN_DISK_TYPE_DIR: - /* QEMU only supports magic FAT format for now */ - if (disk->format > 0 && disk->format != VIR_STORAGE_FILE_FAT) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk driver type for '%s'"), - virStorageFileFormatTypeToString(disk->format)); - goto error; - } + switch (actualType) { + case VIR_DOMAIN_DISK_TYPE_DIR: + /* QEMU only supports magic FAT format for now */ + if (disk->format > 0 && disk->format != VIR_STORAGE_FILE_FAT) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported disk driver type for '%s'"), + virStorageFileFormatTypeToString(disk->format)); + goto error; + } - if (!disk->readonly) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot create virtual FAT disks in read-write mode")); - goto error; - } + if (!disk->readonly) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot create virtual FAT disks in read-write mode")); + goto error; + } - virBufferAddLit(&opt, "fat:"); + virBufferAddLit(&opt, "fat:"); - if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) - virBufferAddLit(&opt, "floppy:"); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) + virBufferAddLit(&opt, "floppy:"); - break; + break; - case VIR_DOMAIN_DISK_TYPE_BLOCK: - if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME ? - _("tray status 'open' is invalid for block type volume") : - _("tray status 'open' is invalid for block type disk")); - goto error; - } + case VIR_DOMAIN_DISK_TYPE_BLOCK: + if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME ? + _("tray status 'open' is invalid for block type volume") : + _("tray status 'open' is invalid for block type disk")); + goto error; + } - break; + break; - default: - break; - } + default: + break; + } - virBufferEscape(&opt, ',', ",", "%s,", source); + virBufferEscape(&opt, ',', ",", "%s,", source); + } + VIR_FREE(source); } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) -- 1.8.1.4

2 2

[libvirt] [PATCH python 00/15] Initial work porting to python3
by Daniel P. Berrange 04 Dec '13

04 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series starts, but does not complete, the work to port over to build with python3. This involves making the code generator able to run under python3, as well as making it generate code which is python3 compatible. And of course the examples are fixed up too Some things still todo - Deal with String vs Unicode problems - Python2 defaulted to C strings, while Python3 defaults to Unicode - Deal with Int vs Long problems - Python2 had two integer types, Int & Long, but Python3 only has one, Long. - Fix examples to not use libxml2 since it isn't compiled for Python3 in Fedora. - Probably more bugs to find... Daniel P. Berrange (15): generator: Don't use 'list' as a variable name generator: Remove string.lower(XXX) with XXX.lower() generator: Invoke print("...") instead of print "..." generator: Cast iterators to a list() explicitly generator: Remove use of 'has_key' function generator: Update to use sort() 'key' param generator: Remove use of string.replace and string.find functions generator: Sort enums and functions when generating code setup: Fix exception catching syntax examples: Invoke print("...") instead of print "..." examples: Fix exception catching syntax examples: Ensure we write bytes to the self-pipe generator: Fix exception catching syntax in generated code override: Fix native module registration to work with Python3 override: Fix exception catching syntax examples/consolecallback.py | 6 +- examples/dominfo.py | 14 +- examples/domrestore.py | 17 ++- examples/domsave.py | 15 +- examples/domstart.py | 19 ++- examples/esxlist.py | 14 +- examples/event-test.py | 74 +++++----- examples/topology.py | 14 +- generator.py | 328 +++++++++++++++++++++--------------------- libvirt-lxc-override.c | 73 +++++++--- libvirt-override-virStream.py | 6 +- libvirt-override.c | 75 +++++++--- libvirt-override.py | 4 +- libvirt-qemu-override.c | 73 +++++++--- setup.py | 2 +- 15 files changed, 417 insertions(+), 317 deletions(-) -- 1.8.3.1

3 30

[libvirt] [PATCH 0/2] Remove a broken example code and kill usage of atoi in libvirt
by Peter Krempa 04 Dec '13

04 Dec '13

Peter Krempa (2): examples: Remove broken bad example maint: Kill usage of atoi() .gitignore | 1 - Makefile.am | 4 +- cfg.mk | 6 ++ examples/domsuspend/Makefile.am | 25 ------- examples/domsuspend/suspend.c | 136 ------------------------------------- libvirt.spec.in | 3 +- src/conf/storage_conf.h | 2 +- src/storage/storage_backend_disk.c | 14 ++-- src/xen/xend_internal.c | 17 +++-- 9 files changed, 32 insertions(+), 176 deletions(-) delete mode 100644 examples/domsuspend/Makefile.am delete mode 100644 examples/domsuspend/suspend.c -- 1.8.4.3

2 4

[libvirt] [PATCH python] Optimize callback lookup in event handlers
by Daniel P. Berrange 04 Dec '13

04 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The event handler code currently invokes PyImport_ImportModule which is very heavyweight. This is not in fact required, since we know the libvirt module has already been imported. We can thus use PyImport_ImportModuleNoBlock and do away with the global variables caching the imported module reference. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-override.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 03aab89..aaee6b8 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4929,39 +4929,26 @@ cleanup: * Helper functions to avoid importing modules * for every callback *******************************************/ -static PyObject *libvirt_module = NULL; -static PyObject *libvirt_dict = NULL; static PyObject * -getLibvirtModuleObject(void) { - if (libvirt_module) - return libvirt_module; - - // PyImport_ImportModule returns a new reference - /* Bogus (char *) cast for RHEL-5 python API brokenness */ - libvirt_module = PyImport_ImportModule((char *)"libvirt"); - if (!libvirt_module) { - DEBUG("%s Error importing libvirt module\n", __FUNCTION__); +getLibvirtDictObject(void) { + PyObject *libvirt_mod; + PyObject *libvirt_dict; + + libvirt_mod = PyImport_ImportModuleNoBlock("libvirt"); + if (!libvirt_mod) { + DEBUG("%s Error finding libvirt in imports\n", + __FUNCTION__); PyErr_Print(); return NULL; } - - return libvirt_module; -} - -static PyObject * -getLibvirtDictObject(void) { - if (libvirt_dict) - return libvirt_dict; - - // PyModule_GetDict returns a borrowed reference - libvirt_dict = PyModule_GetDict(getLibvirtModuleObject()); + libvirt_dict = PyModule_GetDict(libvirt_mod); if (!libvirt_dict) { - DEBUG("%s Error importing libvirt dictionary\n", __FUNCTION__); + DEBUG("%s Error finding libvirt dict\n", + __FUNCTION__); PyErr_Print(); return NULL; } - Py_INCREF(libvirt_dict); return libvirt_dict; } -- 1.8.3.1

2 3