- Devel - libvirt List Archives

[libvirt] [PATCH] Support reporting live interface IP/netmask.
by Laine Stump 06 Oct '09

06 Oct '09

From: root <root(a)vlap.laine.org> This patch adds the flag VIR_INTERFACE_XML_INACTIVE to virInterfaceGetXMLDesc's flags. When it is *not* set (the default), the live interface info will be returned in the XML. in particular, the IP address(es) and netmask(s) will be retrieved by querying the device directly, rather than just reporting what's in the config file. The backend of this is in netcf's new ncf_if_xml_state() function. Any live interface ip address info in the xml will have the property "source" set to "device", eg: <ip address='10.24.0.1' prefix='24' source='device'/> Also, if an interface is currently inactive, no ip addresses will be returned, since an inactive interface device can't be queried for IP addresses (effectively it has none). A difference in the XML from previously - it is now acceptable to have both a dhcp *and* an ip node (or neither) within the protocol node. Before you had to have one or the other, but couldn't have both. Note that you need at least netcf 0.1.2 for this to build and work, and an upcoming release (patches submitted today) for it to work exactly as described above. --- include/libvirt/libvirt.h.in | 4 +++ src/conf/interface_conf.c | 62 ++++++++++++++++++++++------------------- src/conf/interface_conf.h | 1 + src/interface/netcf_driver.c | 8 ++++- src/libvirt.c | 15 +++++++--- tools/virsh.c | 10 +++++- 6 files changed, 63 insertions(+), 37 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 4e63e48..fd0c90b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -922,6 +922,10 @@ virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, const char* virInterfaceGetName (virInterfacePtr iface); const char* virInterfaceGetMACString (virInterfacePtr iface); +typedef enum { + VIR_INTERFACE_XML_INACTIVE = 1 /* dump inactive interface information */ +} virInterfaceXMLFlags; + char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index e646351..b422464 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -92,6 +92,7 @@ void virInterfaceDefFree(virInterfaceDefPtr def) VIR_FREE(def->proto.family); VIR_FREE(def->proto.address); VIR_FREE(def->proto.gateway); + VIR_FREE(def->proto.source); VIR_FREE(def); } @@ -272,6 +273,8 @@ virInterfaceDefParseIp(virConnectPtr conn, virInterfaceDefPtr def, "%s", _("Invalid ip address prefix value")); return(-1); } + tmp = virXPathString(conn, "string(./ip[1]/@source)", ctxt); + def->proto.source = tmp; } tmp = virXPathString(conn, "string(./route[1]/@gateway)", ctxt); def->proto.gateway = tmp; @@ -282,22 +285,19 @@ virInterfaceDefParseIp(virConnectPtr conn, virInterfaceDefPtr def, static int virInterfaceDefParseProtoIPv4(virConnectPtr conn, virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { - xmlNodePtr cur; - int ret; + xmlNodePtr dhcp, ip; + int ret = 0; - cur = virXPathNode(conn, "./dhcp", ctxt); - if (cur != NULL) - ret = virInterfaceDefParseDhcp(conn, def, cur, ctxt); - else { - cur = virXPathNode(conn, "./ip", ctxt); - if (cur != NULL) - ret = virInterfaceDefParseIp(conn, def, cur, ctxt); - else { - virInterfaceReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("interface miss dhcp or ip adressing")); - ret = -1; - } - } + dhcp = virXPathNode(conn, "./dhcp", ctxt); + if (dhcp != NULL) + ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt); + + if (ret != 0) + return(ret); + + ip = virXPathNode(conn, "./ip", ctxt); + if (ip != NULL) + ret = virInterfaceDefParseIp(conn, def, ip, ctxt); return(ret); } @@ -1005,6 +1005,7 @@ virInterfaceVlanDefFormat(virConnectPtr conn, virBufferPtr buf, static int virInterfaceProtocolDefFormat(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferPtr buf, const virInterfaceDefPtr def) { + char prefixStr[16]; if (def->proto.family == NULL) return(0); virBufferVSprintf(buf, " <protocol family='%s'>\n", def->proto.family); @@ -1015,20 +1016,23 @@ virInterfaceProtocolDefFormat(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferAddLit(buf, " <dhcp peerdns='yes'/>\n"); else virBufferAddLit(buf, " <dhcp/>\n"); - } else { - /* theorically if we don't have dhcp we should have an address */ - if (def->proto.address != NULL) { - if (def->proto.prefix != 0) - virBufferVSprintf(buf, " <ip address='%s' prefix='%d'/>\n", - def->proto.address, def->proto.prefix); - else - virBufferVSprintf(buf, " <ip address='%s'/>\n", - def->proto.address); - } - if (def->proto.gateway != NULL) { - virBufferVSprintf(buf, " <route gateway='%s'/>\n", - def->proto.gateway); - } + } + if (def->proto.address != NULL) { + if (def->proto.prefix != 0) + snprintf(prefixStr, sizeof(prefixStr), "%d", def->proto.prefix); + + virBufferVSprintf(buf, " <ip address='%s'%s%s%s%s%s%s/>\n", + def->proto.address, + def->proto.prefix ? " prefix='" : "", + def->proto.prefix ? prefixStr : "", + def->proto.prefix ? "'" : "", + def->proto.source ? " source='" : "", + def->proto.source ? def->proto.source : "", + def->proto.source ? "'" : ""); + } + if (def->proto.gateway != NULL) { + virBufferVSprintf(buf, " <route gateway='%s'/>\n", + def->proto.gateway); } virBufferAddLit(buf, " </protocol>\n"); return(0); diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index bb9dce4..df871aa 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -132,6 +132,7 @@ struct _virInterfaceProtocolDef { char *address; /* ip address */ int prefix; /* ip prefix */ char *gateway; /* route gateway */ + char *source; /* source of address - "device" or "config" (default) */ }; diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index ca14fb0..b5c3664 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -326,7 +326,7 @@ cleanup: } static char *interfaceGetXMLDesc(virInterfacePtr ifinfo, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int flags) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; @@ -342,7 +342,11 @@ static char *interfaceGetXMLDesc(virInterfacePtr ifinfo, goto cleanup; } - xmlstr = ncf_if_xml_desc(iface); + if ((flags & VIR_INTERFACE_XML_INACTIVE)) { + xmlstr = ncf_if_xml_desc(iface); + } else { + xmlstr = ncf_if_xml_state(iface); + } if (!xmlstr) { const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); diff --git a/src/libvirt.c b/src/libvirt.c index bcb89e1..bd712dc 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5915,10 +5915,17 @@ virInterfaceGetMACString(virInterfacePtr iface) /** * virInterfaceGetXMLDesc: * @iface: an interface object - * @flags: an OR'ed set of extraction flags, not used yet + * @flags: an OR'ed set of extraction flags. Current valid bits: + * + * VIR_INTERFACE_XML_INACTIVE - return the static configuration, + * suitable for use redefining the + * interface via virInterfaceDefineXML() * - * Provide an XML description of the interface. The description may be reused - * later to redefine the interface with virInterfaceDefineXML(). + * Provide an XML description of the interface. If + * VIR_INTERFACE_XML_INACTIVE is set, the description may be reused + * later to redefine the interface with virInterfaceDefineXML(). If it + * is not set, the ip address and netmask will be the current live + * setting of the interface, not the settings from the config files. * * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. * the caller must free() the returned value. @@ -5935,7 +5942,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } - if (flags != 0) { + if ((flags & ~VIR_INTERFACE_XML_INACTIVE) != 0) { virLibInterfaceError(iface, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } diff --git a/tools/virsh.c b/tools/virsh.c index 3482389..77f1d70 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2763,7 +2763,7 @@ cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) char *doc = NULL; char *doc_edited = NULL; char *doc_reread = NULL; - int flags = 0; + int flags = VIR_INTERFACE_XML_INACTIVE; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; @@ -3297,6 +3297,7 @@ static const vshCmdInfo info_interface_dumpxml[] = { static const vshCmdOptDef opts_interface_dumpxml[] = { {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {"inactive", VSH_OT_BOOL, 0, gettext_noop("show inactive defined XML")}, {NULL, 0, 0, NULL} }; @@ -3306,6 +3307,11 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) virInterfacePtr iface; int ret = TRUE; char *dump; + int flags = 0; + int inactive = vshCommandOptBool(cmd, "inactive"); + + if (inactive) + flags |= VIR_INTERFACE_XML_INACTIVE; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -3313,7 +3319,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) if (!(iface = vshCommandOptInterface(ctl, cmd, NULL))) return FALSE; - dump = virInterfaceGetXMLDesc(iface, 0); + dump = virInterfaceGetXMLDesc(iface, flags); if (dump != NULL) { printf("%s", dump); free(dump); -- 1.6.2.5

5 16

[libvirt] [RFC] Multi-IQN proposal
by Shyam_Iyer＠Dell.com 06 Oct '09

06 Oct '09

Would this proposal be acceptable ? Example XML schema for an iSCSI storage pool created -- <pool type="iscsi"> <name>dell</name> <uuid>cf354733-b01b-8870-2040-94888640e24d</uuid> <capacity>0</capacity> <allocation>0</allocation> <available>0</available> - <source> <initiator iqnname = "<initiator IQN1>"> <initiator iqnname = "<initiator IQN2>"> ........................................ ........................................ <host name="<iSCSI target hostname or Target IP address>" /> <device path="<iSCSI Target IQN name>" /> </source> - <target> <path>/dev/disk/by-path</path> - <permissions> <mode>0700</mode> <owner>0</owner> <group>0</group> </permissions> </target> </pool> Each initiator iqn name can be parsed to create the unique sessions. This should solve the following possibilities -- * possibility of multiple IQNs for a single Guest * option for Guest's own BIOS & initiator to use these IQNs (iSCSI in Guest) * option for hypervisor's initiator to use these IQNs on behalf of the guest (Multi-IQN) Compile tested only. Needs beatification. diff --git a/src/storage_conf.c b/src/storage_conf.c index cb063cc..915e897 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -116,6 +116,7 @@ enum { VIR_STORAGE_POOL_SOURCE_DIR = (1<<2), VIR_STORAGE_POOL_SOURCE_ADAPTER = (1<<3), VIR_STORAGE_POOL_SOURCE_NAME = (1<<4), + VIR_STORAGE_POOL_SOURCE_INITIATOR_IQN = (1<<5), }; @@ -537,6 +538,33 @@ virStoragePoolDefParseXML(virConnectPtr conn, goto cleanup; } } + +/* Read the conf here */ + if (options->flags & VIR_STORAGE_POOL_SOURCE_INITATOR_IQN) { + int niqn, i; + + if ((niqn = virXPathNodeSet(conn, "./source/host/initiator", ctxt, &nodeset)) < 0) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("cannot extract storage pool source devices")); + goto cleanup; + } + if (VIR_ALLOC_N(ret->source.niqn, niqn) < 0) { + VIR_FREE(nodeset); + virReportOOMError(conn); + goto cleanup; + } + for (i = 0 ; i < niqn ; i++ ) { + xmlChar *name = xmlGetProp(nodeset[i], BAD_CAST "iqnname"); + if (path == NULL) { + VIR_FREE(nodeset); + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("missing storage pool source device path")); + goto cleanup; + } + ret->source.initiator[i].iqnname = (char *)name; + } + } if (options->flags & VIR_STORAGE_POOL_SOURCE_DEVICE) { xmlNodePtr *nodeset = NULL; int nsource, i; diff --git a/src/storage_conf.h b/src/storage_conf.h index 421d305..c2504be 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -202,7 +202,12 @@ struct _virStoragePoolSourceDevice { } geometry; }; - +/* Initiator Attributes */ +typedef virStoragePoolSourceInitiatorAttr *virStoragePoolSourceInitiatorAttrPtr; +struct virStoragePoolSourceInitiatorAttr { + char *iqnname; + /* We could put other initiator specific things here */ +} typedef struct _virStoragePoolSource virStoragePoolSource; typedef virStoragePoolSource *virStoragePoolSourcePtr; @@ -214,6 +219,9 @@ struct _virStoragePoolSource { int ndevice; virStoragePoolSourceDevicePtr devices; + /*And either one or more initiators*/ + virStoragePoolSourceInitiatorAttrPtr initiator; + /* Or a directory */ char *dir;

4 9

[libvirt] [RFC PATCH 0/6] Series short description
by Gerhard Stenzel 06 Oct '09

06 Oct '09

The following series of patches is a prototype implementation of a ebtables based MAC address filter. This is currently not intended for inclusion, but rather to get some feedback/comments about the approach and the implementation. At the moment, some defaults are set when libvirtd starts and when a domain is started or destroyed. The plan is to extend this filter capability to the API level and virsh command level. The plan is also to add more filtering features like VLAN filtering and QoS filtering. Thanks, Gerhard --- Gerhard Stenzel (6): remove currently unused parameter to pass make check test add MAC address based port filtering to qemu add MAC address based port filtering to libvirt add the ebtables wrapper to network driver add build support for ebtables wrapper add ebtables wrapper configure.in | 3 include/libvirt/libvirt.h.in | 14 + src/Makefile.am | 1 src/conf/network_conf.h | 10 src/driver.h | 14 + src/libvirt.c | 119 +++++ src/libvirt_private.syms | 26 + src/libvirt_public.syms | 3 src/network/bridge_driver.c | 175 ++++++++ src/qemu/qemu.conf | 3 src/qemu/qemu_conf.c | 14 + src/qemu/qemu_conf.h | 2 src/qemu/qemu_driver.c | 23 + src/test/test_driver.c | 3 src/util/ebtables.c | 961 ++++++++++++++++++++++++++++++++++++++++++ src/util/ebtables.h | 134 ++++++ 16 files changed, 1505 insertions(+), 0 deletions(-) create mode 100644 src/util/ebtables.c create mode 100644 src/util/ebtables.h --

2 11

[libvirt] [PATCH] 526769 change logrotate config default to weekly
by Daniel Veillard 06 Oct '09

06 Oct '09

https://bugzilla.redhat.com/show_bug.cgi?id=526769 Current setup is daily with 7 backups so one week worth of logs per domain in /var/log/libvirt/qemu/*.log First a week worth of backup is a bit short, second for most domains the logs are really small, and with 7 backup files this directory gets crowded quickly. This patches changes to weekly, with 4 backups, so always a month worth of logs, and will nearly cut in half the number of entries in that directory. 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/

3 6

[libvirt] Regarding connecting to libvirt from windows
by anuj rampal 06 Oct '09

06 Oct '09

Hi, I can connect to libvirt over TCP/IP from windows and call all the functions. what i want is to do some kind of authentication like entering some kind of username/password. im using virConnectOpen(const char* name) function. i tried using virConnectOpenAuth().. but whatever parameter ii give it gets connected and there is no option to pass username/password. Thanks in advance. Regards Anuj

1 0

[libvirt] Creating Guest OS in Virtual Box
by santosh gandham 06 Oct '09

06 Oct '09

Hi, I am trying to create Guest OS (VM) in virtualBox throught libvirt. I installed libvirt 0.7.0 and created the template as <domain type='vbox'> <name>ubuntu</name> <os> <type>hvm</type> <boot dev='hd'/> </os> <memory>542720</memory> <vcpu>1</vcpu> <devices> <disk type='file' device='disk'> <source file='/home/santhosh/Desktop/ubuntu9.vdi'/> <target dev='hdd'/> </disk> <graphics type='rdp' port='3386'/> </devices> </domain> Then I issued this command $ virsh -c vbox:///session define /home/santhosh/Desktop/ubun.tmpl Domain ubuntu defined from /home/santhosh/Desktop/ubun.tmpl When I open VirtualBox, it has created a domain named "ubuntu". All the parameters specified in the template file are set except "Hard disks" . So, when I start the VM, I am left with boot errors 00:00:06.318 Guest Log: BIOS: int13_harddisk: function 02, unmapped device for ELDL=80 00:00:06.319 Guest Log: BIOS: Boot from Hard Disk 0 failed 00:00:06.321 Guest Log: Could not read from the boot medium! System halted. It is unable to boot from the disk image which I specified in the template and I am sure the path specified to disk image in the template is correct. I am unable to diagnize and find where is the error. Can any one help me here to know what might be the problem and what should I do. Thank you. Best Regards, Gandham Santhosh

2 3

[libvirt] USB node devices info
by Daniel Berteaud 05 Oct '09

05 Oct '09

Hi there. I have a problem with USB host device enumeration with libvirt. I'm running libvirt 0.7.0 on a fully updated CentOS 5.3 (libvirt was rebuilt unmodified from http://libvirt.org/sources/libvirt-0.7.0-1.fc11.src.rpm) I want to pas an USB key to one of my guest. lsusb see it just fine: (I want to pass the device 13fe:1d23) Bus 005 Device 001: ID 0000:0000 Bus 005 Device 002: ID 046b:ff10 American Megatrends, Inc. Bus 004 Device 001: ID 0000:0000 Bus 007 Device 001: ID 0000:0000 Bus 006 Device 001: ID 0000:0000 Bus 008 Device 001: ID 0000:0000 Bus 002 Device 006: ID 13fe:1d23 Kingston Technology Company Inc. Bus 002 Device 001: ID 0000:0000 Bus 001 Device 001: ID 0000:0000 Bus 003 Device 001: ID 0000:0000 Bus 003 Device 002: ID 413c:2003 Dell Computer Corp. Keyboard If I create a XML file for this device, I can attach it to my guest with virsh attach-device, no problem here. The problem is that libvirt cannot access the devices informations like pretty name, vendorID and productID, so for example, virt-manager only see devices with name "USB Raw Device Access" with 0000 as vendorID and productID. For example, for this particular USB key: virsh nodedev-dumpxml usb_device_13fe_1d23_07780BA646FD_0_usbraw <device> <name>usb_device_13fe_1d23_07780BA646FD_0_usbraw</name> <parent>usb_device_13fe_1d23_07780BA646FD_0</parent> <capability type='usb_device'> <bus>0</bus> <device>0</device> <product id='0x0000'>USB Raw Device Access</product> <vendor id='0x0000' /> </capability> </device> SELinux is in permissive mode. Anybody have an idea ? Where does libvirt get the info about host device ? (/sys ?) Regards, Daniel -- Daniel Berteaud FIREWALL-SERVICES SARL. Société de Services en Logiciels Libres Technopôle Montesquieu 33650 MARTILLAC Tel : 05 56 64 15 32 Fax : 05 56 64 15 32 Mail: daniel(a)firewall-services.com Web : http://www.firewall-services.com

1 0

[libvirt] regarding libvirtd start
by santosh gandham 05 Oct '09

05 Oct '09

Hi, I have installed libvirt 0.7.0. in fedora 11. When I start libvirt by using #libvirtd start , it is not showing any status message like libvirtd has started. The command line stuck up there itself. What is the problem? What should I do to run the libvirtd successfully? Thank you. -- Gandham Santhosh

2 1

[libvirt] [PATCH 0/5] test: Add node device driver
by Cole Robinson 05 Oct '09

05 Oct '09

The following patches implement a basic node device driver for the test hypervisor driver. This is useful for unit tests in libvirt users (particularly virtinst). Cole Robinson (5): nodedev: Add locking in nodeNumOfDevices nodedev: Break out virNodeDeviceHasCap to node_conf test: Implement node device driver. node conf: Make parsing routines consistent with other drivers test: Support loading node device info from file/XML examples/xml/test/testdev.xml | 16 ++ examples/xml/test/testnode.xml | 1 + examples/xml/test/testnodeinline.xml | 19 +++ src/conf/node_device_conf.c | 57 ++++++- src/conf/node_device_conf.h | 11 ++ src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 22 +-- src/test/test_driver.c | 291 +++++++++++++++++++++++++++++++++- 8 files changed, 396 insertions(+), 22 deletions(-) create mode 100644 examples/xml/test/testdev.xml

2 11

[libvirt] [PATCH] test: Throw a proper error in GetBridgeName
by Cole Robinson 05 Oct '09

05 Oct '09

Throw error in GetBridgeName if net has no bridge. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test/test_driver.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f57c92a..30014fc 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2546,8 +2546,14 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) { goto cleanup; } - if (privnet->def->bridge && - !(bridge = strdup(privnet->def->bridge))) { + if (!(privnet->def->bridge)) { + testError(network->conn, VIR_ERR_INTERNAL_ERROR, + _("network '%s' does not have a bridge name."), + privnet->def->name); + goto cleanup; + } + + if (!(bridge = strdup(privnet->def->bridge))) { virReportOOMError(network->conn); goto cleanup; } -- 1.6.5.rc2

3 3

[libvirt] [PATCHv2 0/8] Python related fixes
by Cole Robinson 05 Oct '09

05 Oct '09

The following series fixes various issues related to the python bindings. Cole Robinson (8): configure: Add explict --with-python option. python: Remove FastParser from generator. python: Remove use of xmllib in generator.py python: Don't generate conflicting conn.createXML functions. python: Don't generate bindings for vir*Ref python: Use a pure python implementation of 'vir*GetConnect' python: Fix generated virInterface method names python: Add a newline after custom classes configure.in | 6 ++- python/generator.py | 117 ++++++++++++++++++++++----------------------------- 2 files changed, 55 insertions(+), 68 deletions(-)

3 20

[libvirt] A first look at the node device libudev backend
by Dave Allan 05 Oct '09

05 Oct '09

Hi all, Here is a first cut at the node device backend. The only devices implemented are part of storage and PCI devices, but it's conceptually finished. The remaining work is implementing the other device properties and types. Before I go do that, I'd like to get feedback on my approach. Since libudev doesn't have the concept of capabilities the way HAL does, Chris Lalancette and I thought it made more sense and rendered much more readable code to implement each device type in a single function and avoid the indirection created by the caps_tbl structure containing a function pointer. Monitoring of libudev for new devices is not implemented, but I'm not too concerned about that at this point. As Dan Berrange suggested on IRC, putting a call in the main loop to poll the monitor file descriptor will do the job. Dave >From 34fa8bf6ce1b72276dc73f292ae12a9dd1ab2433 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Fri, 25 Sep 2009 10:59:28 -0400 Subject: [PATCH 1/1] A first look at the libudev node device backend. Thanks to Jiri for the build system changes and to Chris Lalancette for his code and suggestions on how this backend should be implemented. Storage device properties are partly populated and PCI devices are discovered, but all other devices are as yet unimplemented. --- configure.in | 47 ++- daemon/libvirtd.c | 3 +- src/Makefile.am | 16 +- src/node_device/node_device_driver.c | 3 + src/node_device/node_device_driver.h | 22 + src/node_device/node_device_hal.h | 19 - ...evice_hal_linux.c => node_device_linux_sysfs.c} | 0 src/node_device/node_device_udev.c | 627 ++++++++++++++++++++ src/node_device/node_device_udev.h | 27 + src/util/util.c | 46 ++ src/util/util.h | 4 + 11 files changed, 788 insertions(+), 26 deletions(-) rename src/node_device/{node_device_hal_linux.c => node_device_linux_sysfs.c} (100%) create mode 100644 src/node_device/node_device_udev.c create mode 100644 src/node_device/node_device_udev.h diff --git a/configure.in b/configure.in index cb5ce55..356abb7 100644 --- a/configure.in +++ b/configure.in @@ -1560,7 +1560,7 @@ test "$enable_shared" = no && lt_cv_objdir=. LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) -dnl HAL or DeviceKit library for host device enumeration +dnl HAL, DeviceKit, or libudev library for host device enumeration HAL_REQUIRED=0.0 HAL_CFLAGS= HAL_LIBS= @@ -1654,8 +1654,46 @@ AM_CONDITIONAL([HAVE_DEVKIT], [test "x$with_devkit" = "xyes"]) AC_SUBST([DEVKIT_CFLAGS]) AC_SUBST([DEVKIT_LIBS]) +UDEV_REQUIRED=143 +UDEV_CFLAGS= +UDEV_LIBS= +AC_ARG_WITH([udev], + [ --with-udev use libudev for host device enumeration], + [], + [with_udev=check]) + +if test "$with_libvirtd" = "no" ; then + with_udev=no +fi +if test "x$with_udev" = "xyes" -o "x$with_udev" = "xcheck"; then + PKG_CHECK_MODULES(UDEV, libudev >= $UDEV_REQUIRED, + [with_udev=yes], [ + if test "x$with_udev" = "xcheck" ; then + with_udev=no + else + AC_MSG_ERROR( + [You must install udev-devel >= $UDEV_REQUIRED to compile libvirt]) + fi + ]) + if test "x$with_udev" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_UDEV], 1, + [use UDEV for host device enumeration]) + + old_CFLAGS=$CFLAGS + old_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $UDEV_CFLAGS" + LDFLAGS="$LDFLAGS $UDEV_LIBS" + AC_CHECK_FUNCS([udev_new],,[with_udev=no]) + CFLAGS="$old_CFLAGS" + LDFLAGS="$old_LDFLAGS" + fi +fi +AM_CONDITIONAL([HAVE_UDEV], [test "x$with_udev" = "xyes"]) +AC_SUBST([UDEV_CFLAGS]) +AC_SUBST([UDEV_LIBS]) + with_nodedev=no; -if test "$with_devkit" = "yes" -o "$with_hal" = "yes"; +if test "$with_devkit" = "yes" -o "$with_hal" = "yes" -o "$with_udev" = "yes"; then with_nodedev=yes AC_DEFINE_UNQUOTED([WITH_NODE_DEVICES], 1, [with node device driver]) @@ -1815,6 +1853,11 @@ AC_MSG_NOTICE([ devkit: $DEVKIT_CFLAGS $DEVKIT_LIBS]) else AC_MSG_NOTICE([ devkit: no]) fi +if test "$with_udev" = "yes" ; then +AC_MSG_NOTICE([ udev: $UDEV_CFLAGS $UDEV_LIBS]) +else +AC_MSG_NOTICE([ udev: no]) +fi if test "$with_netcf" = "yes" ; then AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $NETCF_LIBS]) else diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 2bae782..c60a09f 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -832,8 +832,7 @@ static struct qemud_server *qemudInitialize(int sigread) { #ifdef WITH_STORAGE_DIR storageRegister(); #endif -#if defined(WITH_NODE_DEVICES) && \ - (defined(HAVE_HAL) || defined(HAVE_DEVKIT)) +#if defined(WITH_NODE_DEVICES) nodedevRegister(); #endif secretRegister(); diff --git a/src/Makefile.am b/src/Makefile.am index 9cbec47..b4328d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -237,16 +237,20 @@ SECURITY_DRIVER_SELINUX_SOURCES = \ NODE_DEVICE_DRIVER_SOURCES = \ - node_device/node_device_driver.c node_device/node_device_driver.h + node_device/node_device_driver.c \ + node_device/node_device_driver.h \ + node_device/node_device_linux_sysfs.c NODE_DEVICE_DRIVER_HAL_SOURCES = \ node_device/node_device_hal.c \ - node_device/node_device_hal.h \ - node_device/node_device_hal_linux.c + node_device/node_device_hal.h NODE_DEVICE_DRIVER_DEVKIT_SOURCES = \ node_device/node_device_devkit.c +NODE_DEVICE_DRIVER_UDEV_SOURCES = \ + node_device/node_device_udev.c + ######################### # @@ -626,6 +630,11 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(DEVKIT_CFLAGS) libvirt_driver_nodedev_la_LDFLAGS += $(DEVKIT_LIBS) endif +if HAVE_UDEV +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) +libvirt_driver_nodedev_la_LDFLAGS += $(UDEV_LIBS) +endif if WITH_DRIVER_MODULES libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version @@ -667,6 +676,7 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(VBOX_DRIVER_EXTRA_DIST) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 93ca28c..3d06ed1 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -760,5 +760,8 @@ int nodedevRegister(void) { #ifdef HAVE_DEVKIT return devkitNodeRegister(); #endif +#ifdef HAVE_UDEV + return udevNodeRegister(); +#endif #endif } diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index db01624..5be0781 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -45,6 +45,9 @@ int halNodeRegister(void); #ifdef HAVE_DEVKIT int devkitNodeRegister(void); #endif +#ifdef HAVE_UDEV +int udevNodeRegister(void); +#endif void nodeDeviceLock(virDeviceMonitorStatePtr driver); void nodeDeviceUnlock(virDeviceMonitorStatePtr driver); @@ -53,4 +56,23 @@ void registerCommonNodeFuncs(virDeviceMonitorPtr mon); int nodedevRegister(void); +#ifdef __linux__ + +#define check_fc_host(d) check_fc_host_linux(d) +int check_fc_host_linux(union _virNodeDevCapData *d); + +#define check_vport_capable(d) check_vport_capable_linux(d) +int check_vport_capable_linux(union _virNodeDevCapData *d); + +#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) +int read_wwn_linux(int host, const char *file, char **wwn); + +#else /* __linux__ */ + +#define check_fc_host(d) +#define check_vport_capable(d) +#define read_wwn(host, file, wwn) + +#endif /* __linux__ */ + #endif /* __VIR_NODE_DEVICE_H__ */ diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h index c859fe3..8ac8a35 100644 --- a/src/node_device/node_device_hal.h +++ b/src/node_device/node_device_hal.h @@ -22,23 +22,4 @@ #ifndef __VIR_NODE_DEVICE_HAL_H__ #define __VIR_NODE_DEVICE_HAL_H__ -#ifdef __linux__ - -#define check_fc_host(d) check_fc_host_linux(d) -int check_fc_host_linux(union _virNodeDevCapData *d); - -#define check_vport_capable(d) check_vport_capable_linux(d) -int check_vport_capable_linux(union _virNodeDevCapData *d); - -#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) -int read_wwn_linux(int host, const char *file, char **wwn); - -#else /* __linux__ */ - -#define check_fc_host(d) -#define check_vport_capable(d) -#define read_wwn(host, file, wwn) - -#endif /* __linux__ */ - #endif /* __VIR_NODE_DEVICE_HAL_H__ */ diff --git a/src/node_device/node_device_hal_linux.c b/src/node_device/node_device_linux_sysfs.c similarity index 100% rename from src/node_device/node_device_hal_linux.c rename to src/node_device/node_device_linux_sysfs.c diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c new file mode 100644 index 0000000..22669ff --- /dev/null +++ b/src/node_device/node_device_udev.c @@ -0,0 +1,627 @@ +/* + * node_device_udev.c: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <config.h> +#include <libudev.h> +#include <regex.h> + +#include "node_device_udev.h" +#include "virterror_internal.h" +#include "node_device_conf.h" +#include "node_device_driver.h" +#include "driver.h" +#include "datatypes.h" +#include "uuid.h" +#include "logging.h" +#include "memory.h" +#include "util.h" + +#define VIR_FROM_THIS VIR_FROM_NODEDEV + +static virDeviceMonitorStatePtr driverState = NULL; + +static struct udev *udevGetUdev(void) +{ + return udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driverState)); +} + + +static int udevGetSysfsData(char **data, const char *path) +{ + char *tmp = NULL; + FILE *fp = NULL; + int ret = -1; + + if (VIR_ALLOC_N(tmp, SYSFS_DATA_SIZE) != 0) { + goto out; + } + + memset(tmp, 0, SYSFS_DATA_SIZE); + + fp = fopen(path, "r"); + if (fp == NULL) { + goto out; + } + + if (fread(tmp, SYSFS_DATA_SIZE, 1, fp) == SYSFS_DATA_SIZE) { + goto out; + } + + /* strip off the trailing \n */ + tmp[strlen(tmp) - 1] = '\0'; + + /* return a block of memory containing only what was read; + * otherwise we will consume vast amounts of largely unused memory + * on systems with large numbers of devices. */ + *data = strdup(tmp); + if (*data == NULL) { + goto out; + } + + ret = 0; + +out: + VIR_FREE(tmp); + fclose(fp); + + return ret; +} + + +static int udevGetPCI(unsigned int *data, + const char *devpath, + const char *field) +{ + const char *syspath = NULL; + char *path = NULL, *tmp = NULL; + char *dummy; + int ret = 0; + + syspath = udev_get_sys_path(udevGetUdev()); + + if (virBuildPath(&path, syspath, devpath, field) != 0) { + goto out; + } + + if (udevGetSysfsData(&tmp, path) == 0) { + ret = virStrToLong_ui(tmp, &dummy, 16, data); + } + +out: + VIR_FREE(path); + return ret; +} + + +static int udevGetDMIData(char **data, + const char *field) +{ + const char *syspath = NULL; + char *path = NULL; + int ret = -1; + + syspath = udev_get_sys_path(udevGetUdev()); + + if (virBuildPath(&path, syspath, "class/dmi/id", field) == 0) { + ret = udevGetSysfsData(data, path); + VIR_FREE(path); + } + + return ret; +} + + +/* This function allocates memory from the heap for the property + * value. That memory must be later freed by some other code. */ +static int udevGetDeviceProperty(struct udev_device *udev_device, + const char *property_key, + char **property_value) +{ + const char *udev_value = NULL; + int ret = -1; + + udev_value = udev_device_get_property_value(udev_device, property_key); + if (udev_value == NULL) { + VIR_ERROR(_("udev reports property '%s' does not exist"), + property_key); + goto out; + } + + /* If this allocation is changed, the comment at the beginning + * of the function must also be changed. */ + *property_value = strdup(udev_value); + if (*property_value == NULL) { + VIR_ERROR(_("Failed to allocate memory for " + "property '%s' on device '%s'"), + property_key, udev_device_get_sysname(udev_device)); + goto out; + } + + ret = 0; + +out: + if (ret != 0) { + VIR_ERROR(_("Failed to get udev property '%s' for device '%s'"), + property_key, udev_device_get_sysname(udev_device)); + } + + return ret; +} + + +static int udevGetStringProperty(struct udev_device *udev_device, + const char *property_key, + char **value) +{ + return udevGetDeviceProperty(udev_device, property_key, value); +} + +/* +static int udevGetIntProperty(struct udev_device *udev_device, + const char *property_key, + int *value) +{ + char *udev_value = NULL; + int ret = 0; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == 0) { + ret = virStrToLong_i(udev_value, NULL, 0, value); + } + + return ret; +} + + +static int udevGetUint64Property(struct udev_device *udev_device, + const char *property_key, + uint64_t *value) +{ + char *udev_value = NULL; + int ret = 0; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == 0) { + ret = virStrToLong_ull(udev_value, NULL, 0, value); + } + + return ret; +} +*/ + +static void udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, + int priority ATTRIBUTE_UNUSED, + const char *file, + int line, + const char *fn, + const char *fmt, + va_list args) +{ + VIR_ERROR_INT(file, fn, line, fmt, args); +} + + +static void virUdevGetDeviceProperties(struct udev *udev, const char *name) +{ + struct udev_device *device = NULL; + struct udev_list_entry *list_entry = NULL; + + device = udev_device_new_from_syspath(udev, name); + + udev_list_entry_foreach(list_entry, + udev_device_get_properties_list_entry(device)) { + + VIR_ERROR(" name: '%s' value: '%s'\n", + udev_list_entry_get_name(list_entry), + udev_list_entry_get_value(list_entry)); + } + + udev_device_unref(device); + + return; +} + + +static int udevProcessPCI(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + const char *devpath = NULL, *syspath = NULL; + int ret = -1; + + devpath = udev_device_get_devpath(device); + syspath = udev_device_get_syspath(device); + + if (VIR_ALLOC(def->caps) != 0) { + goto out; + } + + def->caps->type = VIR_NODE_DEV_CAP_PCI_DEV; + + char *p = strrchr(devpath, '/'); + if (p) { + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.domain); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.bus); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.slot); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.function); + } + + if (udevGetPCI(&def->caps->data.pci_dev.vendor, devpath, "vendor") || + udevGetPCI(&def->caps->data.pci_dev.product, devpath, "device")) { + goto out; + } + + /* FIXME: to do the vendor name and product name, we have to + * parse /usr/share/hwdata/pci.ids. Look in hal/hald/ids.c + */ + + ret = 0; + +out: + return ret; +} + + +static int udevProcessStorage(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + const char *devpath = NULL; + struct udev_list_entry *list_entry = NULL; + int ret = -1; + + devpath = udev_device_get_devpath(device); + + /* Can we get libudev to add device subtypes? */ + if (STRPREFIX(devpath, "/devices/virtual/block")) { + goto out; + } + + if (VIR_ALLOC(def->caps) != 0) { + goto out; + } + + def->caps->type = VIR_NODE_DEV_CAP_STORAGE; + + def->caps->data.storage.block = strdup(udev_device_get_devnode(device)); + /* Can we get libudev to add subtypes? */ + def->caps->data.storage.drive_type = strdup("disk"); + + udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) { + if (STREQ(udev_list_entry_get_name(list_entry), "/dev/cdrom")) { + VIR_FREE(def->caps->data.storage.drive_type); + def->caps->data.storage.drive_type = strdup("cdrom"); + } + } + + /* These lines are somewhat more than 80 col, but I think the code + * is more readable if they aren't broken up. */ + if (udevGetStringProperty(device, "DEVNAME", &def->caps->data.storage.block)) { + /* None of these properties are available through libudev... + udevGetStringProperty(device, "ID_MODEL", &def->caps->data.storage.model) || + udevGetStringProperty(device, "ID_VENDOR", &def->caps->data.storage.vendor) || + udevGetStringProperty(device, "ID_SERIAL", &def->caps->data.storage.serial)) { + */ + goto out; + } + ret = 0; + +out: + return ret; +} + + +static int udevProcessOneDevice(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + virNodeDeviceObjPtr dev = NULL; + const char *devtype = NULL, *devpath = NULL; + regex_t pci_rec; + int ret = -1; + + /* How to handle parent devices? Shall we change the meaning of + * the parent pointer for the udev backend? What does client code + * use the parent relationship for? We really want to preserve + * the behavior of the HAL backend, but that may be difficult in + * practice. */ + //parent = udev_device_get_parent(device); + + devtype = udev_device_get_devtype(device); + devpath = udev_device_get_devpath(device); + + regcomp(&pci_rec, + "^/devices/pci[0-9]{4}:[0-9]{2}/[0-9]{4}:[0-9]{2}:[0-9]{2}.[0-9]$", + REG_EXTENDED | REG_NOSUB); + + if (devtype != NULL && STREQ(devtype, "disk")) { + ret = udevProcessStorage(device, def); + } else if (regexec(&pci_rec, devpath, 0, NULL, 0) == 0) { + /* This is puzzling...why isn't there a devtype for pci in libudev? */ + ret = udevProcessPCI(device, def); + } + + if (ret == 0) { + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); + virNodeDeviceObjUnlock(dev); + } + + return ret; +} + + +static int udevProcessDeviceListEntry(struct udev *udev, + struct udev_list_entry *list_entry) +{ + struct udev_device *device; + virNodeDeviceDefPtr def = NULL; + const char *name = NULL; + int ret = -1; + + name = udev_list_entry_get_name(list_entry); + + if (VIR_ALLOC(def) != 0) { + goto out; + } + + def->name = strdup(name); + if (def->name == NULL) { + goto out; + } + + device = udev_device_new_from_syspath(udev, name); + if (device != NULL) { + udevProcessOneDevice(device, def); + udev_device_unref(device); + ret = 0; + } + +out: + return ret; +} + + +static int udevEnumerateDevices(struct udev *udev) +{ + struct udev_enumerate *udev_enumerate = NULL; + struct udev_list_entry *list_entry = NULL; + const char *name = NULL; + int ret = 0; + + udev_enumerate = udev_enumerate_new(udev); + + ret = udev_enumerate_scan_devices(udev_enumerate); + if (0 != ret) { + VIR_ERROR("udev scan devices returned %d\n", ret); + goto out; + } + + udev_list_entry_foreach(list_entry, + udev_enumerate_get_list_entry(udev_enumerate)) { + + udevProcessDeviceListEntry(udev, list_entry); + name = udev_list_entry_get_name(list_entry); + virUdevGetDeviceProperties(udev, name); + } + +out: + udev_enumerate_unref(udev_enumerate); + return ret; +} + + +static int udevDeviceMonitorShutdown(void) +{ + int ret = 0; + + struct udev_monitor *udev_monitor = NULL; + struct udev *udev = NULL; + + if (driverState) { + + nodeDeviceLock(driverState); + udev_monitor = DRV_STATE_UDEV_MONITOR(driverState); + + if (udev_monitor != NULL) { + udev = udev_monitor_get_udev(udev_monitor); + udev_monitor_unref(udev_monitor); + } + + if (udev != NULL) { + udev_unref(udev); + } + + virNodeDeviceObjListFree(&driverState->devs); + nodeDeviceUnlock(driverState); + virMutexDestroy(&driverState->lock); + VIR_FREE(driverState); + + } else { + ret = -1; + } + + return ret; +} + + +static int udevSetupSystemDev(void) +{ + virNodeDeviceDefPtr def = NULL; + virNodeDeviceObjPtr dev = NULL; + char *tmp = NULL; + int ret = -1; + + if (VIR_ALLOC(def) != 0) { + goto out; + } + + def->name = strdup("system"); + if (def->name == NULL) { + goto out; + } + + if (VIR_ALLOC(def->caps) != 0) { + goto out; + } + + /* These lines are somewhat more than 80 col, but I think the code + * is more readable if they aren't broken up. */ + if (udevGetDMIData(&def->caps->data.system.product_name, "product_name") || + udevGetDMIData(&def->caps->data.system.hardware.vendor_name, "sys_vendor") || + udevGetDMIData(&def->caps->data.system.hardware.version, "product_version") || + udevGetDMIData(&def->caps->data.system.hardware.serial, "product_serial")) { + goto out; + } + + udevGetDMIData(&tmp, "product_uuid"); + virUUIDParse(tmp, def->caps->data.system.hardware.uuid); + VIR_FREE(tmp); + + if (udevGetDMIData(&def->caps->data.system.firmware.vendor_name, "bios_vendor") || + udevGetDMIData(&def->caps->data.system.firmware.version, "bios_version") || + udevGetDMIData(&def->caps->data.system.firmware.release_date, "bios_date")) { + goto out; + } + + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); + virNodeDeviceObjUnlock(dev); + + ret = 0; + +out: + return ret; +} + + +static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) +{ + struct udev *udev = NULL; + struct udev_monitor *udev_monitor = NULL; + int ret = 0; + + if (VIR_ALLOC(driverState) < 0) { + ret = -1; + goto out; + } + + if (virMutexInit(&driverState->lock) < 0) { + VIR_FREE(driverState); + ret = -1; + goto out; + } + + nodeDeviceLock(driverState); + + /* + * http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev.h… + * + * indicates no return value other than success, so we don't check + * its return value. + */ + udev = udev_new(); + udev_set_log_fn(udev, udevLogFunction); + + udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); + if (udev_monitor == NULL) { + ret = -1; + goto out; + } + + /* udev can be retrieved from udev_monitor */ + driverState->privateData = udev_monitor; + nodeDeviceUnlock(driverState); + + /* Populate with known devices */ + + if (udevSetupSystemDev() != 0) { + ret = -1; + goto out; + } + + if (udevEnumerateDevices(udev) != 0) { + ret = -1; + goto out; + } + +out: + if (ret == -1) { + udevDeviceMonitorShutdown(); + } + return ret; +} + + +static int udevDeviceMonitorReload(void) +{ + return 0; +} + + +static int udevDeviceMonitorActive(void) +{ + /* Always ready to deal with a shutdown */ + return 0; +} + + +static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (driverState == NULL) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->devMonPrivateData = driverState; + + return VIR_DRV_OPEN_SUCCESS; +} + +static int udevNodeDrvClose(virConnectPtr conn) +{ + conn->devMonPrivateData = NULL; + return 0; +} + +static virDeviceMonitor udevDeviceMonitor = { + .name = "udevDeviceMonitor", + .open = udevNodeDrvOpen, + .close = udevNodeDrvClose, +}; + +static virStateDriver udevStateDriver = { + .initialize = udevDeviceMonitorStartup, + .cleanup = udevDeviceMonitorShutdown, + .reload = udevDeviceMonitorReload, + .active = udevDeviceMonitorActive, +}; + +int udevNodeRegister(void) +{ + VIR_ERROR0("Registering udev node device backend\n"); + + registerCommonNodeFuncs(&udevDeviceMonitor); + if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { + return -1; + } + + return virRegisterStateDriver(&udevStateDriver); +} diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h new file mode 100644 index 0000000..bac628d --- /dev/null +++ b/src/node_device/node_device_udev.h @@ -0,0 +1,27 @@ +/* + * node_device_udev.h: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <libudev.h> +#include <stdint.h> + +#define SYSFS_DATA_SIZE 4096 +#define DRV_STATE_UDEV_MONITOR(ds) ((struct udev_monitor *)((ds)->privateData)) diff --git a/src/util/util.c b/src/util/util.c index ef07a6a..a1fe0d5 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2088,3 +2088,49 @@ void virFileWaitForDevices(virConnectPtr conn) void virFileWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} #endif #endif + +/* Don't call this function directly, call virBuildPath instead. */ +int virBuildPathInternal(char **path, ...) +{ + char *path_component = NULL; + va_list ap; + size_t used = 0; + int ret = 0; + + if (VIR_ALLOC_N(*path, PATH_MAX) != 0) { + ret = -1; + goto out; + } + + va_start(ap, *path); + + while ((path_component = va_arg(ap, char *)) != NULL) + { + used += snprintf(*path + used, PATH_MAX - used, "%s/", path_component); + + /* From the snprintf man page: + + The functions snprintf() and vsnprintf() do not write more + than size bytes (including the trailing '\0'). If the + output was truncated due to this limit then the return + value is the number of characters (not including the + trailing '\0') which would have been written to the final + string if enough space had been available. Thus, a return + value of size or more means that the output was truncated. + + We therefore set used to the size of the buffer to avoid + the size being passed to snprintf from becoming negative. + */ + + if (used > PATH_MAX) { + used = PATH_MAX; + } + } + + va_end(ap); + + *(*path + used - 1) = '\0'; /* kill trailing slash */ + +out: + return ret; +} diff --git a/src/util/util.h b/src/util/util.h index dbfdc45..aa466af 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -244,4 +244,8 @@ char *virFileFindMountPoint(const char *type); void virFileWaitForDevices(virConnectPtr conn); +#define virBuildPath(path, ...) virBuildPathInternal(path, __VA_ARGS__, NULL) +/* Don't call virBuildPathInternal directly, use virBuildPath */ +int virBuildPathInternal(char **path, ...); + #endif /* __VIR_UTIL_H__ */ -- 1.6.4.4

