- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/4] Add support for adjusting the 64-bit PCI hole size
by Ján Tomko 27 Aug '13

27 Aug '13

v3: use <pcihole64> sub-element of the root PCI controller with 'unit' attribute, defaulting to KiB v2: https://www.redhat.com/archives/libvir-list/2013-August/msg00565.html Use 'pcihole64' attribute of the root PCI controller instead of <pcihole64> element in domain features. v1: https://www.redhat.com/archives/libvir-list/2013-August/msg00510.html https://bugzilla.redhat.com/show_bug.cgi?id=990418 Ján Tomko (4): Move virDomainParseScaledValue earlier Allow controller XML parsing to use XPath context Add pcihole64 element to root PCI controllers Build QEMU command line for pcihole64 docs/formatdomain.html.in | 9 ++ docs/schemas/domaincommon.rng | 32 +++-- src/conf/domain_conf.c | 140 +++++++++++++-------- src/conf/domain_conf.h | 8 ++ src/qemu/qemu_capabilities.c | 14 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 58 +++++++++ .../qemuxml2argv-pcihole64-gib.xml | 23 ++++ .../qemuxml2argv-pcihole64-none.args | 4 + .../qemuxml2argv-pcihole64-none.xml | 23 ++++ .../qemuxml2argv-pcihole64-q35.args | 9 ++ .../qemuxml2argv-pcihole64-q35.xml | 33 +++++ tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 5 + tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 23 ++++ tests/qemuxml2argvtest.c | 10 ++ .../qemuxml2xmlout-pcihole64-gib.xml | 23 ++++ tests/qemuxml2xmltest.c | 5 + 17 files changed, 358 insertions(+), 63 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-gib.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-gib.xml -- 1.8.1.5

3 13

[libvirt] [PATCHv4 0/5] Introduce API to query IP addresses for given domain
by Nehal J Wani 27 Aug '13

27 Aug '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.mail-archive.com/libvir-list@redhat.com/msg51857.html A patch was submitted, using structs: http://www.mail-archive.com/libvir-list@redhat.com/msg57141.html Another patch was submitted, using XML: http://www.mail-archive.com/libvir-list@redhat.com/msg57829.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: http://www.mail-archive.com/libvir-list@redhat.com/msg79793.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfacesAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) Nehal J Wani (5): domifaddr: Implement the public API domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 127 +++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 +++++++++++++ include/libvirt/libvirt.h.in | 33 +++++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 8 ++- python/libvirt-override.c | 113 +++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 109 ++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 153 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 55 +++++++++++++++ src/remote/remote_driver.c | 85 ++++++++++++++++++++++ src/remote/remote_protocol.x | 41 ++++++++++- src/remote_protocol-structs | 24 +++++++ tests/qemuagenttest.c | 113 +++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 101 ++++++++++++++++++++++++++ tools/virsh.pod | 10 +++ 20 files changed, 1040 insertions(+), 3 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

4 22

[libvirt] [PATCHv2 0/4] VMX: CD-ROM handling improvements
by Doug Goldstein 27 Aug '13

27 Aug '13

A user came into #virt the other day and was trying to get libvirtd to work with VMWare Fusion 5, which is basically the Mac OS X version of VMWare Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. However I came across the fact that we only support 2 types of CD-ROMs instead of the 3 types that VMWare has lead to adding support for a <driver> element to CD-ROM drives. Additionally VMWare Fusion has a concept of auto detecting your host CD-ROM drive at boot and we don't have a XML field for this so I omitted a <source> element and added the tray to be opened. Doug Goldstein (4): VMX: Add cdrom-raw dev type from VMWare Fusion VMX: Add support for 'auto detect' fileNames VMX: Some serial ports are not actually connected VMX: Add a VMWare Fusion 5 configuration for tests docs/formatdomain.html.in | 3 +- src/vmx/vmx.c | 61 ++++++++++++--- tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 1 + .../vmx2xml-cdrom-ide-raw-auto-detect.vmx | 5 ++ .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 24 ++++++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 5 ++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 25 ++++++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 1 + .../vmx2xml-cdrom-scsi-raw-auto-detect.vmx | 6 ++ .../vmx2xml-cdrom-scsi-raw-auto-detect.xml | 24 ++++++ .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx | 6 ++ .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 25 ++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 1 + tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 ++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 39 ++++++++++ tests/vmx2xmltest.c | 6 ++ .../xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.vmx | 13 ++++ .../xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.xml | 15 ++++ .../xml2vmx-cdrom-ide-raw-auto-detect.vmx | 14 ++++ .../xml2vmx-cdrom-ide-raw-auto-detect.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx | 13 ++++ tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml | 15 ++++ .../xml2vmx-cdrom-scsi-atapi-device.vmx | 14 ++++ .../xml2vmx-cdrom-scsi-atapi-device.xml | 15 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.vmx | 15 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.xml | 14 ++++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx | 14 ++++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml | 15 ++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 30 ++++++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 40 ++++++++++ tests/xml2vmxtest.c | 8 ++ 31 files changed, 558 insertions(+), 11 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-atapi-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-atapi-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml -- 1.8.1.5

3 7

[libvirt] [RFC] Expose cpu_map.xml via API
by Giuseppe Scrivano 27 Aug '13

27 Aug '13

--- I have started working on: https://bugzilla.redhat.com/show_bug.cgi?id=916786 Before I split it in a series of commits, test it better and then proceed to virt-manager, are you ok with this idea? include/libvirt/libvirt.h.in | 11 +++++++++++ src/driver.h | 4 ++++ src/libvirt.c | 38 ++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/lxc/lxc_driver.c | 11 +++++++++++ src/qemu/qemu_driver.c | 10 ++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +++++++++++- src/remote_protocol-structs | 4 ++++ src/test/test_driver.c | 6 ++++++ src/uml/uml_driver.c | 11 +++++++++++ src/util/virutil.c | 23 +++++++++++++++++++++++ src/util/virutil.h | 3 +++ tools/virsh-host.c | 21 +++++++++++++++++++++ tools/virsh.pod | 5 +++++ 16 files changed, 161 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a47e33c..d6e0d9a 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4006,6 +4006,17 @@ int virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags); +/** + * virConnectGetCPUMapDesc: + * + * @conn: virConnect connection + * + * Get the content of the cpu_map.xml file used by the connection. + * + * Returns XML description of the cpu_map.xml file. + */ +char *virConnectGetCPUMapDesc(virConnectPtr conn); + /** * virConnectBaselineCPUFlags diff --git a/src/driver.h b/src/driver.h index be64333..ab31262 100644 --- a/src/driver.h +++ b/src/driver.h @@ -681,6 +681,9 @@ typedef char * unsigned int ncpus, unsigned int flags); +typedef char * +(*virDrvConnectGetCPUMapDesc)(virConnectPtr conn); + typedef int (*virDrvDomainGetJobInfo)(virDomainPtr domain, virDomainJobInfoPtr info); @@ -1332,6 +1335,7 @@ struct _virDriver { virDrvDomainMigratePerform3Params domainMigratePerform3Params; virDrvDomainMigrateFinish3Params domainMigrateFinish3Params; virDrvDomainMigrateConfirm3Params domainMigrateConfirm3Params; + virDrvConnectGetCPUMapDesc connectGetCPUMapDesc; }; diff --git a/src/libvirt.c b/src/libvirt.c index 07a3fd5..5e5e594 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18519,6 +18519,44 @@ error: /** + * virConnectGetCPUMapDesc: + * + * @conn: virConnect connection + * + * Get the content of the cpu_map.xml file used by the connection. + * + * Returns the content of the cpu_map.xml file. The result must be freed + * by the caller of this function. + */ +char * +virConnectGetCPUMapDesc(virConnectPtr conn) +{ + VIR_DEBUG("conn=%p", conn); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return NULL; + } + + if (conn->driver->connectGetCPUMapDesc) { + char *ret = conn->driver->connectGetCPUMapDesc(conn); + if (ret == NULL) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(conn); + return NULL; +} + + +/** * virConnectBaselineCPU: * * @conn: virConnect connection diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c25a61f..ed6d2a0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2074,6 +2074,7 @@ virSetUIDGID; virSetUIDGIDWithCaps; virStrIsPrint; virValidateWWN; +virGetCPUMapDesc; # util/viruuid.h diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index bbdf78a..8023c7e 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -629,6 +629,7 @@ LIBVIRT_1.1.0 { LIBVIRT_1.1.1 { global: + virConnectGetCPUMapDesc; virDomainCreateWithFiles; virDomainCreateXMLWithFiles; virDomainSetMemoryStatsPeriod; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9cb95ff..633248b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4590,6 +4590,16 @@ lxcNodeSuspendForDuration(virConnectPtr conn, } +static char * +lxcConnectGetCPUMapDesc(virConnectPtr conn) +{ + if (virConnectGetCPUMapDescEnsureACL(conn) < 0) + return NULL; + + return virGetCPUMapDesc(); +} + + /* Function Tables */ static virDriver lxcDriver = { .no = VIR_DRV_LXC, @@ -4671,6 +4681,7 @@ static virDriver lxcDriver = { .domainShutdownFlags = lxcDomainShutdownFlags, /* 1.0.1 */ .domainReboot = lxcDomainReboot, /* 1.0.1 */ .domainLxcOpenNamespace = lxcDomainLxcOpenNamespace, /* 1.0.2 */ + .connectGetCPUMapDesc = lxcConnectGetCPUMapDesc, /* 1.1.0 */ }; static virStateDriver lxcStateDriver = { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2ad236e..4a1d6fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16033,6 +16033,15 @@ qemuNodeSuspendForDuration(virConnectPtr conn, return nodeSuspendForDuration(target, duration, flags); } +static char * +qemuConnectGetCPUMapDesc(virConnectPtr conn) +{ + if (virConnectGetCPUMapDescEnsureACL(conn) < 0) + return NULL; + + return virGetCPUMapDesc(); +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, @@ -16220,6 +16229,7 @@ static virDriver qemuDriver = { .domainMigratePerform3Params = qemuDomainMigratePerform3Params, /* 1.1.0 */ .domainMigrateFinish3Params = qemuDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = qemuDomainMigrateConfirm3Params, /* 1.1.0 */ + .connectGetCPUMapDesc = qemuConnectGetCPUMapDesc, /* 1.1.0 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 71d0034..017c7af 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6811,6 +6811,7 @@ static virDriver remote_driver = { .domainMigratePerform3Params = remoteDomainMigratePerform3Params, /* 1.1.0 */ .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */ + .connectGetCPUMapDesc = remoteConnectGetCPUMapDesc, /* 1.1.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 7cfebdf..6e17b41 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2837,6 +2837,10 @@ struct remote_domain_event_device_removed_msg { remote_nonnull_string devAlias; }; +struct remote_connect_get_cpu_map_desc_ret { + remote_nonnull_string xml; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -5000,5 +5004,11 @@ enum remote_procedure { * @generate: both * @acl: none */ - REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311 + REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311, + + /** + * @generate: both + * @acl: connect:read + */ + REMOTE_PROC_CONNECT_GET_CPU_MAP_DESC = 312 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 4e27aae..ce1e9f5 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2316,6 +2316,9 @@ struct remote_domain_event_device_removed_msg { remote_nonnull_domain dom; remote_nonnull_string devAlias; }; +struct remote_connect_get_cpu_map_desc_ret { + remote_nonnull_string xml; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -2628,4 +2631,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_CREATE_XML_WITH_FILES = 309, REMOTE_PROC_DOMAIN_CREATE_WITH_FILES = 310, REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311, + REMOTE_PROC_CONNECT_GET_CPU_MAP_DESC = 312, }; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d7b2e40..82610b3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5801,6 +5801,11 @@ testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, return ret; } +static char * +testConnectGetCPUMapDesc(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return virGetCPUMapDesc(); +} static virDriver testDriver = { .no = VIR_DRV_TEST, @@ -5872,6 +5877,7 @@ static virDriver testDriver = { .connectIsAlive = testConnectIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ + .connectGetCPUMapDesc = testConnectGetCPUMapDesc, /* 1.1.0 */ }; static virNetworkDriver testNetworkDriver = { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 9ca352f..2aa2c08 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2831,6 +2831,16 @@ umlNodeSuspendForDuration(virConnectPtr conn, } +static char * +umlConnectGetCPUMapDesc(virConnectPtr conn) +{ + if (virConnectGetCPUMapDescEnsureACL(conn) < 0) + return NULL; + + return virGetCPUMapDesc(); +} + + static virDriver umlDriver = { .no = VIR_DRV_UML, .name = "UML", @@ -2892,6 +2902,7 @@ static virDriver umlDriver = { .nodeSuspendForDuration = umlNodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = umlNodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = umlNodeSetMemoryParameters, /* 0.10.2 */ + .connectGetCPUMapDesc = umlConnectGetCPUMapDesc, /* 1.1.0 */ }; static virStateDriver umlStateDriver = { diff --git a/src/util/virutil.c b/src/util/virutil.c index 34f5998..9d71a53 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -80,6 +80,7 @@ #include "virprocess.h" #include "virstring.h" #include "virutil.h" +#include "configmake.h" #ifndef NSIG # define NSIG 32 @@ -2116,3 +2117,25 @@ cleanup: return rc; } + +char * +virGetCPUMapDesc(void) +{ + char *data, *ret = NULL; + int len; + const char *cpumapfile = PKGDATADIR "/cpu_map.xml"; + if ((len = virFileReadAll(cpumapfile, 1024 * 1024, &data)) < 0) { + goto cleanup; + } + + if (VIR_ALLOC_N(ret, len + 1) < 0) { + goto cleanup; + } + + memcpy(ret, data, len); + ret[len] = '\0'; + +cleanup: + VIR_FREE(data); + return ret; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 4b06992..11030c5 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -172,4 +172,7 @@ int virCompareLimitUlong(unsigned long long a, unsigned long b); int virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr); + +char *virGetCPUMapDesc(void); + #endif /* __VIR_UTIL_H__ */ diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 880ae4b..3bc4f73 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -626,6 +626,21 @@ cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) return true; } +static bool +cmdCPUMapDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + char *xml = virConnectGetCPUMapDesc(ctl->conn); + if (xml == NULL) { + vshError(ctl, "%s", _("failed to get CPU Map XML file")); + return false; + } + + vshPrint(ctl, "%s\n", xml); + VIR_FREE(xml); + + return true; +} + /* * "version" command */ @@ -851,6 +866,12 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_capabilities, .flags = 0 }, + {.name = "cpu-map-desc", + .handler = cmdCPUMapDesc, + .opts = NULL, + .info = info_uri, + .flags = 0 + }, {.name = "freecell", .handler = cmdFreecell, .opts = opts_freecell, diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..d705a54 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -163,6 +163,7 @@ group as an option. For example: Host and Hypervisor (help keyword 'host'): capabilities capabilities + cpu-map-desc print the content of the cpu_map.xml file connect (re)connect to hypervisor freecell NUMA free memory hostname print the hypervisor hostname @@ -358,6 +359,10 @@ current domain is in. =over 4 +=item B<cpu-map-desc> + +Print the content of the cpu_map.xml file used by the hypervisor. + =item B<running> The domain is currently running on a CPU -- 1.8.3.1

