- Devel - libvirt List Archives

[libvirt] [PATCH] esx: Gather some XML generation macros in esx_vi.h
by Matthias Bolte 21 Apr '10

21 Apr '10

--- src/esx/esx_vi.c | 27 ++------------------------- src/esx/esx_vi.h | 37 +++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_methods.c | 17 ----------------- src/esx/esx_vi_types.c | 20 -------------------- 4 files changed, 39 insertions(+), 62 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index c6854f1..e405c80 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -38,38 +38,13 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_VI__SOAP__REQUEST_HEADER \ - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ - "<soapenv:Envelope " \ - "xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " \ - "xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " \ - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \ - "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" \ - "<soapenv:Body>" - -#define ESX_VI__SOAP__REQUEST_FOOTER \ - "</soapenv:Body>" \ - "</soapenv:Envelope>" + #define ESX_VI__SOAP__RESPONSE_XPATH(_type) \ ((char *)"/soapenv:Envelope/soapenv:Body/" \ "vim:"_type"Response/vim:returnval") -#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ - do { \ - virBufferAddLit(_buffer, "<"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ - virBufferAdd(_buffer, _type, -1); \ - virBufferAddLit(_buffer, "\">"); \ - } while (0) - -#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ - do { \ - virBufferAddLit(_buffer, "</"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, ">"); \ - } while (0) + #define ESX_VI__TEMPLATE__ALLOC(_type) \ int \ @@ -78,6 +53,8 @@ return esxVI_Alloc((void **)ptrptr, sizeof(esxVI_##_type)); \ } + + #define ESX_VI__TEMPLATE__FREE(_type, _body) \ void \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a3d9363..e0d731e 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -40,6 +40,43 @@ +#define ESX_VI__SOAP__REQUEST_HEADER \ + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ + "<soapenv:Envelope\n" \ + " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" \ + " xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"\n" \ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \ + " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" \ + "<soapenv:Body>\n" + + + +#define ESX_VI__SOAP__REQUEST_FOOTER \ + "</soapenv:Body>\n" \ + "</soapenv:Envelope>" + + + +#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ + do { \ + virBufferAddLit(_buffer, "<"); \ + virBufferAdd(_buffer, _element, -1); \ + virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ + virBufferAdd(_buffer, _type, -1); \ + virBufferAddLit(_buffer, "\">"); \ + } while (0) + + + +#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ + do { \ + virBufferAddLit(_buffer, "</"); \ + virBufferAdd(_buffer, _element, -1); \ + virBufferAddLit(_buffer, ">"); \ + } while (0) + + + typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index 5c52167..8f841e3 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -34,23 +34,6 @@ -#define ESX_VI__SOAP__REQUEST_HEADER \ - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ - "<soapenv:Envelope " \ - "xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " \ - "xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " \ - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \ - "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" \ - "<soapenv:Body>" - - - -#define ESX_VI__SOAP__REQUEST_FOOTER \ - "</soapenv:Body>" \ - "</soapenv:Envelope>" - - - #define ESX_VI__METHOD__CHECK_OUTPUT__None \ /* nothing */ diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index ed4674b..7d2c02c 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -39,26 +39,6 @@ -#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ - do { \ - virBufferAddLit(_buffer, "<"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ - virBufferAdd(_buffer, _type, -1); \ - virBufferAddLit(_buffer, "\">"); \ - } while (0) - - - -#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ - do { \ - virBufferAddLit(_buffer, "</"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, ">"); \ - } while (0) - - - #define ESX_VI__TEMPLATE__ALLOC(__type) \ int \ esxVI_##__type##_Alloc(esxVI_##__type **ptrptr) \ -- 1.6.3.3

2 3

[libvirt] [RFC PATCH] Support for qemu aio drive option
by Matthias Dahl 21 Apr '10

21 Apr '10

