- Devel - libvirt List Archives

[libvirt] [PATCH 2/2] OpenNebula driver, libvirt-0.6.1
by "Abel Míguez Rodríguez" 18 Mar '09

18 Mar '09

1 0

[libvirt] I have no idea why the current version of libvirt works for anyone in enforcing mode.
by Daniel J Walsh 17 Mar '09

17 Mar '09

Libvirt is executing qemu requiring it to execute pulseaudio which would require the folowing permissions, #============= svirt_t ============== allow svirt_t admin_home_t:dir setattr; allow svirt_t admin_home_t:file { read write }; allow svirt_t pulseaudio_port_t:tcp_socket name_connect; allow svirt_t svirt_tmpfs_t:file read; allow svirt_t user_tmpfs_t:file read; Since qemu(svirt_t) is not allowed these permissions, pulseaudio crashes and qemu dies. I believe you need to run without sound if you are running as root.

4 11

[libvirt] PATCH: PCI device passthrough in Xen driver
by Daniel P. Berrange 17 Mar '09

17 Mar '09

This patch provides initial support for PCI device passthrough in Xen, at time of boot. It does not (yet) implement device hotplug for PCI, since it works in an annoyingly different way to device hotplug of disks & nics. The patch has several aspects - Refactors the pci.c file to make it easier to support both Xen's pci-back.ko and upstream's pcistub.ko, which are almost identical - Add code to pci.c register the PCI device with 'new_slot' before invoking 'bind', since pci-back.ko wants this extra step - In xen_unified.c, add implmentations of APIs to dettach, reattach and reset PCI devices - this just calls into shared pci.c code that QEMU/KVM uses. - In xend_internal.c implement SEXPR conversion. - In xm_internal.c implement parsing of 'pci' config parameter - Add lots of test cases XenD only supports 'unmanaged' PCI devices - ie mgmt app is responsible for detaching/reattaching PCI devices from/to host device drivers. XenD itself won't automatically do this for us, though perhaps someone might like to implement this as an optional feature for XenD, since it is more convenient in some cases. src/pci.c | 182 +++++++++++++-------- src/xen_unified.c | 122 ++++++++++++++ src/xend_internal.c | 232 +++++++++++++++++++++++++++ src/xm_internal.c | 156 ++++++++++++++++++ tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr | 2 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 37 ++++ tests/sexpr2xmltest.c | 1 tests/xmconfigdata/test-pci-devs.cfg | 24 ++ tests/xmconfigdata/test-pci-devs.xml | 56 ++++++ tests/xmconfigtest.c | 1 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 1 tests/xml2sexprdata/xml2sexpr-pci-devs.xml | 33 +++ tests/xml2sexprtest.c | 1 13 files changed, 784 insertions(+), 64 deletions(-) Daniel Index: src/pci.c =================================================================== RCS file: /data/cvs/libvirt/src/pci.c,v retrieving revision 1.4 diff -u -p -r1.4 pci.c --- src/pci.c 3 Mar 2009 17:00:18 -0000 1.4 +++ src/pci.c 16 Mar 2009 11:31:29 -0000 @@ -614,46 +614,80 @@ pciResetDevice(virConnectPtr conn, pciDe return ret; } -static int -pciBindDeviceToStub(virConnectPtr conn, pciDevice *dev, const char *stub_module) + +static void +pciDriverDir(char *buf, size_t buflen, const char *driver) { - char stub_dir[PATH_MAX]; - char path[PATH_MAX]; + snprintf(buf, buflen, PCI_SYSFS "drivers/%s", driver); +} - snprintf(stub_dir, sizeof(stub_dir), PCI_SYSFS "drivers/%s", stub_module); +static void +pciDriverFile(char *buf, size_t buflen, const char *driver, const char *file) +{ + snprintf(buf, buflen, PCI_SYSFS "drivers/%s/%s", driver, file); +} - /* Try loading the stub module if it isn't already loaded; - * Do not return an error if the stub module is not available. - */ - if (!virFileExists(stub_dir)) { - const char *const modprobeargv[] = { MODPROBE, stub_module, NULL }; +static void +pciDeviceFile(char *buf, size_t buflen, const char *device, const char *file) +{ + snprintf(buf, buflen, PCI_SYSFS "devices/%s/%s", device, file); +} + + +static const char * +pciFindStubDriver(virConnectPtr conn) +{ + char drvpath[PATH_MAX]; + int probed = 0; - if (virRun(conn, modprobeargv, NULL) < 0) { +recheck: + pciDriverDir(drvpath, sizeof(drvpath), "pci-stub"); + if (virFileExists(drvpath)) + return "pci-stub"; + pciDriverDir(drvpath, sizeof(drvpath), "pciback"); + if (virFileExists(drvpath)) + return "pciback"; + + if (!probed) { + const char *const stubprobe[] = { MODPROBE, "pci-stub", NULL }; + const char *const backprobe[] = { MODPROBE, "pciback", NULL }; + + probed = 1; + if (virRun(conn, stubprobe, NULL) < 0 && + virRun(conn, backprobe, NULL) < 0) { char ebuf[1024]; - VIR_WARN(_("modprobe %s failed: %s"), stub_module, + VIR_WARN(_("failed to load pci-stub or pciback drivers: %s"), virStrerror(errno, ebuf, sizeof ebuf)); + return 0; } + + goto recheck; } - if (!virFileExists(stub_dir)) { - VIR_WARN(_("%s module not available, cannot bind device %s to it"), - stub_module, dev->name); - } else { - /* Add the PCI device ID to the stub's dynamic ID table; - * this is needed to allow us to bind the device to the stub. - * Note: if the device is not currently bound to any driver, - * stub will immediately be bound to the device. Also, note - * that if a new device with this ID is hotplugged, or if a probe - * is triggered for such a device, it will also be immediately - * bound by the stub. - */ - snprintf(path, sizeof(path), "%s/new_id", stub_dir); - if (virFileWriteStr(path, dev->id) < 0) { - virReportSystemError(conn, errno, - _("Failed to add PCI device ID '%s' to %s"), - dev->id, stub_module); - return -1; - } + return NULL; +} + + +static int +pciBindDeviceToStub(virConnectPtr conn, pciDevice *dev, const char *driver) +{ + char drvdir[PATH_MAX]; + char path[PATH_MAX]; + + /* Add the PCI device ID to the stub's dynamic ID table; + * this is needed to allow us to bind the device to the stub. + * Note: if the device is not currently bound to any driver, + * stub will immediately be bound to the device. Also, note + * that if a new device with this ID is hotplugged, or if a probe + * is triggered for such a device, it will also be immediately + * bound by the stub. + */ + pciDriverFile(path, sizeof(path), driver, "new_id"); + if (virFileWriteStr(path, dev->id) < 0) { + virReportSystemError(conn, errno, + _("Failed to add PCI device ID '%s' to %s"), + dev->id, driver); + return -1; } /* If the device is already bound to a driver, unbind it. @@ -661,66 +695,79 @@ pciBindDeviceToStub(virConnectPtr conn, * PCI device happens to be IDE controller for the disk hosting * your root filesystem. */ - snprintf(path, sizeof(path), - PCI_SYSFS "devices/%s/driver/unbind", dev->name); + pciDeviceFile(path, sizeof(path), dev->name, "driver/unbind"); if (virFileExists(path) && virFileWriteStr(path, dev->name) < 0) { virReportSystemError(conn, errno, _("Failed to unbind PCI device '%s'"), dev->name); return -1; } - if (virFileExists(stub_dir)) { - /* If the device isn't already bound to pci-stub, try binding it now. - */ - snprintf(path, sizeof(path), PCI_SYSFS "devices/%s/driver", dev->name); - if (!virFileLinkPointsTo(path, stub_dir)) { - snprintf(path, sizeof(path), "%s/bind", stub_dir); - if (virFileWriteStr(path, dev->name) < 0) { - virReportSystemError(conn, errno, - _("Failed to bind PCI device '%s' to %s"), - dev->name, stub_module); - return -1; - } + /* If the device isn't already bound to pci-stub, try binding it now. + */ + pciDriverDir(drvdir, sizeof(drvdir), driver); + pciDeviceFile(path, sizeof(path), dev->name, "driver"); + if (!virFileLinkPointsTo(path, drvdir)) { + /* Xen's pciback.ko wants you to use new_slot first */ + pciDriverFile(path, sizeof(path), driver, "new_slot"); + if (virFileExists(path) && virFileWriteStr(path, dev->name) < 0) { + virReportSystemError(conn, errno, + _("Failed to add slot for PCI device '%s' to %s"), + dev->name, driver); + return -1; } - /* If 'remove_id' exists, remove the device id from pci-stub's dynamic - * ID table so that 'drivers_probe' works below. - */ - snprintf(path, sizeof(path), "%s/remove_id", stub_dir); - if (virFileExists(path) && virFileWriteStr(path, dev->id) < 0) { + pciDriverFile(path, sizeof(path), driver, "bind"); + if (virFileWriteStr(path, dev->name) < 0) { virReportSystemError(conn, errno, - _("Failed to remove PCI ID '%s' from %s"), - dev->id, stub_module); + _("Failed to bind PCI device '%s' to %s"), + dev->name, driver); return -1; } } + /* If 'remove_id' exists, remove the device id from pci-stub's dynamic + * ID table so that 'drivers_probe' works below. + */ + pciDriverFile(path, sizeof(path), driver, "remove_id"); + if (virFileExists(path) && virFileWriteStr(path, dev->id) < 0) { + virReportSystemError(conn, errno, + _("Failed to remove PCI ID '%s' from %s"), + dev->id, driver); + return -1; + } + return 0; } int pciDettachDevice(virConnectPtr conn, pciDevice *dev) { - return pciBindDeviceToStub(conn, dev, "pci-stub"); + const char *driver = pciFindStubDriver(conn); + if (!driver) { + pciReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot find any PCI stub module")); + return -1; + } + + return pciBindDeviceToStub(conn, dev, driver); } static int -pciUnBindDeviceFromStub(virConnectPtr conn, pciDevice *dev, const char *stub_module) +pciUnBindDeviceFromStub(virConnectPtr conn, pciDevice *dev, const char *driver) { - char stub_dir[PATH_MAX]; + char drvdir[PATH_MAX]; char path[PATH_MAX]; - snprintf(stub_dir, sizeof(stub_dir), PCI_SYSFS "drivers/%s", stub_module); - /* If the device is bound to stub, unbind it. */ - snprintf(path, sizeof(path), PCI_SYSFS "devices/%s/driver", dev->name); - if (virFileExists(stub_dir) && virFileLinkPointsTo(path, stub_dir)) { - snprintf(path, sizeof(path), "%s/unbind", stub_dir); + pciDriverDir(drvdir, sizeof(drvdir), driver); + pciDeviceFile(path, sizeof(path), dev->name, "driver"); + if (virFileExists(drvdir) && virFileLinkPointsTo(path, drvdir)) { + pciDriverFile(path, sizeof(path), driver, "unbind"); if (virFileWriteStr(path, dev->name) < 0) { virReportSystemError(conn, errno, _("Failed to bind PCI device '%s' to %s"), - dev->name, stub_module); + dev->name, driver); return -1; } } @@ -730,8 +777,8 @@ pciUnBindDeviceFromStub(virConnectPtr co * available, then re-probing would just cause the device to be * re-bound to the stub. */ - snprintf(path, sizeof(path), "%s/remove_id", stub_dir); - if (!virFileExists(stub_dir) || virFileExists(path)) { + pciDriverFile(path, sizeof(path), driver, "remove_id"); + if (!virFileExists(drvdir) || virFileExists(path)) { if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name) < 0) { virReportSystemError(conn, errno, _("Failed to trigger a re-probe for PCI device '%s'"), @@ -746,7 +793,14 @@ pciUnBindDeviceFromStub(virConnectPtr co int pciReAttachDevice(virConnectPtr conn, pciDevice *dev) { - return pciUnBindDeviceFromStub(conn, dev, "pci-stub"); + const char *driver = pciFindStubDriver(conn); + if (!driver) { + pciReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot find any PCI stub module")); + return -1; + } + + return pciUnBindDeviceFromStub(conn, dev, driver); } static char * Index: src/xen_unified.c =================================================================== RCS file: /data/cvs/libvirt/src/xen_unified.c,v retrieving revision 1.83 diff -u -p -r1.83 xen_unified.c --- src/xen_unified.c 5 Feb 2009 16:03:11 -0000 1.83 +++ src/xen_unified.c 16 Mar 2009 11:31:29 -0000 @@ -43,6 +43,8 @@ #include "xml.h" #include "util.h" #include "memory.h" +#include "node_device_conf.h" +#include "pci.h" #define VIR_FROM_THIS VIR_FROM_XEN @@ -1420,6 +1422,123 @@ xenUnifiedDomainEventDeregister (virConn return ret; } + +static int +xenUnifiedNodeDeviceGetPciInfo (virNodeDevicePtr dev, + unsigned *domain, + unsigned *bus, + unsigned *slot, + unsigned *function) +{ + virNodeDeviceDefPtr def = NULL; + virNodeDevCapsDefPtr cap; + char *xml = NULL; + int ret = -1; + + xml = virNodeDeviceGetXMLDesc(dev, 0); + if (!xml) + goto out; + + def = virNodeDeviceDefParseString(dev->conn, xml); + if (!def) + goto out; + + cap = def->caps; + while (cap) { + if (cap->type == VIR_NODE_DEV_CAP_PCI_DEV) { + *domain = cap->data.pci_dev.domain; + *bus = cap->data.pci_dev.bus; + *slot = cap->data.pci_dev.slot; + *function = cap->data.pci_dev.function; + break; + } + + cap = cap->next; + } + + if (!cap) { + xenUnifiedError(dev->conn, VIR_ERR_INVALID_ARG, + _("device %s is not a PCI device"), dev->name); + goto out; + } + + ret = 0; +out: + virNodeDeviceDefFree(def); + VIR_FREE(xml); + return ret; +} + +static int +xenUnifiedNodeDeviceDettach (virNodeDevicePtr dev) +{ + pciDevice *pci; + unsigned domain, bus, slot, function; + int ret = -1; + + if (xenUnifiedNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) + return -1; + + pci = pciGetDevice(dev->conn, domain, bus, slot, function); + if (!pci) + return -1; + + if (pciDettachDevice(dev->conn, pci) < 0) + goto out; + + ret = 0; +out: + pciFreeDevice(dev->conn, pci); + return ret; +} + +static int +xenUnifiedNodeDeviceReAttach (virNodeDevicePtr dev) +{ + pciDevice *pci; + unsigned domain, bus, slot, function; + int ret = -1; + + if (xenUnifiedNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) + return -1; + + pci = pciGetDevice(dev->conn, domain, bus, slot, function); + if (!pci) + return -1; + + if (pciReAttachDevice(dev->conn, pci) < 0) + goto out; + + ret = 0; +out: + pciFreeDevice(dev->conn, pci); + return ret; +} + +static int +xenUnifiedNodeDeviceReset (virNodeDevicePtr dev) +{ + pciDevice *pci; + unsigned domain, bus, slot, function; + int ret = -1; + + if (xenUnifiedNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) + return -1; + + pci = pciGetDevice(dev->conn, domain, bus, slot, function); + if (!pci) + return -1; + + if (pciResetDevice(dev->conn, pci) < 0) + goto out; + + ret = 0; +out: + pciFreeDevice(dev->conn, pci); + return ret; +} + + /*----- Register with libvirt.c, and initialise Xen drivers. -----*/ /* The interface which we export upwards to libvirt.c. */ @@ -1481,6 +1600,9 @@ static virDriver xenUnifiedDriver = { .getFreeMemory = xenUnifiedNodeGetFreeMemory, .domainEventRegister = xenUnifiedDomainEventRegister, .domainEventDeregister = xenUnifiedDomainEventDeregister, + .nodeDeviceDettach = xenUnifiedNodeDeviceDettach, + .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach, + .nodeDeviceReset = xenUnifiedNodeDeviceReset, }; /** Index: src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.253 diff -u -p -r1.253 xend_internal.c --- src/xend_internal.c 10 Mar 2009 11:13:32 -0000 1.253 +++ src/xend_internal.c 16 Mar 2009 11:31:29 -0000 @@ -92,6 +92,11 @@ xenDaemonFormatSxprNet(virConnectPtr con int xendConfigVersion, int isAttach); static int +xenDaemonFormatSxprOnePCI(virConnectPtr conn, + virDomainHostdevDefPtr def, + virBufferPtr buf); + +static int virDomainXMLDevID(virDomainPtr domain, virDomainDeviceDefPtr dev, char *class, @@ -2145,6 +2150,131 @@ error: return -1; } +/** + * xenDaemonParseSxprPCI + * @conn: connection + * @root: root sexpr + * + * This parses out block devices from the domain sexpr + * + * Returns 0 if successful or -1 if failed. + */ +static int +xenDaemonParseSxprPCI(virConnectPtr conn, + virDomainDefPtr def, + const struct sexpr *root) +{ + const struct sexpr *cur, *tmp = NULL, *node; + virDomainHostdevDefPtr dev = NULL; + + /* + * With the (domain ...) block we have the following odd setup + * + * (device + * (pci + * (dev (domain 0x0000) (bus 0x00) (slot 0x1b) (func 0x0)) + * (dev (domain 0x0000) (bus 0x00) (slot 0x13) (func 0x0)) + * ) + * ) + * + * Normally there is one (device ...) block per device, but in + * wierd world of Xen PCI, once (device ...) covers multiple + * devices. + */ + + for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { + node = cur->u.s.car; + if ((tmp = sexpr_lookup(node, "device/pci")) != NULL) + break; + } + + if (!tmp) + return 0; + + for (cur = tmp; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { + const char *domain = NULL; + const char *bus = NULL; + const char *slot = NULL; + const char *func = NULL; + int domainID; + int busID; + int slotID; + int funcID; + + node = cur->u.s.car; + if (!sexpr_lookup(node, "dev")) + continue; + + if (!(domain = sexpr_node(node, "dev/domain"))) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing PCI domain")); + goto error; + } + if (!(bus = sexpr_node(node, "dev/bus"))) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing PCI bus")); + goto error; + } + if (!(slot = sexpr_node(node, "dev/slot"))) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing PCI slot")); + goto error; + } + if (!(func = sexpr_node(node, "dev/func"))) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing PCI func")); + goto error; + } + + if (virStrToLong_i(domain, NULL, 0, &domainID) < 0) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse PCI domain '%s'"), domain); + goto error; + } + if (virStrToLong_i(bus, NULL, 0, &busID) < 0) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse PCI bus '%s'"), bus); + goto error; + } + if (virStrToLong_i(slot, NULL, 0, &slotID) < 0) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse PCI slot '%s'"), slot); + goto error; + } + if (virStrToLong_i(func, NULL, 0, &funcID) < 0) { + virXendError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse PCI func '%s'"), func); + goto error; + } + + if (VIR_ALLOC(dev) < 0) + goto no_memory; + + dev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; + dev->managed = 0; + dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; + dev->source.subsys.u.pci.domain = domainID; + dev->source.subsys.u.pci.bus = busID; + dev->source.subsys.u.pci.slot = slotID; + dev->source.subsys.u.pci.function = funcID; + + if (VIR_REALLOC_N(def->hostdevs, def->nhostdevs+1) < 0) { + goto no_memory; + } + + def->hostdevs[def->nhostdevs++] = dev; + } + + return 0; + +no_memory: + virReportOOMError(conn); + +error: + virDomainHostdevDefFree(dev); + return -1; +} + /** * xenDaemonParseSxpr: @@ -2310,6 +2440,9 @@ xenDaemonParseSxpr(virConnectPtr conn, if (xenDaemonParseSxprNets(conn, def, root) < 0) goto error; + if (xenDaemonParseSxprPCI(conn, def, root) < 0) + goto error; + /* New style graphics device config */ if (xenDaemonParseSxprGraphicsNew(conn, def, root) < 0) goto error; @@ -3953,6 +4086,20 @@ xenDaemonAttachDevice(virDomainPtr domai goto cleanup; break; + case VIR_DOMAIN_DEVICE_HOSTDEV: + if (dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + if (xenDaemonFormatSxprOnePCI(domain->conn, + dev->data.hostdev, + &buf) < 0) + goto cleanup; + } else { + virXendError(domain->conn, VIR_ERR_NO_SUPPORT, "%s", + _("unsupported device type")); + goto cleanup; + } + break; + default: virXendError(domain->conn, VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); @@ -5263,6 +5410,85 @@ xenDaemonFormatSxprNet(virConnectPtr con return 0; } + +static void +xenDaemonFormatSxprPCI(virDomainHostdevDefPtr def, + virBufferPtr buf) +{ + virBufferVSprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func 0x%x))", + def->source.subsys.u.pci.domain, + def->source.subsys.u.pci.bus, + def->source.subsys.u.pci.slot, + def->source.subsys.u.pci.function); +} + +static int +xenDaemonFormatSxprOnePCI(virConnectPtr conn, + virDomainHostdevDefPtr def, + virBufferPtr buf) +{ + if (def->managed) { + virXendError(conn, VIR_ERR_NO_SUPPORT, "%s", + _("managed PCI devices not supported with XenD")); + return -1; + } + + virBufferAddLit(buf, "(pci "); + xenDaemonFormatSxprPCI(def, buf); + virBufferAddLit(buf, ")"); + + return 0; +} + +static int +xenDaemonFormatSxprAllPCI(virConnectPtr conn, + virDomainDefPtr def, + virBufferPtr buf) +{ + int hasPCI = 0; + int i; + + for (i = 0 ; i < def->nhostdevs ; i++) + if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + hasPCI = 1; + + if (!hasPCI) + return 0; + + /* + * With the (domain ...) block we have the following odd setup + * + * (device + * (pci + * (dev (domain 0x0000) (bus 0x00) (slot 0x1b) (func 0x0)) + * (dev (domain 0x0000) (bus 0x00) (slot 0x13) (func 0x0)) + * ) + * ) + * + * Normally there is one (device ...) block per device, but in + * wierd world of Xen PCI, once (device ...) covers multiple + * devices. + */ + + virBufferAddLit(buf, "(device (pci "); + for (i = 0 ; i < def->nhostdevs ; i++) { + if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + if (def->hostdevs[i]->managed) { + virXendError(conn, VIR_ERR_NO_SUPPORT, "%s", + _("managed PCI devices not supported with XenD")); + return -1; + } + + xenDaemonFormatSxprPCI(def->hostdevs[i], buf); + } + } + virBufferAddLit(buf, "))"); + + return 0; +} + int xenDaemonFormatSxprSound(virConnectPtr conn, virDomainDefPtr def, @@ -5529,6 +5755,9 @@ xenDaemonFormatSxpr(virConnectPtr conn, &buf, hvm, xendConfigVersion, 0) < 0) goto error; + if (xenDaemonFormatSxprAllPCI(conn, def, &buf) < 0) + goto error; + /* New style PV graphics config xen >= 3.0.4, * or HVM graphics config xen >= 3.0.5 */ if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) || @@ -5611,6 +5840,9 @@ virDomainXMLDevID(virDomainPtr domain, strncpy(ref, xref, ref_len); free(xref); ref[ref_len - 1] = '\0'; + } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { } else { virXendError(NULL, VIR_ERR_NO_SUPPORT, "%s", _("hotplug of device type not supported")); Index: src/xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.117 diff -u -p -r1.117 xm_internal.c --- src/xm_internal.c 5 Feb 2009 16:03:11 -0000 1.117 +++ src/xm_internal.c 16 Mar 2009 11:31:29 -0000 @@ -673,6 +673,7 @@ xenXMDomainConfigParse(virConnectPtr con virDomainDiskDefPtr disk = NULL; virDomainNetDefPtr net = NULL; virDomainGraphicsDefPtr graphics = NULL; + virDomainHostdevDefPtr hostdev = NULL; int i; const char *defaultArch, *defaultMachine; @@ -1115,6 +1116,88 @@ xenXMDomainConfigParse(virConnectPtr con } } + list = virConfGetValue(conf, "pci"); + if (list && list->type == VIR_CONF_LIST) { + list = list->list; + while (list) { + char domain[5]; + char bus[3]; + char slot[3]; + char func[2]; + char *key, *nextkey; + int domainID; + int busID; + int slotID; + int funcID; + + domain[0] = bus[0] = slot[0] = func[0] = '\0'; + + if ((list->type != VIR_CONF_STRING) || (list->str == NULL)) + goto skippci; + + /* pci=['0000:00:1b.0','0000:00:13.0'] */ + key = list->str; + if (!(key = list->str)) + goto skippci; + if (!(nextkey = strchr(key, ':'))) + goto skippci; + + if ((nextkey - key) > (sizeof(domain)-1)) + goto skippci; + + strncpy(domain, key, sizeof(domain)); + domain[sizeof(domain)-1] = '\0'; + + key = nextkey + 1; + if (!(nextkey = strchr(key, ':'))) + goto skippci; + + strncpy(bus, key, sizeof(bus)); + bus[sizeof(bus)-1] = '\0'; + + key = nextkey + 1; + if (!(nextkey = strchr(key, '.'))) + goto skippci; + + strncpy(slot, key, sizeof(slot)); + slot[sizeof(slot)-1] = '\0'; + + key = nextkey + 1; + if (strlen(key) != 1) + goto skippci; + + strncpy(func, key, sizeof(func)); + func[sizeof(func)-1] = '\0'; + + if (virStrToLong_i(domain, NULL, 16, &domainID) < 0) + goto skippci; + if (virStrToLong_i(bus, NULL, 16, &busID) < 0) + goto skippci; + if (virStrToLong_i(slot, NULL, 16, &slotID) < 0) + goto skippci; + if (virStrToLong_i(func, NULL, 16, &funcID) < 0) + goto skippci; + + if (VIR_ALLOC(hostdev) < 0) + goto cleanup; + + hostdev->managed = 0; + hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; + hostdev->source.subsys.u.pci.domain = domainID; + hostdev->source.subsys.u.pci.bus = busID; + hostdev->source.subsys.u.pci.slot = slotID; + hostdev->source.subsys.u.pci.function = funcID; + + if (VIR_REALLOC_N(def->hostdevs, def->nhostdevs+1) < 0) + goto no_memory; + def->hostdevs[def->nhostdevs++] = hostdev; + hostdev = NULL; + + skippci: + list = list->next; + } + } + if (hvm) { if (xenXMConfigGetString(conn, conf, "usbdevice", &str, NULL) < 0) goto cleanup; @@ -1939,6 +2022,76 @@ cleanup: +static int +xenXMDomainConfigFormatPCI(virConnectPtr conn, + virConfPtr conf, + virDomainDefPtr def) +{ + + virConfValuePtr pciVal = NULL; + int hasPCI = 0; + int i; + + for (i = 0 ; i < def->nhostdevs ; i++) + if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + hasPCI = 1; + + if (!hasPCI) + return 0; + + if (VIR_ALLOC(pciVal) < 0) + return -1; + + pciVal->type = VIR_CONF_LIST; + pciVal->list = NULL; + + for (i = 0 ; i < def->nhostdevs ; i++) { + if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + virConfValuePtr val, tmp; + char *buf; + + if (virAsprintf(&buf, "%04x:%02x:%02x.%x", + def->hostdevs[i]->source.subsys.u.pci.domain, + def->hostdevs[i]->source.subsys.u.pci.bus, + def->hostdevs[i]->source.subsys.u.pci.slot, + def->hostdevs[i]->source.subsys.u.pci.function) < 0) + goto error; + + if (VIR_ALLOC(val) < 0) { + VIR_FREE(buf); + virReportOOMError(conn); + goto error; + } + val->type = VIR_CONF_STRING; + val->str = buf; + tmp = pciVal->list; + while (tmp && tmp->next) + tmp = tmp->next; + if (tmp) + tmp->next = val; + else + pciVal->list = val; + } + } + + if (pciVal->list != NULL) { + int ret = virConfSetValue(conf, "pci", pciVal); + pciVal = NULL; + if (ret < 0) + return -1; + } + VIR_FREE(pciVal); + + return 0; + +error: + virConfFreeValue(pciVal); + return -1; +} + + virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, virDomainDefPtr def) { virConfPtr conf = NULL; @@ -2260,6 +2413,9 @@ virConfPtr xenXMDomainConfigFormat(virCo } VIR_FREE(netVal); + if (xenXMDomainConfigFormatPCI(conn, conf, def) < 0) + goto cleanup; + if (hvm) { if (def->nparallels) { virBuffer buf = VIR_BUFFER_INITIALIZER; Index: tests/sexpr2xmltest.c =================================================================== RCS file: /data/cvs/libvirt/tests/sexpr2xmltest.c,v retrieving revision 1.36 diff -u -p -r1.36 sexpr2xmltest.c --- tests/sexpr2xmltest.c 29 Jan 2009 17:02:00 -0000 1.36 +++ tests/sexpr2xmltest.c 16 Mar 2009 11:31:29 -0000 @@ -142,6 +142,7 @@ mymain(int argc, char **argv) DO_TEST("net-e1000", "net-e1000", 2); DO_TEST("bridge-ipaddr", "bridge-ipaddr", 3); DO_TEST("no-source-cdrom", "no-source-cdrom", 2); + DO_TEST("pci-devs", "pci-devs", 2); DO_TEST("fv-utc", "fv-utc", 1); DO_TEST("fv-localtime", "fv-localtime", 1); Index: tests/xmconfigtest.c =================================================================== RCS file: /data/cvs/libvirt/tests/xmconfigtest.c,v retrieving revision 1.26 diff -u -p -r1.26 xmconfigtest.c --- tests/xmconfigtest.c 8 Jan 2009 19:52:15 -0000 1.26 +++ tests/xmconfigtest.c 16 Mar 2009 11:31:29 -0000 @@ -231,6 +231,7 @@ mymain(int argc, char **argv) DO_TEST("escape-paths", 2); DO_TEST("no-source-cdrom", 2); + DO_TEST("pci-devs", 2); virCapabilitiesFree(caps); Index: tests/xml2sexprtest.c =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprtest.c,v retrieving revision 1.34 diff -u -p -r1.34 xml2sexprtest.c --- tests/xml2sexprtest.c 23 Jan 2009 01:48:47 -0000 1.34 +++ tests/xml2sexprtest.c 16 Mar 2009 11:31:29 -0000 @@ -128,6 +128,7 @@ mymain(int argc, char **argv) DO_TEST("net-e1000", "net-e1000", "pvtest", 2); DO_TEST("bridge-ipaddr", "bridge-ipaddr", "pvtest", 2); DO_TEST("no-source-cdrom", "no-source-cdrom", "test", 2); + DO_TEST("pci-devs", "pci-devs", "pvtest", 2); DO_TEST("fv-utc", "fv-utc", "fvtest", 1); DO_TEST("fv-localtime", "fv-localtime", "fvtest", 1); Index: tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr =================================================================== RCS file: tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr diff -N tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr 16 Mar 2009 11:31:29 -0000 @@ -0,0 +1,2 @@ +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (pci (backend 0)(dev (domain 0x0001) (bus 0x0c) (slot 0x1b) (func 0x2))(dev (domain 0x0000) (bus 0x01) (slot 0x13) (func 0x0))))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) + Index: tests/sexpr2xmldata/sexpr2xml-pci-devs.xml =================================================================== RCS file: tests/sexpr2xmldata/sexpr2xml-pci-devs.xml diff -N tests/sexpr2xmldata/sexpr2xml-pci-devs.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/sexpr2xmldata/sexpr2xml-pci-devs.xml 16 Mar 2009 11:31:29 -0000 @@ -0,0 +1,37 @@ +<domain type='xen' id='6'> + <name>pvtest</name> + <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> + <memory>430080</memory> + <currentMemory>430080</currentMemory> + <vcpu>2</vcpu> + <os> + <type>linux</type> + <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel> + <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> + <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… </cmdline> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/MainVG/GuestVG'/> + <target dev='xvda' bus='xen'/> + </disk> + <console type='pty'> + <target port='0'/> + </console> + <hostdev mode='subsystem' type='pci' managed='no'> + <source> + <address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='no'> + <source> + <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/> + </source> + </hostdev> + </devices> +</domain> Index: tests/xmconfigdata/test-pci-devs.cfg =================================================================== RCS file: tests/xmconfigdata/test-pci-devs.cfg diff -N tests/xmconfigdata/test-pci-devs.cfg --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xmconfigdata/test-pci-devs.cfg 16 Mar 2009 11:31:29 -0000 @@ -0,0 +1,24 @@ +name = "test" +uuid = "cc2315e7-d26a-307a-438c-6d188ec4c09c" +maxmem = 382 +memory = 350 +vcpus = 1 +builder = "hvm" +kernel = "/usr/lib/xen/boot/hvmloader" +boot = "c" +pae = 1 +acpi = 1 +apic = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "destroy" +on_crash = "destroy" +device_model = "/usr/lib/xen/bin/qemu-dm" +sdl = 0 +vnc = 1 +vncunused = 1 +disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ] +vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,type=ioemu" ] +pci = [ "0001:0c:1b.2", "0000:01:13.0" ] +parallel = "none" +serial = "pty" Index: tests/xmconfigdata/test-pci-devs.xml =================================================================== RCS file: tests/xmconfigdata/test-pci-devs.xml diff -N tests/xmconfigdata/test-pci-devs.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xmconfigdata/test-pci-devs.xml 16 Mar 2009 11:31:29 -0000 @@ -0,0 +1,56 @@ +<domain type='xen'> + <name>test</name> + <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid> + <memory>391168</memory> + <currentMemory>358400</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='xenfv'>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/sda8'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='phy'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:0a:7b:39'/> + <source bridge='xenbr0'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'/> + <hostdev mode='subsystem' type='pci' managed='no'> + <source> + <address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='no'> + <source> + <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/> + </source> + </hostdev> + </devices> +</domain> Index: tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr =================================================================== RCS file: tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr diff -N tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr 16 Mar 2009 11:31:29 -0000 @@ -0,0 +1 @@ +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0))))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-pci-devs.xml =================================================================== RCS file: tests/xml2sexprdata/xml2sexpr-pci-devs.xml diff -N tests/xml2sexprdata/xml2sexpr-pci-devs.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xml2sexprdata/xml2sexpr-pci-devs.xml 16 Mar 2009 11:31:29 -0000 @@ -0,0 +1,33 @@ +<domain type='xen' id='15'> + <name>pvtest</name> + <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid> + <os> + <type>linux</type> + <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel> + <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> + <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… </cmdline> + </os> + <memory>430080</memory> + <vcpu>2</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='block' device='disk'> + <source dev='/dev/MainVG/GuestLV'/> + <target dev='xvda'/> + </disk> + <console tty='/dev/pts/4'/> + <hostdev mode='subsystem' type='pci' managed='no'> + <source> + <address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='no'> + <source> + <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/> + </source> + </hostdev> + </devices> +</domain> + -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] Problem with the current svirt patch
by Daniel J Walsh 17 Mar '09

17 Mar '09

The current svirt patch relabels all disk to the image_t:MCS, which is incorrect. Read Only Disks and Sharable Disks should not be labeled. Also when libvirt is completed running the image it needs to relabel the image back to something sane. Right now it is labeling everything imagelabel:s0, including phisical disk partitions. I considered two ways of labeling the "disk" back. We can either grab the label when libvirt starts and change it back to this label when ever an image completes or we can ask the system what the label should be. (matcpathcon). I originally coded up the first, but quickly realized if anything went wrong with libvirt labeling like a crash, the labels on disk could be wrong. And libvirt would continuously set them to this wrong label. With matchpathcon, libvirt will at least set them to something sane. So this patch Removes labeling of readonly and shared disks and restores the images label to the system default when the image completes. I would really like to get this in ASAP. Since currently libvirt is relabeing the cdrom to virt_image_t when it is complete as well as physical disks.

2 4

[libvirt] [PATCH] leak of file descriptors in remote code
by Daniel Veillard 17 Mar '09

17 Mar '09

We never deallocate the pipe used to do the wake-up trick, loosing 2 descriptor per connection opened in a process, 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/

2 2

[libvirt] [RFC][PATCH] storage: allow alphabetical names in owner/group of permissions
by Ryota Ozaki 16 Mar '09

16 Mar '09

Hi, This patch allows to specify owner/group of permissions in storage XML as alphabetical names. One concern of this patch is since alphabetical names are converted to uid/gid at XML parsing (e.g., virsh pool-define some-pool.xml), the generated XML file for libvirt internal does not contain the original alphabetical names and dumpxml does not as well. Is it better the conversion is done when activated not defined? And I know I need to modify documents and write test XMLs. Any comments are welcome! Thanks, ozaki-r >From bf8a01689e345ec9c08a1348b5781c51b6016ef4 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Sun, 15 Mar 2009 02:30:02 +0900 Subject: [PATCH] storage: allow alphabetical names in owner/group of permissions --- configure.in | 2 +- src/storage_conf.c | 50 ++++++++++++++++++++++++++++++++++++--------- src/util.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/util.h | 8 +++++++ 4 files changed, 105 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index 413d27c..0277d9a 100644 --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ dnl Availability of various common functions (non-fatal if missing). AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid]) dnl Availability of various not common threadsafe functions -AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r]) +AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r getpwnam_r]) dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h syslog.h]) diff --git a/src/storage_conf.c b/src/storage_conf.c index 1c9a4e5..7d75b71 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -412,23 +412,53 @@ virStorageDefParsePerms(virConnectPtr conn, if (virXPathNode(conn, "./owner", ctxt) == NULL) { perms->uid = getuid(); } else { - if (virXPathLong(conn, "number(./owner)", ctxt, &v) < 0) { - virStorageReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("malformed owner element")); - goto error; + if (virXPathLong(conn, "number(./owner)", ctxt, &v) == 0) { + perms->uid = (int)v; + } else { + char *name; + int uid; + + name = virXPathString(conn, "string(./owner)", ctxt); + if (!name) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("malformed owner element")); + goto error; + } + + uid = virGetUIDByUsername(conn, name); + VIR_FREE(name); + if (uid < 0) { + goto error; + } + + perms->uid = uid; } - perms->uid = (int)v; } if (virXPathNode(conn, "./group", ctxt) == NULL) { perms->gid = getgid(); } else { - if (virXPathLong(conn, "number(./group)", ctxt, &v) < 0) { - virStorageReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("malformed group element")); - goto error; + if (virXPathLong(conn, "number(./group)", ctxt, &v) == 0) { + perms->gid = (int)v; + } else { + char *name; + int gid; + + name = virXPathString(conn, "string(./group)", ctxt); + if (!name) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("malformed group element")); + goto error; + } + + gid = virGetGIDByGroupname(conn, name); + VIR_FREE(name); + if (gid < 0) { + goto error; + } + + perms->gid = gid; } - perms->gid = (int)v; } /* NB, we're ignoring missing labels here - they'll simply inherit */ diff --git a/src/util.c b/src/util.c index 9b74757..fbe329d 100644 --- a/src/util.c +++ b/src/util.c @@ -50,9 +50,12 @@ #include <paths.h> #endif #include <netdb.h> -#ifdef HAVE_GETPWUID_R +#if defined(HAVE_GETPWUID_R) || defined(HAVE_GETPWNAM_R) #include <pwd.h> #endif +#ifdef HAVE_GETGRNAM_R +#include <grp.h> +#endif #include "virterror_internal.h" #include "logging.h" @@ -1558,3 +1561,55 @@ char *virGetUserDirectory(virConnectPtr conn, return ret; } #endif + + +#ifdef HAVE_GETPWNAM_R +int virGetUIDByUsername(virConnectPtr conn, char *name) +{ + struct passwd pwbuf; + struct passwd *pw = NULL; + char *strbuf; + size_t strbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); + + if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { + virReportOOMError(conn); + return -1; + } + + if (getpwnam_r(name, &pwbuf, strbuf, strbuflen, &pw) != 0 || pw == NULL) { + virReportSystemError(conn, errno, + _("Failed to find user record for name '%s'"), + name); + VIR_FREE(strbuf); + return -1; + } + VIR_FREE(strbuf); + return pw->pw_uid; +} +#endif + + +#ifdef HAVE_GETGRNAM_R +int virGetGIDByGroupname(virConnectPtr conn, char *name) +{ + struct group grbuf; + struct group *gr = NULL; + char *strbuf; + size_t strbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); + + if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { + virReportOOMError(conn); + return -1; + } + + if (getgrnam_r(name, &grbuf, strbuf, strbuflen, &gr) != 0 || gr == NULL) { + virReportSystemError(conn, errno, + _("Failed to find group record for name '%s'"), + name); + VIR_FREE(strbuf); + return -1; + } + VIR_FREE(strbuf); + return gr->gr_gid; +} +#endif diff --git a/src/util.h b/src/util.h index 87cbf67..ffd3458 100644 --- a/src/util.h +++ b/src/util.h @@ -195,6 +195,14 @@ char *virGetUserDirectory(virConnectPtr conn, uid_t uid); #endif +#ifdef HAVE_GETPWNAM_R +int virGetUIDByUsername(virConnectPtr conn, char *name); +#endif + +#ifdef HAVE_GETGRNAM_R +int virGetGIDByGroupname(virConnectPtr conn, char *name); +#endif + int virRandomInitialize(unsigned int seed); int virRandom(int max); -- 1.6.0.6