5 21

[libvirt] [PATCH 0/2] Add http and ftp support for cdrom disk
by Aline Manera 27 Aug '13

27 Aug '13

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): Add http protocol support for cdrom disk Add ftp protocol support for cdrom disk docs/formatdomain.html.in | 16 +++++++++ docs/schemas/domaincommon.rng | 2 ++ src/conf/domain_conf.c | 4 ++- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 13 +++++++ .../qemuxml2argv-disk-cdrom-network-ftp.args | 6 ++++ .../qemuxml2argv-disk-cdrom-network-ftp.xml | 37 ++++++++++++++++++++ .../qemuxml2argv-disk-cdrom-network-http.args | 6 ++++ .../qemuxml2argv-disk-cdrom-network-http.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 +++ 10 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml -- 1.7.10.4

3 5

[libvirt] [PATCH] Don't free NULL network in cmdNetworkUpdate
by Ján Tomko 27 Aug '13

27 Aug '13

If the network has not been found, virNetworkFree(NULL) was called, resulting in an extra error: error: invalid network pointer in virNetworkFree https://bugzilla.redhat.com/show_bug.cgi?id=1001094 --- tools/virsh-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index e1baf0b..06bf483 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -918,7 +918,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) const char *affected; if (!(network = vshCommandOptNetwork(ctl, cmd, NULL))) - goto cleanup; + return false; if (vshCommandOptStringReq(ctl, cmd, "command", &commandStr) < 0) goto cleanup; -- 1.8.1.5

5 8

[libvirt] [PATCH] Always specify qcow2 compat level on qemu-img command line
by Ján Tomko 27 Aug '13

27 Aug '13

qemu-img is going to switch the default for QCOW2 to QCOW2v3 (compat=1.1) [0] Extend the probing for qemu-img command line options to check if -o compat is supported. If the volume definition specifies the qcow2 format but no compat level and -o compat is supported, specify -o compat=0.10 to create a QCOW2v2 image. https://bugzilla.redhat.com/show_bug.cgi?id=997977 --- [0] the switch is not yet upstream. The proposed (incomplete) QEMU patch: http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg02549.html src/storage/storage_backend.c | 47 +++++++++++++++++++--- tests/storagevolxml2argvdata/qcow2-compat.argv | 3 ++ .../qcow2-from-logical-compat.argv | 3 ++ .../qcow2-nobacking-convert-prealloc-compat.argv | 3 ++ .../qcow2-nobacking-prealloc-compat.argv | 3 ++ tests/storagevolxml2argvtest.c | 26 ++++++++++++ 6 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 tests/storagevolxml2argvdata/qcow2-compat.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 8d5880e..4ebe11b 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -581,8 +581,34 @@ enum { QEMU_IMG_BACKING_FORMAT_NONE = 0, QEMU_IMG_BACKING_FORMAT_FLAG, QEMU_IMG_BACKING_FORMAT_OPTIONS, + QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT, }; +static bool +virStorageBackendQemuImgSupportsCompat(const char *qemuimg) +{ + bool ret = false; + char *output; + virCommandPtr cmd = NULL; + + cmd = virCommandNewArgList(qemuimg, "create", "-o", "?", "-f", "qcow2", + "/dev/null", NULL); + + virCommandAddEnvString(cmd, "LC_ALL=C"); + virCommandSetOutputBuffer(cmd, &output); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (strstr(output, "\ncompat ")) + ret = true; + +cleanup: + virCommandFree(cmd); + VIR_FREE(output); + return ret; +} + static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) { @@ -612,12 +638,16 @@ virStorageBackendQEMUImgBackingFormat(const char *qemuimg) goto cleanup; } if (((tmp = strstr(start, "-F fmt")) && tmp < end) || - ((tmp = strstr(start, "-F backing_fmt")) && tmp < end)) + ((tmp = strstr(start, "-F backing_fmt")) && tmp < end)) { ret = QEMU_IMG_BACKING_FORMAT_FLAG; - else if ((tmp = strstr(start, "[-o options]")) && tmp < end) - ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; - else + } else if ((tmp = strstr(start, "[-o options]")) && tmp < end) { + if (virStorageBackendQemuImgSupportsCompat(qemuimg)) + ret = QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT; + else + ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; + } else { ret = QEMU_IMG_BACKING_FORMAT_NONE; + } cleanup: virCommandFree(cmd); @@ -705,6 +735,7 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, const char *backingType = NULL; const char *inputPath = NULL; const char *inputType = NULL; + const char *compat = vol->target.compat; char *opts = NULL; bool convert = false; bool backing = false; @@ -854,12 +885,16 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, if (backing) virCommandAddArgList(cmd, "-b", vol->backingStore.path, NULL); - if (imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS) { + if (imgformat >= QEMU_IMG_BACKING_FORMAT_OPTIONS) { + if (vol->target.format == VIR_STORAGE_FILE_QCOW2 && !compat && + imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT) + compat = "0.10"; + if (virStorageBackendCreateQemuImgOpts(&opts, backing ? backingType : NULL, do_encryption, preallocate, vol->target.format, - vol->target.compat, + compat, vol->target.features) < 0) { virCommandFree(cmd); return NULL; diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv new file mode 100644 index 0000000..37ad2c0 --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-compat.argv @@ -0,0 +1,3 @@ +qemu-img create -f qcow2 -b /dev/null \ +-o backing_fmt=raw,encryption=on,compat=0.10 \ +/var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv new file mode 100644 index 0000000..5f365b1 --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv @@ -0,0 +1,3 @@ +qemu-img convert -f raw -O qcow2 \ +-o encryption=on,compat=0.10 \ +/dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv new file mode 100644 index 0000000..3d93ec8 --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv @@ -0,0 +1,3 @@ +qemu-img convert -f raw -O qcow2 \ +-o encryption=on,preallocation=metadata,compat=0.10 \ +/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv new file mode 100644 index 0000000..903c94e --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv @@ -0,0 +1,3 @@ +qemu-img create -f qcow2 \ +-o encryption=on,preallocation=metadata,compat=0.10 \ +/var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index b1cf09f..cafcaad 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -195,6 +195,7 @@ enum { FMT_NONE = 0, FMT_FLAG, FMT_OPTIONS, + FMT_COMPAT, }; @@ -271,6 +272,31 @@ mymain(void) "pool-dir", "vol-qcow2-nobacking", "logical-from-qcow2", 0, FMT_OPTIONS); + DO_TEST("pool-dir", "vol-qcow2", + NULL, NULL, + "qcow2-compat", 0, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-nobacking", + NULL, NULL, + "qcow2-nobacking-prealloc-compat", flags, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-nobacking", + "pool-dir", "vol-file", + "qcow2-nobacking-convert-prealloc-compat", flags, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-lazy", + NULL, NULL, + "qcow2-lazy", 0, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-1.1", + NULL, NULL, + "qcow2-1.1", 0, FMT_COMPAT); + DO_TEST_FAIL("pool-dir", "vol-qcow2-0.10-lazy", + NULL, NULL, + "qcow2-0.10-lazy", 0, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-nobacking", + "pool-logical", "vol-logical", + "qcow2-from-logical-compat", 0, FMT_COMPAT); + DO_TEST("pool-logical", "vol-logical", + "pool-dir", "vol-qcow2-nobacking", + "logical-from-qcow2", 0, FMT_COMPAT); + return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.1.5