2 1

[libvirt] cann't connect kvm hypervisor
by Liu, Zhentao 05 Oct '09

05 Oct '09

Hello, I'm new of Opennebula. I have installed KVM im my remote node. But when I want to check the KVM in the node, I can't connect to the hypervisor. -------------------------------------------------------------------- root@forest:/var/run/libvirt# virsh -c qemu:///localhost/system list Connecting to uri: qemu:///system error: failed to connect to the hypervisor -------------------------------------------------------------------- Can somebody tell me why virsh doesn't work? And how I can fix it? I think that it's maybe the problem of libvirt. Any helps would be very appreciated? Thanks Zhentao -----Original Message----- From: tinova79(a)gmail.com on behalf of Tino Vazquez Sent: Mon 10/5/2009 4:33 PM To: Shi Jin Cc: Liu, Zhentao; users(a)lists.opennebula.org Subject: Re: [one-users] cann't connect kvm hypervisor Hi there, I would suggest forwarding this question to the libvirt mailing list, other people there may know the best procedure to deal with this. Regards, -Tino -- Constantino Vázquez, Grid Technology Engineer/Researcher: http://www.dsa-research.org/tinova DSA Research Group: http://dsa-research.org Globus GridWay Metascheduler: http://www.GridWay.org OpenNebula Virtual Infrastructure Engine: http://www.OpenNebula.org On Mon, Oct 5, 2009 at 4:30 PM, Shi Jin <jinzishuai(a)gmail.com> wrote: > I had similar problems earlier. > The only solution I found without rebooting the machine is to killall > kvm on the node. > I would also appreciate any suggestion to better handle this problem. > Thanks. > > Shi > > On Mon, Oct 5, 2009 at 5:56 AM, Liu, Zhentao > <Zhentao.Liu(a)fokus.fraunhofer.de> wrote: >> Hi Tino >> >> I have checked that libvirtd deaemon is running. I have also restarted >> libvirtd deaemon, but I can't still connect to kvm hypervisor. >> ----------------------------------------------------------- >> root@forest:/var/run/libvirt# /etc/init.d/libvirt-bin start >> * Starting libvirt management daemon libvirtd [ >> OK ] >> root@forest:/var/run/libvirt# virsh -c qemu:///system list >> >> Connecting to uri: qemu:///system >> error: failed to connect to the hypervisor >> ------------------------------------------------------------- >> >> other ideas? >> >> Thanks >> >> Zhentao >> >> -----Original Message----- >> From: tinova79(a)gmail.com on behalf of Tino Vazquez >> Sent: Mon 10/5/2009 1:43 PM >> To: Liu, Zhentao >> Cc: users(a)lists.opennebula.org >> Subject: Re: [one-users] cann't connect kvm hypervisor >> >> Hi Zhentao, >> >> Can you check that the libvirtd deaemon is running in the remote node? >> >> Regards, >> >> -Tino >> >> -- >> Constantino Vázquez, Grid Technology Engineer/Researcher: >> http://www.dsa-research.org/tinova >> DSA Research Group: http://dsa-research.org >> Globus GridWay Metascheduler: http://www.GridWay.org >> OpenNebula Virtual Infrastructure Engine: http://www.OpenNebula.org >> >> >> >> On Mon, Oct 5, 2009 at 1:30 PM, Liu, Zhentao >> <Zhentao.Liu(a)fokus.fraunhofer.de> wrote: >>> Hello, >>> >>> I'm new of Opennebula. I have installed KVM im my remote node. But when I >>> want to check the KVM in the node, I can't connect to the hypervisor. >>> >>> -------------------------------------------------------------------- >>> root@forest:/var/run/libvirt# virsh -c qemu:///localhost/system list >>> Connecting to uri: qemu:///system >>> error: failed to connect to the hypervisor >>> -------------------------------------------------------------------- >>> >>> Can somebody tell me why virsh doesn't work? And how I can fix it? >>> >>> Any helps would be very appreciated? >>> >>> Thanks >>> >>> Zhentao >>> >>> _______________________________________________ >>> Users mailing list >>> Users(a)lists.opennebula.org >>> http://lists.opennebula.org/listinfo.cgi/users-opennebula.org >>> >>> >> >> >> _______________________________________________ >> Users mailing list >> Users(a)lists.opennebula.org >> http://lists.opennebula.org/listinfo.cgi/users-opennebula.org >> >> > > > > -- > Shi Jin, Ph.D. >