3 3

[libvirt] The gui should drop the connection if libvirt stops for any reason like service libvirt stop.
by Daniel J Walsh 16 Mar '09

16 Mar '09

diff -u virtManager/engine.py~ virtManager/engine.py --- virtManager/engine.py~ 2009-03-16 14:49:16.000000000 -0400 +++ virtManager/engine.py 2009-03-16 14:58:05.000000000 -0400 @@ -158,6 +158,7 @@ logging.error(("Could not refresh connection %s\n" % (uri)) + str(sys.exc_info()[0]) + \ " " + str(sys.exc_info()[1]) + "\n" + \ traceback.format_exc(sys.exc_info()[2])) + self.connections[uri]["connection"].close() return 1 def change_timer_interval(self,ignore1,ignore2,ignore3,ignore4):

1 0

[libvirt] [PATCH] Don't allow read only connection to use SECURE_XML
by Cole Robinson 16 Mar '09

16 Mar '09

Seems to me that a read only connection shouldn't be able to dump domain xml with the SECURE flag. Attached patch blocks the attempt with an explicit error message. Thanks, Cole

3 3

[libvirt] [PATCH] Fix test driver domain save
by Cole Robinson 16 Mar '09

16 Mar '09

Saving a domain via the test driver currently locks up, since the save command is calling out to another public driver method. The attached patch fixes this. Thanks, Cole