2 2

[libvirt] [PATCH 00/17] Add tests for disk hotplug
by Jiri Denemark 27 Aug '13

27 Aug '13

This series adds tests for hotplugging all supported disk types. Jiri Denemark (17): qemu: Typedef monitor callbacks qemu: Avoid using global qemu_driver in event handlers qemu: Move qemuDomainAttachDeviceDiskLive to qemu_hotplug.c qemu: Move qemuDomainDetachDeviceDiskLive to qemu_hotplug.c qemuhotplugtest: Generate better output qemuhotplugtest: Compare domain XML after device hotplug qemuhotplugtest: Define QMP_OK for the most common reply qemuxml2argvtest: Add XML for testing device hotplug qemuhotplugtest: Add tests for virtio disk hotplug tests: Add support for passing vm to qemu monitor tests: Add support for passing driver to qemu monitor qemu: Export qemuProcessHandleDeviceDeleted for tests qemu: Let tests override waiting time for device unplug qemuhotplugtest: Add support for DEVICE_DELETED event qemuhotplugtest: Add tests for async virtio disk detach qemuhotplugtest: Add tests for USB disk hotplug qemuhotplugtest: Add tests for virtio SCSI disk hotplug src/Makefile.am | 2 + src/qemu/qemu_capabilities.c | 5 +- src/qemu/qemu_driver.c | 166 --------------- src/qemu/qemu_hotplug.c | 219 +++++++++++++++++-- src/qemu/qemu_hotplug.h | 25 +-- src/qemu/qemu_hotplugpriv.h | 31 +++ src/qemu/qemu_monitor.c | 30 +-- src/qemu/qemu_monitor.h | 198 +++++++++++------- src/qemu/qemu_process.c | 104 +++++---- src/qemu/qemu_process.h | 2 +- src/qemu/qemu_processpriv.h | 37 ++++ tests/qemuhotplugtest.c | 232 +++++++++++++++++---- ...qemuhotplug-console-compat-2+console-virtio.xml | 127 +++++++++++ .../qemuhotplugtestdata/qemuhotplug-disk-scsi.xml | 7 + tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml | 7 + .../qemuhotplug-disk-virtio.xml | 7 + .../qemuhotplug-hotplug-base+disk-scsi.xml | 46 ++++ .../qemuhotplug-hotplug-base+disk-usb.xml | 45 ++++ .../qemuhotplug-hotplug-base+disk-virtio.xml | 46 ++++ tests/qemumonitorjsontest.c | 26 +-- tests/qemumonitortestutils.c | 31 ++- tests/qemumonitortestutils.h | 8 +- .../qemuxml2argv-hotplug-base.args | 7 + .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 38 ++++ tests/qemuxml2argvtest.c | 4 + 25 files changed, 1047 insertions(+), 403 deletions(-) create mode 100644 src/qemu/qemu_hotplugpriv.h create mode 100644 src/qemu/qemu_processpriv.h create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-virtio.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-scsi.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-usb.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-virtio.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.xml -- 1.8.3.2

4 39

[libvirt] [PATCH] virsh: fix return value error of cpu-stats
by Guannan Ren 27 Aug '13

27 Aug '13

virsh cpu-stats guest --start 0 --count 3 It outputs right but the return value is 1 rather than 0 echo $? 1 Found by running libvirt-autotest ./run -t libvirt --tests virsh_cpu_stats --- tools/virsh-domain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b29f934..bcf495c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6350,7 +6350,9 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) if (!nparams) { vshPrint(ctl, "%s", _("No per-CPU stats available")); - goto do_show_total; + if (show_total) + goto do_show_total; + goto cleanup; } if (VIR_ALLOC_N(params, nparams * MIN(show_count, 128)) < 0) @@ -6389,10 +6391,12 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(params); -do_show_total: - if (!show_total) + if (!show_total) { + ret = true; goto cleanup; + } +do_show_total: /* get supported num of parameter for total statistics */ if ((nparams = virDomainGetCPUStats(dom, NULL, 0, -1, 1, flags)) < 0) goto failed_stats; -- 1.8.3.1

4 5

[libvirt] [RFC PATCH] qemu: Don't set migration bandwidth if user not specify it.
by Li Wei 27 Aug '13

27 Aug '13

Since commit 6cfdeaac("qemu: Migrate at unlimited speed by default"), we set an unlimited migration bandwidth unconditionally, this change will cause problem when doing "--copy-storage-all" migration, qemu will submit as much block aio request as bandwidth allowed and use too much memory and finally killed by the oom-killer. Actually, we should only set migration speed when user specified it, otherwise, we let qemu use its default settings. Signed-off-by: Li Wei <lw(a)cn.fujitsu.com> --- src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_migration.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7f4d17d..b56e6c0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -226,8 +226,6 @@ qemuDomainObjPrivateAlloc(void) if (!(priv->devs = virChrdevAlloc())) goto error; - priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; - return priv; error: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b905459..8d60e3d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3139,7 +3139,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, goto cleanup; } - if (qemuMonitorSetMigrationSpeed(priv->mon, migrate_speed) < 0) { + if (migrate_speed && qemuMonitorSetMigrationSpeed(priv->mon, migrate_speed) < 0) { qemuDomainObjExitMonitor(driver, vm); goto cleanup; } -- 1.8.3.1

2 2

[libvirt] [PATCH] Fix a memory leak in cmdSchedInfoUpdateOne
by hwbi2008＠gmail.com 26 Aug '13

26 Aug '13

From: hwbi <hwbi2008(a)gmail.com> The param needs to be virTypedParamsFree()'d in cmdSchedInfoUpdateOne(). --- tools/virsh-domain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b29f934..d704053 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4085,7 +4085,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, int *nparams, int *maxparams, const char *field, const char *value) { - virTypedParameterPtr param; + virTypedParameterPtr param = NULL; int ret = -1; size_t i; @@ -4109,6 +4109,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, vshError(ctl, _("invalid scheduler option: %s"), field); cleanup: + virTypedParamsFree(param, *nparams); return ret; } -- 1.7.1

2 2

[libvirt] [PATCH] qemuDomainAttachHostPciDevice: Fall back to mem balloon if there's no hard_limit
by Michal Privoznik 26 Aug '13

26 Aug '13

If there's no hard_limit set and domain uses VFIO we still must lock the guest memory (prerequisite from qemu). Hence, we should compute the amount to be locked from max_balloon. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9727410..f028df6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1020,6 +1020,8 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, if (hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { + unsigned long long memKB; + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("VFIO PCI device assignment is not " @@ -1032,8 +1034,9 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, * doesn't hurt to "change" the limit to the same value. */ vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; - virProcessSetMaxMemLock(vm->pid, - vm->def->mem.hard_limit * 1024); + memKB = def->mem.hard_limit ? + def->mem.hard_limit : def->mem.max_balloon + 1024 * 1024; + virProcessSetMaxMemLock(vm->pid, memKB); vm->def->hostdevs[vm->def->nhostdevs--] = NULL; } -- 1.8.1.5

2 2

Re: [libvirt] [PATCH] netns: unix: only allow to find out unix socket in same net namespace
by Gao feng 26 Aug '13

26 Aug '13

cc libvirt-list On 08/21/2013 01:30 PM, Eric W. Biederman wrote: > Gao feng <gaofeng(a)cn.fujitsu.com> writes: > >> Unix sockets are private resources of net namespace, >> allowing one net namespace to access to other netns's unix >> sockets is meaningless. > > Allowing one net namespace to access another netns's unix socket is > deliberate behavior. This is a desired and useful feature, and > only a misconfiguration of visible files would allow this to be a > problem. > >> I'm researching a problem about shutdown from container, >> if the cotainer shares the same file /run/systemd/private >> with host, when we run shutdown -h xxx in container, the >> shutdown message will be send to the systemd-shutdownd >> through unix socket /run/systemd/private, and because >> systemd-shutdownd is running in host, so finally, the host >> will become shutdown. > > The simple answer is don't do that then. I can see no reason > to share /run outside of the container unless you want this kind of > behavior. > > Quite frankly I want this behavior if I am using network namespaces > to support multiple routing contexts. That is if I am using scripts > like: > > ip netns add other > ip netns exec other script > > I don't want to have to remember to say > ip netns orig exec shutdown -h now > > There are more compelling uses and there is no cost in supporting this > in the kernel. > > What kind of misconfiguration caused someone to complain about this? > libvirt lxc allows user to set up a container which shares the same root directory with host. seems like the unix sockets whose sun_path is an abstract socket address are net namespace aware. Should we use "abstract" type of address instead of a file system pathname for systemd in this case?

6 14

[libvirt] [PATCH] schema: Allow dots in device aliases
by Jiri Denemark 26 Aug '13

26 Aug '13

Commit 01b88127 changed aliases for PCI controller devices to "pcie.0" or "pci.%u". Thus device aliases may now contain dots. --- docs/schemas/domaincommon.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index dfcd61c..b537fee 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4302,7 +4302,7 @@ </define> <define name='aliasName'> <data type="string"> - <param name="pattern">[a-zA-Z0-9_\-]+</param> + <param name="pattern">[a-zA-Z0-9_\-.]+</param> </data> </define> <define name='alias'> -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu: Don't update count of vCPUs if hot-plug fails silently
by Peter Krempa 26 Aug '13

26 Aug '13

When cpu hotplug fails without reporting an error, we would fail the command but update the count of vCPUs anyways. Commit 761fc481365703b861429d73a341bde352ba8d41 fixed the case when CPU hot-unplug failed silently, but forgot to fix up the value in this case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1000357 --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a8e518..c39f04d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3982,6 +3982,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, _("got wrong number of vCPU pids from QEMU monitor. " "got %d, wanted %d"), ncpupids, vcpus); + vcpus = oldvcpus; ret = -1; goto cleanup; } -- 1.8.3.2

2 2

[libvirt] [PATCH] Fix loosing the pidfile string of struct _qemuDomainObjPrivate after libvirtd service restarted.
by Wangyufei (A) 26 Aug '13

26 Aug '13

*src/qemu/qemu_domain.c (qemuDomainObjPrivateXMLFormat): Add codes of saving pidfile string to vm'state file. *src/qemu/qemu_domain.c (qemuDomainObjPrivateXMLParse): Add codes of loading pidfile path saved in vm's state file to the pidfile string. Signed-off-by: Xu Chao <xuchao1(a)huawei.com> --- src/qemu/qemu_domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7f4d17d..3c792ab 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -294,6 +294,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) virDomainChrTypeToString(priv->monConfig->type)); } + virBufferEscapeString(buf, " <pidfile path='%s'/>\n", priv->pidfile); if (priv->nvcpupids) { size_t i; @@ -398,6 +399,13 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) goto error; } + if (!(priv->pidfile = + virXPathString("string(./pid[1]/@path)", ctxt))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("no pidfile path")); + goto error; + } + n = virXPathNodeSet("./vcpus/vcpu", ctxt, &nodes); if (n < 0) goto error; Best Regards, -WangYufei

2 1

Re: [libvirt] [PATCH] kvm: warn if num cpus is greater than num recommended
by Eduardo Habkost 26 Aug '13