This is a "quick" implementation to support the qemu aio drive option. I tried to stay true to the coding style and this has been tested w/ libvirt 0.7.6 and works just fine. Since I am not that familiar w/ the inner workings of libvirt, I am sure I missed a few spots, so I hope either someone will base his work on this patch or point me into the right direction so I can finish this up for good. :-) For everyone else, enjoy... --- src/conf/domain_conf.c | 23 +++++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ 4 files changed, 49 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 766993c..8bee7b8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -120,6 +120,11 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback") +VIR_ENUM_IMPL(virDomainDiskAIO, VIR_DOMAIN_DISK_AIO_LAST, + "default", + "native", + "threads") + VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "ide", "fdc", @@ -1228,6 +1233,7 @@ virDomainDiskDefParseXML(virConnectPtr conn, char *target = NULL; char *bus = NULL; char *cachetag = NULL; + char *aiotag = NULL; char *devaddr = NULL; virStorageEncryptionPtr encryption = NULL; char *serial = NULL; @@ -1293,6 +1299,7 @@ virDomainDiskDefParseXML(virConnectPtr conn, driverName = virXMLPropString(cur, "name"); driverType = virXMLPropString(cur, "type"); cachetag = virXMLPropString(cur, "cache"); + aiotag = virXMLPropString(cur, "aio"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -1409,6 +1416,13 @@ virDomainDiskDefParseXML(virConnectPtr conn, goto error; } + if (aiotag && + (def->aiomode = virDomainDiskAIOTypeFromString(aiotag)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown disk aio mode '%s'"), aiotag); + goto error; + } + if (devaddr) { if (sscanf(devaddr, "%x:%x:%x", &def->info.addr.pci.domain, @@ -1450,6 +1464,7 @@ cleanup: VIR_FREE(driverType); VIR_FREE(driverName); VIR_FREE(cachetag); + VIR_FREE(aiotag); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -4565,6 +4580,7 @@ virDomainDiskDefFormat(virConnectPtr conn, const char *device = virDomainDiskDeviceTypeToString(def->device); const char *bus = virDomainDiskBusTypeToString(def->bus); const char *cachemode = virDomainDiskCacheTypeToString(def->cachemode); + const char *aiomode = virDomainDiskAIOTypeToString(def->aiomode); if (!type) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, @@ -4586,6 +4602,11 @@ virDomainDiskDefFormat(virConnectPtr conn, _("unexpected disk cache mode %d"), def- >cachemode); return -1; } + if (!aiomode) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected disk aio mode %d"), def->aiomode); + return -1; + } virBufferVSprintf(buf, " <disk type='%s' device='%s'>\n", @@ -4597,6 +4618,8 @@ virDomainDiskDefFormat(virConnectPtr conn, virBufferVSprintf(buf, " type='%s'", def->driverType); if (def->cachemode) virBufferVSprintf(buf, " cache='%s'", cachemode); + if (def->aiomode) + virBufferVSprintf(buf, " aio='%s'", aiomode); virBufferVSprintf(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0b79e88..07805a6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -141,6 +141,14 @@ enum virDomainDiskCache { VIR_DOMAIN_DISK_CACHE_LAST }; +enum virDomainDiskAIO { + VIR_DOMAIN_DISK_AIO_DEFAULT, + VIR_DOMAIN_DISK_AIO_NATIVE, + VIR_DOMAIN_DISK_AIO_THREADS, + + VIR_DOMAIN_DISK_AIO_LAST +}; + /* Stores the virtual disk configuration */ typedef struct _virDomainDiskDef virDomainDiskDef; typedef virDomainDiskDef *virDomainDiskDefPtr; @@ -154,6 +162,7 @@ struct _virDomainDiskDef { char *driverType; char *serial; int cachemode; + int aiomode; unsigned int readonly : 1; unsigned int shared : 1; virDomainDeviceInfo info; @@ -897,6 +906,7 @@ VIR_ENUM_DECL(virDomainDisk) VIR_ENUM_DECL(virDomainDiskDevice) VIR_ENUM_DECL(virDomainDiskBus) VIR_ENUM_DECL(virDomainDiskCache) +VIR_ENUM_DECL(virDomainDiskAIO) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainNet) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3d83a8f..fd3a670 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -83,6 +83,12 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback"); +VIR_ENUM_DECL(qemuDiskAIO) +VIR_ENUM_IMPL(qemuDiskAIO, VIR_DOMAIN_DISK_AIO_LAST, + "default", + "native", + "threads"); + VIR_ENUM_DECL(qemuVideo) VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, @@ -1137,6 +1143,8 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_DRIVE_CACHE_V2; if (strstr(help, "format=")) flags |= QEMUD_CMD_FLAG_DRIVE_FORMAT; + if (strstr(help, "aio=threads|native")) + flags |= QEMUD_CMD_FLAG_DRIVE_AIO; } if (strstr(help, "-vga") && !strstr(help, "-std-vga")) flags |= QEMUD_CMD_FLAG_VGA; @@ -2340,6 +2348,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAddLit(&opt, ",cache=off"); } + if (disk->aiomode && (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_AIO)) { + const char * mode = qemuDiskAIOTypeToString(disk->aiomode); + + virBufferVSprintf(&opt, ",aio=%s", mode); + } + if (virBufferError(&opt)) { virReportOOMError(NULL); goto error; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 101f187..780ae6e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -82,6 +82,8 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_SDL = (1 << 27), /* Is the new -sdl arg available */ QEMUD_CMD_FLAG_SMP_TOPOLOGY = (1 << 28), /* Is sockets=s,cores=c,threads=t available for -smp? */ QEMUD_CMD_FLAG_NETDEV = (1 << 29), /* The -netdev flag & netdev_add/remove monitor commands */ + + QEMUD_CMD_FLAG_DRIVE_AIO = (1 << 30), /* Is -drive aio= avail */ }; /* Main driver state */ -- 1.7.0.4