3 3

[libvirt] [PATCH] Parse qemu config before SecurityInit
by Cole Robinson 16 Mar '09

16 Mar '09

We aren't parsing qemu.conf before initializing the security driver, yet the config contains relevant security options. The attached patch swaps the ordering, which fixes things for me. Thanks, Cole

3 3

[libvirt] shit-off domains
by Zvi Dubitzky 16 Mar '09

16 Mar '09

I do not see a way to get the shut-off domain list from a libvirt API (case when no id shown under virsh , just domain name) Am I missing something ? thanks Zvi Dubitzky Virtualization and System Architecture Email:dubi@il.ibm.com IBM Haifa Research Laboratory Phone: +972-4-8296182 Haifa, 31905, ISRAEL

2 1

[libvirt] [PATCH] fix Xen event handling
by Daniel Veillard 16 Mar '09

16 Mar '09

As was reported on IRC and found by Dan Berrange, sometimes Xen event handling could start to go wild and block processing of requests in the daemon. The fault at least on libvirt side is that we didn't filter out non read/write event requests when asking for watches in the xenstore. The provided patch seems to work for the person who reported the original problem, 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] libvirt-cim
by Zvi Dubitzky 16 Mar '09

16 Mar '09

Hi can someone tell me what is libvirt-cim . Does it mean libvirt utilized by CIM or there is a special 'dialect' called livirt-cim thanks Zvi Dubitzky Virtualization and System Architecture Email:dubi@il.ibm.com IBM Haifa Research Laboratory Phone: +972-4-8296182 Haifa, 31905, ISRAEL

