- Devel - libvirt List Archives

[libvirt] [PATCH] esx: Fix memory leak in esxVI_HostCpuIdInfo_Free()
by Matthias Bolte 15 Nov '09

15 Nov '09

--- src/esx/esx_vi_types.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 73d3069..9af9f73 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -1496,6 +1496,7 @@ ESX_VI__TEMPLATE__FREE(HostCpuIdInfo, { esxVI_HostCpuIdInfo_Free(&item->_next); + esxVI_Int_Free(&item->level); VIR_FREE(item->vendor); VIR_FREE(item->eax); VIR_FREE(item->ebx); -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Fix MAC address formatting
by Matthias Bolte 15 Nov '09

15 Nov '09

VMware uses two MAC address prefixes: 00:0c:29 and 00:50:56. The 00:0c:29 prefix is used for ESX server generated addresses. The 00:50:56 prefix is split into two parts. MAC addresses above 00:50:56:3f:ff:ff are generated by a vCenter. The rest of the 00:50:56 prefix can be assigned manually. Any MAC address within the 00:0c:29 and 00:50:56 prefix can be specified in a domain XML config and the driver will handle the details internally. * src/esx/esx_vmx.c: fix MAC address formatting * tests/xml2vmxdata/*: update test files accordingly --- src/esx/esx_vmx.c | 21 ++++++++++++++++++--- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx | 2 ++ tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx | 1 + 12 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 97ad43e..9a9fe0a 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -277,8 +277,10 @@ def->nets[0]... ethernet0.addressType = "vpx" # default to "generated" ->mac = <value> <=> ethernet0.generatedAddress = "<value>" - # 00:0c:29 prefix for autogenerated mac's + # 00:0c:29 prefix for autogenerated mac's -> ethernet0.addressType = "generated" # 00:50:56 prefix for manual configured mac's + # 00:50:56:00:00:00 - 00:50:56:3f:ff:ff -> ethernet0.addressType = "static" + # 00:50:56:40:00:00 - 00:50:56:ff:ff:ff -> ethernet0.addressType = "vpx" # 00:05:69 old prefix from esx 1.5 @@ -2687,12 +2689,25 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, virFormatMacAddr(def->mac, mac_string); - if ((def->mac[0] == 0x00 && def->mac[1] == 0x0c && def->mac[2] == 0x29) || - (def->mac[0] == 0x00 && def->mac[1] == 0x50 && def->mac[2] == 0x56)) { + if (def->mac[0] == 0x00 && def->mac[1] == 0x0c && def->mac[2] == 0x29) { virBufferVSprintf(buffer, "ethernet%d.addressType = \"generated\"\n", controller); virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", controller, mac_string); + virBufferVSprintf(buffer, "ethernet%d.generatedAddressOffset = \"0\"\n", + controller); + } else if (def->mac[0] == 0x00 && def->mac[1] == 0x50 && def->mac[2] == 0x56) { + if (def->mac[3] <= 0x3f) { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + controller, mac_string); + } else { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", + controller, mac_string); + } } else { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Unsupported MAC address prefix '%02X:%02X:%02X', expecting " diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx index ea14588..077d907 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx @@ -13,5 +13,5 @@ scsi0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/Fedora11/F ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" +ethernet0.addressType = "vpx" ethernet0.generatedAddress = "00:50:56:91:48:C7" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx index 05e3d46..f507548 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx @@ -36,3 +36,4 @@ ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:3C:98:3E" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx index d418475..10559fb 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx @@ -22,3 +22,4 @@ ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:F5:C3:0C" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx index 68f6d6d..068f0f8 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx @@ -13,12 +13,12 @@ scsi0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/virtMonSer ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" +ethernet0.addressType = "vpx" ethernet0.generatedAddress = "00:50:56:91:66:D4" ethernet1.present = "true" ethernet1.networkName = "VM Switch 2" ethernet1.connectionType = "bridged" -ethernet1.addressType = "generated" +ethernet1.addressType = "vpx" ethernet1.generatedAddress = "00:50:56:91:0C:51" serial0.present = "true" serial0.fileType = "file" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx index 73ca8a8..7d9c6f7 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx @@ -8,5 +8,5 @@ numvcpus = "1" ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" -ethernet0.generatedAddress = "00:50:56:11:22:33" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx index cc42140..fb4b116 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx @@ -9,5 +9,5 @@ ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "custom" ethernet0.vnet = "vmnet7" -ethernet0.addressType = "generated" -ethernet0.generatedAddress = "00:50:56:11:22:33" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx index dd2c86d..3aed46c 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx @@ -9,5 +9,5 @@ ethernet0.present = "true" ethernet0.virtualDev = "e1000" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" -ethernet0.generatedAddress = "00:50:56:11:22:33" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx index 8b2d6a4..526fe3c 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx @@ -14,3 +14,4 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet1" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:D6:2B:D3" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx index d811b7f..34f006d 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx @@ -14,3 +14,4 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet1" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:D6:CB:A4" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx index 7109fb9..a2a3575 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx @@ -14,9 +14,11 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet1" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:C4:BE:5A" +ethernet0.generatedAddressOffset = "0" ethernet1.present = "true" ethernet1.networkName = "net2" ethernet1.connectionType = "custom" ethernet1.vnet = "/dev/vmnet2" ethernet1.addressType = "generated" ethernet1.generatedAddress = "00:0C:29:C4:BE:64" +ethernet1.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx index ee9b8c9..765d35c 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx @@ -14,3 +14,4 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet2" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:C5:E3:5D" +ethernet0.generatedAddressOffset = "0" -- 1.6.0.4

2 1

[libvirt] [PATCH] Change DTD references to use public instead of system identifier
by Matthias Bolte 15 Nov '09

15 Nov '09

Debian's /etc/xml/catalog doesn't contain system identifiers, so use public identifiers instead. * docs/Makefile.am: use public instead of system identifier * docs/site.xsl: use matching public identifier --- docs/Makefile.am | 6 +++--- docs/site.xsl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index d819869..d53f305 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -106,7 +106,7 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl %.html: %.html.tmp @(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \ - if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \ + if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating $@" ; \ $(XMLLINT) --nonet --format --valid $< > $@ || : ; \ else echo "missing XHTML1 DTD" ; fi ; fi ); @@ -117,7 +117,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in echo "Rebuilding the HTML pages from the XML API" ; \ $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi ) -@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \ - if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \ + if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating the resulting XHTML pages" ; \ $(XMLLINT) --nonet --valid --noout html/*.html ; \ else echo "missing XHTML1 DTD" ; fi ; fi ); @@ -159,4 +159,4 @@ uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done \ No newline at end of file + rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done diff --git a/docs/site.xsl b/docs/site.xsl index b2983bd..86cfd41 100644 --- a/docs/site.xsl +++ b/docs/site.xsl @@ -11,7 +11,7 @@ method="xml" encoding="ISO-8859-1" indent="yes" - doctype-public="-//W3C//DTD XHTML 1.0//EN" + doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/> <xsl:variable name="href_base" select="''"/> -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Handle 'vmxnet3' in esxVMX_FormatEthernet()
by Matthias Bolte 15 Nov '09

15 Nov '09

In commit 3c80fac2588cbc9e5ee7e7069e1ca4468f2359d3 'vmxnet3' handling was added to esxVMX_ParseEthernet(), but not to the inverse function esxVMX_FormatEthernet(). --- src/esx/esx_vmx.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 536bf2d..97ad43e 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -1758,7 +1758,8 @@ esxVMX_ParseEthernet(virConnectPtr conn, virConfPtr conf, int controller, STRCASENEQ(virtualDev, "e1000")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name, virtualDev); + "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name, + virtualDev); goto failure; } @@ -2646,11 +2647,12 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, if (def->model != NULL) { if (STRCASENEQ(def->model, "vlance") && STRCASENEQ(def->model, "vmxnet") && + STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Expecting domain XML entry 'devices/interfase/model' " - "to be 'vlance' or 'vmxnet' or 'e1000' but found '%s'", - def->model); + "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' but " + "found '%s'", def->model); return -1; } -- 1.6.0.4

2 1

[libvirt] [PATCH] Fix compilation of libvirt against xen-unstable
by Jim Fehlig 15 Nov '09

15 Nov '09

libvirt fails to compile against current xen-unstable. This patch fixes it. Regards, Jim

2 1

[libvirt] make install fails, missing HTML files
by Thomas Treutner 14 Nov '09

14 Nov '09

Hi, I'm not sure if this is a bug or if I'm missing some tools: When doing a fresh git clone && ./autogen.sh, make install fails because it complains about some missing HTML doc files. # ./autogen.sh ...... configure: Libraries configure: configure: libxml: -I/usr/include/libxml2 -lxml2 configure: libcurl: no configure: libssh2: no configure: gnutls: -lgnutls -lpthread configure: sasl: -lsasl2 configure: avahi: no configure: polkit: no configure: selinux: no configure: apparmor: no configure: numactl: no configure: capng: no configure: xen: -lxenstore configure: hal: no configure: devkit: no configure: netcf: no configure: xmlrpc: no ....... # make ......... make[3]: Leaving directory `/root/tmp/libvirt/docs' (./apibuild.py) missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD ..... (lots more) # ll docs/*html | wc -l 8 # ll docs/*html.in | wc -l 51 Could someone please cross-check? thx,kr tom

4 13

[libvirt] Entering freeze for 0.7.3
by Daniel Veillard 13 Nov '09

13 Nov '09

I think that all expected feature patches have been pushed to git head so it's time to enter feature freeze, and just do cleanup and bug fixing patches until next friday. So the plan is to get 0.7.3 out on the 20th and we then have one month before the end of year holliday season to push the following release (probably 0.7.4 as I don't see a major feature landing in next month, but we never know). so let's focuse on debug for the coming week ! happy hacking :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 1/2] Fix cleanup when state driver init fails
by Daniel P. Berrange 13 Nov '09

13 Nov '09

* daemon/libvirtd.c: Fix incorrect goto label causing cleanup to be missed when state driver init fails --- daemon/libvirtd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ef07460..1caa4ce 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -3153,7 +3153,7 @@ int main(int argc, char **argv) { * seriously delay OS bootup process */ if (virStateInitialize(server->privileged) < 0) { VIR_ERROR0("Driver state initialization failed"); - goto error; + goto shutdown; } /* Start accepting new clients from network */ -- 1.6.2.5

3 6

[libvirt] [PATCH 1/2] Fix guestfwdTarget indentation in domain.rng
by Matthew Booth 13 Nov '09

13 Nov '09

* docs/schemas/domain.rng: Fix up some 4 space indentation --- docs/schemas/domain.rng | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index b75f17e..1bf44fd 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1052,11 +1052,11 @@ </define> <define name="guestfwdTarget"> <element name="target"> - <attribute name="type"> - <value>guestfwd</value> - </attribute> - <attribute name="address"/> - <attribute name="port"/> + <attribute name="type"> + <value>guestfwd</value> + </attribute> + <attribute name="address"/> + <attribute name="port"/> </element> </define> <define name="channel"> -- 1.6.2.5

2 2

[libvirt] [PATCH 1/2] Remove obsolte devicekit checks
by Daniel P. Berrange 13 Nov '09

13 Nov '09

Device kit support was removed, but the configure.ac checks were left in place. A number of the XXX_REQUIRED=X.Y.Z variables were not declared in the correct location (ie top of the file) * configure.in: Remove device kit checks & move mis-placed variables to correct location --- configure.in | 66 +++++---------------------------------------------------- 1 files changed, 6 insertions(+), 60 deletions(-) diff --git a/configure.in b/configure.in index df8eba2..1c705b2 100644 --- a/configure.in +++ b/configure.in @@ -34,6 +34,12 @@ AVAHI_REQUIRED="0.6.0" POLKIT_REQUIRED="0.6" PARTED_REQUIRED="1.8.0" NETCF_REQUIRED="0.1.3" +UDEV_REQUIRED=145 +PCIACCESS_REQUIRED=0.10.0 +XMLRPC_REQUIRED=1.14.0 +HAL_REQUIRED=0.5.0 +DEVMAPPER_REQUIRED=1.0.0 +LIBCURL_REQUIRED="7.18.0" dnl Checks for C compiler. AC_PROG_CC @@ -472,8 +478,6 @@ PKG_PROG_PKG_CONFIG dnl OpenNebula driver Compilation setting dnl -XMLRPC_REQUIRED=1.14.0 - XMLRPC_CFLAGS= XMLRPC_LIBS= if test "x$with_one" = "xyes" -o "x$with_one" = "xcheck"; then @@ -1304,7 +1308,6 @@ fi AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" = "yes"]) if test "$with_storage_mpath" = "yes"; then - DEVMAPPER_REQUIRED=0.0 DEVMAPPER_CFLAGS= DEVMAPPER_LIBS= PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= $DEVMAPPER_REQUIRED], [], [DEVMAPPER_FOUND=no]) @@ -1379,7 +1382,6 @@ dnl LIBCURL_CFLAGS="" LIBCURL_LIBS="" -LIBCURL_REQUIRED="7.18.0" LIBCURL_FOUND="no" if test "$with_esx" = "yes" -o "$with_esx" = "check"; then @@ -1655,7 +1657,6 @@ LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) dnl HAL, DeviceKit, or libudev library for host device enumeration -HAL_REQUIRED=0.0 HAL_CFLAGS= HAL_LIBS= AC_ARG_WITH([hal], @@ -1694,61 +1695,7 @@ AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"]) AC_SUBST([HAL_CFLAGS]) AC_SUBST([HAL_LIBS]) -DEVKIT_REQUIRED=0.0 -DEVKIT_CFLAGS= -DEVKIT_LIBS= -AC_ARG_WITH([devkit], - [ --with-devkit use DeviceKit for host device enumeration], - [], - [with_devkit=no]) -if test "$with_libvirtd" = "no" ; then - with_devkit=no -fi - -dnl Extra check needed while devkit pkg-config info missing glib2 dependency -PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 0.0,,[ - if test "x$with_devkit" = "xcheck"; then - with_devkit=no - elif test "x$with_devkit" = "xyes"; then - AC_MSG_ERROR([required package DeviceKit requires package glib-2.0]) - fi]) - -if test "x$with_devkit" = "xyes" -o "x$with_devkit" = "xcheck"; then - PKG_CHECK_MODULES(DEVKIT, devkit-gobject >= $DEVKIT_REQUIRED, - [with_devkit=yes], [ - if test "x$with_devkit" = "xcheck" ; then - with_devkit=no - else - AC_MSG_ERROR( - [You must install DeviceKit-devel >= $DEVKIT_REQUIRED to compile libvirt]) - fi - ]) - if test "x$with_devkit" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_DEVKIT], 1, - [use DeviceKit for host device enumeration]) - - dnl Add glib2 flags explicitly while devkit pkg-config info missing glib2 dependency - DEVKIT_CFLAGS="$GLIB2_CFLAGS $DEVKIT_CFLAGS" - DEVKIT_LIBS="$GLIB2_LIBS $DEVKIT_LIBS" - - dnl Add more flags apparently required for devkit to work properly - DEVKIT_CFLAGS="$DEVKIT_CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT" - - old_CFLAGS=$CFLAGS - old_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $DEVKIT_CFLAGS" - LDFLAGS="$LDFLAGS $DEVKIT_LIBS" - AC_CHECK_FUNCS([devkit_client_connect],,[with_devkit=no]) - CFLAGS="$old_CFLAGS" - LDFLAGS="$old_LDFLAGS" - fi -fi -AM_CONDITIONAL([HAVE_DEVKIT], [test "x$with_devkit" = "xyes"]) -AC_SUBST([DEVKIT_CFLAGS]) -AC_SUBST([DEVKIT_LIBS]) - -UDEV_REQUIRED=145 UDEV_CFLAGS= UDEV_LIBS= AC_ARG_WITH([udev], @@ -1781,7 +1728,6 @@ if test "x$with_udev" = "xyes" -o "x$with_udev" = "xcheck"; then CFLAGS="$old_CFLAGS" LDFLAGS="$old_LDFLAGS" fi - PCIACCESS_REQUIRED=0.10.0 PCIACCESS_CFLAGS= PCIACCESS_LIBS= PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= $PCIACCESS_REQUIRED], [], [PCIACCESS_FOUND=no]) -- 1.6.2.5

2 3