3 4

[libvirt] New VM Snapshot API Not working
by Tej Parkash, ERS, HCLTech 21 Apr '10

21 Apr '10

All, I have compiled new libvirt library 0.8.0. Compilation and installation went really fine except "make check" which has show some test got failed. Here is what make check said. Failed Test: ---------------snip----------- PASS: statstest TEST: qparamtest ................................ 32 OK PASS: qparamtest TEST: capabilityschematest !!!!!!!!!!!! 12 FAILED FAIL: capabilityschematest TEST: interfaceschematest !!!!!!!!!!!!!!!!!! 18 FAILED FAIL: interfaceschematest TEST: networkschematest !!!!!!!!!!! 11 FAILED FAIL: networkschematest TEST: storagepoolschematest !!!!!!!!!!!!!!!!!!!! 20 FAILED FAIL: storagepoolschematest TEST: storagevolschematest !!!!!!!!!!!! 12 FAILED FAIL: storagevolschematest TEST: domainschematest !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 40 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 80 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 120 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 160 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 200 !! 202 FAILED FAIL: domainschematest TEST: nodedevschematest !!!!!!!!!!!!!! 14 FAILED FAIL: nodedevschematest TEST: nwfilterschematest !!!!!!!!!!!!!!!!!!!!!!!!!!! 27 FAILED FAIL: nwfilterschematest TEST: test_conf.sh .. 2 OK ---------------- snip --------------------------- ==================== 9 of 40 tests failed ==================== make[3]: *** [check-TESTS] Error 1 make[3]: Leaving directory `/tmp/libvirt-0.8.0/tests' make[2]: *** [check-am] Error 2 make[2]: Leaving directory `/tmp/libvirt-0.8.0/tests' make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory `/tmp/libvirt-0.8.0/tests' make: *** [check-recursive] Error 1 ------------------------------------------------------------------------- However installation went fine. After I started create some snapshot, I am getting some remote error: root@hcl:~# xm li Name ID Mem VCPUs State Time(s) Domain-0 0 622 2 r----- 1755.3 Test 3 256 1 -b---- 4.4 root@hcl:~# virsh snapshot-create 3 error: unmarshalling remote_error root@hcl:~# virsh snapshot-create 3 test.xml error: unmarshalling remote_error I have even written a C code with API's but same problem. Here is livirt version n all root@hcl:/tmp/libvirt-0.8.0# libvirtd --version libvirtd (libvirt) 0.8.0 root@hcl:/tmp/libvirt-0.8.0# virsh -v 0.8.0 root@hcl:/tmp/libvirt-0.8.0# Any Idea???????????????? Any suggestion???????/ Thanks Tej DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or HCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of HCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. Before opening any mail and attachments please check them for viruses and defect. -----------------------------------------------------------------------------------------------------------------------

3 4

[libvirt] Bug with creating snapshots in ESX in 0.8.0 (patch included)
by Chris Wong 21 Apr '10

21 Apr '10

I was testing out the new snapshot on functionality with GSX (VMWare Server 2.0.2) and noticed that it would fail to create a snapshot on a VM with no snapshots. I tracked it down to the esxDomainSnapshotCreateXML call, which would prematurely fail if the Root Snapshot Tree was empty -- which it would be. Verified that both ESXi 4.0 and GSX return an empty snapshot tree. I don't feel this should be an error, and it prevents snapshots from being created. I don't think I saw a fix for this in the master git branch. I'm not too sure if this is the proper path to go down, but at the very least it fixes my specific problem. If there is another fix or if I completely missed this point, let me know. diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fea887a..70bfc2c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3330,12 +3330,16 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, (priv->host, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || esxVI_LookupRootSnapshotTreeList(priv->host, domain->uuid, - &rootSnapshotList) < 0 || - esxVI_GetSnapshotTreeByName(rootSnapshotList, def->name, - &snapshotTree, &snapshotTreeParent, - esxVI_Occurrence_OptionalItem) < 0) { + &rootSnapshotList) < 0) { goto failure; } + if (rootSnapshotList) { + if (esxVI_GetSnapshotTreeByName(rootSnapshotList, def->name, + &snapshotTree, &snapshotTreeParent, + esxVI_Occurrence_OptionalItem) < 0) { + goto failure; + } + } if (snapshotTree != NULL) { ESX_ERROR(VIR_ERR_OPERATION_INVALID, diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 89ef2dd..93ef36b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2561,12 +2561,6 @@ esxVI_LookupRootSnapshotTreeList } } - if (*rootSnapshotTreeList == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not lookup root snapshot list")); - goto failure; - } - cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine);