2 1

[libvirt] [PATCH] trying to close some potential FILE * leaks
by Daniel Veillard 16 Mar '09

16 Mar '09

While reviewing the code due to what seems to be a FILE * leak I found the following problems, probably not what got me in troubles but should still be fixed, 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/

2 1

[libvirt] qemu-kvm networking speed
by Bryan_Coleman＠dart.biz 13 Mar '09

13 Mar '09

How do I change the networking speed provided to my qemu-kvm guest? I have four gigabit ports bonded; however, my guest is showing just 100Mb/s. I have used iperf to confirm. I am not sure if the settings would be on the guest or server side. Any help would be greatly appreciated! Thank you, Bryan

3 7

[libvirt] PATCH: Don't try to close unopened connections
by Daniel P. Berrange 13 Mar '09

13 Mar '09

The autostart code for UML and QEMU drivers had a place where it might try to close a connection that is not open. This is harmless because virConnectClose() checks for NULL, but it still causes an annoying diagnosistic to be printed. This avoids it Daniel Index: src/uml_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/uml_driver.c,v retrieving revision 1.25 diff -u -p -r1.25 uml_driver.c --- src/uml_driver.c 3 Mar 2009 09:14:28 -0000 1.25 +++ src/uml_driver.c 13 Mar 2009 16:29:33 -0000 @@ -146,7 +146,8 @@ umlAutostartConfigs(struct uml_driver *d } } - virConnectClose(conn); + if (conn) + virConnectClose(conn); } Index: src/qemu_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_driver.c,v retrieving revision 1.214 diff -u -p -r1.214 qemu_driver.c --- src/qemu_driver.c 3 Mar 2009 16:53:13 -0000 1.214 +++ src/qemu_driver.c 13 Mar 2009 16:29:34 -0000 @@ -235,7 +235,8 @@ qemudAutostartConfigs(struct qemud_drive virDomainObjUnlock(vm); } - virConnectClose(conn); + if (conn) + virConnectClose(conn); } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] libvirt usage
by Zvi Dubitzky 13 Mar '09