26 Aug '13

On 22/08/2013, at 12:39, Andrew Jones <drjones(a)redhat.com> wrote: > The comment in kvm_max_vcpus() states that it's using the recommended > procedure from the kernel API documentation to get the max number > of vcpus that kvm supports. It is, but by always returning the > maximum number supported. The maximum number should only be used > for development purposes. qemu should check KVM_CAP_NR_VCPUS for > the recommended number of vcpus. This patch adds a warning if a user > specifies a number of cpus between the recommended and max. > > Signed-off-by: Andrew Jones <drjones(a)redhat.com> CCing libvir-list. It is probably interesting for libvirt to expose or warn about the recommended VCPU limit somehow, and in this case a simple warning on stderr won't be enough. > --- > kvm-all.c | 45 +++++++++++++++++++++++++++------------------ > 1 file changed, 27 insertions(+), 18 deletions(-) > > diff --git a/kvm-all.c b/kvm-all.c > index 716860f617455..9092e13ae60ea 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -1313,24 +1313,24 @@ static int kvm_irqchip_create(KVMState *s) > return 0; > } > > -static int kvm_max_vcpus(KVMState *s) > +/* Find number of supported CPUs using the recommended > + * procedure from the kernel API documentation to cope with > + * older kernels that may be missing capabilities. > + */ > +static int kvm_recommended_vcpus(KVMState *s) > { > int ret; > > - /* Find number of supported CPUs using the recommended > - * procedure from the kernel API documentation to cope with > - * older kernels that may be missing capabilities. > - */ > - ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS); > - if (ret) { > - return ret; > - } > ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS); > - if (ret) { > - return ret; > - } > + return (ret) ? ret : 4; > +} > > - return 4; > +static int kvm_max_vcpus(KVMState *s) > +{ > + int ret; > + > + ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS); > + return (ret) ? ret : kvm_recommended_vcpus(s); > } > > int kvm_init(void) > @@ -1383,12 +1383,21 @@ int kvm_init(void) > goto err; > } > > - max_vcpus = kvm_max_vcpus(s); > + max_vcpus = kvm_recommended_vcpus(s); > if (smp_cpus > max_vcpus) { > - ret = -EINVAL; > - fprintf(stderr, "Number of SMP cpus requested (%d) exceeds max cpus " > - "supported by KVM (%d)\n", smp_cpus, max_vcpus); > - goto err; > + fprintf(stderr, > + "Warning: Number of SMP cpus requested (%d) exceeds " > + "recommended cpus supported by KVM (%d)\n", > + smp_cpus, max_vcpus); > + > + max_vcpus = kvm_max_vcpus(s); > + if (smp_cpus > max_vcpus) { > + ret = -EINVAL; > + fprintf(stderr, "Number of SMP cpus requested (%d) exceeds " > + "max cpus supported by KVM (%d)\n", > + smp_cpus, max_vcpus); > + goto err; > + } > } > > s->vmfd = kvm_ioctl(s, KVM_CREATE_VM, 0); > -- > 1.8.1.4 > -- Eduardo

4 4

[libvirt] How to deal with LXC cgroup access control with apparmor ?
by 止语 26 Aug '13

26 Aug '13

I don't know if it “legal” to send the email here ：） ================ I am playing with libvirt 1.1.1 (lxc) when I was starting a LXC container, the process location of cgroup is pretty , just the root directory from the process. But I could tune the cgroup in a container as an user that logged, This is not accepted... I wonder how to restrict it with apparmor ,so one can not modify files in the cgroup fs, e.g the cpus or mem, if i restrict it with "deny /sys/fs/cgroup/** wrklx," in apparmor ,the container woulld not start up . "Permission denied", because that a process would mount the cgroup, it seems done by libvirt_lxc, Any way to restrict the cgroup in the container or just not mount cgroup in the container ?? Any help would be appreciated, thanks . ------------------ 止语

1 0

[libvirt] [RFC PATCH v2 0/3] Start fixing the pvpanic mess
by Paolo Bonzini 25 Aug '13

25 Aug '13

The pvpanic mess is even bigger than anticipated. Let's fix the monitor's behavior (patch 1), get rid of all traces that the broken pvpanic existed (patch 2), and give it a new name so that libvirt can detect a design that works (patch 3). All downstreams are urged to apply patches 1+2 as soon as they are merged in QEMU. Still, there are still other problems to solve. In QEMU, exposing "-device isa-pvpanic" in the ACPI tables. Quite frankly I don't have the time to fix this. We have ~3 months though. Patch 3 should not be applied until it is fixed. Also, libvirt needs to know under which circumstances to add "-device isa-pvpanic", besides obviously the availability of the device. IMHO it is just too complicated to retrofit all complications in <on_crash>. In fact, I suspect <on_crash> would match more closely QEMU's "internal error" state, and it would be quite useful to add that to the QEMU driver. Thus, libvirt could add support for an <on_panic> element with the following values: - default, which depends on the hypervisor and is "crash" for Xen, "ignore" for everything else - "crash", which is the only supported value on Xen and means "use the value of <on_crash>" - ignore, which is the behavior of old libvirt that don't know pvpanic - restart, destroy, preserve, rename-restart as for <on_crash>. In particular, preserve can still use the crashed_guest_panicked status, thus keeping the API compatible. - pause, to pause the VM (with a new substatus) <on_panic> would also have a coredump='yes/no' attribute, where yes is only valid if the element is *not* one of default/crash/ignore. Only "default" and "ignore" would be accepted for QEMU that does not support the isa-pvpanic device. Ideally, the coredump attribute would be added to <on_crash> too for simplicity (Xen would refuse coredump + rename-restart and coredump + preserve). Paolo Paolo Bonzini (3): vl: allow "cont" from panicked state pc: get rid of builtin pvpanic pvpanic: rename to isa-pvpanic gdbstub.c | 3 --- hw/i386/pc_piix.c | 8 -------- hw/i386/pc_q35.c | 6 ------ hw/misc/pvpanic.c | 16 +++------------- include/hw/i386/pc.h | 3 --- vl.c | 6 ++---- 6 files changed, 5 insertions(+), 37 deletions(-) -- 1.8.3.1

7 31

[libvirt] [PATCHv3 0/5] Introduce API to query IP addresses for given domain
by nehaljwani 24 Aug '13

24 Aug '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.mail-archive.com/libvir-list@redhat.com/msg51857.html A patch was submitted, using structs: http://www.mail-archive.com/libvir-list@redhat.com/msg57141.html Another patch was submitted, using XML: http://www.mail-archive.com/libvir-list@redhat.com/msg57829.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: http://www.mail-archive.com/libvir-list@redhat.com/msg79793.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfacesAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) nehaljwani (5): domifaddr: Implement the public API domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 123 +++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 +++++++++++++ include/libvirt/libvirt.h.in | 33 +++++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 8 +- python/libvirt-override.c | 114 +++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 110 ++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 157 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 55 ++++++++++++++ src/remote/remote_driver.c | 87 ++++++++++++++++++++++ src/remote/remote_protocol.x | 41 ++++++++++- src/remote_protocol-structs | 24 ++++++ tests/qemuagenttest.c | 90 ++++++++++++++++++++++- tools/virsh-domain-monitor.c | 99 +++++++++++++++++++++++++ tools/virsh.pod | 10 +++ 20 files changed, 1018 insertions(+), 4 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

6 17

[libvirt] [PATCH] tests: skip schema validation tests if xmllint is missing
by Eric Blake 23 Aug '13

23 Aug '13

On IRC, someone complained that a system without xmllint installed failed a number of tests. * tests/schematestutils.sh: Probe for xmllint. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tests/schematestutils.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/schematestutils.sh b/tests/schematestutils.sh index e594f04..a0ff77e 100644 --- a/tests/schematestutils.sh +++ b/tests/schematestutils.sh @@ -1,5 +1,7 @@ #!/bin/sh +(xmllint --version) >/dev/null 2>&1 || skip_test_ 'Missing xmllint' + check_schema () { DIRS=$1 -- 1.8.3.1

2 2

[libvirt] [PATCH] python: simplify complicated conditional assignment
by Claudio Bley 23 Aug '13

23 Aug '13

Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Just noticed this while reading the generated .py files. Might save a few cycles eventually... python/generator.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 427cebc..10390c3 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1455,8 +1455,7 @@ def buildWrappers(module): elif classname in [ "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") - classes.write(" if _obj != None:self._o = _obj;return\n") - classes.write(" self._o = None\n\n") + classes.write(" self._o = _obj\n\n") destruct=None if classes_destructors.has_key(classname): classes.write(" def __del__(self):\n") -- 1.7.9.5

2 3

[libvirt] [PATCH] qemuBuildNicDevStr: Set vectors= on Multiqueue
by Michal Privoznik 23 Aug '13

23 Aug '13

Yet another advice appeared on the Multiqueue wiki page: http://www.linux-kvm.org/page/Multiqueue#Enable_MQ_feature We should add vectors=N onto the qemu command line, where N = 2 * (number of queues) + 1. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 13 +++++++------ src/qemu/qemu_command.h | 2 +- src/qemu/qemu_hotplug.c | 4 +--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b5ac15a..dbfa0dc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4730,7 +4730,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, - bool multiqueue, + int vhostfdSize, virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -4783,8 +4783,11 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainVirtioEventIdxTypeToString(net->driver.virtio.event_idx)); } } - if (usingVirtio && multiqueue) - virBufferAddLit(&buf, ",mq=on"); + if (usingVirtio && vhostfdSize > 1) { + /* As advised at http://www.linux-kvm.org/page/Multiqueue + * we should add vectors=2*N+1 where N is the vhostfdSize */ + virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 1); + } if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); else @@ -7278,10 +7281,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, - multiqueue, qemuCaps))) + vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index a9854a3..4761705 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -102,7 +102,7 @@ char * qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, - bool multiqueue, + int vhostfdSize, virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9727410..3491fd6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -859,10 +859,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, - multiqueue, priv->qemuCaps))) + vhostfdSize, priv->qemuCaps))) goto try_remove; } else { if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) -- 1.8.1.5

1 0

[libvirt] virsh "cpu-stats" not working !!!
by SHREE DUTH AWASTHI 23 Aug '13

23 Aug '13