2 1

Re: [libvirt] Creating Guest OS in Virtual Box
by Pritesh Kothari 05 Oct '09

05 Oct '09

> >> > >> <os> > >> <type>hvm</type> > >> <boot dev='hd'/> > >> </os> > >> > >> <memory>542720</memory> > >> <vcpu>1</vcpu> > >> > >> <devices> > >> <disk type='file' device='disk'> > >> <source file='/home/santhosh/Desktop/ubuntu9.vdi'/> > >> <target dev='hdd'/> ok the actual error is not in the code and the patch failed cause you are using the git HEAD which already has it. The error actually is that you forgot to specify the target type, i.e the target tag should be: <target dev='hdd' bus='ide'/> and not the one which you specified. the documents on the libvirt.org are pretty much old i guess and someone should update them someday ;). Regards, Pritesh

1 0

[libvirt] getting notified of events
by Dan Kenigsberg 05 Oct '09

05 Oct '09

I am trying to understand how to use the virEvent* API. I've built latest libvirt (with "Fix emission of domain events messages" commit) and run the domain-events example. events-c gives me mostly silence. nothing is printed when a domain changes state. events-python is more bizarre: it prints a line on every event - except for the first one, where "Updating Timeout 0 0 Poll sleep 1" is printed. Only when the second event occurs, does the callback for the first event gets executed. What am I missing? Could someone more familiar take a look? Regards, Dan.