2 2

[libvirt] iface-list command in virsh
by Dev.Atom 21 Apr '10

21 Apr '10

Hi, I'm trying to list physical interface of a remote tcp host via the C API and it fails. I have tried to use virsh iface-list in remote TCP connection and it fails also. I have trying on the libvirt host with my normal account and it fails also, but when I connect under root account on the libvirt host, iface-list works. Any clue ? Best regards, Arnaud Champion

4 8

[libvirt] [PATCH] esx: Fix FindByIp response handling
by Matthias Bolte 21 Apr '10

21 Apr '10

FindByIp may return nothing if there is no host or virtual machine with the given IP address. Handle that case properly. --- src/esx/esx_vi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 37270fe..c6854f1 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1968,6 +1968,13 @@ esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, goto failure; } + if (managedObjectReference == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system with IP address '%s'"), + ipAddress); + goto failure; + } + if (esxVI_LookupObjectContentByType(ctx, managedObjectReference, "HostSystem", propertyNameList, esxVI_Boolean_False, hostSystem) < 0) { -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Fix virtualHW.version generation
by Matthias Bolte 21 Apr '10

21 Apr '10

The supported virtualHW.version doesn't depend on the API version, but on the product version. --- src/esx/esx_driver.c | 8 ++-- src/esx/esx_vmx.c | 46 +++++++++++++------------- src/esx/esx_vmx.h | 4 +- tests/vmx2xmltest.c | 85 +++++++++++++++++++++++++------------------------ tests/xml2vmxtest.c | 73 ++++++++++++++++++++++--------------------- 5 files changed, 109 insertions(+), 107 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 97c1645..c0c3195 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2145,7 +2145,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) } def = esxVMX_ParseConfig(priv->host, vmx, datastoreName, directoryName, - priv->host->apiVersion); + priv->host->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, flags); @@ -2188,7 +2188,7 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, } def = esxVMX_ParseConfig(priv->host, nativeConfig, "?", "?", - priv->host->apiVersion); + priv->host->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE); @@ -2222,7 +2222,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, return NULL; } - vmx = esxVMX_FormatConfig(priv->host, def, priv->host->apiVersion); + vmx = esxVMX_FormatConfig(priv->host, def, priv->host->productVersion); virDomainDefFree(def); @@ -2445,7 +2445,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Build VMX from domain XML */ - vmx = esxVMX_FormatConfig(priv->host, def, priv->host->apiVersion); + vmx = esxVMX_FormatConfig(priv->host, def, priv->host->productVersion); if (vmx == NULL) { goto failure; diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c2e9be6..84c4aef 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -724,7 +724,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, virDomainDefPtr esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, const char *datastoreName, const char *directoryName, - esxVI_APIVersion apiVersion) + esxVI_ProductVersion productVersion) { virConfPtr conf = NULL; virDomainDefPtr def = NULL; @@ -774,42 +774,41 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, goto failure; } - switch (apiVersion) { - case esxVI_APIVersion_25: + /* + * virtualHW.version compatibility matrix: + * + * 4 7 API + * ESX 3.5 + 2.5 + * ESX 4.0 + + 4.0 + * GSX 2.0 + + 2.5 + */ + switch (productVersion) { + case esxVI_ProductVersion_ESX35: if (virtualHW_version != 4) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4 for " - "VI API version 2.5 but found %lld"), + _("Expecting VMX entry 'virtualHW.version' to be 4 " + "but found %lld"), virtualHW_version); goto failure; } break; - case esxVI_APIVersion_40: + case esxVI_ProductVersion_GSX20: + case esxVI_ProductVersion_ESX40: if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " - "for VI API version 4.0 but found %lld"), + "but found %lld"), virtualHW_version); goto failure; } break; - case esxVI_APIVersion_Unknown: - if (virtualHW_version != 4 && virtualHW_version != 7) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " - "but found %lld"), virtualHW_version); - goto failure; - } - - break; - default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting VI API version 2.5 or 4.0")); + _("Unexpected product version")); goto failure; } @@ -2189,7 +2188,7 @@ esxVMX_FormatFileName(esxVI_Context *ctx ATTRIBUTE_UNUSED, const char *src) char * esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, - esxVI_APIVersion apiVersion) + esxVI_ProductVersion productVersion) { int i; int sched_cpu_affinity_length; @@ -2210,18 +2209,19 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, virBufferAddLit(&buffer, "config.version = \"8\"\n"); /* vmx:virtualHW.version */ - switch (apiVersion) { - case esxVI_APIVersion_25: + switch (productVersion) { + case esxVI_ProductVersion_ESX35: virBufferAddLit(&buffer, "virtualHW.version = \"4\"\n"); break; - case esxVI_APIVersion_40: + case esxVI_ProductVersion_GSX20: + case esxVI_ProductVersion_ESX40: virBufferAddLit(&buffer, "virtualHW.version = \"7\"\n"); break; default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting VI API version 2.5 or 4.0")); + _("Unexpected product version")); goto failure; } diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index c07f8b3..081b67d 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -58,7 +58,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, virDomainDefPtr esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, const char *datastoreName, const char *directoryName, - esxVI_APIVersion apiVersion); + esxVI_ProductVersion productVersion); int esxVMX_ParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def); @@ -96,7 +96,7 @@ esxVMX_FormatFileName(esxVI_Context *ctx, const char *src); char * esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, - esxVI_APIVersion apiVersion); + esxVI_ProductVersion productVersion); int esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer); diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index f3b3b5e..12229b9 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -17,7 +17,8 @@ static char *abs_srcdir = NULL; # define MAX_FILE 4096 static int -testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) +testCompareFiles(const char *vmx, const char *xml, + esxVI_ProductVersion productVersion) { int result = -1; char vmxData[MAX_FILE]; @@ -37,7 +38,7 @@ testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) } def = esxVMX_ParseConfig(NULL, vmxData, "datastore", "directory", - apiVersion); + productVersion); if (def == NULL) { err = virGetLastError(); @@ -70,7 +71,7 @@ testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) struct testInfo { const char *input; const char *output; - esxVI_APIVersion version; + esxVI_ProductVersion version; }; static int @@ -112,7 +113,7 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } -# define DO_TEST(_in, _out, _version) \ +# define DO_TEST(_in, _out, _version) \ do { \ struct testInfo info = { _in, _out, _version }; \ virResetLastError(); \ @@ -122,57 +123,57 @@ mymain(int argc, char **argv) } \ } while (0) - DO_TEST("case-insensitive-1", "case-insensitive-1", esxVI_APIVersion_25); - DO_TEST("case-insensitive-2", "case-insensitive-2", esxVI_APIVersion_25); + DO_TEST("case-insensitive-1", "case-insensitive-1", esxVI_ProductVersion_ESX35); + DO_TEST("case-insensitive-2", "case-insensitive-2", esxVI_ProductVersion_ESX35); - DO_TEST("minimal", "minimal", esxVI_APIVersion_25); - DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("minimal", "minimal", esxVI_ProductVersion_ESX35); + DO_TEST("minimal-64bit", "minimal-64bit", esxVI_ProductVersion_ESX35); - DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_ProductVersion_ESX35); - DO_TEST("scsi-driver", "scsi-driver", esxVI_APIVersion_25); - DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); + DO_TEST("scsi-driver", "scsi-driver", esxVI_ProductVersion_ESX35); + DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_ProductVersion_ESX35); - DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_APIVersion_25); - DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_APIVersion_25); + DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_ProductVersion_ESX35); - DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_APIVersion_25); - DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_APIVersion_25); + DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_ProductVersion_ESX35); - DO_TEST("floppy-file", "floppy-file", esxVI_APIVersion_25); - DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); + DO_TEST("floppy-file", "floppy-file", esxVI_ProductVersion_ESX35); + DO_TEST("floppy-device", "floppy-device", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); - DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-custom", "ethernet-custom", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); - DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); - DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); - DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-static", "ethernet-static", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-other", "ethernet-other", esxVI_ProductVersion_ESX35); - DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); - DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); - DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_ProductVersion_ESX35); + DO_TEST("serial-device", "serial-device", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_ProductVersion_ESX35); - DO_TEST("parallel-file", "parallel-file", esxVI_APIVersion_25); - DO_TEST("parallel-device", "parallel-device", esxVI_APIVersion_25); + DO_TEST("parallel-file", "parallel-file", esxVI_ProductVersion_ESX35); + DO_TEST("parallel-device", "parallel-device", esxVI_ProductVersion_ESX35); - DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_ProductVersion_ESX35); - DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_ProductVersion_ESX35); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f9c4730..e7720bf 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -65,7 +65,8 @@ testESXCapsInit(void) } static int -testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) +testCompareFiles(const char *xml, const char *vmx, + esxVI_ProductVersion productVersion) { int result = -1; char xmlData[MAX_FILE]; @@ -89,7 +90,7 @@ testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) goto failure; } - formatted = esxVMX_FormatConfig(NULL, def, apiVersion); + formatted = esxVMX_FormatConfig(NULL, def, productVersion); if (formatted == NULL) { goto failure; @@ -112,7 +113,7 @@ testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) struct testInfo { const char *input; const char *output; - esxVI_APIVersion version; + esxVI_ProductVersion version; }; static int @@ -170,51 +171,51 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } - DO_TEST("minimal", "minimal", esxVI_APIVersion_25); - DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("minimal", "minimal", esxVI_ProductVersion_ESX35); + DO_TEST("minimal-64bit", "minimal-64bit", esxVI_ProductVersion_ESX35); - DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_ProductVersion_ESX35); - DO_TEST("scsi-driver", "scsi-driver", esxVI_APIVersion_25); - DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); + DO_TEST("scsi-driver", "scsi-driver", esxVI_ProductVersion_ESX35); + DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_ProductVersion_ESX35); - DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_APIVersion_25); - DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_APIVersion_25); + DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_ProductVersion_ESX35); - DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_APIVersion_25); - DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_APIVersion_25); + DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_ProductVersion_ESX35); - DO_TEST("floppy-file", "floppy-file", esxVI_APIVersion_25); - DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); + DO_TEST("floppy-file", "floppy-file", esxVI_ProductVersion_ESX35); + DO_TEST("floppy-device", "floppy-device", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); - DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-custom", "ethernet-custom", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); - DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); - DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); - DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-static", "ethernet-static", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-other", "ethernet-other", esxVI_ProductVersion_ESX35); - DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); - DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); - DO_TEST("serial-pipe", "serial-pipe", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_ProductVersion_ESX35); + DO_TEST("serial-device", "serial-device", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe", "serial-pipe", esxVI_ProductVersion_ESX35); - DO_TEST("parallel-file", "parallel-file", esxVI_APIVersion_25); - DO_TEST("parallel-device", "parallel-device", esxVI_APIVersion_25); + DO_TEST("parallel-file", "parallel-file", esxVI_ProductVersion_ESX35); + DO_TEST("parallel-device", "parallel-device", esxVI_ProductVersion_ESX35); - DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_ProductVersion_ESX35); - DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_ProductVersion_ESX35); virCapabilitiesFree(caps); -- 1.6.3.3

2 2

[libvirt] [PATCH] nwfilter: add support for connlimit match
by Stefan Berger 20 Apr '10

20 Apr '10

This patch adds support for the connlimit match in iptables that is used to limit number of outgoing directions. Signed-off-by" Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.c | 5 ++ src/conf/nwfilter_conf.h | 1 src/nwfilter/nwfilter_ebiptables_driver.c | 57 +++++++++++++++++++++++------- 3 files changed, 50 insertions(+), 13 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -875,6 +875,11 @@ static const virXMLAttr2Struct ipv6Attri .datatype = DATATYPE_UINT8,\ .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataDSCP),\ /*.validator = dscpValidator,*/\ + },\ + {\ + .name = "connlimit-above",\ + .datatype = DATATYPE_UINT16,\ + .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataConnlimitAbove),\ } #define COMMON_PORT_PROPS(STRUCT) \ Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -153,6 +153,7 @@ struct _ipHdrDataDef { nwItemDesc dataDstIPFrom; nwItemDesc dataDstIPTo; nwItemDesc dataDSCP; + nwItemDesc dataConnlimitAbove; }; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -815,7 +815,8 @@ static int iptablesHandleIpHdr(virBufferPtr buf, virNWFilterHashTablePtr vars, ipHdrDataDefPtr ipHdr, - int directionIn) + int directionIn, + bool *skipRule, bool *skipMatch) { char ipaddr[INET6_ADDRSTRLEN], number[20]; @@ -944,6 +945,24 @@ iptablesHandleIpHdr(virBufferPtr buf, number); } + if (HAS_ENTRY_ITEM(&ipHdr->dataConnlimitAbove)) { + if (directionIn) { + // only support for limit in outgoing dir. + *skipRule = true; + } else { + if (printDataType(vars, + number, sizeof(number), + &ipHdr->dataConnlimitAbove)) + goto err_exit; + + virBufferVSprintf(buf, + " -m connlimit %s --connlimit-above %s", + ENTRY_GET_NEG_SIGN(&ipHdr->dataConnlimitAbove), + number); + *skipMatch = true; + } + } + return 0; err_exit: @@ -1063,6 +1082,8 @@ _iptablesCreateRuleInstance(int directio : iptables_cmd_path; unsigned int bufUsed; bool srcMacSkipped = false; + bool skipRule = false; + bool skipMatch = false; if (!iptables_cmd) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, @@ -1096,7 +1117,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.tcpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1140,7 +1162,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.udpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1171,7 +1194,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.udpliteHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1197,7 +1221,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.espHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1223,7 +1248,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.ahHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1249,7 +1275,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.sctpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1283,7 +1310,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.icmpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPType)) { @@ -1341,7 +1369,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.igmpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1367,7 +1396,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.allHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1376,7 +1406,8 @@ _iptablesCreateRuleInstance(int directio return -1; } - if (srcMacSkipped && bufUsed == virBufferUse(&buf)) { + if ((srcMacSkipped && bufUsed == virBufferUse(&buf)) || + skipRule) { virBufferFreeAndReset(&buf); return 0; } @@ -1385,10 +1416,10 @@ _iptablesCreateRuleInstance(int directio target = accept_target; else { target = "DROP"; - match = NULL; + skipMatch = true; } - if (match) + if (match && !skipMatch) virBufferVSprintf(&buf, " %s", match);

2 2

[libvirt] [PATCH] nwfilter: Extend fwall-drv interface and call functions via interface
by Stefan Berger 20 Apr '10

20 Apr '10

I moving some functions into the interface of the firewall driver and make them only accessible via the driver's interface. Adapt the code where needed. One new function is added that checks whether some 'basic' rules can be applied, which is used by a subsequent patch. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.h | 16 ++++++++++++++++ src/nwfilter/nwfilter_ebiptables_driver.c | 24 +++++++++++++++++++++--- src/nwfilter/nwfilter_ebiptables_driver.h | 8 -------- src/nwfilter/nwfilter_gentech_driver.c | 3 ++- src/nwfilter/nwfilter_learnipaddr.c | 24 ++++++++++++++---------- src/nwfilter/nwfilter_learnipaddr.h | 4 +++- 6 files changed, 56 insertions(+), 23 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -98,6 +98,7 @@ static const char *m_physdev_out_str = " #define MATCH_PHYSDEV_OUT m_physdev_out_str +static int ebtablesRemoveBasicRules(const char *ifname); static int ebiptablesDriverInit(void); static void ebiptablesDriverShutdown(void); @@ -2578,6 +2579,18 @@ ebiptablesInstCommand(virBufferPtr buf, /** + * ebiptablesCanApplyBasicRules + * + * Determine whether this driver can apply the basic rules, meaning + * run ebtablesApplyBasicRules and ebtablesApplyDHCPOnlyRules. + * In case of this driver we need the ebtables tool available. + */ +static int +ebiptablesCanApplyBasicRules(void) { + return (ebtables_cmd_path != NULL); +} + +/** * ebtablesApplyBasicRules * * @conn: virConnect object @@ -2591,7 +2604,7 @@ ebiptablesInstCommand(virBufferPtr buf, * - filtering for MAC address spoofing * - allowing IPv4 & ARP traffic */ -int +static int ebtablesApplyBasicRules(const char *ifname, const unsigned char *macaddr) { @@ -2685,7 +2698,7 @@ tear_down_tmpebchains: * Apply filtering rules so that the VM can only send and receive * DHCP traffic and nothing else. */ -int +static int ebtablesApplyDHCPOnlyRules(const char *ifname, const unsigned char *macaddr, const char *dhcpserver) @@ -2794,7 +2807,7 @@ tear_down_tmpebchains: } -int +static int ebtablesRemoveBasicRules(const char *ifname) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -3188,6 +3201,11 @@ virNWFilterTechDriver ebiptables_driver .removeRules = ebiptablesRemoveRules, .freeRuleInstance = ebiptablesFreeRuleInstance, .displayRuleInstance = ebiptablesDisplayRuleInstance, + + .canApplyBasicRules = ebiptablesCanApplyBasicRules, + .applyBasicRules = ebtablesApplyBasicRules, + .applyDHCPOnlyRules = ebtablesApplyDHCPOnlyRules, + .removeBasicRules = ebtablesRemoveBasicRules, }; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.h @@ -45,12 +45,4 @@ extern virNWFilterTechDriver ebiptables_ # define EBIPTABLES_DRIVER_ID "ebiptables" - -int ebtablesApplyBasicRules(const char *ifname, - const unsigned char *macaddr); -int ebtablesApplyDHCPOnlyRules(const char *ifname, - const unsigned char *macaddr, - const char *dhcpServer); -int ebtablesRemoveBasicRules(const char *ifname); - #endif Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -487,6 +487,17 @@ typedef int (*virNWFilterRuleFreeInstanc typedef int (*virNWFilterRuleDisplayInstanceData)(virConnectPtr conn, void *_inst); +typedef int (*virNWFilterCanApplyBasicRules)(void); + +typedef int (*virNWFilterApplyBasicRules)(const char *ifname, + const unsigned char *macaddr); + +typedef int (*virNWFilterApplyDHCPOnlyRules)(const char *ifname, + const unsigned char *macaddr, + const char *dhcpserver); + +typedef int (*virNWFilterRemoveBasicRules)(const char *ifname); + enum techDrvFlags { TECHDRV_FLAG_INITIALIZED = (1 << 0), }; @@ -506,6 +517,11 @@ struct _virNWFilterTechDriver { virNWFilterRuleAllTeardown allTeardown; virNWFilterRuleFreeInstanceData freeRuleInstance; virNWFilterRuleDisplayInstanceData displayRuleInstance; + + virNWFilterCanApplyBasicRules canApplyBasicRules; + virNWFilterApplyBasicRules applyBasicRules; + virNWFilterApplyDHCPOnlyRules applyDHCPOnlyRules; + virNWFilterRemoveBasicRules removeBasicRules; }; Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.h +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h @@ -33,6 +33,7 @@ enum howDetect { typedef struct _virNWFilterIPAddrLearnReq virNWFilterIPAddrLearnReq; typedef virNWFilterIPAddrLearnReq *virNWFilterIPAddrLearnReqPtr; struct _virNWFilterIPAddrLearnReq { + virNWFilterTechDriverPtr techdriver; char ifname[IF_NAMESIZE]; char linkdev[IF_NAMESIZE]; enum virDomainNetType nettype; @@ -46,7 +47,8 @@ struct _virNWFilterIPAddrLearnReq { pthread_t thread; }; -int virNWFilterLearnIPAddress(const char *ifname, +int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, + const char *ifname, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -593,7 +593,8 @@ virNWFilterInstantiate(virConnectPtr con if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { if (virNWFilterLookupLearnReq(ifname) == NULL) { - rc = virNWFilterLearnIPAddress(ifname, + rc = virNWFilterLearnIPAddress(techdriver, + ifname, linkdev, nettype, macaddr, filter->name, Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -293,6 +293,7 @@ learnIPAddressThread(void *arg) char *filter= NULL; uint16_t etherType; enum howDetect howDetected = 0; + virNWFilterTechDriverPtr techdriver = req->techdriver; req->status = 0; @@ -458,7 +459,7 @@ learnIPAddressThread(void *arg) if (handle) pcap_close(handle); - ebtablesRemoveBasicRules(req->ifname); + techdriver->removeBasicRules(req->ifname); if (req->status == 0) { int ret; @@ -493,7 +494,7 @@ learnIPAddressThread(void *arg) /** * virNWFilterLearnIPAddress - * @conn: pointer to virConnect object + * @techdriver : driver to build firewalls * @ifname: the name of the interface * @linkdev : the name of the link device; currently only used in case of a * macvtap device @@ -513,7 +514,8 @@ learnIPAddressThread(void *arg) * firewall rules on the interface. */ int -virNWFilterLearnIPAddress(const char *ifname, +virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, + const char *ifname, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -569,6 +571,7 @@ virNWFilterLearnIPAddress(const char *if req->filterparams = ht; ht = NULL; req->howDetect = howDetect; + req->techdriver = techdriver; rc = virNWFilterRegisterLearnReq(req); @@ -577,14 +580,14 @@ virNWFilterLearnIPAddress(const char *if switch (howDetect) { case DETECT_DHCP: - if (ebtablesApplyDHCPOnlyRules(ifname, - macaddr, - NULL)) + if (techdriver->applyDHCPOnlyRules(ifname, + macaddr, + NULL)) goto err_free_ht; break; default: - if (ebtablesApplyBasicRules(ifname, - macaddr)) + if (techdriver->applyBasicRules(ifname, + macaddr)) goto err_free_ht; } @@ -598,7 +601,7 @@ virNWFilterLearnIPAddress(const char *if return 0; err_remove_rules: - ebtablesRemoveBasicRules(ifname); + techdriver->removeBasicRules(ifname); err_free_ht: virNWFilterHashTableFree(ht); err_no_ht: @@ -610,7 +613,8 @@ err_no_req: #else int -virNWFilterLearnIPAddress(const char *ifname ATTRIBUTE_UNUSED, +virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, enum virDomainNetType nettype ATTRIBUTE_UNUSED, const unsigned char *macaddr ATTRIBUTE_UNUSED,

2 2

[libvirt] [PATCH] Mark in_open parameter of remoteAuthenticate as unused when it's unused
by Matthias Bolte 20 Apr '10

20 Apr '10

Otherwise compiling with -Werror will fail. --- I just pushed this trivial patch. src/remote/remote_driver.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e3df27b..c2b58e6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6475,7 +6475,11 @@ done: /*----------------------------------------------------------------------*/ static int -remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open, +remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open +#if !HAVE_SASL && !HAVE_POLKIT + ATTRIBUTE_UNUSED +#endif + , virConnectAuthPtr auth #if !HAVE_SASL && !HAVE_POLKIT ATTRIBUTE_UNUSED -- 1.6.3.3

2 2