> > Hi All, > > Can you please guide us in solving this issue. > > Version used : libvirt-1.0.6 > # rpm -qa | egrep "libvirt|qemu" > qemu-kvm-0.14.1-1_WR4.3.x86_64_XXX.x86_64 > libvirt-1.0.6-1_WR4.3.x86_64_XXX.2.x86_64 > > Problem : > > # virsh cpu-stats CLA-0 > error: Failed to retrieve CPU statistics for domain 'CLA-0' > *error: internal error error accessing cgroup cpuacct for vcpu* > > Related info : > > # cat /proc/cgroups > #subsys_name hierarchy num_cgroups enabled > cpuset 3 4 1 > ns 0 1 1 > cpu 1 6 1 > cpuacct 7 3 1 > memory 2 3 1 > freezer 0 1 1 > net_cls 0 1 1 > blkio 0 1 1 > > # cat /proc/mounts | grep cpu > cpu /dev/cgroup_cpu cgroup rw,relatime,cpu 0 0 > cpuset /dev/cgroup_cpuset cgroup rw,relatime,cpuset 0 0 > cpuacct /dev/cgroup_cpuacct cgroup rw,relatime,cpuacct 0 0 > > # cat /proc/self/cgroup > 7:cpuacct:/ > 3:cpuset:/ > 2:memory:/ > 1:cpu:/ > > virsh # vcpucount CLA-0 > maximum config 3 > maximum live 3 > current config 3 > current live 3 > > virsh # vcpuinfo CLA-0 > VCPU: 0 > CPU: 0 > State: running > CPU time: 5.7s > CPU Affinity: yyyyyyyy > > virsh # vcpupin CLA-0 --current > VCPU: CPU Affinity > ---------------------------------- > 0: 0-7 > 1: 0-7 > 2: 0-7 > > # cat /dev/cgroup_cpuacct/cpuacct.usage_percpu > 532996776861 117928641102 125174572624 167825543709 155234053284 > 97350309867 122372010702 110640812251 > # cat /dev/cgroup_cpuacct/cpuacct.usage > 1431288376064 > # cat /dev/cgroup_cpuacct/cpuacct.stat > user 12148 > system 81469 > > # cat /dev/cgroup_cpuacct/*machine*/cpuacct.usage_percpu > 0 0 0 0 0 0 0 0 > # cat /dev/cgroup_cpuacct/*machine/*cpuacct.usage > 0 > > # chkconfig --list | grep cg > cgroups_mount 0:off 1:on 2:on 3:on 4:on 5:on 6:off > > We have also found that there is no "*cgroup*" directory created under * > "/sys/fs/".* We have tried mounting the same manually using the below > commands but we were not successful. > > mkdir -p /dev/cgroup_cpuacct > mount -t cgroup -o cpuacct cpuacct /dev/cgroup_cpuacct > > (or) > > mkdir -p /sys/fs/cgroup > mount -t cgroup -o cgroup cgroup /sys/fs/cgroup > > > Please find the the domain info used for the creation of VM in the > attachment. Please let us know, how to proceed futher. > > Your inputs would be of great help to us. > > Thanks and Regards, > Shree Duth Awasthi. >

2 3

[libvirt] [PATCH] Test for object identity when checking for None in Python
by Claudio Bley 23 Aug '13

23 Aug '13