2 1

[libvirt] Safe? /etc/libvirt/qemu on shared storage?
by James Brackinshaw 05 Oct '09

05 Oct '09

Hello, I have a directory /mnt/shared-storage where the disk files for kvm live. Live migration works well, but I have a problem: after a migration I see two guests, one on the original host "shutoff" and one on the new host "running". I'd like to see the guest only on the host it is running on. Would it be safe/recommended to put the /etc/libvirt/qemu directory on shared storage? What would the best way of doing this be? Is this lock safe? Thanks JB

5 7

[libvirt] Update libvirt API and refs XML files
by Matthias Bolte 02 Oct '09

02 Oct '09

Commit 47c8709564ac3f2ec5b4a3830ac213e69b4a44d5 "Fix up a few typos in the tree" triggered changes in docs/libvirt-api.xml and docs/libvirt-refs.xml. The attached patch contains this changes. The files docs/libvirt-api.xml and docs/libvirt-refs.xml are generated by apibuild.py, why are this generated files under version control? Matthias

6 8

[libvirt] Performance statistics
by James Brackinshaw 02 Oct '09

02 Oct '09

Hello, Is it possible to get at the (historical) performance data provided by libvirtd? Is it stored for a period of time, or only available to clients polling it? Thanks JB

3 3

[libvirt] [PATCH 00/11] Generic data stream handling
by Daniel P. Berrange 02 Oct '09