13 Mar '09

Hi I have a Ubutnu system . I installed libxml2 and libvirt packages by : apt-get install ibvirt-bin and .. libxml2 . They were installed ok . The libraries are located under /user/lib e.g : /usr/lib/libvirt.so.0 I am trying to link as follows: CFLAGS=`pkg-config --cflags libvirt` LDFLAGS=`pkg-config --libs libvirt` gcc -o test_cpu $CFLAGS $LDFLAGS test_cpu.c But get the message : Package libvirt was not found in the pkg-config search path. Perhaps you should add the directory containing `libvirt.pc' to the PKG_CONFIG_PATH environment variable No package 'libvirt' found It turns out that doing : pkg-config --list-all | grep libvirt return no libvirt traces . just as in the file below . On another older machine that links fine - libvirt is found with the above pkg-config but there is no PKG_CONFIG_PATH env variable as well . Both machines PATH is the same . Did I miss something during the install of the first machine. Any remedy ? Zvi Dubitzky Virtualization and System Architecture Email:dubi@il.ibm.com IBM Haifa Research Laboratory Phone: +972-4-8296182 Haifa, 31905, ISRAEL

3 2

[libvirt] [PATCH][take2] storage: fix disregarding specified owner/group permissions
by Ryota Ozaki 13 Mar '09

13 Mar '09

Hi, The changes since the last patch are, - pass a default value of 'mode' permission to virStorageDefParsePerms - fix regression - I missed setting permission values in the case of that there is not <permissions> element Thanks, ozaki-r

2 2

[libvirt] PATCH: Fix node device APIs for RHEL-5 vintage HAL
by Daniel P. Berrange 12 Mar '09

12 Mar '09

In the node device APIs we look for a property in HAL call info.subsystem. Turns out this is a fairly recent addition to HAL, and it used to be called 'linux.subsystem' in RHEL-5 vintage & earlier. This means we never see any PCI / USB devices in libvirt when on RHEL-5. This patch makes us check for both those properties, since the values are the same for each - just the property name changed Daniel Index: src/node_device_hal.c =================================================================== RCS file: /data/cvs/libvirt/src/node_device_hal.c,v retrieving revision 1.9 diff -u -p -r1.9 node_device_hal.c --- src/node_device_hal.c 2 Mar 2009 17:41:13 -0000 1.9 +++ src/node_device_hal.c 12 Mar 2009 14:07:12 -0000 @@ -357,7 +357,8 @@ static int gather_capabilities(LibHalCon goto failure; } - if (get_str_prop(ctx, udi, "info.subsystem", &bus_name) == 0) { + if (get_str_prop(ctx, udi, "info.subsystem", &bus_name) == 0 || + get_str_prop(ctx, udi, "linux.subsystem", &bus_name) == 0) { rv = gather_capability(ctx, udi, bus_name, &caps); if (rv != 0) goto failure; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] xen+ssh:// "ghost" connections
by Nick Moffitt 12 Mar '09

12 Mar '09

Many thanks to Daniel Veillard for the Xen storage patch that was ACKed here yesterday! It does indeed seem to fix the crashing and lockup problems I was seeingw hen performing many simultaneous operations. At the moment, it may have exposed something else I find curious. I have a set of twelve VMs across two hosts (seven on one, five on the other). At night they're all paused, and in the morning they're all resumed at once. For the past two evenings, the pause operation has stalled for two of the VMs. The first time it was one per host, and just yesterday it was both on the 7-domain host. These connections are mostly harmless. The libvirtd still accepts new connections, but I can see the stalled ssh/netcat processes still running to forward the local socket. I've attached (okay, pasted inline) a traceback of the daemon that had two ghost connections, and from my inexperienced read-through it looks as though libvirtd doesn't even know that anyone's trying to talk to it. This isn't much to go on, but I felt it was better to post this than to let it drop on the floor, since there does seem to be a pattern so far (we'll see how things go tonight, and I'll be able to do more destructive testing next week). (gdb) thread apply all bt Thread 6 (Thread 0x7f5ca3af7950 (LWP 889)): #0 0x00007f5ca84dab99 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f5ca9b43369 in virCondWait (c=0x65a63c, m=0x80) at threads-pthread.c:81 #2 0x0000000000412ab5 in qemudWorker (data=<value optimized out>) at qemud.c:1445 #3 0x00007f5ca84d63f7 in start_thread () from /lib/libpthread.so.0 #4 0x00007f5ca8245b3d in clone () from /lib/libc.so.6 #5 0x0000000000000000 in ?? () Thread 5 (Thread 0x7f5c9bfff950 (LWP 28425)): #0 0x00007f5ca84dab99 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f5ca9b43369 in virCondWait (c=0x65a63c, m=0x80) at threads-pthread.c:81 #2 0x0000000000412ab5 in qemudWorker (data=<value optimized out>) at qemud.c:1445 #3 0x00007f5ca84d63f7 in start_thread () from /lib/libpthread.so.0 #4 0x00007f5ca8245b3d in clone () from /lib/libc.so.6 #5 0x0000000000000000 in ?? () Thread 4 (Thread 0x7f5ca52fa950 (LWP 5493)): #0 0x00007f5ca84dab99 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f5ca9b43369 in virCondWait (c=0x65a63c, m=0x80) at threads-pthread.c:81 #2 0x0000000000412ab5 in qemudWorker (data=<value optimized out>) at qemud.c:1445 #3 0x00007f5ca84d63f7 in start_thread () from /lib/libpthread.so.0 #4 0x00007f5ca8245b3d in clone () from /lib/libc.so.6 #5 0x0000000000000000 in ?? () Thread 3 (Thread 0x7f5ca4af9950 (LWP 25795)): #0 0x00007f5ca84dab99 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f5ca9b43369 in virCondWait (c=0x65a63c, m=0x80) at threads-pthread.c:81 #2 0x0000000000412ab5 in qemudWorker (data=<value optimized out>) at qemud.c:1445 #3 0x00007f5ca84d63f7 in start_thread () from /lib/libpthread.so.0 #4 0x00007f5ca8245b3d in clone () from /lib/libc.so.6 #5 0x0000000000000000 in ?? () Thread 2 (Thread 0x7f5ca2af5950 (LWP 25810)): #0 0x00007f5ca84dab99 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f5ca9b43369 in virCondWait (c=0x65a63c, m=0x80) at threads-pthread.c:81 #2 0x0000000000412ab5 in qemudWorker (data=<value optimized out>) at qemud.c:1445 #3 0x00007f5ca84d63f7 in start_thread () from /lib/libpthread.so.0 #4 0x00007f5ca8245b3d in clone () from /lib/libc.so.6 #5 0x0000000000000000 in ?? () Thread 1 (Thread 0x7f5caa853780 (LWP 864)): #0 0x00007f5ca823cc86 in poll () from /lib/libc.so.6 #1 0x000000000040f1d6 in virEventRunOnce () at event.c:542 #2 0x00000000004116cd in qemudRunLoop (server=0x65a610) at qemud.c:2067 #3 0x0000000000414bbe in main (argc=4, argv=<value optimized out>) at qemud.c:2921 #0 0x00007f5ca823cc86 in poll () from /lib/libc.so.6 -- BitKeeper, how quaint. Nick Moffitt -- Alan Cox nick(a)zork.net

1 0

[libvirt] Looking for good example API function(s)
by Laine Stump 11 Mar '09

11 Mar '09

To help with lutter's network configuration project, I'm looking at adding API functions to libvirt which are essentially pass-throughs to netcf library APIs called by libvirtd. Can someone point me to good examples of APIs that are not hypervisor driver-dependent (and possibly not host OS-dependent either - I believe the final intent is for netcf to handle all host OS dependencies itself) to use as a basis for writing these new APIs? At a more detailed level, a quick trace through the code of some other APIs got me as far as the call to the "call" function, with an RPC code, but I didn't find where that call was caught (and the RPC code interpreted, eg REMOTE_PROC_NETWORK_CREATE_XML - cscope couldn't find any other reference to this value) on the libvirtd side. I'm about run virsh and libvirtd under gdb to learn this by experimentation, but if someone wants to take the fun out of it for me, hints would be gladly accepted! ;-)

4 3

[libvirt] PATCH: Support SASL auth for QEMU VNC servers
by Daniel P. Berrange 11 Mar '09

11 Mar '09

This patch adds a config option to /etc/libvirt/qemu.conf to allow the enablement of SASL authentication of the QEMU VNC servers. The patches to QEMU are posted upstream, and though their merge is delayed while the QEMU release is sorted out, I expect them to be merged in a week or so. I'm posting this patch for review now, though best not to commit it to CVS until the QEMU stuff is finally merged. Daniel diff -r 961d4b1ca1d3 qemud/libvirtd_qemu.aug --- a/qemud/libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000 +++ b/qemud/libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000 @@ -27,6 +27,8 @@ module Libvirtd_qemu = | str_entry "vnc_tls_x509_cert_dir" | bool_entry "vnc_tls_x509_verify" | str_entry "vnc_password" + | bool_entry "vnc_sasl" + | str_entry "vnc_sasl_dir" (* Each enty in the config is one of the following three ... *) let entry = vnc_entry diff -r 961d4b1ca1d3 qemud/test_libvirtd_qemu.aug --- a/qemud/test_libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000 +++ b/qemud/test_libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000 @@ -60,6 +60,25 @@ vnc_tls_x509_verify = 1 # example here before you set this # vnc_password = \"XYZ12345\" + + +# Enable use of SASL encryption on the VNC server. This requires +# a VNC client which supports the SASL protocol extension. +# Examples include vinagre, virt-viewer and virt-manager +# itself. UltraVNC, RealVNC, TightVNC do not support this +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +vnc_sasl = 1 + + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +vnc_sasl_dir = \"/some/directory/sasl2\" " test Libvirtd_qemu.lns get conf = @@ -123,3 +142,22 @@ vnc_password = \"XYZ12345\" { "#comment" = "example here before you set this" } { "#comment" = "" } { "vnc_password" = "XYZ12345" } +{ "#empty" } +{ "#empty" } +{ "#comment" = "Enable use of SASL encryption on the VNC server. This requires" } +{ "#comment" = "a VNC client which supports the SASL protocol extension." } +{ "#comment" = "Examples include vinagre, virt-viewer and virt-manager" } +{ "#comment" = "itself. UltraVNC, RealVNC, TightVNC do not support this" } +{ "#comment" = "" } +{ "#comment" = "It is necessary to configure /etc/sasl2/qemu.conf to choose" } +{ "#comment" = "the desired SASL plugin (eg, GSSPI for Kerberos)" } +{ "#comment" = "" } +{ "vnc_sasl" = "1" } +{ "#empty" } +{ "#empty" } +{ "#comment" = "The default SASL configuration file is located in /etc/sasl2/" } +{ "#comment" = "When running libvirtd unprivileged, it may be desirable to" } +{ "#comment" = "override the configs in this location. Set this parameter to" } +{ "#comment" = "point to the directory, and create a qemu.conf in that location" } +{ "#comment" = "" } +{ "vnc_sasl_dir" = "/some/directory/sasl2" } diff -r 961d4b1ca1d3 src/qemu.conf --- a/src/qemu.conf Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu.conf Thu Mar 05 14:22:50 2009 +0000 @@ -60,6 +60,27 @@ # vnc_password = "XYZ12345" +# Enable use of SASL encryption on the VNC server. This requires +# a VNC client which supports the SASL protocol extension. +# Examples include vinagre, virt-viewer and virt-manager +# itself. UltraVNC, RealVNC, TightVNC do not support this +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +# vnc_sasl = 1 + + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +# vnc_sasl_dir = "/some/directory/sasl2" + + + + # The default security driver is SELinux. If SELinux is disabled # on the host, then the security driver will automatically disable # itself. If you wish to disable QEMU SELinux security driver while diff -r 961d4b1ca1d3 src/qemu_conf.c --- a/src/qemu_conf.c Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_conf.c Thu Mar 05 14:22:50 2009 +0000 @@ -161,6 +161,21 @@ int qemudLoadDriverConfig(struct qemud_d } } + p = virConfGetValue (conf, "vnc_sasl"); + CHECK_TYPE ("vnc_sasl", VIR_CONF_LONG); + if (p) driver->vncSASL = p->l; + + p = virConfGetValue (conf, "vnc_sasl_dir"); + CHECK_TYPE ("vnc_sasl_dir", VIR_CONF_STRING); + if (p && p->str) { + VIR_FREE(driver->vncSASLdir); + if (!(driver->vncSASLdir = strdup(p->str))) { + virReportOOMError(NULL); + virConfFree(conf); + return -1; + } + } + virConfFree (conf); return 0; } @@ -838,15 +853,20 @@ int qemudBuildCommandLine(virConnectPtr goto no_memory; \ } while (0) +#define ADD_ENV_PAIR(envname, val) \ + do { \ + char *envval; \ + ADD_ENV_SPACE; \ + if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \ + goto no_memory; \ + qenv[qenvc++] = envval; \ + } while (0) + #define ADD_ENV_COPY(envname) \ do { \ char *val = getenv(envname); \ - char *envval; \ - ADD_ENV_SPACE; \ if (val != NULL) { \ - if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \ - goto no_memory; \ - qenv[qenvc++] = envval; \ + ADD_ENV_PAIR(envname, val); \ } \ } while (0) @@ -1295,6 +1315,15 @@ int qemudBuildCommandLine(virConnectPtr driver->vncTLSx509certdir); } } + + if (driver->vncSASL) { + virBufferAddLit(&opt, ",sasl"); + + if (driver->vncSASLdir) + ADD_ENV_PAIR("SASL_CONF_DIR", driver->vncSASLdir); + + /* TODO: Support ACLs later */ + } } else { virBufferVSprintf(&opt, "%d", vm->def->graphics->data.vnc.port - 5900); diff -r 961d4b1ca1d3 src/qemu_conf.h --- a/src/qemu_conf.h Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_conf.h Thu Mar 05 14:22:50 2009 +0000 @@ -73,9 +73,11 @@ struct qemud_driver { char *stateDir; unsigned int vncTLS : 1; unsigned int vncTLSx509verify : 1; + unsigned int vncSASL : 1; char *vncTLSx509certdir; char *vncListen; char *vncPassword; + char *vncSASLdir; virCapsPtr caps; diff -r 961d4b1ca1d3 src/qemu_driver.c --- a/src/qemu_driver.c Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_driver.c Thu Mar 05 14:22:50 2009 +0000 @@ -620,6 +620,7 @@ qemudShutdown(void) { VIR_FREE(qemu_driver->vncTLSx509certdir); VIR_FREE(qemu_driver->vncListen); VIR_FREE(qemu_driver->vncPassword); + VIR_FREE(qemu_driver->vncSASLdir); /* Free domain callback list */ virDomainEventCallbackListFree(qemu_driver->domainEventCallbacks); diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,sasl diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/> + </devices> +</domain> diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/> + </devices> +</domain> diff -r 961d4b1ca1d3 tests/qemuxml2argvtest.c --- a/tests/qemuxml2argvtest.c Wed Mar 04 13:17:44 2009 +0000 +++ b/tests/qemuxml2argvtest.c Thu Mar 05 14:22:50 2009 +0000 @@ -213,6 +213,19 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_CACHE_V2); DO_TEST("disk-usb", 0); DO_TEST("graphics-vnc", 0); + + driver.vncSASL = 1; + driver.vncSASLdir = strdup("/root/.sasl2"); + DO_TEST("graphics-vnc-sasl", 0); + driver.vncTLS = 1; + driver.vncTLSx509verify = 1; + driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu"); + DO_TEST("graphics-vnc-tls", 0); + driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0; + free(driver.vncSASLdir); + free(driver.vncTLSx509certdir); + driver.vncSASLdir = driver.vncTLSx509certdir = NULL; + DO_TEST("graphics-sdl", 0); DO_TEST("graphics-sdl-fullscreen", 0); DO_TEST("input-usbmouse", 0); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] [patch 0/4] checkpoint functionality
by Matt McCowan 11 Mar '09

11 Mar '09

OK. Another run at producing a function that helps the likes of me backup my kvm Windows servers. 'virsh checkpoint domain file [script]' is what the following patch set (against cvs) enables. Modelled on the virDomainSave function it takes an optional script which it will execute (and pass the name of the domain as an argument) while the domain is paused, then resume the domain. By the by stability is coming along nicely since 0.6.0. Thanks! Matt McCowan

4 5

[libvirt] [PATCH] storage: fix disregarding specified owner/group permissions
by Ryota Ozaki 11 Mar '09

11 Mar '09

Hi, storage_conf.c always sets owner/group permissions as 0, even if non-0 values are specified in XML. Because XPaths in DefParsePerms functions are wrong and XPath functions using the XPaths fail, as a result the values obtained by getpid()/getgid() are used instead. This patch fixes this and also unifies duplicated functions, virStoragePoolDefParsePerms and virStorageVolDefParsePerms, as a common function virStorageDefParsePerms to fix the bug prettily. One concern I have is the default value of mode permission in virStorageDefParsePerms is now 0700 but that in virStorageVolDefParsePerms was 0600. Is this considerable change? Thanks, ozaki-r

2 2

[libvirt] PATCH: Fix hang setting QEMU vcpu count
by Daniel P. Berrange 10 Mar '09

10 Mar '09

In the QEMu driver, the qemudDomainSetVcpus() entry point is calling into another entry point qemudDomainGetMaxVcpus(), this causes a deadlock due to recursive mutex locking. The qemudDomainSetVcpus() method should in fact be calling the internal method qemudGetMaxVCPUs(). This patch makes it do that, thus avoiding the recursive mutex locking. Daniel diff -r 6d2500176f31 src/qemu_driver.c --- a/src/qemu_driver.c Tue Mar 10 11:05:49 2009 +0000 +++ b/src/qemu_driver.c Tue Mar 10 12:09:41 2009 +0000 @@ -2725,6 +2725,7 @@ static int qemudDomainSetVcpus(virDomain virDomainObjPtr vm; int max; int ret = -1; + const char *type; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -2745,7 +2746,14 @@ static int qemudDomainSetVcpus(virDomain goto cleanup; } - if ((max = qemudDomainGetMaxVcpus(dom)) < 0) { + if (!(type = virDomainVirtTypeToString(vm->def->virtType))) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + _("unknown virt type in domain definition '%d'"), + vm->def->virtType); + goto cleanup; + } + + if ((max = qemudGetMaxVCPUs(dom->conn, type)) < 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("could not determine max vcpus for the domain")); goto cleanup; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1