Consistently use "is" or "is not" to compare variables to None, because doing so is preferrable, as per PEP 8 (http://www.python.org/dev/peps/pep-0008/#programming-recommendations) > Comparisons to singletons like None should always be done with is or > is not, never the equality operators. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Purely mechanical change, using: find . -name '*.py' -exec sed -i -e 's,[ \t][ \t]*!=[ \t][ \t]*None, is not None,g' '{}' \+ find . -name '*.py' -exec sed -i -e 's,[ \t][ \t]*==[ \t][ \t]*None, is None,g' '{}' \+ docs/apibuild.py | 254 ++++++++++++++++----------------- docs/index.py | 178 +++++++++++------------ examples/python/consolecallback.py | 2 +- examples/python/dominfo.py | 2 +- examples/python/domrestore.py | 2 +- examples/python/domsave.py | 2 +- examples/python/domstart.py | 4 +- python/generator.py | 30 ++-- python/libvirt-override-virConnect.py | 2 +- python/libvirt-override-virStream.py | 4 +- 10 files changed, 240 insertions(+), 240 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 5c55d79..ab6b0b4 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -111,7 +111,7 @@ class identifier: self.extra = extra self.lineno = lineno self.static = 0 - if conditionals == None or len(conditionals) == 0: + if conditionals is None or len(conditionals) == 0: self.conditionals = None else: self.conditionals = conditionals[:] @@ -123,13 +123,13 @@ class identifier: r = "%s %s:" % (self.type, self.name) if self.static: r = r + " static" - if self.module != None: + if self.module is not None: r = r + " from %s" % (self.module) - if self.info != None: + if self.info is not None: r = r + " " + `self.info` - if self.extra != None: + if self.extra is not None: r = r + " " + `self.extra` - if self.conditionals != None: + if self.conditionals is not None: r = r + " " + `self.conditionals` return r @@ -149,7 +149,7 @@ class identifier: def set_static(self, static): self.static = static def set_conditionals(self, conditionals): - if conditionals == None or len(conditionals) == 0: + if conditionals is None or len(conditionals) == 0: self.conditionals = None else: self.conditionals = conditionals[:] @@ -178,17 +178,17 @@ class identifier: if self.name == debugsym and not quiet: print "=> update %s : %s" % (debugsym, (module, type, info, extra, conditionals)) - if header != None and self.header == None: + if header is not None and self.header is None: self.set_header(module) - if module != None and (self.module == None or self.header == self.module): + if module is not None and (self.module is None or self.header == self.module): self.set_module(module) - if type != None and self.type == None: + if type is not None and self.type is None: self.set_type(type) - if info != None: + if info is not None: self.set_info(info) - if extra != None: + if extra is not None: self.set_extra(extra) - if conditionals != None: + if conditionals is not None: self.set_conditionals(conditionals) class index: @@ -217,10 +217,10 @@ class index: d = identifier(name, header, module, type, lineno, info, extra, conditionals) self.identifiers[name] = d - if d != None and static == 1: + if d is not None and static == 1: d.set_static(1) - if d != None and name != None and type != None: + if d is not None and name is not None and type is not None: self.references[name] = d if name == debugsym and not quiet: @@ -239,10 +239,10 @@ class index: d = identifier(name, header, module, type, lineno, info, extra, conditionals) self.identifiers[name] = d - if d != None and static == 1: + if d is not None and static == 1: d.set_static(1) - if d != None and name != None and type != None: + if d is not None and name is not None and type is not None: if type == "function": self.functions[name] = d elif type == "functype": @@ -432,7 +432,7 @@ class CLexer: else: line = self.line self.line = "" - if line == None: + if line is None: return None if line[0] == '#': @@ -461,7 +461,7 @@ class CLexer: tok = tok + line if found == 0: line = self.getline() - if line == None: + if line is None: return None self.last = ('string', tok) return self.last @@ -486,7 +486,7 @@ class CLexer: tok = tok + line if found == 0: line = self.getline() - if line == None: + if line is None: return None self.last = ('comment', tok) return self.last @@ -598,7 +598,7 @@ class CParser: self.is_header = 0 self.input = open(filename) self.lexer = CLexer(self.input) - if idx == None: + if idx is None: self.index = index() else: self.index = idx @@ -707,7 +707,7 @@ class CParser: com = token[1] if self.top_comment == "": self.top_comment = com - if self.comment == None or com[0] == '*': + if self.comment is None or com[0] == '*': self.comment = com else: self.comment = self.comment + com @@ -731,7 +731,7 @@ class CParser: args = [] desc = "" - if self.comment == None: + if self.comment is None: if not quiet: self.warning("Missing comment for type %s" % (name)) return((args, desc)) @@ -780,7 +780,7 @@ class CParser: args = [] desc = "" - if self.comment == None: + if self.comment is None: if not quiet: self.warning("Missing comment for macro %s" % (name)) return((args, desc)) @@ -860,7 +860,7 @@ class CParser: desc = "" retdesc = "" - if self.comment == None: + if self.comment is None: if not quiet: self.warning("Missing comment for function %s" % (name)) return(((ret[0], retdesc), args, desc)) @@ -958,7 +958,7 @@ class CParser: # i = 0 while i < nbargs: - if args[i][2] == None and args[i][0] != "void" and args[i][1] != None: + if args[i][2] is None and args[i][0] != "void" and args[i][1] is not None: self.warning("Function comment for %s lacks description of arg %s" % (name, args[i][1])) i = i + 1 if retdesc == "" and ret[0] != "void": @@ -975,7 +975,7 @@ class CParser: name = token[1] if name == "#include": token = self.lexer.token() - if token == None: + if token is None: return None if token[0] == 'preproc': self.index_add(token[1], self.filename, not self.is_header, @@ -984,14 +984,14 @@ class CParser: return token if name == "#define": token = self.lexer.token() - if token == None: + if token is None: return None if token[0] == 'preproc': # TODO macros with arguments name = token[1] lst = [] token = self.lexer.token() - while token != None and token[0] == 'preproc' and \ + while token is not None and token[0] == 'preproc' and \ token[1][0] != '#': lst.append(token[1]) token = self.lexer.token() @@ -1059,7 +1059,7 @@ class CParser: self.conditionals = self.conditionals[:-1] self.defines = self.defines[:-1] token = self.lexer.token() - while token != None and token[0] == 'preproc' and \ + while token is not None and token[0] == 'preproc' and \ token[1][0] != '#': token = self.lexer.token() return token @@ -1076,7 +1076,7 @@ class CParser: global ignored_words token = self.lexer.token() - while token != None: + while token is not None: if token[0] == 'comment': token = self.parseComment(token) continue @@ -1088,7 +1088,7 @@ class CParser: return token elif token[0] == "name" and token[1] == "__attribute": token = self.lexer.token() - while token != None and token[1] != ";": + while token is not None and token[1] != ";": token = self.lexer.token() return token elif token[0] == "name" and ignored_words.has_key(token[1]): @@ -1109,20 +1109,20 @@ class CParser: # Parse a typedef, it records the type and its name. # def parseTypedef(self, token): - if token == None: + if token is None: return None token = self.parseType(token) - if token == None: + if token is None: self.error("parsing typedef") return None base_type = self.type type = base_type #self.debug("end typedef type", token) - while token != None: + while token is not None: if token[0] == "name": name = token[1] signature = self.signature - if signature != None: + if signature is not None: type = string.split(type, '(')[0] d = self.mergeFunctionComment(name, ((type, None), signature), 1) @@ -1143,15 +1143,15 @@ class CParser: self.error("parsing typedef: expecting a name") return token #self.debug("end typedef", token) - if token != None and token[0] == 'sep' and token[1] == ',': + if token is not None and token[0] == 'sep' and token[1] == ',': type = base_type token = self.token() - while token != None and token[0] == "op": + while token is not None and token[0] == "op": type = type + token[1] token = self.token() - elif token != None and token[0] == 'sep' and token[1] == ';': + elif token is not None and token[0] == 'sep' and token[1] == ';': break - elif token != None and token[0] == 'name': + elif token is not None and token[0] == 'name': type = base_type continue else: @@ -1165,7 +1165,7 @@ class CParser: # the balancing } included # def parseBlock(self, token): - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseBlock(token) @@ -1205,7 +1205,7 @@ class CParser: def parseStruct(self, token): fields = [] #self.debug("start parseStruct", token) - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) @@ -1220,7 +1220,7 @@ class CParser: #self.debug("before parseType", token) token = self.parseType(token) #self.debug("after parseType", token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": fname = token[1] token = self.token() if token[0] == "sep" and token[1] == ";": @@ -1236,12 +1236,12 @@ class CParser: self.comment = None else: self.error("parseStruct: expecting ;", token) - elif token != None and token[0] == "sep" and token[1] == "{": + elif token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": token = self.token() - if token != None and token[0] == "sep" and token[1] == ";": + if token is not None and token[0] == "sep" and token[1] == ";": token = self.token() else: self.error("parseStruct: expecting ;", token) @@ -1260,7 +1260,7 @@ class CParser: def parseUnion(self, token): fields = [] # self.debug("start parseUnion", token) - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) @@ -1275,7 +1275,7 @@ class CParser: # self.debug("before parseType", token) token = self.parseType(token) # self.debug("after parseType", token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": fname = token[1] token = self.token() if token[0] == "sep" and token[1] == ";": @@ -1286,12 +1286,12 @@ class CParser: self.comment = None else: self.error("parseUnion: expecting ;", token) - elif token != None and token[0] == "sep" and token[1] == "{": + elif token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": token = self.token() - if token != None and token[0] == "sep" and token[1] == ";": + if token is not None and token[0] == "sep" and token[1] == ";": token = self.token() else: self.error("parseUnion: expecting ;", token) @@ -1313,14 +1313,14 @@ class CParser: self.comment = None comment = "" value = "0" - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) elif token[0] == "sep" and token[1] == "}": - if name != None: + if name is not None: self.cleanupComment() - if self.comment != None: + if self.comment is not None: comment = self.comment self.comment = None self.enums.append((name, value, comment)) @@ -1328,8 +1328,8 @@ class CParser: return token elif token[0] == "name": self.cleanupComment() - if name != None: - if self.comment != None: + if name is not None: + if self.comment is not None: comment = string.strip(self.comment) self.comment = None self.enums.append((name, value, comment)) @@ -1451,7 +1451,7 @@ class CParser: # the balancing } # def parseTypeBlock(self, token): - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) @@ -1472,7 +1472,7 @@ class CParser: self.struct_fields = [] self.union_fields = [] self.signature = None - if token == None: + if token is None: return token while token[0] == "name" and ( @@ -1524,13 +1524,13 @@ class CParser: if token[0] == "name": nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == "{": + if token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseStruct(token) - elif token != None and token[0] == "op" and token[1] == "*": + elif token is not None and token[0] == "op" and token[1] == "*": self.type = self.type + " " + nametok[1] + " *" token = self.token() - while token != None and token[0] == "op" and token[1] == "*": + while token is not None and token[0] == "op" and token[1] == "*": self.type = self.type + " *" token = self.token() if token[0] == "name": @@ -1539,11 +1539,11 @@ class CParser: else: self.error("struct : expecting name", token) return token - elif token != None and token[0] == "name" and nametok != None: + elif token is not None and token[0] == "name" and nametok is not None: self.type = self.type + " " + nametok[1] return token - if nametok != None: + if nametok is not None: self.lexer.push(token) token = nametok return token @@ -1558,14 +1558,14 @@ class CParser: if token[0] == "name": nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == "{": + if token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseUnion(token) - elif token != None and token[0] == "name" and nametok != None: + elif token is not None and token[0] == "name" and nametok is not None: self.type = self.type + " " + nametok[1] return token - if nametok != None: + if nametok is not None: self.lexer.push(token) token = nametok return token @@ -1577,13 +1577,13 @@ class CParser: self.type = self.type + " " + token[1] self.enums = [] token = self.token() - if token != None and token[0] == "sep" and token[1] == "{": + if token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseEnumBlock(token) else: self.error("parsing enum: expecting '{'", token) enum_type = None - if token != None and token[0] != "name": + if token is not None and token[0] != "name": self.lexer.push(token) token = ("name", "enum") else: @@ -1595,24 +1595,24 @@ class CParser: return token elif token[0] == "name" and token[1] == "VIR_ENUM_DECL": token = self.token() - if token != None and token[0] == "sep" and token[1] == "(": + if token is not None and token[0] == "sep" and token[1] == "(": token = self.token() token = self.parseVirEnumDecl(token) else: self.error("parsing VIR_ENUM_DECL: expecting '('", token) - if token != None: + if token is not None: self.lexer.push(token) token = ("name", "virenumdecl") return token elif token[0] == "name" and token[1] == "VIR_ENUM_IMPL": token = self.token() - if token != None and token[0] == "sep" and token[1] == "(": + if token is not None and token[0] == "sep" and token[1] == "(": token = self.token() token = self.parseVirEnumImpl(token) else: self.error("parsing VIR_ENUM_IMPL: expecting '('", token) - if token != None: + if token is not None: self.lexer.push(token) token = ("name", "virenumimpl") return token @@ -1627,7 +1627,7 @@ class CParser: token) return token token = self.token() - while token != None and (token[0] == "op" or + while token is not None and (token[0] == "op" or token[0] == "name" and token[1] == "const"): self.type = self.type + " " + token[1] token = self.token() @@ -1635,22 +1635,22 @@ class CParser: # # if there is a parenthesis here, this means a function type # - if token != None and token[0] == "sep" and token[1] == '(': + if token is not None and token[0] == "sep" and token[1] == '(': self.type = self.type + token[1] token = self.token() - while token != None and token[0] == "op" and token[1] == '*': + while token is not None and token[0] == "op" and token[1] == '*': self.type = self.type + token[1] token = self.token() - if token == None or token[0] != "name" : + if token is None or token[0] != "name" : self.error("parsing function type, name expected", token) return token self.type = self.type + token[1] nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == ')': + if token is not None and token[0] == "sep" and token[1] == ')': self.type = self.type + token[1] token = self.token() - if token != None and token[0] == "sep" and token[1] == '(': + if token is not None and token[0] == "sep" and token[1] == '(': token = self.token() type = self.type token = self.parseSignature(token) @@ -1668,25 +1668,25 @@ class CParser: # # do some lookahead for arrays # - if token != None and token[0] == "name": + if token is not None and token[0] == "name": nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == '[': + if token is not None and token[0] == "sep" and token[1] == '[': self.type = self.type + " " + nametok[1] - while token != None and token[0] == "sep" and token[1] == '[': + while token is not None and token[0] == "sep" and token[1] == '[': self.type = self.type + token[1] token = self.token() - while token != None and token[0] != 'sep' and \ + while token is not None and token[0] != 'sep' and \ token[1] != ']' and token[1] != ';': self.type = self.type + token[1] token = self.token() - if token != None and token[0] == 'sep' and token[1] == ']': + if token is not None and token[0] == 'sep' and token[1] == ']': self.type = self.type + token[1] token = self.token() else: self.error("parsing array type, ']' expected", token) return token - elif token != None and token[0] == "sep" and token[1] == ':': + elif token is not None and token[0] == "sep" and token[1] == ':': # remove :12 in case it's a limited int size token = self.token() token = self.token() @@ -1700,25 +1700,25 @@ class CParser: # up to the ')' included def parseSignature(self, token): signature = [] - if token != None and token[0] == "sep" and token[1] == ')': + if token is not None and token[0] == "sep" and token[1] == ')': self.signature = [] token = self.token() return token - while token != None: + while token is not None: token = self.parseType(token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": signature.append((self.type, token[1], None)) token = self.token() - elif token != None and token[0] == "sep" and token[1] == ',': + elif token is not None and token[0] == "sep" and token[1] == ',': token = self.token() continue - elif token != None and token[0] == "sep" and token[1] == ')': + elif token is not None and token[0] == "sep" and token[1] == ')': # only the type was provided if self.type == "...": signature.append((self.type, "...", None)) else: signature.append((self.type, None, None)) - if token != None and token[0] == "sep": + if token is not None and token[0] == "sep": if token[1] == ',': token = self.token() continue @@ -1813,17 +1813,17 @@ class CParser: static = 0 if token[1] == 'extern': token = self.token() - if token == None: + if token is None: return token if token[0] == 'string': if token[1] == 'C': token = self.token() - if token == None: + if token is None: return token if token[0] == 'sep' and token[1] == "{": token = self.token() # print 'Entering extern "C line ', self.lineno() - while token != None and (token[0] != 'sep' or + while token is not None and (token[0] != 'sep' or token[1] != "}"): if token[0] == 'name': token = self.parseGlobal(token) @@ -1840,7 +1840,7 @@ class CParser: elif token[1] == 'static': static = 1 token = self.token() - if token == None or token[0] != 'name': + if token is None or token[0] != 'name': return token if token[1] == 'typedef': @@ -1849,22 +1849,22 @@ class CParser: else: token = self.parseType(token) type_orig = self.type - if token == None or token[0] != "name": + if token is None or token[0] != "name": return token type = type_orig self.name = token[1] token = self.token() - while token != None and (token[0] == "sep" or token[0] == "op"): + while token is not None and (token[0] == "sep" or token[0] == "op"): if token[0] == "sep": if token[1] == "[": type = type + token[1] token = self.token() - while token != None and (token[0] != "sep" or \ + while token is not None and (token[0] != "sep" or \ token[1] != ";"): type = type + token[1] token = self.token() - if token != None and token[0] == "op" and token[1] == "=": + if token is not None and token[0] == "op" and token[1] == "=": # # Skip the initialization of the variable # @@ -1874,15 +1874,15 @@ class CParser: token = self.parseBlock(token) else: self.comment = None - while token != None and (token[0] != "sep" or \ + while token is not None and (token[0] != "sep" or \ (token[1] != ';' and token[1] != ',')): token = self.token() self.comment = None - if token == None or token[0] != "sep" or (token[1] != ';' and + if token is None or token[0] != "sep" or (token[1] != ';' and token[1] != ','): self.error("missing ';' or ',' after value") - if token != None and token[0] == "sep": + if token is not None and token[0] == "sep": if token[1] == ";": self.comment = None token = self.token() @@ -1897,7 +1897,7 @@ class CParser: elif token[1] == "(": token = self.token() token = self.parseSignature(token) - if token == None: + if token is None: return None if token[0] == "sep" and token[1] == ";": self.checkLongLegacyFunction(self.name, type, self.signature) @@ -1920,10 +1920,10 @@ class CParser: "variable", type) type = type_orig token = self.token() - while token != None and token[0] == "sep": + while token is not None and token[0] == "sep": type = type + token[1] token = self.token() - if token != None and token[0] == "name": + if token is not None and token[0] == "name": self.name = token[1] token = self.token() else: @@ -1935,7 +1935,7 @@ class CParser: if not quiet: print "Parsing %s" % (self.filename) token = self.token() - while token != None: + while token is not None: if token[0] == 'name': token = self.parseGlobal(token) else: @@ -1977,7 +1977,7 @@ class docBuilder: print >>sys.stderr, "Error:", msg def indexString(self, id, str): - if str == None: + if str is None: return str = string.replace(str, "'", ' ') str = string.replace(str, '"', ' ') @@ -2069,17 +2069,17 @@ class docBuilder: id = self.idx.enums[name] output.write(" <enum name='%s' file='%s'" % (name, self.modulename_file(id.header))) - if id.info != None: + if id.info is not None: info = id.info - if info[0] != None and info[0] != '': + if info[0] is not None and info[0] != '': try: val = eval(info[0]) except: val = info[0] output.write(" value='%s'" % (val)) - if info[2] != None and info[2] != '': + if info[2] is not None and info[2] != '': output.write(" type='%s'" % info[2]) - if info[1] != None and info[1] != '': + if info[1] is not None and info[1] != '': output.write(" info='%s'" % escape(info[1])) output.write("/>\n") @@ -2087,15 +2087,15 @@ class docBuilder: id = self.idx.macros[name] output.write(" <macro name='%s' file='%s'>\n" % (name, self.modulename_file(id.header))) - if id.info != None: + if id.info is not None: try: (args, desc) = id.info - if desc != None and desc != "": + if desc is not None and desc != "": output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) for arg in args: (name, desc) = arg - if desc != None and desc != "": + if desc is not None and desc != "": output.write(" <arg name='%s' info='%s'/>\n" % ( name, escape(desc))) self.indexString(name, desc) @@ -2110,7 +2110,7 @@ class docBuilder: output.write(" <union>\n") for f in field[3]: desc = f[2] - if desc == None: + if desc is None: desc = '' else: desc = escape(desc) @@ -2133,7 +2133,7 @@ class docBuilder: for field in self.idx.structs[name].info: desc = field[2] self.indexString(name, desc) - if desc == None: + if desc is None: desc = '' else: desc = escape(desc) @@ -2151,7 +2151,7 @@ class docBuilder: name, self.modulename_file(id.header), id.info)) try: desc = id.extra - if desc != None and desc != "": + if desc is not None and desc != "": output.write(">\n <info><![CDATA[%s]]></info>\n" % (desc)) output.write(" </typedef>\n") else: @@ -2161,7 +2161,7 @@ class docBuilder: def serialize_variable(self, output, name): id = self.idx.variables[name] - if id.info != None: + if id.info is not None: output.write(" <variable name='%s' file='%s' type='%s'/>\n" % ( name, self.modulename_file(id.header), id.info)) else: @@ -2179,7 +2179,7 @@ class docBuilder: # # Processing of conditionals modified by Bill 1/1/05 # - if id.conditionals != None: + if id.conditionals is not None: apstr = "" for cond in id.conditionals: if apstr != "": @@ -2190,10 +2190,10 @@ class docBuilder: (ret, params, desc) = id.info output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) - if ret[0] != None: + if ret[0] is not None: if ret[0] == "void": output.write(" <return type='void'/>\n") - elif (ret[1] == None or ret[1] == '') and not ignored_functions.has_key(name): + elif (ret[1] is None or ret[1] == '') and not ignored_functions.has_key(name): self.error("Missing documentation for return of function `%s'" % name) else: output.write(" <return type='%s' info='%s'/>\n" % ( @@ -2202,7 +2202,7 @@ class docBuilder: for param in params: if param[0] == 'void': continue - if (param[2] == None or param[2] == ''): + if (param[2] is None or param[2] == ''): if ignored_functions.has_key(name): output.write(" <arg name='%s' type='%s' info=''/>\n" % (param[1], param[0])) else: @@ -2219,7 +2219,7 @@ class docBuilder: module = self.modulename_file(file) output.write(" <file name='%s'>\n" % (module)) dict = self.headers[file] - if dict.info != None: + if dict.info is not None: for data in ('Summary', 'Description', 'Author'): try: output.write(" <%s>%s</%s>\n" % ( @@ -2352,12 +2352,12 @@ class docBuilder: ids.sort() for id in ids: if id[0] != letter: - if letter != None: + if letter is not None: output.write(" </letter>\n") letter = id[0] output.write(" <letter name='%s'>\n" % (letter)) output.write(" <ref name='%s'/>\n" % (id)) - if letter != None: + if letter is not None: output.write(" </letter>\n") def serialize_xrefs_references(self, output): @@ -2383,8 +2383,8 @@ class docBuilder: if len(index[id]) > 30: continue if id[0] != letter: - if letter == None or count > 200: - if letter != None: + if letter is None or count > 200: + if letter is not None: output.write(" </letter>\n") output.write(" </chunk>\n") count = 0 @@ -2392,7 +2392,7 @@ class docBuilder: output.write(" <chunk name='chunk%s'>\n" % (chunk)) first_letter = id[0] chunk = chunk + 1 - elif letter != None: + elif letter is not None: output.write(" </letter>\n") letter = id[0] output.write(" <letter name='%s'>\n" % (letter)) @@ -2407,7 +2407,7 @@ class docBuilder: output.write(" <ref name='%s'/>\n" % (token)) count = count + 1 output.write(" </word>\n") - if letter != None: + if letter is not None: output.write(" </letter>\n") output.write(" </chunk>\n") if count != 0: diff --git a/docs/index.py b/docs/index.py index ce5180f..2f0ad26 100755 --- a/docs/index.py +++ b/docs/index.py @@ -127,9 +127,9 @@ DB=None def createTable(db, name): global TABLES - if db == None: + if db is None: return -1 - if name == None: + if name is None: return -1 c = db.cursor() @@ -147,7 +147,7 @@ def createTable(db, name): def checkTables(db, verbose = 1): global TABLES - if db == None: + if db is None: return -1 c = db.cursor() nbtables = c.execute("show tables") @@ -191,7 +191,7 @@ def checkTables(db, verbose = 1): def openMySQL(db="libvir", passwd=None, verbose = 1): global DB - if passwd == None: + if passwd is None: try: passwd = os.environ["MySQL_PASS"] except: @@ -199,7 +199,7 @@ def openMySQL(db="libvir", passwd=None, verbose = 1): sys.exit(1) DB = MySQLdb.connect(passwd=passwd, db=db) - if DB == None: + if DB is None: return -1 ret = checkTables(DB, verbose) return ret @@ -207,13 +207,13 @@ def openMySQL(db="libvir", passwd=None, verbose = 1): def updateWord(name, symbol, relevance): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if symbol == None: + if symbol is None: return -1 c = DB.cursor() @@ -238,15 +238,15 @@ def updateSymbol(name, module, type, desc): global DB updateWord(name, name, 50) - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if module == None: + if module is None: return -1 - if type == None: + if type is None: return -1 try: @@ -299,11 +299,11 @@ def addFunctype(name, module, desc = ""): def addPage(resource, title): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if resource == None: + if resource is None: return -1 c = DB.cursor() @@ -327,17 +327,17 @@ def addPage(resource, title): def updateWordHTML(name, resource, desc, id, relevance): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if resource == None: + if resource is None: return -1 - if id == None: + if id is None: id = "" - if desc == None: + if desc is None: desc = "" else: try: @@ -367,11 +367,11 @@ def updateWordHTML(name, resource, desc, id, relevance): def checkXMLMsgArchive(url): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if url == None: + if url is None: return -1 c = DB.cursor() @@ -379,7 +379,7 @@ def checkXMLMsgArchive(url): ret = c.execute( """SELECT ID FROM archives WHERE resource='%s'""" % (url)) row = c.fetchone() - if row == None: + if row is None: return -1 except: return -1 @@ -389,13 +389,13 @@ def checkXMLMsgArchive(url): def addXMLMsgArchive(url, title): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if url == None: + if url is None: return -1 - if title == None: + if title is None: title = "" else: title = string.replace(title, "'", " ") @@ -408,7 +408,7 @@ def addXMLMsgArchive(url, title): cmd = """SELECT ID FROM archives WHERE resource='%s'""" % (url) ret = c.execute(cmd) row = c.fetchone() - if row == None: + if row is None: print "addXMLMsgArchive failed to get the ID: %s" % (url) return -1 except: @@ -420,13 +420,13 @@ def addXMLMsgArchive(url, title): def updateWordArchive(name, id, relevance): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if id == None: + if id is None: return -1 c = DB.cursor() @@ -533,9 +533,9 @@ def splitIdentifier(str): def addWord(word, module, symbol, relevance): global wordsDict - if word == None or len(word) < 3: + if word is None or len(word) < 3: return -1 - if module == None or symbol == None: + if module is None or symbol is None: return -1 if dropWords.has_key(word): return 0 @@ -544,7 +544,7 @@ def addWord(word, module, symbol, relevance): if wordsDict.has_key(word): d = wordsDict[word] - if d == None: + if d is None: return 0 if len(d) > 500: wordsDict[word] = None @@ -559,7 +559,7 @@ def addWord(word, module, symbol, relevance): return relevance def addString(str, module, symbol, relevance): - if str == None or len(str) < 3: + if str is None or len(str) < 3: return -1 ret = 0 str = cleanupWordsString(str) @@ -573,9 +573,9 @@ def addString(str, module, symbol, relevance): def addWordHTML(word, resource, id, section, relevance): global wordsDictHTML - if word == None or len(word) < 3: + if word is None or len(word) < 3: return -1 - if resource == None or section == None: + if resource is None or section is None: return -1 if dropWords.has_key(word): return 0 @@ -586,14 +586,14 @@ def addWordHTML(word, resource, id, section, relevance): if wordsDictHTML.has_key(word): d = wordsDictHTML[word] - if d == None: + if d is None: print "skipped %s" % (word) return 0 try: (r,i,s) = d[resource] - if i != None: + if i is not None: id = i - if s != None: + if s is not None: section = s relevance = relevance + r except: @@ -605,7 +605,7 @@ def addWordHTML(word, resource, id, section, relevance): return relevance def addStringHTML(str, resource, id, section, relevance): - if str == None or len(str) < 3: + if str is None or len(str) < 3: return -1 ret = 0 str = cleanupWordsString(str) @@ -626,9 +626,9 @@ def addStringHTML(str, resource, id, section, relevance): def addWordArchive(word, id, relevance): global wordsDictArchive - if word == None or len(word) < 3: + if word is None or len(word) < 3: return -1 - if id == None or id == -1: + if id is None or id == -1: return -1 if dropWords.has_key(word): return 0 @@ -637,7 +637,7 @@ def addWordArchive(word, id, relevance): if wordsDictArchive.has_key(word): d = wordsDictArchive[word] - if d == None: + if d is None: print "skipped %s" % (word) return 0 try: @@ -652,7 +652,7 @@ def addWordArchive(word, id, relevance): return relevance def addStringArchive(str, id, relevance): - if str == None or len(str) < 3: + if str is None or len(str) < 3: return -1 ret = 0 str = cleanupWordsString(str) @@ -683,9 +683,9 @@ def loadAPI(filename): return doc def foundExport(file, symbol): - if file == None: + if file is None: return 0 - if symbol == None: + if symbol is None: return 0 addFunction(symbol, file) l = splitIdentifier(symbol) @@ -697,7 +697,7 @@ def analyzeAPIFile(top): count = 0 name = top.prop("name") cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -712,7 +712,7 @@ def analyzeAPIFiles(top): count = 0 cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -725,10 +725,10 @@ def analyzeAPIFiles(top): def analyzeAPIEnum(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addEnum(symbol, file) @@ -740,10 +740,10 @@ def analyzeAPIEnum(top): def analyzeAPIConst(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addConst(symbol, file) @@ -755,10 +755,10 @@ def analyzeAPIConst(top): def analyzeAPIType(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addType(symbol, file) @@ -769,10 +769,10 @@ def analyzeAPIType(top): def analyzeAPIFunctype(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addFunctype(symbol, file) @@ -783,10 +783,10 @@ def analyzeAPIFunctype(top): def analyzeAPIStruct(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addStruct(symbol, file) @@ -795,7 +795,7 @@ def analyzeAPIStruct(top): addWord(word, file, symbol, 10) info = top.prop("info") - if info != None: + if info is not None: info = string.replace(info, "'", " ") info = string.strip(info) l = string.split(info) @@ -806,17 +806,17 @@ def analyzeAPIStruct(top): def analyzeAPIMacro(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 symbol = string.replace(symbol, "'", " ") symbol = string.strip(symbol) info = None cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -829,7 +829,7 @@ def analyzeAPIMacro(top): for word in l: addWord(word, file, symbol, 10) - if info == None: + if info is None: addMacro(symbol, file) print "Macro %s description has no <info>" % (symbol) return 0 @@ -845,17 +845,17 @@ def analyzeAPIMacro(top): def analyzeAPIFunction(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 symbol = string.replace(symbol, "'", " ") symbol = string.strip(symbol) info = None cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -863,23 +863,23 @@ def analyzeAPIFunction(top): info = cur.content elif cur.name == "return": rinfo = cur.prop("info") - if rinfo != None: + if rinfo is not None: rinfo = string.replace(rinfo, "'", " ") rinfo = string.strip(rinfo) addString(rinfo, file, symbol, 7) elif cur.name == "arg": ainfo = cur.prop("info") - if ainfo != None: + if ainfo is not None: ainfo = string.replace(ainfo, "'", " ") ainfo = string.strip(ainfo) addString(ainfo, file, symbol, 5) name = cur.prop("name") - if name != None: + if name is not None: name = string.replace(name, "'", " ") name = string.strip(name) addWord(name, file, symbol, 7) cur = cur.next - if info == None: + if info is None: print "Function %s description has no <info>" % (symbol) addFunction(symbol, file, "") else: @@ -898,7 +898,7 @@ def analyzeAPISymbols(top): count = 0 cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -923,14 +923,14 @@ def analyzeAPISymbols(top): def analyzeAPI(doc): count = 0 - if doc == None: + if doc is None: return -1 root = doc.getRootElement() if root.name != "api": print "Unexpected root name" return -1 cur = root.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -1056,7 +1056,7 @@ def analyzeHTMLPages(): import time def getXMLDateArchive(t = None): - if t == None: + if t is None: t = time.time() T = time.gmtime(t) month = time.strftime("%B", T) @@ -1065,7 +1065,7 @@ def getXMLDateArchive(t = None): return url def scanXMLMsgArchive(url, title, force = 0): - if url == None or title == None: + if url is None or title is None: return 0 ID = checkXMLMsgArchive(url) @@ -1082,7 +1082,7 @@ def scanXMLMsgArchive(url, title, force = 0): doc = libxml2.htmlParseFile(url, None) except: doc = None - if doc == None: + if doc is None: print "Failed to parse %s" % (url) return 0 @@ -1105,7 +1105,7 @@ def scanXMLDateArchive(t = None, force = 0): doc = libxml2.htmlParseFile(url, None) except: doc = None - if doc == None: + if doc is None: print "Failed to parse %s" % (url) return -1 ctxt = doc.xpathNewContext() @@ -1114,16 +1114,16 @@ def scanXMLDateArchive(t = None, force = 0): newmsg = 0 for anchor in anchors: href = anchor.prop("href") - if href == None or href[0:3] != "msg": + if href is None or href[0:3] != "msg": continue try: links = links + 1 msg = libxml2.buildURI(href, url) title = anchor.content - if title != None and title[0:4] == 'Re: ': + if title is not None and title[0:4] == 'Re: ': title = title[4:] - if title != None and title[0:6] == '[xml] ': + if title is not None and title[0:6] == '[xml] ': title = title[6:] newmsg = newmsg + scanXMLMsgArchive(msg, title, force) @@ -1148,7 +1148,7 @@ def analyzeArchives(t = None, force = 0): skipped = 0 for word in wordsDictArchive.keys(): refs = wordsDictArchive[word] - if refs == None: + if refs is None: skipped = skipped + 1 continue for id in refs.keys(): @@ -1168,7 +1168,7 @@ def analyzeHTMLTop(): skipped = 0 for word in wordsDictHTML.keys(): refs = wordsDictHTML[word] - if refs == None: + if refs is None: skipped = skipped + 1 continue for resource in refs.keys(): @@ -1197,7 +1197,7 @@ def analyzeAPITop(): skipped = 0 for word in wordsDict.keys(): refs = wordsDict[word] - if refs == None: + if refs is None: skipped = skipped + 1 continue for (module, symbol) in refs.keys(): diff --git a/examples/python/consolecallback.py b/examples/python/consolecallback.py index 23316ce..d8e33a9 100644 --- a/examples/python/consolecallback.py +++ b/examples/python/consolecallback.py @@ -29,7 +29,7 @@ class Console(object): def check_console(console): if (console.state[0] == libvirt.VIR_DOMAIN_RUNNING or console.state[0] == libvirt.VIR_DOMAIN_PAUSED): - if console.stream == None: + if console.stream is None: console.stream = console.connection.newStream(libvirt.VIR_STREAM_NONBLOCK) console.domain.openConsole(None, console.stream, 0) console.stream.eventAddCallback(libvirt.VIR_STREAM_EVENT_READABLE, stream_callback, console) diff --git a/examples/python/dominfo.py b/examples/python/dominfo.py index 0d3238b..bfa3ca3 100755 --- a/examples/python/dominfo.py +++ b/examples/python/dominfo.py @@ -35,7 +35,7 @@ name = sys.argv[1] # Connect to libvirt conn = libvirt.openReadOnly(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) diff --git a/examples/python/domrestore.py b/examples/python/domrestore.py index ccc82f6..fffc90f 100755 --- a/examples/python/domrestore.py +++ b/examples/python/domrestore.py @@ -21,7 +21,7 @@ dir = sys.argv[1] imgs = os.listdir(dir) conn = libvirt.open(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) diff --git a/examples/python/domsave.py b/examples/python/domsave.py index 12ffac1..bac4536 100755 --- a/examples/python/domsave.py +++ b/examples/python/domsave.py @@ -19,7 +19,7 @@ if len(sys.argv) != 2: dir = sys.argv[1] conn = libvirt.open(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) diff --git a/examples/python/domstart.py b/examples/python/domstart.py index b1e89b8..b14fad1 100755 --- a/examples/python/domstart.py +++ b/examples/python/domstart.py @@ -33,7 +33,7 @@ if len(sys.argv) != 2: (name, xmldesc) = read_domain(sys.argv[1]) conn = libvirt.open(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) @@ -43,7 +43,7 @@ except libvirt.libvirtError: print "Starting domain %s ... " % name, sys.stdout.flush() dom = conn.createLinux(xmldesc, 0) - if dom == None: + if dom is None: print "failed" sys.exit(1) else: diff --git a/python/generator.py b/python/generator.py index 427cebc..6c7414a 100755 --- a/python/generator.py +++ b/python/generator.py @@ -136,7 +136,7 @@ class docParser(xml.sax.handler.ContentHandler): print "end %s" % tag if tag == 'function': # fuctions come from source files, hence 'virerror.c' - if self.function != None: + if self.function is not None: if (self.function_module == "libvirt" or self.function_module == "virevent" or self.function_module == "virerror"): @@ -641,9 +641,9 @@ def print_function_wrapper(module, name, output, export, include): (f, t, n, c) = py_types[arg[1]] if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0): f = 't#' - if f != None: + if f is not None: format = format + f - if t != None: + if t is not None: format_args = format_args + ", &pyobj_%s" % (arg[0]) c_args = c_args + " PyObject *pyobj_%s;\n" % (arg[0]) c_convert = c_convert + \ @@ -686,7 +686,7 @@ def print_function_wrapper(module, name, output, export, include): elif py_types.has_key(ret[0]): (f, t, n, c) = py_types[ret[0]] c_return = " %s c_retval;\n" % (ret[0]) - if file == "python_accessor" and ret[2] != None: + if file == "python_accessor" and ret[2] is not None: c_call = "\n c_retval = %s->%s;\n" % (args[0][0], ret[2]) else: c_call = "\n c_retval = %s(%s);\n" % (name, c_call) @@ -708,7 +708,7 @@ def print_function_wrapper(module, name, output, export, include): unknown_types[ret[0]] = [name] return -1 - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#if %s\n" % cond) export.write("#if %s\n" % cond) output.write("#if %s\n" % cond) @@ -729,14 +729,14 @@ def print_function_wrapper(module, name, output, export, include): if file == "python": # Those have been manually generated - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#endif\n") export.write("#endif\n") output.write("#endif\n") return 1 if file == "python_accessor" and ret[0] != "void" and ret[2] is None: # Those have been manually generated - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#endif\n") export.write("#endif\n") output.write("#endif\n") @@ -771,7 +771,7 @@ def print_function_wrapper(module, name, output, export, include): output.write(" LIBVIRT_END_ALLOW_THREADS;\n") output.write(ret_convert) output.write("}\n\n") - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#endif /* %s */\n" % cond) export.write("#endif /* %s */\n" % cond) output.write("#endif /* %s */\n" % cond) @@ -1313,7 +1313,7 @@ def buildWrappers(module): classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") classes.write("#\n") - if extra != None: + if extra is not None: classes.writelines(extra.readlines()) classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") @@ -1321,7 +1321,7 @@ def buildWrappers(module): classes.write("# Automatically written part of python bindings for libvirt\n") classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") - if extra != None: + if extra is not None: extra.close() if function_classes.has_key("None"): @@ -1460,7 +1460,7 @@ def buildWrappers(module): destruct=None if classes_destructors.has_key(classname): classes.write(" def __del__(self):\n") - classes.write(" if self._o != None:\n") + classes.write(" if self._o is not None:\n") classes.write(" libvirtmod.%s(self._o)\n" % classes_destructors[classname]) classes.write(" self._o = None\n\n") @@ -1776,7 +1776,7 @@ def qemuBuildWrappers(module): fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") fd.write("#\n") - if extra != None: + if extra is not None: fd.writelines(extra.readlines()) fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") @@ -1784,7 +1784,7 @@ def qemuBuildWrappers(module): fd.write("# Automatically written part of python bindings for libvirt\n") fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") - if extra != None: + if extra is not None: extra.close() fd.write("try:\n") @@ -1888,7 +1888,7 @@ def lxcBuildWrappers(module): fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") fd.write("#\n") - if extra != None: + if extra is not None: fd.writelines(extra.readlines()) fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") @@ -1896,7 +1896,7 @@ def lxcBuildWrappers(module): fd.write("# Automatically written part of python bindings for libvirt\n") fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") - if extra != None: + if extra is not None: extra.close() fd.write("try:\n") diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 044faa0..4ba3d30 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -7,7 +7,7 @@ except AttributeError: pass - if self._o != None: + if self._o is not None: libvirtmod.virConnectClose(self._o) self._o = None diff --git a/python/libvirt-override-virStream.py b/python/libvirt-override-virStream.py index b5cec2a..53000da 100644 --- a/python/libvirt-override-virStream.py +++ b/python/libvirt-override-virStream.py @@ -5,7 +5,7 @@ except AttributeError: pass - if self._o != None: + if self._o is not None: libvirtmod.virStreamFree(self._o) self._o = None @@ -103,7 +103,7 @@ the request would block, integer -2 is returned. """ ret = libvirtmod.virStreamRecv(self._o, nbytes) - if ret == None: raise libvirtError ('virStreamRecv() failed') + if ret is None: raise libvirtError ('virStreamRecv() failed') return ret def send(self, data): -- 1.7.9.5

2 2