02 Oct '09

The following series of patches introduce support for generic data streams in the libvirt API, the remote protocol, client & daemon. The public API takes the form of a new object virStreamPtr and methods to read/write/close it The remote protocol was the main hard bit. Since the protocol allows multiple concurrent API calls on a single connection, this needed to also allow concurrent data streams. It is also not acceptable for a large data stream to block other traffic while it is transferring. Thus, we introduce a new protocol message type 'REMOTE_STREAM' to handle transfer for the stream data. A method involving a data streams starts off in the normal way with a REMOTE_CALL to the server, and a REMOTE_REPLY response message. If this was successful, there now follows the data stream traffic. For outgoing streams (data from client to server), the client will send zero or more REMOTE_STREAM packets containing the data with status == REMOTE_CONTINUE. These are asynchronous and not acknowledged by the server. At any time the server may send an async message with a type of REMOTE_STREAM and status of REMOTE_ERROR. This indicates to the client that the transfer is aborting at server request. If the client wishes to abort, it can send the server a REMOTE_STREAM+REMOTE_ERROR message. If the client finishes its data transfer, it will send a final REMOTE_STREAM+REMOTE_OK message, and the server will respond with the same. This full roundtrip handshake ensures any async error messages are guarenteed to be flushed For incoming data streams (data from server to client), the server sends zero or more REMOTE_STREAM packets containing the data with status == REMOTE_CONTINUE. These are asynchronous and not acknowledged by the client. At any time the client may send an async message with a type of REMOTE_STREAM and status of REMOTE_ERROR. This indicates to the server that the transfer is aborting at client request. If the server wishes to abort, it can send the server a REMOTE_STREAM+REMOTE_ERROR message. When the server finishes its data transfer, it will send a final REMOTE_STREAM+REMOTE_CONTINUE message ewith a data length of zero (ie EOF). The client will then send a REMOTE_STREAM+REMOTE_OK packet and the server will respond with the same. This full roundtrip handshake ensures any async error messages are guarenteed to be flushed This all ensures that multiple data streams can be active in parallel, and with a maximum data packet size of 256 KB, no single stream can cause too much latency on the connection for other API calls/streams. The only thing it does not allow for is one API method to use two or more streams. These may be famous last words, but I don't think that use case will be neccessary for any of our APIs... The last 5 patches with a subject of [DEMO] are *NOT* intended to be committed to the repository. They merely demonstrate the use of data streams for a couple of hypothetical file upload and download APIs. Actually they were mostly to allow me to test the code streams code without messing around with the QEMU migration code. The immediate use case for this data stream code is Chris' QEMU migration patchset. The next use case is to allow serial console access to be tunnelled over libvirtd, eg to make 'virsh console GUEST' work remotely. This use case is why I included the support for non-blocking data streams and event loop integration (not required for Chris' migration use case) Anyway, assuming Chris confirms that I've not broken his code, then patches 1-6 are targetted for this next release. .x-sc_avoid_write | 3 include/libvirt/libvirt.h | 101 ++++ include/libvirt/libvirt.h.in | 101 ++++ po/POTFILES.in | 1 qemud/Makefile.am | 1 qemud/dispatch.c | 131 ++++++ qemud/dispatch.h | 17 qemud/event.c | 54 +- qemud/qemud.c | 56 +- qemud/qemud.h | 33 + qemud/remote.c | 237 ++++++++++- qemud/remote.h | 1 qemud/remote_dispatch_args.h | 2 qemud/remote_dispatch_prototypes.h | 153 +++++++ qemud/remote_dispatch_table.h | 10 qemud/remote_generate_stubs.pl | 1 qemud/remote_protocol.c | 18 qemud/remote_protocol.h | 20 qemud/remote_protocol.x | 57 ++ qemud/stream.c | 605 +++++++++++++++++++++++++++++ qemud/stream.h | 53 ++ src/datatypes.c | 59 ++ src/datatypes.h | 33 + src/driver.h | 40 + src/esx/esx_driver.c | 2 src/libvirt.c | 769 +++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 src/libvirt_public.syms | 18 src/lxc_driver.c | 2 src/opennebula/one_driver.c | 2 src/openvz_driver.c | 2 src/qemu_driver.c | 2 src/remote_internal.c | 601 ++++++++++++++++++++++++++++ src/test.c | 477 ++++++++++++++++++++++ src/uml_driver.c | 2 src/vbox/vbox_tmpl.c | 3 src/virsh.c | 164 +++++++ src/xen_unified.c | 2 tests/eventtest.c | 19 39 files changed, 3783 insertions(+), 71 deletions(-) Regards, Daniel

5 43

[libvirt] [PATCH 1/2] Fix ordering of <exports> in API description file
by Daniel P. Berrange 02 Oct '09

02 Oct '09

* docs/apibuild.py: Make uniq() function sort keys before returning them to ensure consitent ordering of <exports> in XML file --- docs/apibuild.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index b00619f..c5257f3 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -55,7 +55,9 @@ def uniq(items): d = {} for item in items: d[item]=1 - return d.keys() + k = d.keys() + k.sort() + return k class identifier: def __init__(self, name, header=None, module=None, type=None, lineno = 0, -- 1.6.2.5

2 3

[libvirt] Tunnelled migration
by Chris Lalancette 02 Oct '09

02 Oct '09

At long last, now that the stream stuff is committed to the tree, I can repost the tunnelled migration patches. Note that these patches will conflict in some places with danpb's previously posted "PEER2PEER" patches, but it should be easy to resolve the differences. V2: Rework the monitor patch to be an API Use the new monitor API Remove silly use of qemuEscapeMonitorArgs()

2 6

[libvirt] Silently ignored virDomainRestore failures
by Charles Duffy 02 Oct '09

02 Oct '09

Howdy, all. I maintain a test infrastructure which makes heavy use of virDomainSave and virDomainRestore, and have been seeing occasional cases where my saved images are for some reason not restored correctly -- and, indeed, the incoming migration streams are not even read in their entirety. While this generally appears to be caused by issues outside of libvirt's purview, one unfortunate issue is that libvirt can report success performing a restore even when the operation is effectively an abject failure. Consider the following snippet, taken from one of my /var/log/libvirt/qemu/<domain>.log files: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin USER=root LOGNAME=root /usr/bin/qemu-kvm -S -M pc-0.11 -m 512 -smp 1 <...lots of arguments here...> -incoming exec:cat cat: write error: Broken pipe This leaves a running qemu hosting a catatonic guest -- but the libvirt client (connecting through the Python bindings) received a status of success for the operation given here. libvirt's mechanism for validating a successful restore consists of running a "cont" command on the guest, and then checking virGetLastError(); AIUI, it is expected that the "cont" will not be able to run until the restore is completed, as the monitor should not be responsive until that time. Browsing through qemudMonitorSendCont (and qemudMonitorCommandWithHandler, which it calls), I don't see anything which looks at the log file with the stderr output from qemu to determine whether an error actually occurred. (As an aside, "info history" on the guest's monitor socket indicates that it was indeed issued this "cont"). Should the existing cont+virGetLastError() approach be sufficient to handle this class of error? If not, is there any guidance on what would comprise a better system? (I suppose we could add something to the exec: to affirmatively indicate on stderr that the decompressor [or cat, if not using one] exited successfully, and check for that marker in the log file... but that seems quite a dirty hack). Thanks!

2 7

[libvirt] [PATCH 00/27] Refactor QEMU monitor command handling
by Daniel P. Berrange 01 Oct '09

01 Oct '09

In the QEMU driver source code the methods which talk to the QEMU monitor currently all just call qemudMonitorCommand() directly with the raw command string, and then parse the raw reply. In the not too distant future QEMU is introducing a new machine parsable monitor syntax. With the current way the code is structured supporting this new mode will be seriously unpleasant. This large series of patches, moves all the monitor command formatting and parsing code out into a separate source file src/qemu/qemu_monitor_text.c. There is one API in that file for each logical monitor command we wish to issue, accepting (mostly) strongly typed arguments. The exception is the NIC hotplug method which still takes the raw NIC string for now. The main qemu_driver.c file now directly calls the appropriate monitor command APIs, making logic there much cleaner. When we add support for the new QEMU monitor syntax we'll gain another file src/qemu/qemu_monitor_json.c which implements all the same APIs as src/qemu/qemu_monitor_text.c, but using the new JSON syntax instead of raw text strings This patch series is soooooo large, because I did it in many small steps, one command at a time. It is also now much easier to debug the monitor by just setting the env variables LIBVIRT_LOG_OUTPUTS="1:stderr" LIBVIRT_LOG_FILTERS="1:qemu_monitor" And you'll get the command & reply of each monitor interaction printed I've tested basic handling of every new method with the exception of the migration ones, since I don't have a convenient target host when on my laptop. Overall we get a small increase in code size, but huge increase in readability ! Makefile.am | 1 libvirt_private.syms | 1 qemu/qemu_conf.c | 20 qemu/qemu_conf.h | 2 qemu/qemu_driver.c | 1669 +++++--------------------------------------- qemu/qemu_monitor_text.c | 1777 +++++++++++++++++++++++++++++++++++++++++++++++ qemu/qemu_monitor_text.h | 173 ++++ 7 files changed, 2171 insertions(+), 1472 deletions(-) Daniel

4 63

[libvirt] Re: [virt-tools-list] Some VMs not starting at host boot
by Cole Robinson 01 Oct '09

01 Oct '09

On 10/01/2009 11:07 AM, Daniel Huhardeaux wrote: > Hi, > > 3 VMs on a host, all in autostart: the both where > > <disk type='block' device='disk'> > <source dev='/dev/vg0/DomU1'/> > <target dev='vda' bus='virtio'/> > </disk> > > are not started automagically on host startup. They start without > problem from virsh. The one having > > <disk type='file' device='disk'> > <source file='/media/vm2/vdisk.qcow2'/> > <target dev='hda' bus='ide'/> > </disk> > > has no problem. Any idea why? FYI, libvirt/virsh specific questions should go to libvirt-list(a)redhat.com. CCing Try 'virsh dominfo <vmname>' for each VM to ensure autostart is actually enabled. To see why autostart is failing, you want to launch libvirtd by hand. Stop all your VMs, do a service libvirtd stop, then (as root) run 'libvirtd'. Any VM startup error messages should be printed on the console. - Cole

2 1

[libvirt] [PATCH] Fix build in separate build directory
by Jiri Denemark 01 Oct '09

01 Oct '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- cfg.mk | 2 +- examples/domain-events/events-c/Makefile.am | 2 +- examples/hellolibvirt/Makefile.am | 2 +- tools/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index c217332..44cfd17 100644 --- a/cfg.mk +++ b/cfg.mk @@ -101,7 +101,7 @@ sc_prohibit_VIR_ERR_NO_MEMORY: msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY \ $(_prohibit_regexp) -include Makefile.nonreentrant +include $(srcdir)/Makefile.nonreentrant sc_prohibit_nonreentrant: @fail=0 ; \ for i in $(NON_REENTRANT) ; \ diff --git a/examples/domain-events/events-c/Makefile.am b/examples/domain-events/events-c/Makefile.am index 60b1589..64457c2 100644 --- a/examples/domain-events/events-c/Makefile.am +++ b/examples/domain-events/events-c/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I@top_srcdir@/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = event-test event_test_CFLAGS = $(WARN_CFLAGS) event_test_SOURCES = event-test.c diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am index 6ef2cc8..8d108a7 100644 --- a/examples/hellolibvirt/Makefile.am +++ b/examples/hellolibvirt/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I@top_srcdir@/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = hellolibvirt hellolibvirt_CFLAGS = $(WARN_CFLAGS) hellolibvirt_SOURCES = hellolibvirt.c diff --git a/tools/Makefile.am b/tools/Makefile.am index c48b203..941e93e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -43,7 +43,7 @@ virsh_LDADD = \ $(VIRSH_LIBS) virsh_CFLAGS = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ - -I../include \ + -I../include -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ -- 1.6.5.rc2

2 1