- Devel - libvirt List Archives

[libvirt] PATCH: Convert VBox driver to preferred style
by Daniel P. Berrange 02 Jun '09

02 Jun '09

The driver function table in the VBox driver is currently using named struct member initializers. We previously removed all these from other drivers, so we have a clearer indication of missing APIs in each driver. This patch updates VBox to follow the preferred style Daniel diff -r f639344b66bc src/vbox/vbox_tmpl.c --- a/src/vbox/vbox_tmpl.c Thu May 28 11:36:37 2009 +0100 +++ b/src/vbox/vbox_tmpl.c Thu May 28 11:55:49 2009 +0100 @@ -4899,64 +4899,72 @@ cleanup: virDriver NAME(Driver) = { VIR_DRV_VBOX, "VBOX", - .open = vboxOpen, - .close = vboxClose, - .supports_feature = NULL, - .type = NULL, - .version = vboxGetVersion, - .getHostname = vboxGetHostname, - .getMaxVcpus = vboxGetMaxVcpus, - .nodeGetInfo = nodeGetInfo, - .getCapabilities = vboxGetCapabilities, - .listDomains = vboxListDomains, - .numOfDomains = vboxNumOfDomains, - .domainCreateXML = vboxDomainCreateXML, - .domainLookupByID = vboxDomainLookupByID, - .domainLookupByUUID = vboxDomainLookupByUUID, - .domainLookupByName = vboxDomainLookupByName, - .domainSuspend = vboxDomainSuspend, - .domainResume = vboxDomainResume, - .domainShutdown = vboxDomainShutdown, - .domainReboot = vboxDomainReboot, - .domainDestroy = vboxDomainDestroy, - .domainGetOSType = vboxDomainGetOSType, - .domainGetMaxMemory = NULL, - .domainSetMaxMemory = NULL, - .domainSetMemory = vboxDomainSetMemory, - .domainGetInfo = vboxDomainGetInfo, - .domainSave = vboxDomainSave, - .domainRestore = NULL, - .domainCoreDump = NULL, - .domainSetVcpus = NULL, - .domainPinVcpu = NULL, - .domainGetVcpus = NULL, - .domainGetMaxVcpus = NULL, - .domainDumpXML = vboxDomainDumpXML, - .listDefinedDomains = vboxListDefinedDomains, - .numOfDefinedDomains = vboxNumOfDefinedDomains, - .domainCreate = vboxDomainCreate, - .domainDefineXML = vboxDomainDefineXML, - .domainUndefine = vboxDomainUndefine, - .domainAttachDevice = vboxDomainAttachDevice, - .domainDetachDevice = vboxDomainDetachDevice, - .domainGetAutostart = NULL, - .domainSetAutostart = NULL, - .domainGetSchedulerType = NULL, - .domainGetSchedulerParameters = NULL, - .domainSetSchedulerParameters = NULL, - .domainMigratePrepare = NULL, - .domainMigratePerform = NULL, - .domainMigrateFinish = NULL, - .domainBlockStats = NULL, - .domainInterfaceStats = NULL, - .domainBlockPeek = NULL, - .domainMemoryPeek = NULL, - .nodeGetCellsFreeMemory = NULL, - .getFreeMemory = NULL, - .domainEventRegister = NULL, - .domainEventDeregister = NULL, - .domainMigratePrepare2 = NULL, - .domainMigrateFinish2 = NULL, + vboxOpen, /* open */ + vboxClose, /* close */ + NULL, /* supports_feature */ + NULL, /* type */ + vboxGetVersion, /* version */ + vboxGetHostname, /* getHostname */ + vboxGetMaxVcpus, /* getMaxVcpus */ + nodeGetInfo, /* nodeGetInfo */ + vboxGetCapabilities, /* getCapabilities */ + vboxListDomains, /* listDomains */ + vboxNumOfDomains, /* numOfDomains */ + vboxDomainCreateXML, /* domainCreateXML */ + vboxDomainLookupByID, /* domainLookupByID */ + vboxDomainLookupByUUID, /* domainLookupByUUID */ + vboxDomainLookupByName, /* domainLookupByName */ + vboxDomainSuspend, /* domainSuspend */ + vboxDomainResume, /* domainResume */ + vboxDomainShutdown, /* domainShutdown */ + vboxDomainReboot, /* domainReboot */ + vboxDomainDestroy, /* domainDestroy */ + vboxDomainGetOSType, /* domainGetOSType */ + NULL, /* domainGetMaxMemory */ + NULL, /* domainSetMaxMemory */ + vboxDomainSetMemory, /* domainSetMemory */ + vboxDomainGetInfo, /* domainGetInfo */ + vboxDomainSave, /* domainSave */ + NULL, /* domainRestore */ + NULL, /* domainCoreDump */ + NULL, /* domainSetVcpus */ + NULL, /* domainPinVcpu */ + NULL, /* domainGetVcpus */ + NULL, /* domainGetMaxVcpus */ + NULL, /* domainGetSecurityLabel */ + NULL, /* nodeGetSecurityModel */ + vboxDomainDumpXML, /* domainDumpXML */ + NULL, /* domainXmlFromNative */ + NULL, /* domainXmlToNative */ + vboxListDefinedDomains, /* listDefinedDomains */ + vboxNumOfDefinedDomains, /* numOfDefinedDomains */ + vboxDomainCreate, /* domainCreate */ + vboxDomainDefineXML, /* domainDefineXML */ + vboxDomainUndefine, /* domainUndefine */ + vboxDomainAttachDevice, /* domainAttachDevice */ + vboxDomainDetachDevice, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ + NULL, /* domainGetSchedulerType */ + NULL, /* domainGetSchedulerParameters */ + NULL, /* domainSetSchedulerParameters */ + NULL, /* domainMigratePrepare */ + NULL, /* domainMigratePerform */ + NULL, /* domainMigrateFinish */ + NULL, /* domainBlockStats */ + NULL, /* domainInterfaceStats */ + NULL, /* domainBlockPeek */ + NULL, /* domainMemoryPeek */ + NULL, /* nodeGetCellsFreeMemory */ + NULL, /* getFreeMemory */ + NULL, /* domainEventRegister */ + NULL, /* domainEventDeregister */ + NULL, /* domainMigratePrepare2 */ + NULL, /* domainMigrateFinish2 */ + NULL, /* nodeDeviceDettach */ + NULL, /* nodeDeviceReAttach */ + NULL, /* nodeDeviceReset */ + }; virNetworkDriver NAME(NetworkDriver) = { -- |: 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 :|

3 2

[libvirt] PATCH: Implement capabilities & NUMA APIs in LXC driver
by Daniel P. Berrange 02 Jun '09

02 Jun '09

The LXC driver is missing a implementation of the capabilities API, even though it has its capabilities object available in its internally struct. This patch exposes the capabilities, and also hooks up the shared NUMA APIs. Daniel diff -r 0d3150636e3e src/lxc_driver.c --- a/src/lxc_driver.c Thu May 28 11:33:16 2009 +0100 +++ b/src/lxc_driver.c Thu May 28 11:36:37 2009 +0100 @@ -47,6 +47,7 @@ #include "veth.h" #include "event.h" #include "cgroup.h" +#include "nodeinfo.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -115,6 +116,19 @@ static int lxcClose(virConnectPtr conn) return 0; } +static char *lxcGetCapabilities(virConnectPtr conn) { + lxc_driver_t *driver = conn->privateData; + char *xml; + + lxcDriverLock(driver); + if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + virReportOOMError(conn); + lxcDriverUnlock(driver); + + return xml; +} + + static virDomainPtr lxcDomainLookupByID(virConnectPtr conn, int id) { @@ -1429,8 +1443,8 @@ static virDriver lxcDriver = { lxcVersion, /* version */ lxcGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ - NULL, /* nodeGetInfo */ - NULL, /* getCapabilities */ + nodeGetInfo, /* nodeGetInfo */ + lxcGetCapabilities, /* getCapabilities */ lxcListDomains, /* listDomains */ lxcNumDomains, /* numOfDomains */ lxcDomainCreateAndStart, /* domainCreateXML */ @@ -1478,8 +1492,8 @@ static virDriver lxcDriver = { NULL, /* domainInterfaceStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ + nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ + nodeGetFreeMemory, /* getFreeMemory */ NULL, /* domainEventRegister */ NULL, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ -- |: 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] PATCH: Support networking in User Mode Linux driver
by Daniel P. Berrange 02 Jun '09

02 Jun '09

This patch adds support for bridge, virtual network, multicast and user-mode networking in the User Mode Linux driver. You can't pass an open TAP device file descriptor to UML, so we also extend the bridge.c file to supporting creation & deletion of persistent TAP devices. Daniel diff --git a/src/bridge.c b/src/bridge.c --- a/src/bridge.c +++ b/src/bridge.c @@ -451,8 +451,11 @@ brProbeVnetHdr(int tapfd) * * This function creates a new tap device on a bridge. @ifname can be either * a fixed name or a name template with '%d' for dynamic name allocation. - * in either case the final name for the bridge will be stored in @ifname - * and the associated file descriptor in @tapfd. + * in either case the final name for the bridge will be stored in @ifname. + * If the @tapfd parameter is supplied, the open tap device file + * descriptor will be returned, otherwise the TAP device will be made + * persistent and closed. The caller must use brDeleteTap to remove + * a persistent TAP devices when it is no longer needed. * * Returns 0 in case of success or an errno code in case of failure. */ @@ -465,7 +468,7 @@ brAddTap(brControl *ctl, { int id, subst, fd; - if (!ctl || !ctl->fd || !bridge || !ifname || !tapfd) + if (!ctl || !ctl->fd || !bridge || !ifname) return EINVAL; subst = id = 0; @@ -520,10 +523,14 @@ brAddTap(brControl *ctl, goto error; if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) goto error; + if (!tapfd && + (errno = ioctl(fd, TUNSETPERSIST, 1))) + goto error; VIR_FREE(*ifname); if (!(*ifname = strdup(try.ifr_name))) goto error; - *tapfd = fd; + if (tapfd) + *tapfd = fd; return 0; } @@ -535,6 +542,43 @@ brAddTap(brControl *ctl, return errno; } + +int brDeleteTap(brControl *ctl, + const char *ifname) +{ + struct ifreq try; + int len; + int fd; + + if (!ctl || !ctl->fd || !ifname) + return EINVAL; + + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) + return errno; + + memset(&try, 0, sizeof(struct ifreq)); + try.ifr_flags = IFF_TAP|IFF_NO_PI; + + len = strlen(ifname); + if (len >= BR_IFNAME_MAXLEN - 1) { + errno = EINVAL; + goto error; + } + + strncpy(try.ifr_name, ifname, len); + try.ifr_name[len] = '\0'; + + if (ioctl(fd, TUNSETIFF, &try) == 0) { + if ((errno = ioctl(fd, TUNSETPERSIST, 0))) + goto error; + } + + error: + close(fd); + + return errno; +} + /** * brSetInterfaceUp: diff --git a/src/bridge.h b/src/bridge.h --- a/src/bridge.h +++ b/src/bridge.h @@ -60,11 +60,19 @@ int brDeleteInterface (brContr const char *bridge, const char *iface); +enum { + BR_TAP_VNET_HDR = (1 << 0), + BR_TAP_PERSIST = (1 << 1), +}; + int brAddTap (brControl *ctl, const char *bridge, char **ifname, - int vnet_hdr, + int features, int *tapfd); + +int brDeleteTap (brControl *ctl, + const char *ifname); int brSetInterfaceUp (brControl *ctl, const char *ifname, diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -3146,6 +3146,7 @@ virDomainNetDefFormat(virConnectPtr conn else virBufferVSprintf(buf, " <source port='%d'/>\n", def->data.socket.port); + break; case VIR_DOMAIN_NET_TYPE_INTERNAL: virBufferEscapeString(buf, " <source name='%s'/>\n", diff --git a/src/libvirt_bridge.syms b/src/libvirt_bridge.syms --- a/src/libvirt_bridge.syms +++ b/src/libvirt_bridge.syms @@ -8,6 +8,7 @@ brAddBridge; brAddBridge; brAddInterface; brAddTap; +brDeleteTap; brDeleteBridge; brHasBridge; brInit; diff --git a/src/uml_conf.c b/src/uml_conf.c --- a/src/uml_conf.c +++ b/src/uml_conf.c @@ -44,6 +44,7 @@ #include "memory.h" #include "nodeinfo.h" #include "verify.h" +#include "bridge.h" #define VIR_FROM_THIS VIR_FROM_UML @@ -90,6 +91,172 @@ virCapsPtr umlCapsInit(void) { return NULL; } + +static int +umlConnectTapDevice(virConnectPtr conn, + virDomainNetDefPtr net, + const char *bridge) +{ + int tapfd = -1; + int err; + brControl *brctl = NULL; + + if (!net->ifname || + STRPREFIX(net->ifname, "vnet") || + strchr(net->ifname, '%')) { + VIR_FREE(net->ifname); + if (!(net->ifname = strdup("vnet%d"))) + goto no_memory; + } + + if ((err = brInit(&brctl))) { + char ebuf[1024]; + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot initialize bridge support: %s"), + virStrerror(err, ebuf, sizeof ebuf)); + goto error; + } + + if ((err = brAddTap(brctl, bridge, + &net->ifname, BR_TAP_PERSIST, &tapfd))) { + if (errno == ENOTSUP) { + /* In this particular case, give a better diagnostic. */ + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to add tap interface to bridge. " + "%s is not a bridge device"), bridge); + } else { + char ebuf[1024]; + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to add tap interface '%s' " + "to bridge '%s' : %s"), + net->ifname, bridge, virStrerror(err, ebuf, sizeof ebuf)); + } + goto error; + } + close(tapfd); + + brShutdown(brctl); + + return 0; + +no_memory: + virReportOOMError(conn); +error: + brShutdown(brctl); + return -1; +} + +static char * +umlBuildCommandLineNet(virConnectPtr conn, + virDomainNetDefPtr def, + int idx) +{ + char *ret; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + /* General format: ethNN=type,options */ + + virBufferVSprintf(&buf, "eth%d=", idx); + + switch (def->type) { + case VIR_DOMAIN_NET_TYPE_USER: + /* ethNNN=slirp,macaddr */ + virBufferAddLit(&buf, "slirp"); + break; + + case VIR_DOMAIN_NET_TYPE_ETHERNET: + /* ethNNN=tuntap,tapname,macaddr,gateway */ + virBufferAddLit(&buf, "tuntap"); + if (def->data.ethernet.ipaddr) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("IP address not supported for ethernet inteface")); + goto error; + } + if (def->data.ethernet.script) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("script execution not supported for ethernet inteface")); + goto error; + } + break; + + case VIR_DOMAIN_NET_TYPE_SERVER: + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("TCP server networking type not supported")); + goto error; + + case VIR_DOMAIN_NET_TYPE_CLIENT: + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("TCP client networking type not supported")); + goto error; + + case VIR_DOMAIN_NET_TYPE_MCAST: + /* ethNNN=tuntap,macaddr,ipaddr,port */ + virBufferAddLit(&buf, "mcast"); + break; + + case VIR_DOMAIN_NET_TYPE_NETWORK: + { + char *bridge; + virNetworkPtr network = virNetworkLookupByName(conn, + def->data.network.name); + if (!network) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Network '%s' not found"), + def->data.network.name); + goto error; + } + bridge = virNetworkGetBridgeName(network); + virNetworkFree(network); + if (bridge == NULL) { + goto error; + } + + if (umlConnectTapDevice(conn, def, bridge) < 0) { + VIR_FREE(bridge); + goto error; + } + + /* ethNNN=tuntap,tapname,macaddr,gateway */ + virBufferVSprintf(&buf, "tuntap,%s", def->ifname); + break; + } + + case VIR_DOMAIN_NET_TYPE_BRIDGE: + if (umlConnectTapDevice(conn, def, def->data.bridge.brname) < 0) + goto error; + + /* ethNNN=tuntap,tapname,macaddr,gateway */ + virBufferVSprintf(&buf, "tuntap,%s", def->ifname); + break; + + case VIR_DOMAIN_NET_TYPE_INTERNAL: + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("internal networking type not supported")); + goto error; + } + + virBufferVSprintf(&buf, ",%02x:%02x:%02x:%02x:%02x:%02x", + def->mac[0], def->mac[1], def->mac[2], + def->mac[3], def->mac[4], def->mac[5]); + + if (def->type == VIR_DOMAIN_NET_TYPE_MCAST) { + virBufferVSprintf(&buf, ",%s,%d", + def->data.socket.address, + def->data.socket.port); + } + + if (virBufferError(&buf)) { + virReportOOMError(conn); + return NULL; + } + + return virBufferContentAndReset(&buf); + +error: + ret = virBufferContentAndReset(&buf); + VIR_FREE(ret); + return NULL; +} static char * umlBuildCommandLineChr(virConnectPtr conn, @@ -166,9 +333,8 @@ int umlBuildCommandLine(virConnectPtr co struct uml_driver *driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, const char ***retargv, - const char ***retenv, - int **tapfds, - int *ntapfds) { + const char ***retenv) +{ int i, j; char memory[50]; struct utsname ut; @@ -277,6 +443,13 @@ int umlBuildCommandLine(virConnectPtr co ADD_ARG_PAIR(disk->dst, disk->src); } + for (i = 0 ; i < vm->def->nnets ; i++) { + char *ret = umlBuildCommandLineNet(conn, vm->def->nets[i], i); + if (!ret) + goto error; + ADD_ARG(ret); + } + for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) { char *ret; if (i == 0 && vm->def->console) @@ -311,13 +484,7 @@ int umlBuildCommandLine(virConnectPtr co no_memory: virReportOOMError(conn); error: - if (tapfds && - *tapfds) { - for (i = 0; i < *ntapfds; i++) - close((*tapfds)[i]); - VIR_FREE(*tapfds); - *ntapfds = 0; - } + if (qargv) { for (i = 0 ; i < qargc ; i++) VIR_FREE((qargv)[i]); diff --git a/src/uml_conf.h b/src/uml_conf.h --- a/src/uml_conf.h +++ b/src/uml_conf.h @@ -70,8 +70,6 @@ int umlBuildCommandLine (v struct uml_driver *driver, virDomainObjPtr dom, const char ***retargv, - const char ***retenv, - int **tapfds, - int *ntapfds); + const char ***retenv); #endif /* __UML_CONF_H */ diff --git a/src/uml_driver.c b/src/uml_driver.c --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -715,6 +721,35 @@ error: return -1; } + +static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainObjPtr vm) { + int i; + int err; + int ret = 0; + brControl *brctl = NULL; + VIR_ERROR0("Cleanup tap"); + if (brInit(&brctl) < 0) + return -1; + + for (i = 0 ; i < vm->def->nnets ; i++) { + virDomainNetDefPtr def = vm->def->nets[i]; + + if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && + def->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + VIR_ERROR("Cleanup '%s'", def->ifname); + err = brDeleteTap(brctl, def->ifname); + if (err) { + VIR_ERROR("Cleanup failed %d", err); + ret = -1; + } + } + VIR_ERROR0("Cleanup tap done"); + brShutdown(brctl); + return ret; +} static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, @@ -726,8 +761,6 @@ static int umlStartVMDaemon(virConnectPt char *logfile; int logfd = -1; struct stat sb; - int *tapfds = NULL; - int ntapfds = 0; fd_set keepfd; char ebuf[1024]; @@ -786,9 +819,9 @@ static int umlStartVMDaemon(virConnectPt } if (umlBuildCommandLine(conn, driver, vm, - &argv, &progenv, - &tapfds, &ntapfds) < 0) { + &argv, &progenv) < 0) { close(logfd); + umlCleanupTapDevices(conn, vm); return -1; } @@ -818,9 +851,6 @@ static int umlStartVMDaemon(virConnectPt vm->monitor = -1; - for (i = 0 ; i < ntapfds ; i++) - FD_SET(tapfds[i], &keepfd); - ret = virExecDaemonize(conn, argv, progenv, &keepfd, &pid, -1, &logfd, &logfd, 0, NULL, NULL, NULL); @@ -834,15 +864,14 @@ static int umlStartVMDaemon(virConnectPt VIR_FREE(progenv[i]); VIR_FREE(progenv); - if (tapfds) { - for (i = 0 ; i < ntapfds ; i++) { - close(tapfds[i]); - } - VIR_FREE(tapfds); - } + if (ret < 0) + umlCleanupTapDevices(conn, vm); /* NB we don't mark it running here - we do that async with inotify */ + /* XXX what if someone else tries to start it again + before we get the inotification ? Sounds like + trouble.... */ return ret; } @@ -874,6 +901,8 @@ static void umlShutdownVMDaemon(virConne vm->state = VIR_DOMAIN_SHUTOFF; VIR_FREE(vm->vcpupids); vm->nvcpupids = 0; + + umlCleanupTapDevices(conn, vm); if (vm->newDef) { virDomainDefFree(vm->def); -- |: 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] PATCH: Misc user mode linux startup bugs
by Daniel P. Berrange 02 Jun '09

02 Jun '09

There's a number of annoying bugs in the user mode linux driver startup code. This patch fixes lots of them. We failed to check umlMonitorCommand for error, leading to a NULL de-reference due to another bug in that function. This patch also checks if 'res' is NULL before de-referenceing it, just in case. In the code for handling inotify delete events, we duplicated alot of the umlShutdownVMDaemon code, but forgot to close the monitor. This patches makes it just call umlShutdownVMDaemon directly. In one place where we spin in a usleep loop, we forgot to increment our retries counter, making it spin forever. Finally, switch to virKillProcess and make the latter also avoids pid==1, since I can't imagine a time where we'd ever want to kill 'init' :-) Daniel diff --git a/src/uml_driver.c b/src/uml_driver.c --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -166,9 +166,10 @@ umlIdentifyOneChrPTY(virConnectPtr conn, return -1; } requery: - umlMonitorCommand(NULL, driver, dom, cmd, &res); + if (umlMonitorCommand(NULL, driver, dom, cmd, &res) < 0) + return -1; - if (STRPREFIX(res, "pts:")) { + if (res && STRPREFIX(res, "pts:")) { VIR_FREE(def->data.file.path); if ((def->data.file.path = strdup(res + 4)) == NULL) { virReportOOMError(conn); @@ -176,7 +177,7 @@ requery: VIR_FREE(cmd); return -1; } - } else if (STRPREFIX(res, "pts")) { + } else if (!res || STRPREFIX(res, "pts")) { /* It can take a while to startup, so retry for upto 5 seconds */ /* XXX should do this in a better non-blocking @@ -263,19 +264,15 @@ reread: } if (e->mask & IN_DELETE) { + VIR_DEBUG("Got inotify domain shutdown '%s'", name); if (!virDomainIsActive(dom)) { virDomainObjUnlock(dom); continue; } - dom->def->id = -1; - dom->pid = -1; - if (dom->newDef) { - virDomainDefFree(dom->def); - dom->def = dom->newDef; - } - dom->state = VIR_DOMAIN_SHUTOFF; + umlShutdownVMDaemon(NULL, driver, dom); } else if (e->mask & (IN_CREATE | IN_MODIFY)) { + VIR_DEBUG("Got inotify domain startup '%s'", name); if (virDomainIsActive(dom)) { virDomainObjUnlock(dom); continue; @@ -289,11 +286,13 @@ reread: dom->def->id = driver->nextvmid++; dom->state = VIR_DOMAIN_RUNNING; - if (umlOpenMonitor(NULL, driver, dom) < 0) + if (umlOpenMonitor(NULL, driver, dom) < 0) { + VIR_WARN0("Could not open monitor for new domain"); umlShutdownVMDaemon(NULL, driver, dom); - - if (umlIdentifyChrPTY(NULL, driver, dom) < 0) + } else if (umlIdentifyChrPTY(NULL, driver, dom) < 0) { + VIR_WARN0("Could not identify charater devices for new domain"); umlShutdownVMDaemon(NULL, driver, dom); + } } virDomainObjUnlock(dom); } @@ -383,6 +382,7 @@ umlStartup(void) { goto error; } + VIR_INFO("Adding inotify watch on %s", uml_driver->monitorDir); if (inotify_add_watch(uml_driver->inotifyFD, uml_driver->monitorDir, IN_CREATE | IN_MODIFY | IN_DELETE) < 0) { @@ -595,10 +595,11 @@ static int umlOpenMonitor(virConnectPtr if (umlMonitorAddress(conn, driver, vm, &addr) < 0) return -1; + VIR_DEBUG("Dest address for monitor is '%s'", addr.sun_path); restat: if (stat(addr.sun_path, &sb) < 0) { if (errno == ENOENT && - retries < 50) { + retries++ < 50) { usleep(1000 * 100); goto restat; } @@ -612,7 +613,8 @@ restat: } memset(addr.sun_path, 0, sizeof addr.sun_path); - sprintf(addr.sun_path + 1, "%u", getpid()); + sprintf(addr.sun_path + 1, "libvirt-uml-%u", vm->pid); + VIR_DEBUG("Reply address for monitor is '%s'", addr.sun_path+1); if (bind(vm->monitor, (struct sockaddr *)&addr, sizeof addr) < 0) { virReportSystemError(conn, errno, "%s", _("cannot bind socket")); @@ -656,6 +658,8 @@ static int umlMonitorCommand(virConnectP int retlen = 0, ret = 0; struct sockaddr_un addr; unsigned int addrlen; + + VIR_DEBUG("Run command '%s'", cmd); *reply = NULL; @@ -706,6 +710,8 @@ static int umlMonitorCommand(virConnectP } while (res.extra); + VIR_DEBUG("Command reply is '%s'", NULLSTR(retdata)); + *reply = retdata; return ret; @@ -852,12 +881,10 @@ static void umlShutdownVMDaemon(virConne virDomainObjPtr vm) { int ret; - if (!virDomainIsActive(vm) || - vm->pid <= 1) + if (!virDomainIsActive(vm)) return; - - kill(vm->pid, SIGTERM); + virKillProcess(vm->pid, SIGTERM); if (vm->monitor != -1) close(vm->monitor); diff --git a/src/util.c b/src/util.c --- a/src/util.c +++ b/src/util.c @@ -1680,7 +1680,7 @@ char *virGetHostname(void) /* send signal to a single process */ int virKillProcess(pid_t pid, int sig) { - if (pid < 1) { + if (pid <= 1) { errno = ESRCH; return -1; } -- |: 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] PATCH: Fix libvirt log initialization to not override environment
by Daniel P. Berrange 02 Jun '09

02 Jun '09

Witht he libvirtd daemon, if you start it up with LIBVIRT_LOG_OUTPUTS or LIBVIRT_LOG_FILTERS set, then it'll initially use these settings for logging, but then when it reads the config file it'll reset all logging and ignore your environment variables. This is rather confusing ! This quick fix makes it honour this env variables, if the config file has not got explicit overrides. Daniel diff --git a/qemud/qemud.c b/qemud/qemud.c --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2482,6 +2482,11 @@ qemudSetLogging(virConfPtr conf, const c /* there is no default filters */ GET_CONF_STR (conf, filename, log_filters); + if (!log_filters) { + debugEnv = getenv("LIBVIRT_LOG_FILTERS"); + if (debugEnv) + log_filters = strdup(debugEnv); + } virLogParseFilters(log_filters); /* @@ -2489,7 +2494,12 @@ qemudSetLogging(virConfPtr conf, const c * all logs to stderr if not running as daemon */ GET_CONF_STR (conf, filename, log_outputs); - if (log_outputs == NULL) { + if (!log_outputs) { + debugEnv = getenv("LIBVIRT_LOG_OUTPUTS"); + if (debugEnv) + log_outputs = strdup(debugEnv); + } + if (!log_outputs) { if (godaemon) { char *tmp = NULL; if (virAsprintf (&tmp, "%d:syslog:libvirtd", log_level) < 0) @@ -2499,8 +2509,9 @@ qemudSetLogging(virConfPtr conf, const c } else { virLogParseOutputs("0:stderr:libvirtd"); } - } else + } else { virLogParseOutputs(log_outputs); + } ret = 0; free_and_fail: -- |: 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] [PATCH 0/1] NPIV support revised patch
by David Allan 02 Jun '09

02 Jun '09

Here is a new version of the NPIV support incorporating everybody's comments. I think it should be ready to go in at this point. Dave

3 3

[libvirt] PATCH: Remove all getuid==0 checks from code
by Daniel P. Berrange 02 Jun '09

02 Jun '09

This patch is preparing the way for future work on allowing the libvirtd daemon to run as a less-privileged user ID. The idea is that we will switch from 'root' to 'libvirtd', but use Linux capabilties to keep the handful of higher privileges we need for our work. Thus any code which does a check of 'getuid() == 0' is guarenteed to break [1]. The way this patch approaches this problem, is to change the driver initialization function virStateInitialize() to have it be passed in a 'int privileged' flag from the libvirtd daemon. Each driver is updated to record this flag, and use it for checks where needed. The only real exception is the Xen driver, where we simply check access(2) against the file we need to open. [1] Technically this is already broken on Solaris, since they already change user id qemud/qemud.c | 39 ++++++++++++++++++++++----------------- qemud/qemud.h | 2 ++ src/driver.h | 2 +- src/libvirt.c | 4 ++-- src/libvirt_internal.h | 2 +- src/lxc_driver.c | 25 +++---------------------- src/network_driver.c | 4 ++-- src/node_device_devkit.c | 2 +- src/node_device_hal.c | 2 +- src/qemu_conf.h | 2 ++ src/qemu_driver.c | 37 +++++++++++++++++++------------------ src/remote_internal.c | 2 +- src/storage_driver.c | 6 +++--- src/uml_conf.h | 2 ++ src/uml_driver.c | 18 +++++++++--------- src/xen_internal.c | 2 +- src/xen_unified.c | 2 +- 17 files changed, 73 insertions(+), 80 deletions(-) Daniel diff -r 5e3b5d1f91c2 qemud/qemud.c --- a/qemud/qemud.c Thu May 21 16:21:20 2009 +0100 +++ b/qemud/qemud.c Thu May 21 16:27:16 2009 +0100 @@ -112,8 +112,6 @@ static int unix_sock_ro_mask = 0666; #else -#define SYSTEM_UID 0 - static gid_t unix_sock_gid = 0; /* Only root by default */ static int unix_sock_rw_mask = 0700; /* Allow user only */ static int unix_sock_ro_mask = 0777; /* Allow world */ @@ -512,7 +510,7 @@ static int qemudListenUnix(struct qemud_ oldgrp = getgid(); oldmask = umask(readonly ? ~unix_sock_ro_mask : ~unix_sock_rw_mask); - if (getuid() == 0) + if (server->privileged) setgid(unix_sock_gid); if (bind(sock->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { @@ -521,7 +519,7 @@ static int qemudListenUnix(struct qemud_ goto cleanup; } umask(oldmask); - if (getuid() == 0) + if (server->privileged) setgid(oldgrp); if (listen(sock->fd, 30) < 0) { @@ -696,7 +694,6 @@ static int qemudInitPaths(struct qemud_s char *roSockname, int maxlen) { - uid_t uid = geteuid(); char *sock_dir; char *dir_prefix = NULL; int ret = -1; @@ -706,7 +703,7 @@ static int qemudInitPaths(struct qemud_s sock_dir = unix_sock_dir; else { sock_dir = sockname; - if (uid == SYSTEM_UID) { + if (server->privileged) { dir_prefix = strdup (LOCAL_STATE_DIR); if (dir_prefix == NULL) { virReportOOMError(NULL); @@ -716,6 +713,7 @@ static int qemudInitPaths(struct qemud_s dir_prefix) >= maxlen) goto snprintf_error; } else { + uid_t uid = geteuid(); dir_prefix = virGetUserDirectory(NULL, uid); if (dir_prefix == NULL) { /* Do not diagnose here; virGetUserDirectory does that. */ @@ -733,7 +731,7 @@ static int qemudInitPaths(struct qemud_s goto cleanup; } - if (uid == SYSTEM_UID) { + if (server->privileged) { if (snprintf (sockname, maxlen, "%s/libvirt-sock", sock_dir_prefix) >= maxlen || (snprintf (roSockname, maxlen, "%s/libvirt-sock-ro", @@ -747,10 +745,10 @@ static int qemudInitPaths(struct qemud_s goto snprintf_error; } - if (uid == SYSTEM_UID) - server->logDir = strdup (LOCAL_STATE_DIR "/log/libvirt"); + if (server->privileged) + server->logDir = strdup (LOCAL_STATE_DIR "/log/libvirt"); else - virAsprintf(&server->logDir, "%s/.libvirt/log", dir_prefix); + virAsprintf(&server->logDir, "%s/.libvirt/log", dir_prefix); if (server->logDir == NULL) virReportOOMError(NULL); @@ -786,6 +784,7 @@ static struct qemud_server *qemudInitial VIR_FREE(server); } + server->privileged = getuid() == 0 ? 1 : 0; server->sigread = sigread; if (virEventInit() < 0) { @@ -844,7 +843,7 @@ static struct qemud_server *qemudInitial virEventUpdateTimeoutImpl, virEventRemoveTimeoutImpl); - virStateInitialize(); + virStateInitialize(server->privileged); return server; } @@ -915,7 +914,7 @@ static struct qemud_server *qemudNetwork } #ifdef HAVE_AVAHI - if (getuid() == 0 && mdns_adv) { + if (server->privileged && mdns_adv) { struct libvirtd_mdns_group *group; int port = 0; @@ -2507,9 +2506,9 @@ remoteReadConfigFile (struct qemud_serve #if HAVE_POLKIT /* Change the default back to no auth for non-root */ - if (getuid() != 0 && auth_unix_rw == REMOTE_AUTH_POLKIT) + if (!server->privileged && auth_unix_rw == REMOTE_AUTH_POLKIT) auth_unix_rw = REMOTE_AUTH_NONE; - if (getuid() != 0 && auth_unix_ro == REMOTE_AUTH_POLKIT) + if (!server->privileged && auth_unix_ro == REMOTE_AUTH_POLKIT) auth_unix_ro = REMOTE_AUTH_NONE; #endif @@ -2546,7 +2545,7 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { - if (getuid() != 0) { + if (!server->privileged) { VIR_WARN0(_("Cannot set group when not running as root")); } else { int ret; @@ -2871,7 +2870,7 @@ int main(int argc, char **argv) { sigaction(SIGPIPE, &sig_action, NULL); /* Ensure the rundir exists (on tmpfs on some systems) */ - if (geteuid () == 0) { + if (getuid() == 0) { const char *rundir = LOCAL_STATE_DIR "/run/libvirt"; if (mkdir (rundir, 0755)) { @@ -2882,6 +2881,12 @@ int main(int argc, char **argv) { } } + /* Beyond this point, nothing should rely on using + * getuid/geteuid() == 0, for privilege level checks. + * It must all use the flag 'server->privileged' + * which is also passed into all libvirt stateful + * drivers + */ if (qemudSetupPrivs() < 0) goto error2; @@ -2895,7 +2900,7 @@ int main(int argc, char **argv) { goto error2; /* Change the group ownership of /var/run/libvirt to unix_sock_gid */ - if (unix_sock_dir && geteuid() == 0) { + if (unix_sock_dir && server->privileged) { if (chown(unix_sock_dir, -1, unix_sock_gid) < 0) VIR_ERROR(_("Failed to change group ownership of %s"), unix_sock_dir); diff -r 5e3b5d1f91c2 qemud/qemud.h --- a/qemud/qemud.h Thu May 21 16:21:20 2009 +0100 +++ b/qemud/qemud.h Thu May 21 16:27:16 2009 +0100 @@ -172,6 +172,8 @@ struct qemud_server { virMutex lock; virCond job; + int privileged; + int nworkers; int nactiveworkers; struct qemud_worker *workers; diff -r 5e3b5d1f91c2 src/driver.h --- a/src/driver.h Thu May 21 16:21:20 2009 +0100 +++ b/src/driver.h Thu May 21 16:27:16 2009 +0100 @@ -717,7 +717,7 @@ struct _virStorageDriver { }; #ifdef WITH_LIBVIRTD -typedef int (*virDrvStateInitialize) (void); +typedef int (*virDrvStateInitialize) (int privileged); typedef int (*virDrvStateCleanup) (void); typedef int (*virDrvStateReload) (void); typedef int (*virDrvStateActive) (void); diff -r 5e3b5d1f91c2 src/libvirt.c --- a/src/libvirt.c Thu May 21 16:21:20 2009 +0100 +++ b/src/libvirt.c Thu May 21 16:27:16 2009 +0100 @@ -765,7 +765,7 @@ virRegisterStateDriver(virStateDriverPtr * * Return 0 if all succeed, -1 upon any failure. */ -int virStateInitialize(void) { +int virStateInitialize(int privileged) { int i, ret = 0; if (virInitialize() < 0) @@ -773,7 +773,7 @@ int virStateInitialize(void) { for (i = 0 ; i < virStateDriverTabCount ; i++) { if (virStateDriverTab[i]->initialize && - virStateDriverTab[i]->initialize() < 0) + virStateDriverTab[i]->initialize(privileged) < 0) ret = -1; } return ret; diff -r 5e3b5d1f91c2 src/libvirt_internal.h --- a/src/libvirt_internal.h Thu May 21 16:21:20 2009 +0100 +++ b/src/libvirt_internal.h Thu May 21 16:27:16 2009 +0100 @@ -26,7 +26,7 @@ #ifdef WITH_LIBVIRTD -int virStateInitialize(void); +int virStateInitialize(int privileged); int virStateCleanup(void); int virStateReload(void); int virStateActive(void); diff -r 5e3b5d1f91c2 src/lxc_driver.c --- a/src/lxc_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/lxc_driver.c Thu May 21 16:27:16 2009 +0100 @@ -51,7 +51,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -static int lxcStartup(void); +static int lxcStartup(int privileged); static int lxcShutdown(void); static lxc_driver_t *lxc_driver = NULL; @@ -67,15 +67,6 @@ static void lxcDriverUnlock(lxc_driver_t } -static int lxcProbe(void) -{ - if (getuid() != 0 || - lxcContainerAvailable(0) < 0) - return 0; - - return 1; -} - static virDrvOpenStatus lxcOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) @@ -86,9 +77,6 @@ static virDrvOpenStatus lxcOpen(virConne if (lxc_driver == NULL) return VIR_DRV_OPEN_DECLINED; - if (!lxcProbe()) - return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("lxc:///"); if (!conn->uri) { virReportOOMError(conn); @@ -115,12 +103,6 @@ static virDrvOpenStatus lxcOpen(virConne _("lxc state driver is not active")); return VIR_DRV_OPEN_ERROR; } - - if (!lxcProbe()) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - _("kernel does not support LXC feature")); - return VIR_DRV_OPEN_ERROR; - } } conn->privateData = lxc_driver; @@ -1149,9 +1131,8 @@ static int lxcCheckNetNsSupport(void) return 1; } -static int lxcStartup(void) +static int lxcStartup(int privileged) { - uid_t uid = getuid(); unsigned int i; char *ld; @@ -1164,7 +1145,7 @@ static int lxcStartup(void) return -1; /* Check that the user is root */ - if (0 != uid) { + if (!privileged) { return -1; } diff -r 5e3b5d1f91c2 src/network_driver.c --- a/src/network_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/network_driver.c Thu May 21 16:27:16 2009 +0100 @@ -182,7 +182,7 @@ networkAutostartConfigs(struct network_d * Initialization function for the QEmu daemon */ static int -networkStartup(void) { +networkStartup(int privileged) { uid_t uid = geteuid(); char *base = NULL; int err; @@ -196,7 +196,7 @@ networkStartup(void) { } networkDriverLock(driverState); - if (!uid) { + if (privileged) { if (virAsprintf(&driverState->logDir, "%s/log/libvirt/qemu", LOCAL_STATE_DIR) == -1) goto out_of_memory; diff -r 5e3b5d1f91c2 src/node_device_devkit.c --- a/src/node_device_devkit.c Thu May 21 16:21:20 2009 +0100 +++ b/src/node_device_devkit.c Thu May 21 16:27:16 2009 +0100 @@ -284,7 +284,7 @@ static void dev_create(void *_dkdev, voi } -static int devkitDeviceMonitorStartup(void) +static int devkitDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { size_t caps_tbl_len = sizeof(caps_tbl) / sizeof(caps_tbl[0]); DevkitClient *devkit_client = NULL; diff -r 5e3b5d1f91c2 src/node_device_hal.c --- a/src/node_device_hal.c Thu May 21 16:21:20 2009 +0100 +++ b/src/node_device_hal.c Thu May 21 16:27:16 2009 +0100 @@ -661,7 +661,7 @@ static void toggle_dbus_watch(DBusWatch } -static int halDeviceMonitorStartup(void) +static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { LibHalContext *hal_ctx = NULL; DBusConnection *dbus_conn = NULL; diff -r 5e3b5d1f91c2 src/qemu_conf.h --- a/src/qemu_conf.h Thu May 21 16:21:20 2009 +0100 +++ b/src/qemu_conf.h Thu May 21 16:27:16 2009 +0100 @@ -62,6 +62,8 @@ enum qemud_cmd_flags { struct qemud_driver { virMutex lock; + int privileged; + unsigned int qemuVersion; int nextvmid; diff -r 5e3b5d1f91c2 src/qemu_driver.c --- a/src/qemu_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/qemu_driver.c Thu May 21 16:27:16 2009 +0100 @@ -130,24 +130,26 @@ static struct qemud_driver *qemu_driver static int -qemudLogFD(virConnectPtr conn, const char* logDir, const char* name) +qemudLogFD(virConnectPtr conn, struct qemud_driver *driver, const char* name) { char logfile[PATH_MAX]; mode_t logmode; - uid_t uid = geteuid(); int ret, fd = -1; - if ((ret = snprintf(logfile, sizeof(logfile), "%s/%s.log", logDir, name)) + if ((ret = snprintf(logfile, sizeof(logfile), "%s/%s.log", + driver->logDir, name)) < 0 || ret >= sizeof(logfile)) { virReportOOMError(conn); return -1; } logmode = O_CREAT | O_WRONLY; - if (uid != 0) + /* Only logrotate files in /var/log, so only append if running privileged */ + if (driver->privileged) + logmode |= O_APPEND; + else logmode |= O_TRUNC; - else - logmode |= O_APPEND; + if ((fd = open(logfile, logmode, S_IRUSR | S_IWUSR)) < 0) { virReportSystemError(conn, errno, _("failed to create logfile %s"), @@ -210,9 +212,9 @@ qemudAutostartConfigs(struct qemud_drive * to lookup the bridge associated with a virtual * network */ - virConnectPtr conn = virConnectOpen(getuid() ? - "qemu:///session" : - "qemu:///system"); + virConnectPtr conn = virConnectOpen(driver->privileged ? + "qemu:///system" : + "qemu:///session"); /* Ignoring NULL conn which is mostly harmless here */ qemuDriverLock(driver); @@ -333,7 +335,7 @@ qemudReconnectVMs(struct qemud_driver *d goto next_error; } - if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0) + if ((vm->logfile = qemudLogFD(NULL, driver, vm->def->name)) < 0) goto next_error; if (vm->def->id >= driver->nextvmid) @@ -420,8 +422,7 @@ qemudSecurityInit(struct qemud_driver *q * Initialization function for the QEmu daemon */ static int -qemudStartup(void) { - uid_t uid = geteuid(); +qemudStartup(int privileged) { char *base = NULL; char driverConf[PATH_MAX]; @@ -434,6 +435,7 @@ qemudStartup(void) { return -1; } qemuDriverLock(qemu_driver); + qemu_driver->privileged = privileged; /* Don't have a dom0 so start from 1 */ qemu_driver->nextvmid = 1; @@ -448,7 +450,7 @@ qemudStartup(void) { virEventAddTimeout(-1, qemuDomainEventFlush, qemu_driver, NULL)) < 0) goto error; - if (!uid) { + if (privileged) { if (virAsprintf(&qemu_driver->logDir, "%s/log/libvirt/qemu", LOCAL_STATE_DIR) == -1) goto out_of_memory; @@ -460,6 +462,7 @@ qemudStartup(void) { "%s/run/libvirt/qemu/", LOCAL_STATE_DIR) == -1) goto out_of_memory; } else { + uid_t uid = geteuid(); char *userdir = virGetUserDirectory(NULL, uid); if (!userdir) goto error; @@ -1372,7 +1375,7 @@ static int qemudStartVMDaemon(virConnect goto cleanup; } - if((vm->logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) + if ((vm->logfile = qemudLogFD(conn, driver, vm->def->name)) < 0) goto cleanup; emulator = vm->def->emulator; @@ -1773,8 +1776,6 @@ static int qemudProbe(void) static virDrvOpenStatus qemudOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - uid_t uid = getuid(); - if (conn->uri == NULL) { if (qemu_driver == NULL) return VIR_DRV_OPEN_DECLINED; @@ -1782,7 +1783,7 @@ static virDrvOpenStatus qemudOpen(virCon if (!qemudProbe()) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(uid == 0 ? + conn->uri = xmlParseURI(qemu_driver->privileged ? "qemu:///system" : "qemu:///session"); if (!conn->uri) { @@ -1805,7 +1806,7 @@ static virDrvOpenStatus qemudOpen(virCon return VIR_DRV_OPEN_ERROR; } - if (!uid) { + if (qemu_driver->privileged) { if (STRNEQ (conn->uri->path, "/system") && STRNEQ (conn->uri->path, "/session")) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, diff -r 5e3b5d1f91c2 src/remote_internal.c --- a/src/remote_internal.c Thu May 21 16:21:20 2009 +0100 +++ b/src/remote_internal.c Thu May 21 16:27:16 2009 +0100 @@ -235,7 +235,7 @@ static gnutls_session_t negotiate_gnutls #ifdef WITH_LIBVIRTD static int -remoteStartup(void) +remoteStartup(int privileged ATTRIBUTE_UNUSED) { /* Mark that we're inside the daemon so we can avoid * re-entering ourselves diff -r 5e3b5d1f91c2 src/storage_driver.c --- a/src/storage_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/storage_driver.c Thu May 21 16:27:16 2009 +0100 @@ -106,8 +106,7 @@ storageDriverAutostart(virStorageDriverS * Initialization function for the QEmu daemon */ static int -storageDriverStartup(void) { - uid_t uid = geteuid(); +storageDriverStartup(int privileged) { char *base = NULL; char driverConf[PATH_MAX]; @@ -120,10 +119,11 @@ storageDriverStartup(void) { } storageDriverLock(driverState); - if (!uid) { + if (privileged) { if ((base = strdup (SYSCONF_DIR "/libvirt")) == NULL) goto out_of_memory; } else { + uid_t uid = geteuid(); char *userdir = virGetUserDirectory(NULL, uid); if (!userdir) diff -r 5e3b5d1f91c2 src/uml_conf.h --- a/src/uml_conf.h Thu May 21 16:21:20 2009 +0100 +++ b/src/uml_conf.h Thu May 21 16:27:16 2009 +0100 @@ -42,6 +42,8 @@ struct uml_driver { virMutex lock; + int privileged; + unsigned int umlVersion; int nextvmid; diff -r 5e3b5d1f91c2 src/uml_driver.c --- a/src/uml_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/uml_driver.c Thu May 21 16:27:16 2009 +0100 @@ -131,9 +131,9 @@ umlAutostartConfigs(struct uml_driver *d * to lookup the bridge associated with a virtual * network */ - virConnectPtr conn = virConnectOpen(getuid() ? - "uml:///session" : - "uml:///system"); + virConnectPtr conn = virConnectOpen(driver->privileged ? + "uml:///system" : + "uml:///session"); /* Ignoring NULL conn which is mostly harmless here */ for (i = 0 ; i < driver->domains.count ; i++) { @@ -308,7 +308,7 @@ cleanup: * Initialization function for the Uml daemon */ static int -umlStartup(void) { +umlStartup(int privileged) { uid_t uid = geteuid(); char *base = NULL; char driverConf[PATH_MAX]; @@ -317,6 +317,8 @@ umlStartup(void) { if (VIR_ALLOC(uml_driver) < 0) return -1; + uml_driver->privileged = privileged; + if (virMutexInit(&uml_driver->lock) < 0) { VIR_FREE(uml_driver); return -1; @@ -331,7 +333,7 @@ umlStartup(void) { if (!userdir) goto error; - if (!uid) { + if (privileged) { if (virAsprintf(&uml_driver->logDir, "%s/log/libvirt/uml", LOCAL_STATE_DIR) == -1) goto out_of_memory; @@ -887,13 +889,11 @@ static void umlShutdownVMDaemon(virConne static virDrvOpenStatus umlOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - uid_t uid = getuid(); - if (conn->uri == NULL) { if (uml_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(uid == 0 ? + conn->uri = xmlParseURI(uml_driver->privileged ? "uml:///system" : "uml:///session"); if (!conn->uri) { @@ -915,7 +915,7 @@ static virDrvOpenStatus umlOpen(virConne return VIR_DRV_OPEN_ERROR; } - if (uid == 0) { + if (uml_driver->privileged) { if (STRNEQ (conn->uri->path, "/system") && STRNEQ (conn->uri->path, "/session")) { umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, diff -r 5e3b5d1f91c2 src/xen_internal.c --- a/src/xen_internal.c Thu May 21 16:21:20 2009 +0100 +++ b/src/xen_internal.c Thu May 21 16:27:16 2009 +0100 @@ -3434,6 +3434,6 @@ xenHavePrivilege() #ifdef __sun return priv_ineffect (PRIV_XVM_CONTROL); #else - return getuid () == 0; + return access(XEN_HYPERVISOR_SOCKET, R_OK) == 0; #endif } diff -r 5e3b5d1f91c2 src/xen_unified.c --- a/src/xen_unified.c Thu May 21 16:21:20 2009 +0100 +++ b/src/xen_unified.c Thu May 21 16:27:16 2009 +0100 @@ -175,7 +175,7 @@ done: #ifdef WITH_LIBVIRTD static int -xenInitialize (void) +xenInitialize (int privileged ATTRIBUTE_UNUSED) { inside_daemon = 1; return 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 Fix BuildRequires in spec file
by Trent Johnson 01 Jun '09

01 Jun '09

Fixes error from rpmbuild RPM build errors: File not found: /var/tmp/libvirt-0.6.3-1.el5-root/usr/libexec/libvirt_parthelper diff -u -r libvirt.spec.orig libvirt.spec --- libvirt.spec.orig 2009-04-24 08:58:29.000000000 -0500 +++ libvirt.spec 2009-05-29 09:57:56.000000000 -0500 @@ -59,7 +59,7 @@ Source: libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ -BuildRequires: python python-devel +BuildRequires: python python-devel e2fsprogs-devel Requires: libxml2 Requires: readline Requires: ncurses

2 4

[libvirt] PATCH: Fix mingw32 build
by Daniel P. Berrange 29 May '09

29 May '09

On Win32/mingw32 the name 'interface' is #defined to the COM_interface struct. Needless to say, libvirt thus fails to build in spectacular ways. This patch does s/interface/iface/ on all variables. It also fixes bugs in the qemud/Makefile.am and tests/testutils.h files include/libvirt/libvirt.h | 18 +++--- include/libvirt/libvirt.h.in | 18 +++--- qemud/Makefile.am | 6 +- qemud/remote.c | 82 ++++++++++++++--------------- qemud/remote_protocol.c | 14 ++--- qemud/remote_protocol.h | 14 ++--- qemud/remote_protocol.x | 14 ++--- src/datatypes.c | 36 ++++++------ src/datatypes.h | 2 src/driver.h | 8 +- src/libvirt.c | 120 +++++++++++++++++++++---------------------- src/remote_internal.c | 56 ++++++++++---------- tests/testutils.c | 10 +++ 13 files changed, 206 insertions(+), 192 deletions(-) Daniel Index: include/libvirt/libvirt.h =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/libvirt.h,v retrieving revision 1.105 diff -u -p -r1.105 libvirt.h --- include/libvirt/libvirt.h 21 May 2009 13:46:36 -0000 1.105 +++ include/libvirt/libvirt.h 28 May 2009 16:32:53 -0000 @@ -883,7 +883,7 @@ typedef struct _virInterface virInterfac */ typedef virInterface *virInterfacePtr; -virConnectPtr virInterfaceGetConnect (virInterfacePtr interface); +virConnectPtr virInterfaceGetConnect (virInterfacePtr iface); int virConnectNumOfInterfaces (virConnectPtr conn); int virConnectListInterfaces (virConnectPtr conn, @@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLook virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, const char *mac); -const char* virInterfaceGetName (virInterfacePtr interface); -const char* virInterfaceGetMACString (virInterfacePtr interface); +const char* virInterfaceGetName (virInterfacePtr iface); +const char* virInterfaceGetMACString (virInterfacePtr iface); -char * virInterfaceGetXMLDesc (virInterfacePtr interface, +char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); -int virInterfaceUndefine (virInterfacePtr interface); +int virInterfaceUndefine (virInterfacePtr iface); -int virInterfaceCreate (virInterfacePtr interface, +int virInterfaceCreate (virInterfacePtr iface, unsigned int flags); -int virInterfaceDestroy (virInterfacePtr interface, +int virInterfaceDestroy (virInterfacePtr iface, unsigned int flags); -int virInterfaceRef (virInterfacePtr interface); -int virInterfaceFree (virInterfacePtr interface); +int virInterfaceRef (virInterfacePtr iface); +int virInterfaceFree (virInterfacePtr iface); /** * virStoragePool: Index: include/libvirt/libvirt.h.in =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/libvirt.h.in,v retrieving revision 1.70 diff -u -p -r1.70 libvirt.h.in --- include/libvirt/libvirt.h.in 21 May 2009 13:46:36 -0000 1.70 +++ include/libvirt/libvirt.h.in 28 May 2009 16:32:53 -0000 @@ -883,7 +883,7 @@ typedef struct _virInterface virInterfac */ typedef virInterface *virInterfacePtr; -virConnectPtr virInterfaceGetConnect (virInterfacePtr interface); +virConnectPtr virInterfaceGetConnect (virInterfacePtr iface); int virConnectNumOfInterfaces (virConnectPtr conn); int virConnectListInterfaces (virConnectPtr conn, @@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLook virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, const char *mac); -const char* virInterfaceGetName (virInterfacePtr interface); -const char* virInterfaceGetMACString (virInterfacePtr interface); +const char* virInterfaceGetName (virInterfacePtr iface); +const char* virInterfaceGetMACString (virInterfacePtr iface); -char * virInterfaceGetXMLDesc (virInterfacePtr interface, +char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); -int virInterfaceUndefine (virInterfacePtr interface); +int virInterfaceUndefine (virInterfacePtr iface); -int virInterfaceCreate (virInterfacePtr interface, +int virInterfaceCreate (virInterfacePtr iface, unsigned int flags); -int virInterfaceDestroy (virInterfacePtr interface, +int virInterfaceDestroy (virInterfacePtr iface, unsigned int flags); -int virInterfaceRef (virInterfacePtr interface); -int virInterfaceFree (virInterfacePtr interface); +int virInterfaceRef (virInterfacePtr iface); +int virInterfaceFree (virInterfacePtr iface); /** * virStoragePool: Index: qemud/Makefile.am =================================================================== RCS file: /data/cvs/libvirt/qemud/Makefile.am,v retrieving revision 1.78 diff -u -p -r1.78 Makefile.am --- qemud/Makefile.am 25 May 2009 11:56:00 -0000 1.78 +++ qemud/Makefile.am 28 May 2009 16:32:53 -0000 @@ -31,7 +31,7 @@ EXTRA_DIST = \ $(AVAHI_SOURCES) \ $(DAEMON_SOURCES) -BUILT_SOURCES = libvirtd.init libvirtd.logrotate +BUILT_SOURCES = if HAVE_RPCGEN # @@ -218,6 +218,8 @@ remote_dispatch_args.h: $(srcdir)/remote remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x perl -w $(srcdir)/remote_generate_stubs.pl -r $(srcdir)/remote_protocol.x > $@ +BUILT_SOURCES += libvirtd.logrotate + libvirtd.logrotate: libvirtd.logrotate.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ @@ -242,6 +244,8 @@ uninstall-init: rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd +BUILT_SOURCES += libvirtd.init + libvirtd.init: libvirtd.init.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ Index: qemud/remote.c =================================================================== RCS file: /data/cvs/libvirt/qemud/remote.c,v retrieving revision 1.71 diff -u -p -r1.71 remote.c --- qemud/remote.c 21 May 2009 13:50:56 -0000 1.71 +++ qemud/remote.c 28 May 2009 16:32:54 -0000 @@ -2664,16 +2664,16 @@ remoteDispatchInterfaceLookupByName (str remote_interface_lookup_by_name_args *args, remote_interface_lookup_by_name_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceLookupByName (conn, args->name); - if (interface == NULL) { + iface = virInterfaceLookupByName (conn, args->name); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2685,16 +2685,16 @@ remoteDispatchInterfaceLookupByMacString remote_interface_lookup_by_mac_string_args *args, remote_interface_lookup_by_mac_string_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceLookupByMACString (conn, args->mac); - if (interface == NULL) { + iface = virInterfaceLookupByMACString (conn, args->mac); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2706,22 +2706,22 @@ remoteDispatchInterfaceGetXmlDesc (struc remote_interface_get_xml_desc_args *args, remote_interface_get_xml_desc_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } /* remoteDispatchClientRequest will free this. */ - ret->xml = virInterfaceGetXMLDesc (interface, args->flags); + ret->xml = virInterfaceGetXMLDesc (iface, args->flags); if (!ret->xml) { - virInterfaceFree(interface); + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2733,16 +2733,16 @@ remoteDispatchInterfaceDefineXml (struct remote_interface_define_xml_args *args, remote_interface_define_xml_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceDefineXML (conn, args->xml, args->flags); - if (interface == NULL) { + iface = virInterfaceDefineXML (conn, args->xml, args->flags); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2754,20 +2754,20 @@ remoteDispatchInterfaceUndefine (struct remote_interface_undefine_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceUndefine (interface) == -1) { - virInterfaceFree(interface); + if (virInterfaceUndefine (iface) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2779,20 +2779,20 @@ remoteDispatchInterfaceCreate (struct qe remote_interface_create_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceCreate (interface, args->flags) == -1) { - virInterfaceFree(interface); + if (virInterfaceCreate (iface, args->flags) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2804,20 +2804,20 @@ remoteDispatchInterfaceDestroy (struct q remote_interface_destroy_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceDestroy (interface, args->flags) == -1) { - virInterfaceFree(interface); + if (virInterfaceDestroy (iface, args->flags) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -4823,9 +4823,9 @@ get_nonnull_network (virConnectPtr conn, } static virInterfacePtr -get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface) +get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface) { - return virGetInterface (conn, interface.name, interface.mac); + return virGetInterface (conn, iface.name, iface.mac); } static virStoragePoolPtr Index: qemud/remote_protocol.c =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.c,v retrieving revision 1.34 diff -u -p -r1.34 remote_protocol.c --- qemud/remote_protocol.c 21 May 2009 13:50:56 -0000 1.34 +++ qemud/remote_protocol.c 28 May 2009 16:32:54 -0000 @@ -1530,7 +1530,7 @@ bool_t xdr_remote_interface_lookup_by_name_ret (XDR *xdrs, remote_interface_lookup_by_name_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1548,7 +1548,7 @@ bool_t xdr_remote_interface_lookup_by_mac_string_ret (XDR *xdrs, remote_interface_lookup_by_mac_string_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1557,7 +1557,7 @@ bool_t xdr_remote_interface_get_xml_desc_args (XDR *xdrs, remote_interface_get_xml_desc_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; @@ -1588,7 +1588,7 @@ bool_t xdr_remote_interface_define_xml_ret (XDR *xdrs, remote_interface_define_xml_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1597,7 +1597,7 @@ bool_t xdr_remote_interface_undefine_args (XDR *xdrs, remote_interface_undefine_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1606,7 +1606,7 @@ bool_t xdr_remote_interface_create_args (XDR *xdrs, remote_interface_create_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; @@ -1617,7 +1617,7 @@ bool_t xdr_remote_interface_destroy_args (XDR *xdrs, remote_interface_destroy_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; Index: qemud/remote_protocol.h =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.h,v retrieving revision 1.33 diff -u -p -r1.33 remote_protocol.h --- qemud/remote_protocol.h 21 May 2009 13:50:56 -0000 1.33 +++ qemud/remote_protocol.h 28 May 2009 16:32:54 -0000 @@ -853,7 +853,7 @@ struct remote_interface_lookup_by_name_a typedef struct remote_interface_lookup_by_name_args remote_interface_lookup_by_name_args; struct remote_interface_lookup_by_name_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_lookup_by_name_ret remote_interface_lookup_by_name_ret; @@ -863,12 +863,12 @@ struct remote_interface_lookup_by_mac_st typedef struct remote_interface_lookup_by_mac_string_args remote_interface_lookup_by_mac_string_args; struct remote_interface_lookup_by_mac_string_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_lookup_by_mac_string_ret remote_interface_lookup_by_mac_string_ret; struct remote_interface_get_xml_desc_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_get_xml_desc_args remote_interface_get_xml_desc_args; @@ -885,23 +885,23 @@ struct remote_interface_define_xml_args typedef struct remote_interface_define_xml_args remote_interface_define_xml_args; struct remote_interface_define_xml_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_define_xml_ret remote_interface_define_xml_ret; struct remote_interface_undefine_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_undefine_args remote_interface_undefine_args; struct remote_interface_create_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_create_args remote_interface_create_args; struct remote_interface_destroy_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_destroy_args remote_interface_destroy_args; Index: qemud/remote_protocol.x =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.x,v retrieving revision 1.32 diff -u -p -r1.32 remote_protocol.x --- qemud/remote_protocol.x 21 May 2009 13:50:56 -0000 1.32 +++ qemud/remote_protocol.x 28 May 2009 16:32:54 -0000 @@ -798,7 +798,7 @@ struct remote_interface_lookup_by_name_a }; struct remote_interface_lookup_by_name_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_lookup_by_mac_string_args { @@ -806,11 +806,11 @@ struct remote_interface_lookup_by_mac_st }; struct remote_interface_lookup_by_mac_string_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_get_xml_desc_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; @@ -824,20 +824,20 @@ struct remote_interface_define_xml_args }; struct remote_interface_define_xml_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_undefine_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_create_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; struct remote_interface_destroy_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; Index: src/datatypes.c =================================================================== RCS file: /data/cvs/libvirt/src/datatypes.c,v retrieving revision 1.12 diff -u -p -r1.12 datatypes.c --- src/datatypes.c 20 May 2009 14:26:50 -0000 1.12 +++ src/datatypes.c 28 May 2009 16:32:54 -0000 @@ -75,9 +75,9 @@ virNetworkFreeName(virNetworkPtr network * Returns 0 in case of success and -1 in case of failure. */ static int -virInterfaceFreeName(virInterfacePtr interface, const char *name ATTRIBUTE_UNUSED) +virInterfaceFreeName(virInterfacePtr iface, const char *name ATTRIBUTE_UNUSED) { - return (virUnrefInterface(interface)); + return (virUnrefInterface(iface)); } /** @@ -589,19 +589,19 @@ virGetInterface(virConnectPtr conn, cons * which may also be released if its ref count hits zero. */ static void -virReleaseInterface(virInterfacePtr interface) { - virConnectPtr conn = interface->conn; - DEBUG("release interface %p %s", interface, interface->name); +virReleaseInterface(virInterfacePtr iface) { + virConnectPtr conn = iface->conn; + DEBUG("release interface %p %s", iface, iface->name); /* TODO search by MAC first as they are better differenciators */ - if (virHashRemoveEntry(conn->interfaces, interface->name, NULL) < 0) + if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0) virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("interface missing from connection hash table")); - interface->magic = -1; - VIR_FREE(interface->name); - VIR_FREE(interface->mac); - VIR_FREE(interface); + iface->magic = -1; + VIR_FREE(iface->name); + VIR_FREE(iface->mac); + VIR_FREE(iface); DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; @@ -625,24 +625,24 @@ virReleaseInterface(virInterfacePtr inte * Returns the reference count or -1 in case of failure. */ int -virUnrefInterface(virInterfacePtr interface) { +virUnrefInterface(virInterfacePtr iface) { int refs; - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } - virMutexLock(&interface->conn->lock); - DEBUG("unref interface %p %s %d", interface, interface->name, interface->refs); - interface->refs--; - refs = interface->refs; + virMutexLock(&iface->conn->lock); + DEBUG("unref interface %p %s %d", iface, iface->name, iface->refs); + iface->refs--; + refs = iface->refs; if (refs == 0) { - virReleaseInterface(interface); + virReleaseInterface(iface); /* Already unlocked mutex */ return (0); } - virMutexUnlock(&interface->conn->lock); + virMutexUnlock(&iface->conn->lock); return (refs); } Index: src/datatypes.h =================================================================== RCS file: /data/cvs/libvirt/src/datatypes.h,v retrieving revision 1.8 diff -u -p -r1.8 datatypes.h --- src/datatypes.h 20 May 2009 14:26:50 -0000 1.8 +++ src/datatypes.h 28 May 2009 16:32:54 -0000 @@ -254,7 +254,7 @@ int virUnrefNetwork(virNetworkPtr networ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac); -int virUnrefInterface(virInterfacePtr interface); +int virUnrefInterface(virInterfacePtr iface); virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, Index: src/driver.h =================================================================== RCS file: /data/cvs/libvirt/src/driver.h,v retrieving revision 1.75 diff -u -p -r1.75 driver.h --- src/driver.h 25 May 2009 11:56:00 -0000 1.75 +++ src/driver.h 28 May 2009 16:32:54 -0000 @@ -516,7 +516,7 @@ typedef virInterfacePtr const char *mac); typedef char * - (*virDrvInterfaceGetXMLDesc) (virInterfacePtr interface, + (*virDrvInterfaceGetXMLDesc) (virInterfacePtr iface, unsigned int flags); typedef virInterfacePtr @@ -524,12 +524,12 @@ typedef virInterfacePtr const char *xmlDesc, unsigned int flags); typedef int - (*virDrvInterfaceUndefine) (virInterfacePtr interface); + (*virDrvInterfaceUndefine) (virInterfacePtr iface); typedef int - (*virDrvInterfaceCreate) (virInterfacePtr interface, + (*virDrvInterfaceCreate) (virInterfacePtr iface, unsigned int flags); typedef int - (*virDrvInterfaceDestroy) (virInterfacePtr interface, + (*virDrvInterfaceDestroy) (virInterfacePtr iface, unsigned int flags); typedef struct _virInterfaceDriver virInterfaceDriver; Index: src/libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.211 diff -u -p -r1.211 libvirt.c --- src/libvirt.c 25 May 2009 11:56:00 -0000 1.211 +++ src/libvirt.c 28 May 2009 16:32:54 -0000 @@ -472,7 +472,7 @@ virLibNetworkError(virNetworkPtr network * Handle an error at the connection level */ static void -virLibInterfaceError(virInterfacePtr interface, virErrorNumber error, +virLibInterfaceError(virInterfacePtr iface, virErrorNumber error, const char *info) { virConnectPtr conn = NULL; @@ -483,7 +483,7 @@ virLibInterfaceError(virInterfacePtr int errmsg = virErrorMsg(error, info); if (error != VIR_ERR_INVALID_INTERFACE) { - conn = interface->conn; + conn = iface->conn; } virRaiseError(conn, NULL, NULL, VIR_FROM_INTERFACE, error, VIR_ERR_ERROR, errmsg, info, NULL, 0, 0, errmsg, info); @@ -5485,17 +5485,17 @@ error: * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr -virInterfaceGetConnect (virInterfacePtr interface) +virInterfaceGetConnect (virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE (interface)) { + if (!VIR_IS_CONNECTED_INTERFACE (iface)) { virLibInterfaceError (NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return NULL; } - return interface->conn; + return iface->conn; } /** @@ -5663,7 +5663,7 @@ error: /** * virInterfaceGetName: - * @interface: a interface object + * @iface: a interface object * * Get the public name for that interface * @@ -5671,22 +5671,22 @@ error: * its lifetime will be the same as the interface object. */ const char * -virInterfaceGetName(virInterfacePtr interface) +virInterfaceGetName(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_INTERFACE(interface)) { + if (!VIR_IS_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } - return (interface->name); + return (iface->name); } /** * virInterfaceGetMACString: - * @interface: a interface object + * @iface: a interface object * * Get the MAC for a interface as string. For more information about * MAC see RFC4122. @@ -5696,22 +5696,22 @@ virInterfaceGetName(virInterfacePtr inte * will be the same as the interface object. */ const char * -virInterfaceGetMACString(virInterfacePtr interface) +virInterfaceGetMACString(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_INTERFACE(interface)) { + if (!VIR_IS_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } - return (interface->mac); + return (iface->mac); } /** * virInterfaceGetXMLDesc: - * @interface: a interface object + * @iface: a interface object * @flags: and OR'ed set of extraction flags, not used yet * * Provide an XML description of the interface. The description may be reused @@ -5721,27 +5721,27 @@ virInterfaceGetMACString(virInterfacePtr * the caller must free() the returned value. */ char * -virInterfaceGetXMLDesc(virInterfacePtr interface, unsigned int flags) +virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } if (flags != 0) { - virLibInterfaceError(interface, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - conn = interface->conn; + conn = iface->conn; if (conn->interfaceDriver && conn->interfaceDriver->interfaceGetXMLDesc) { char *ret; - ret = conn->interfaceDriver->interfaceGetXMLDesc (interface, flags); + ret = conn->interfaceDriver->interfaceGetXMLDesc (iface, flags); if (!ret) goto error; return ret; @@ -5751,7 +5751,7 @@ virInterfaceGetXMLDesc(virInterfacePtr i error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return NULL; } @@ -5803,7 +5803,7 @@ error: /** * virInterfaceUndefine: - * @interface: pointer to a defined interface + * @iface: pointer to a defined interface * * Undefine an interface, ie remove it from the config. * This does not free the associated virInterfacePtr object. @@ -5811,25 +5811,25 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virInterfaceUndefine(virInterfacePtr interface) { +virInterfaceUndefine(virInterfacePtr iface) { virConnectPtr conn; - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceUndefine) { int ret; - ret = conn->interfaceDriver->interfaceUndefine (interface); + ret = conn->interfaceDriver->interfaceUndefine (iface); if (ret < 0) goto error; return ret; @@ -5839,13 +5839,13 @@ virInterfaceUndefine(virInterfacePtr int error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceCreate: - * @interface: pointer to a defined interface + * @iface: pointer to a defined interface * @flags: and OR'ed set of extraction flags, not used yet * * Activate an interface (ie call "ifup") @@ -5853,26 +5853,26 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virInterfaceCreate(virInterfacePtr interface, unsigned int flags) +virInterfaceCreate(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceCreate) { int ret; - ret = conn->interfaceDriver->interfaceCreate (interface, flags); + ret = conn->interfaceDriver->interfaceCreate (iface, flags); if (ret < 0) goto error; return ret; @@ -5882,13 +5882,13 @@ virInterfaceCreate(virInterfacePtr inter error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceDestroy: - * @interface: an interface object + * @iface: an interface object * @flags: and OR'ed set of extraction flags, not used yet * * deactivate an interface (ie call "ifdown") @@ -5898,27 +5898,27 @@ error: * Returns 0 in case of success and -1 in case of failure. */ int -virInterfaceDestroy(virInterfacePtr interface, unsigned int flags) +virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceDestroy) { int ret; - ret = conn->interfaceDriver->interfaceDestroy (interface, flags); + ret = conn->interfaceDriver->interfaceDestroy (iface, flags); if (ret < 0) goto error; return ret; @@ -5928,13 +5928,13 @@ virInterfaceDestroy(virInterfacePtr inte error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceRef: - * @interface: the interface to hold a reference on + * @iface: the interface to hold a reference on * * Increment the reference count on the interface. For each * additional call to this method, there shall be a corresponding @@ -5950,22 +5950,22 @@ error: * Returns 0 in case of success, -1 in case of failure. */ int -virInterfaceRef(virInterfacePtr interface) +virInterfaceRef(virInterfacePtr iface) { - if ((!VIR_IS_CONNECTED_INTERFACE(interface))) { + if ((!VIR_IS_CONNECTED_INTERFACE(iface))) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } - virMutexLock(&interface->conn->lock); - DEBUG("interface=%p refs=%d", interface, interface->refs); - interface->refs++; - virMutexUnlock(&interface->conn->lock); + virMutexLock(&iface->conn->lock); + DEBUG("iface=%p refs=%d", iface, iface->refs); + iface->refs++; + virMutexUnlock(&iface->conn->lock); return 0; } /** * virInterfaceFree: - * @interface: a interface object + * @iface: a interface object * * Free the interface object. The interface itself is unaltered. * The data structure is freed and should not be used thereafter. @@ -5973,17 +5973,17 @@ virInterfaceRef(virInterfacePtr interfac * Returns 0 in case of success and -1 in case of failure. */ int -virInterfaceFree(virInterfacePtr interface) +virInterfaceFree(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - if (virUnrefInterface(interface) < 0) + if (virUnrefInterface(iface) < 0) return (-1); return(0); } Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.153 diff -u -p -r1.153 remote_internal.c --- src/remote_internal.c 21 May 2009 13:50:56 -0000 1.153 +++ src/remote_internal.c 28 May 2009 16:32:54 -0000 @@ -212,7 +212,7 @@ static void errorf (virConnectPtr conn, static void server_error (virConnectPtr conn, remote_error *err); static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network); -static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface); +static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface); static virStoragePoolPtr get_nonnull_storage_pool (virConnectPtr conn, remote_nonnull_storage_pool pool); static virStorageVolPtr get_nonnull_storage_vol (virConnectPtr conn, remote_nonnull_storage_vol vol); static virNodeDevicePtr get_nonnull_node_device (virConnectPtr conn, remote_nonnull_node_device dev); @@ -3876,7 +3876,7 @@ static virInterfacePtr remoteInterfaceLookupByName (virConnectPtr conn, const char *name) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_lookup_by_name_args args; remote_interface_lookup_by_name_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3891,19 +3891,19 @@ remoteInterfaceLookupByName (virConnectP (xdrproc_t) xdr_remote_interface_lookup_by_name_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_name_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static virInterfacePtr remoteInterfaceLookupByMACString (virConnectPtr conn, const char *mac) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_lookup_by_mac_string_args args; remote_interface_lookup_by_mac_string_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3918,30 +3918,30 @@ remoteInterfaceLookupByMACString (virCon (xdrproc_t) xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static char * -remoteInterfaceGetXMLDesc (virInterfacePtr interface, +remoteInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags) { char *rv = NULL; remote_interface_get_xml_desc_args args; remote_interface_get_xml_desc_ret ret; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; memset (&ret, 0, sizeof ret); - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC, (xdrproc_t) xdr_remote_interface_get_xml_desc_args, (char *) &args, (xdrproc_t) xdr_remote_interface_get_xml_desc_ret, (char *) &ret) == -1) goto done; @@ -3959,7 +3959,7 @@ remoteInterfaceDefineXML (virConnectPtr const char *xmlDesc, unsigned int flags) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_define_xml_args args; remote_interface_define_xml_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3975,26 +3975,26 @@ remoteInterfaceDefineXML (virConnectPtr (xdrproc_t) xdr_remote_interface_define_xml_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_define_xml_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static int -remoteInterfaceUndefine (virInterfacePtr interface) +remoteInterfaceUndefine (virInterfacePtr iface) { int rv = -1; remote_interface_undefine_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE, (xdrproc_t) xdr_remote_interface_undefine_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4007,19 +4007,19 @@ done: } static int -remoteInterfaceCreate (virInterfacePtr interface, +remoteInterfaceCreate (virInterfacePtr iface, unsigned int flags) { int rv = -1; remote_interface_create_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE, (xdrproc_t) xdr_remote_interface_create_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4032,19 +4032,19 @@ done: } static int -remoteInterfaceDestroy (virInterfacePtr interface, +remoteInterfaceDestroy (virInterfacePtr iface, unsigned int flags) { int rv = -1; remote_interface_destroy_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY, (xdrproc_t) xdr_remote_interface_destroy_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -7256,9 +7256,9 @@ get_nonnull_network (virConnectPtr conn, } static virInterfacePtr -get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface) +get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface) { - return virGetInterface (conn, interface.name, interface.mac); + return virGetInterface (conn, iface.name, iface.mac); } static virStoragePoolPtr Index: tests/testutils.c =================================================================== RCS file: /data/cvs/libvirt/tests/testutils.c,v retrieving revision 1.28 diff -u -p -r1.28 testutils.c --- tests/testutils.c 21 May 2009 14:22:51 -0000 1.28 +++ tests/testutils.c 28 May 2009 16:32:54 -0000 @@ -18,7 +18,9 @@ #ifndef WIN32 #include <sys/wait.h> #endif +#ifdef HAVE_REGEX_H #include <regex.h> +#endif #include <unistd.h> #include <string.h> #include <fcntl.h> @@ -460,6 +462,7 @@ cleanup: } +#ifdef HAVE_REGEX_H int virtTestClearLineRegex(const char *pattern, char *str) { @@ -503,3 +506,10 @@ int virtTestClearLineRegex(const char *p return 0; } +#else +int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED, + char *str ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif -- |: 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 :|

3 3

[libvirt] [PATCH] virsh: Use consistent spacing for net-list
by Cole Robinson 29 May '09

29 May '09

There is different spacing when listing active vs. inactive networks. Ex: Name State Autostart ----------------------------------------- default active yes xxxxxx inactive no Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index fe4e8e6..e6241e6 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -2798,7 +2798,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) else autostartStr = autostart ? "yes" : "no"; - vshPrint(ctl, "%-20s %s %s\n", + vshPrint(ctl, "%-20s %-10s %-10s\n", inactiveNames[i], _("inactive"), autostartStr); -- 1.6.0.6

3 12

[libvirt] libvirt needs to dynamically support kvm-img and/or qemu-img
by Doug Goldstein 29 May '09

29 May '09

Several distros out there install "kvm-img" when they install KVM and do not install "qemu-img". The following patch checks for kvm-img and qemu-img and does the right thing. I've taken it a step further and made the check a run-time check instead of a build-time check since people are able to remove and install KVM, QEMU and Xen components as they please and as such may invalidate the build-time check. The patch prefers "kvm-img" over "qemu-img" over "qcow-create" since there was a comment that libvirt wanted to support a feature of qemu-img that wasn't present in upstream qemu releases, however the feature is present in kvm-img. The patch adds a new util function called "virFindFileInPath()" which merely searches PATH for the actual location of the binary. It might be worth-while to make some of the other build-time tool checks run-time with that function since it would allow users to get more features just by installing new tools and wouldn't require distros to disable features because they don't want libvirt to be too dependency heavy. -- Doug Goldstein

3 4

[libvirt] PATCH: Fix thread safety with HAL driver restart
by Daniel P. Berrange 29 May '09

29 May '09

The restart method of the HAL implementation of node device is not currently threadsafe, because it destroys and creates the entire driver, including its mutexes. This patch changes it to simply throw away all existing devices, and re-load them from dbus. Daniel diff -r 625ffe1918a4 src/node_device_hal.c --- a/src/node_device_hal.c Thu May 21 15:56:27 2009 +0100 +++ b/src/node_device_hal.c Thu May 21 15:56:33 2009 +0100 @@ -785,10 +785,28 @@ static int halDeviceMonitorShutdown(void static int halDeviceMonitorReload(void) { - /* XXX This isn't thread safe because its free'ing the thing - * we're locking */ - (void)halDeviceMonitorShutdown(); - return halDeviceMonitorStartup(); + DBusError err; + char **udi = NULL; + int num_devs, i; + LibHalContext *hal_ctx; + + nodeDeviceLock(driverState); + virNodeDeviceObjListFree(&driverState->devs); + nodeDeviceUnlock(driverState); + + hal_ctx = DRV_STATE_HAL_CTX(driverState); + udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); + if (udi == NULL) { + fprintf(stderr, "%s: libhal_get_all_devices failed\n", __FUNCTION__); + return -1; + } + for (i = 0; i < num_devs; i++) { + dev_create(udi[i]); + VIR_FREE(udi[i]); + } + VIR_FREE(udi); + + return 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 1

[libvirt] PATCH: Fix double-free in daemon after client connection drop
by Daniel P. Berrange 29 May '09

29 May '09

If a client drops a connection unexpectedly there is a possiblity of a double free in the daemon if using SASL or TLS. This is because there is possibility for poll() on the socket, returns POLLIN and POLLHUP/ERR at the same time. Both the POLLIN and POLLHUP handling code will attempt to use qemudDispatchClientFailure to mark the client as dieing, doing a double free. It is hard to avoid this potential double-invocation of the cleanup function, so it is preferrable to make it safe Daniel diff -rup libvirt-0.6.2.orig/qemud/qemud.c libvirt-0.6.2.new/qemud/qemud.c --- libvirt-0.6.2.orig/qemud/qemud.c 2009-03-13 17:06:16.000000000 +0000 +++ libvirt-0.6.2.new/qemud/qemud.c 2009-05-28 17:58:44.000000000 +0100 @@ -1397,7 +1397,10 @@ static int qemudDispatchServer(struct qe * jobs have finished, then clean it up elsehwere */ void qemudDispatchClientFailure(struct qemud_client *client) { - virEventRemoveHandleImpl(client->watch); + if (client->watch != -1) { + virEventRemoveHandleImpl(client->watch); + client->watch = -1; + } /* Deregister event delivery callback */ if(client->conn) { @@ -1406,12 +1409,21 @@ void qemudDispatchClientFailure(struct q } #if HAVE_SASL - if (client->saslconn) sasl_dispose(&client->saslconn); + if (client->saslconn) { + sasl_dispose(&client->saslconn); + client->saslconn = NULL; + } free(client->saslUsername); + client->saslUsername = NULL; #endif - if (client->tlssession) gnutls_deinit (client->tlssession); - close(client->fd); - client->fd = -1; + if (client->tlssession) { + gnutls_deinit (client->tlssession); + client->tlssession = NULL; + } + if (client->fd != -1) { + close(client->fd); + client->fd = -1; + } } -- |: 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] PPC Qemu Machine Type Patch
by Thomas J. Baker 29 May '09

29 May '09

Here's a patch I was asked to post here that attempts to fix libvirt incorrectly specifying g3bw as the machine type when it calls qemu-system-ppc. The renamed machine type is g3beige. I searched for all occurrences of g3bw and replaced it with g3beige. Thanks, tjb -- ======================================================================= | Thomas Baker email: tjb(a)unh.edu | | Systems Programmer | | Research Computing Center voice: (603) 862-4490 | | University of New Hampshire fax: (603) 862-1761 | | 332 Morse Hall | | Durham, NH 03824 USA http://wintermute.sr.unh.edu/~tjb | =======================================================================

3 2

[libvirt] [PATCH] fix storage volume inconsistencies in schema and document
by Ryota Ozaki 29 May '09

29 May '09

Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> >From 23b096394eb15183a12c3277ac7a61e1eb73deb2 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Sat, 23 May 2009 20:52:51 +0900 Subject: [PATCH] fix storage volume inconsistencies in schema and document This patch fixes the following inconsistencies: - The volume element does not take a type attribute, but the document says it can. - The capacity element can take a unit attribute optionally, but the schema does not reflect that. This patch also modifies a testcase to check the unit attribute. --- docs/formatstorage.html | 4 ++-- docs/formatstorage.html.in | 4 ++-- docs/schemas/storagevol.rng | 11 +++++++++++ tests/storagevolschemadata/vol-qcow2.xml | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/formatstorage.html b/docs/formatstorage.html index fc47991..e96712d 100644 --- a/docs/formatstorage.html +++ b/docs/formatstorage.html @@ -294,7 +294,7 @@ <a name="StorageVolFirst" id="StorageVolFirst">General metadata</a> </h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <key>/var/lib/xen/images/sparse.img</key> <allocation>0</allocation> @@ -432,7 +432,7 @@ <a name="exampleVol" id="exampleVol">Storage volume</a> </h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <allocation>0</allocation> <capacity unit="T">1</capacity> diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 60e2ebc..4878d72 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -183,7 +183,7 @@ <h3><a name="StorageVolFirst">General metadata</a></h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <key>/var/lib/xen/images/sparse.img</key> <allocation>0</allocation> @@ -353,7 +353,7 @@ <h3><a name="exampleVol">Storage volume</a></h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <allocation>0</allocation> <capacity unit="T">1</capacity> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index c7bd3a7..7dc7876 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -29,6 +29,11 @@ <define name='sizing'> <optional> <element name='capacity'> + <optional> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + </optional> <ref name='uint'/> </element> </optional> @@ -183,5 +188,11 @@ </data> </define> + <define name='unit'> + <data type='string'> + <param name="pattern">[kKmMgGtTpPyYzZ]</param> + </data> + </define> + </grammar> diff --git a/tests/storagevolschemadata/vol-qcow2.xml b/tests/storagevolschemadata/vol-qcow2.xml index a3f5cca..c1cf02f 100644 --- a/tests/storagevolschemadata/vol-qcow2.xml +++ b/tests/storagevolschemadata/vol-qcow2.xml @@ -3,7 +3,7 @@ <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> - <capacity>5242880000</capacity> + <capacity unit="G">5</capacity> <allocation>294912</allocation> <target> <path>/var/lib/libvirt/images/OtherDemo.img</path> -- 1.6.0.6

2 1

[libvirt] [PATCH 0/1] API extension tutorial
by David Allan 28 May '09

28 May '09

Here is a document describing the process for extending the libvirt API. Note that the patch includes 8 sample patches that go with the document that should be included in and not applied to the tree. Dave

4 7

[libvirt] PATCH: Fix misc bugs in QEMU ARGV -> XML convertor
by Daniel P. Berrange 28 May '09

28 May '09

Having just tried out the QEMU ARGV -> XML convertor on a random set of args posted on the mailing list I found a few bugs. It didn't cope with a -net arg without a vlan=XX option set - this should assume vlan=0 if not set. It didn't cope with quoting of args with spaces in them. It finally did not generate a random UUID or MAC address if omitted. Regards, Daniel diff -r eb060781cfb9 src/qemu_conf.c --- a/src/qemu_conf.c Wed May 27 21:07:37 2009 +0100 +++ b/src/qemu_conf.c Wed May 27 22:56:55 2009 +0100 @@ -1565,14 +1565,27 @@ static int qemuStringToArgvEnv(const cha /* Iterate over string, splitting on sequences of ' ' */ while (curr && *curr != '\0') { char *arg; - const char *next = strchr(curr, ' '); + const char *next; + if (*curr == '\'') { + curr++; + next = strchr(curr, '\''); + } else if (*curr == '"') { + curr++; + next = strchr(curr, '"'); + } else { + next = strchr(curr, ' '); + } if (!next) next = strchr(curr, '\n'); - if (next) + if (next) { arg = strndup(curr, next-curr); - else + if (*next == '\'' || + *next == '"') + next++; + } else { arg = strdup(curr); + } if (!arg) goto no_memory; @@ -1644,7 +1657,7 @@ static const char *qemuFindEnv(const cha int i; int len = strlen(name); - for (i = 0 ; progenv[i] ; i++) { + for (i = 0 ; progenv && progenv[i] ; i++) { if (STREQLEN(progenv[i], name, len) && progenv[i][len] == '=') return progenv[i] + len + 1; @@ -1883,8 +1896,10 @@ qemuFindNICForVLAN(virConnectPtr conn, int gotvlan; const char *tmp = strstr(nics[i], "vlan="); char *end; - if (tmp) - tmp += strlen("vlan="); + if (!tmp) + continue; + + tmp += strlen("vlan="); if (virStrToLong_i(tmp, &end, 10, &gotvlan) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -1896,6 +1911,9 @@ qemuFindNICForVLAN(virConnectPtr conn, return nics[i]; } + if (wantvlan == 0 && nnics > 0) + return nics[0]; + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("cannot find NIC definition for vlan %d"), wantvlan); return NULL; @@ -1909,32 +1927,33 @@ qemuFindNICForVLAN(virConnectPtr conn, */ static virDomainNetDefPtr qemuParseCommandLineNet(virConnectPtr conn, + virCapsPtr caps, const char *val, int nnics, const char **nics) { virDomainNetDefPtr def = NULL; - char **keywords; - char **values; + char **keywords = NULL; + char **values = NULL; int nkeywords; const char *nic; int wantvlan = 0; const char *tmp; + int genmac = 1; int i; tmp = strchr(val, ','); - if (!tmp) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("cannot extract NIC type from '%s'"), val); - return NULL; + + if (tmp) { + if ((nkeywords = qemuParseCommandLineKeywords(conn, + tmp+1, + &keywords, + &values)) < 0) + return NULL; + } else { + nkeywords = 0; } - if ((nkeywords = qemuParseCommandLineKeywords(conn, - tmp+1, - &keywords, - &values)) < 0) - return NULL; - if (VIR_ALLOC(def) < 0) { virReportOOMError(conn); goto cleanup; @@ -1983,7 +2002,9 @@ qemuParseCommandLineNet(virConnectPtr co goto cleanup; } - if (!STRPREFIX(nic, "nic,")) { + if (!STRPREFIX(nic, "nic")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot parse NIC definition '%s'"), nic); virDomainNetDefFree(def); def = NULL; goto cleanup; @@ -1996,17 +2017,22 @@ qemuParseCommandLineNet(virConnectPtr co VIR_FREE(keywords); VIR_FREE(values); - if ((nkeywords = qemuParseCommandLineKeywords(conn, - nic + strlen("nic,"), - &keywords, - &values)) < 0) { - virDomainNetDefFree(def); - def = NULL; - goto cleanup; + if (STRPREFIX(nic, "nic,")) { + if ((nkeywords = qemuParseCommandLineKeywords(conn, + nic + strlen("nic,"), + &keywords, + &values)) < 0) { + virDomainNetDefFree(def); + def = NULL; + goto cleanup; + } + } else { + nkeywords = 0; } for (i = 0 ; i < nkeywords ; i++) { if (STREQ(keywords[i], "macaddr")) { + genmac = 0; virParseMacAddr(values[i], def->mac); } else if (STREQ(keywords[i], "model")) { def->model = values[i]; @@ -2014,6 +2040,9 @@ qemuParseCommandLineNet(virConnectPtr co } } + if (genmac) + virCapabilitiesGenerateMac(caps, def->mac); + cleanup: for (i = 0 ; i < nkeywords ; i++) { VIR_FREE(keywords[i]); @@ -2283,6 +2312,7 @@ error: * as is practical. This is not an exact science.... */ virDomainDefPtr qemuParseCommandLine(virConnectPtr conn, + virCapsPtr caps, const char **progenv, const char **progargv) { @@ -2303,6 +2333,8 @@ virDomainDefPtr qemuParseCommandLine(vir if (VIR_ALLOC(def) < 0) goto no_memory; + virUUIDGenerate(def->uuid); + def->id = -1; def->memory = def->maxmem = 64 * 1024; def->vcpus = 1; @@ -2604,7 +2636,7 @@ virDomainDefPtr qemuParseCommandLine(vir WANT_VALUE(); if (!STRPREFIX(val, "nic") && STRNEQ(val, "none")) { virDomainNetDefPtr net; - if (!(net = qemuParseCommandLineNet(conn, val, nnics, nics))) + if (!(net = qemuParseCommandLineNet(conn, caps, val, nnics, nics))) goto error; if (VIR_REALLOC_N(def->nets, def->nnets+1) < 0) { virDomainNetDefFree(net); @@ -2741,6 +2773,7 @@ error: virDomainDefPtr qemuParseCommandLineString(virConnectPtr conn, + virCapsPtr caps, const char *args) { const char **progenv = NULL; @@ -2751,7 +2784,7 @@ virDomainDefPtr qemuParseCommandLineStri if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0) goto cleanup; - def = qemuParseCommandLine(conn, progenv, progargv); + def = qemuParseCommandLine(conn, caps, progenv, progargv); cleanup: for (i = 0 ; progargv && progargv[i] ; i++) diff -r eb060781cfb9 src/qemu_conf.h --- a/src/qemu_conf.h Wed May 27 21:07:37 2009 +0100 +++ b/src/qemu_conf.h Wed May 27 22:56:55 2009 +0100 @@ -127,9 +127,11 @@ int qemudBuildCommandLine const char *migrateFrom); virDomainDefPtr qemuParseCommandLine(virConnectPtr conn, + virCapsPtr caps, const char **progenv, const char **progargv); virDomainDefPtr qemuParseCommandLineString(virConnectPtr conn, + virCapsPtr caps, const char *args); #endif /* __QEMUD_CONF_H */ diff -r eb060781cfb9 src/qemu_driver.c --- a/src/qemu_driver.c Wed May 27 21:07:37 2009 +0100 +++ b/src/qemu_driver.c Wed May 27 22:56:55 2009 +0100 @@ -3418,6 +3418,7 @@ static char *qemuDomainXMLFromNative(vir const char *format, const char *config, unsigned int flags ATTRIBUTE_UNUSED) { + struct qemud_driver *driver = conn->privateData; virDomainDefPtr def = NULL; char *xml = NULL; @@ -3427,7 +3428,7 @@ static char *qemuDomainXMLFromNative(vir goto cleanup; } - def = qemuParseCommandLineString(conn, config); + def = qemuParseCommandLineString(conn, driver->caps, config); if (!def) goto cleanup; diff -r eb060781cfb9 tests/qemuargv2xmltest.c --- a/tests/qemuargv2xmltest.c Wed May 27 21:07:37 2009 +0100 +++ b/tests/qemuargv2xmltest.c Wed May 27 22:56:55 2009 +0100 @@ -49,7 +49,7 @@ static int testCompareXMLToArgvFiles(con if (virtTestLoadFile(xml, &expectxml, MAX_FILE) < 0) goto fail; - if (!(vmdef = qemuParseCommandLineString(NULL, cmd))) + if (!(vmdef = qemuParseCommandLineString(NULL, driver.caps, cmd))) goto fail; if (!(actualxml = virDomainDefFormat(NULL, vmdef, 0))) @@ -109,6 +109,8 @@ mymain(int argc, char **argv) if (!abs_srcdir) abs_srcdir = getcwd(cwd, sizeof(cwd)); + virRandomInitialize(0); + if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; if((driver.stateDir = strdup("/nowhere")) == NULL) -- |: 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] PATCH: Don't set ifname or script args for QEMU tap devices
by Daniel P. Berrange 28 May '09

28 May '09

When running QEMU with a type=bridge or type=network interface config, we pass a pre-created TAP device file descriptor, eg -net tap,fd=17,script=,vlan=0,ifname=vnet0 The ifname and script args have always been ignored by all QEMU versions we support. Latest QEMU will now error out if they are set. So this patch drops those two redundant options. NB, then are still set for type=ethernet inteface configs, because in that config we're not creating a TAP device. -net tap,fd=17,vlan=0 There is no impact on test cases, because live TAP devices is something that you can exercise in the test cases. Daniel diff -r b9dc4ea7f6aa src/qemu_conf.c --- a/src/qemu_conf.c Tue May 26 16:16:28 2009 +0100 +++ b/src/qemu_conf.c Tue May 26 22:56:09 2009 +0100 @@ -662,8 +662,8 @@ qemudNetworkIfaceConnect(virConnectPtr c } snprintf(tapfdstr, sizeof(tapfdstr), - "tap,fd=%d,script=,vlan=%d,ifname=%s", - tapfd, vlan, net->ifname); + "tap,fd=%d,vlan=%d", + tapfd, vlan); if (!(retval = strdup(tapfdstr))) goto no_memory; -- |: 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] PATCH: Always log source location if available.
by Daniel P. Berrange 28 May '09

28 May '09

Currently, even though all the logging functions get given the source function and line number, it is just discarded unless priority == DEBUG. As an example, run virsh with logging enabled, and a bogus URI LIBVIRT_DEBUG=1 LIBVIRT_LOG_OUTPUTS=1:stderr virsh -c foo://bar 13:12:06.252: debug : do_open:993 : trying driver 4 (remote) ... 13:12:06.252: debug : do_open:999 : driver 4 remote returned DECLINED 13:12:06.252: error : could not connect to foo://bar 13:12:06.252: debug : virUnrefConnect:232 : unref connection 0x99617b0 1 13:12:06.252: debug : virReleaseConnect:191 : release connection 0x99617b0 Notice how it doesn't tell the user where the log message with 'error' priority came from. The same happens for info & warn levels. With the following patch applied, we always report function if it was passed into virLogMessage() 13:15:00.456: debug : do_open:993 : trying driver 4 (remote) ... 13:15:00.456: debug : do_open:999 : driver 4 remote returned DECLINED 13:15:00.456: error : virLibConnError:390 : could not connect to foo://bar 13:15:00.456: debug : virUnrefConnect:232 : unref connection 0x8dd87b0 1 13:15:00.456: debug : virReleaseConnect:191 : release connection 0x8dd87b0 So, we now see that the error came from virLibConnError at line 390 Daniel diff -r b9dc4ea7f6aa src/logging.c --- a/src/logging.c Tue May 26 16:16:28 2009 +0100 +++ b/src/logging.c Wed May 27 13:15:55 2009 +0100 @@ -516,7 +516,7 @@ void virLogMessage(const char *category, gettimeofday(&cur_time, NULL); localtime_r(&cur_time.tv_sec, &time_info); - if ((funcname != NULL) && (priority == VIR_LOG_DEBUG)) { + if ((funcname != NULL)) { ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %s : %s:%lld : %s\n", time_info.tm_hour, time_info.tm_min, time_info.tm_sec, (int) cur_time.tv_usec / 1000, -- |: 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] [PATCH 1/2] (Updated & fixed) OpenNebula driver, libvirt-0.6.2
by "Abel Míguez Rodríguez" 27 May '09

27 May '09

Hi all, Here is the One driver & patches for the current git's master commit "9e9527 - Remove stale QEMU pidfiles". [PATCH 1/2] Patch to be applied to libvirt-0.6.2 sources and building files. [PATCH 2/2] Driver source code. Thanks for all the comments about the patches. We waited for the libvirt's release to update the driver's structure to 0.6.2 and apply the improvements. Here is a short list of the main changes applied: - Included driver's files in a different directory "src/opennebula" - Added Capabilities "virCapabilitiesAddGuest" for "x86_64" and "i686" guests and used "one" as hypervisor at "virCapabilitiesAddGuestDomain". - Instead creating a temporal file to send the VM definition we have updated the API we were using to being able to do everything in memory, so making use of "virBuffer" to create the VM definition Template. - Added previously unsupported features to the ONE Template, other types of disks and graphics (vnc,sdl) settings. - Fixed up warnings at compilation and make 'syntax-check' test passed. thanks, Abel Miguez. [PATCH 1/2] diff --git a/configure.in b/configure.in index dcacc7f..ab14303 100644 --- a/configure.in +++ b/configure.in @@ -186,6 +186,8 @@ AC_ARG_WITH([vbox], [ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes]) AC_ARG_WITH([lxc], [ --with-lxc add Linux Container support (on)],[],[with_lxc=yes]) +AC_ARG_WITH([one], +[ --with-one add ONE support (on)],[],[with_one=no]) AC_ARG_WITH([test], [ --with-test add test driver support (on)],[],[with_test=yes]) AC_ARG_WITH([remote], @@ -305,6 +307,11 @@ if test "$with_uml" = "yes" ; then fi AM_CONDITIONAL([WITH_UML], [test "$with_uml" = "yes"]) +if test "$with_one" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_ONE],1,[whether ONE driver is enabled]) +fi +AM_CONDITIONAL([WITH_ONE],[test "$with_one" = "yes"]) + if test "$with_test" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) fi @@ -406,6 +413,15 @@ dnl check for kvm headers dnl AC_CHECK_HEADERS([linux/kvm.h]) +dnl OpenNebula driver Compilation setting +dnl + +if test "$with_one" = "yes" ; then + CFLAGS="$CFLAGS -I$ONE_LOCATION/include" + ONE_LIBS="-L/usr/local/lib -lxmlrpc_client++ -lxmlrpc -lxmlrpc_util -lxmlrpc_xmlparse -lxmlrpc_xmltok -lxmlrpc++ -lxmlrpc_client -L$ONE_LOCATION/lib -loneapi" + AC_SUBST([ONE_LIBS]) +fi + dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG @@ -1372,6 +1388,7 @@ AC_MSG_NOTICE([ UML: $with_uml]) AC_MSG_NOTICE([ OpenVZ: $with_openvz]) AC_MSG_NOTICE([ VBox: $with_vbox]) AC_MSG_NOTICE([ LXC: $with_lxc]) +AC_MSG_NOTICE([ ONE: $with_one]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Network: $with_network]) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index faf3f61..abe54b2 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -63,6 +63,7 @@ typedef enum { VIR_FROM_XEN_INOTIFY, /* Error from xen inotify layer */ VIR_FROM_SECURITY, /* Error from security framework */ VIR_FROM_VBOX, /* Error from VirtualBox driver */ + VIR_FROM_ONE, /* Error from ONE driver */ } virErrorDomain; diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 924e8ad..9d7f61f 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -120,6 +120,10 @@ if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif +if WITH_ONE + libvirtd_LDADD += ../src/libvirt_driver_one.la +endif + if WITH_STORAGE_DIR libvirtd_LDADD += ../src/libvirt_driver_storage.la endif diff --git a/qemud/qemud.c b/qemud/qemud.c index 829a4bc..a069f38 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -75,6 +75,9 @@ #ifdef WITH_UML #include "uml_driver.h" #endif +#ifdef WITH_ONE +#include "opennebula/one_driver.h" +#endif #ifdef WITH_NETWORK #include "network_driver.h" #endif @@ -841,6 +844,7 @@ static struct qemud_server *qemudInitialize(int sigread) { virDriverLoadModule("qemu"); virDriverLoadModule("lxc"); virDriverLoadModule("uml"); + virDriverLoadModule("one"); #else #ifdef WITH_NETWORK networkRegister(); @@ -861,6 +865,9 @@ static struct qemud_server *qemudInitialize(int sigread) { #ifdef WITH_UML umlRegister(); #endif +#ifdef WITH_ONE + oneRegister(); +#endif #endif virEventRegisterImpl(virEventAddHandleImpl, diff --git a/src/Makefile.am b/src/Makefile.am index fd692b4..17ae0e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -144,6 +144,12 @@ UML_DRIVER_SOURCES = \ uml_conf.c uml_conf.h \ uml_driver.c uml_driver.h +ONE_DRIVER_SOURCES = \ + ./opennebula/one_conf.c \ + ./opennebula/one_conf.h \ + ./opennebula/one_driver.c \ + ./opennebula/one_driver.h + NETWORK_DRIVER_SOURCES = \ network_driver.h network_driver.c @@ -337,6 +342,25 @@ endif libvirt_driver_uml_la_SOURCES = $(UML_DRIVER_SOURCES) endif +if WITH_ONE +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_one.la +else +noinst_LTLIBRARIES += libvirt_driver_one.la +# Stateful, so linked to daemon instead +#libvirt_la_LIBADD += libvirt_driver_one.la +endif +libvirt_driver_one_la_LDFLAGS = $(ONE_LIBS) + +if WITH_DRIVER_MODULES +libvirt_driver_one_la_LDFLAGS += -module -avoid-version +endif +libvirt_driver_one_la_SOURCES = $(ONE_DRIVER_SOURCES) +endif + + + + if WITH_NETWORK if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_network.la @@ -429,6 +453,7 @@ EXTRA_DIST += \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(UML_DRIVER_SOURCES) \ + $(ONE_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ diff --git a/src/domain_conf.c b/src/domain_conf.c index 648d9e9..06b9713 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -55,7 +55,8 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "test", "vmware", "hyperv", - "vbox") + "vbox", + "one") VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, "fd", diff --git a/src/domain_conf.h b/src/domain_conf.h index f4eea6b..c91a245 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -49,6 +49,7 @@ enum virDomainVirtType { VIR_DOMAIN_VIRT_VMWARE, VIR_DOMAIN_VIRT_HYPERV, VIR_DOMAIN_VIRT_VBOX, + VIR_DOMAIN_VIRT_ONE, VIR_DOMAIN_VIRT_LAST, }; diff --git a/src/driver.h b/src/driver.h index 39dc413..5685783 100644 --- a/src/driver.h +++ b/src/driver.h @@ -21,6 +21,7 @@ typedef enum { VIR_DRV_LXC = 6, VIR_DRV_UML = 7, VIR_DRV_VBOX = 8, + VIR_DRV_ONE = 9, } virDrvNo; diff --git a/src/libvirt.c b/src/libvirt.c index 95a861e..4b1610a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -845,6 +845,10 @@ virGetVersion(unsigned long *libVer, const char *type, if (STRCASEEQ(type, "UML")) *typeVer = LIBVIR_VERSION_NUMBER; #endif +#if WITH_ONE + if (STRCASEEQ(type, "ONE")) + *typeVer = LIBVIR_VERSION_NUMBER; +#endif #if WITH_REMOTE if (STRCASEEQ(type, "Remote")) *typeVer = remoteVersion(); diff --git a/src/virterror.c b/src/virterror.c index 2d34ed7..d4b429c 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -156,6 +156,8 @@ static const char *virErrorDomainName(virErrorDomain domain) { break; case VIR_FROM_VBOX: dom = "VBOX "; + case VIR_FROM_ONE: + dom = "ONE "; break; } return(dom); ---- Distributed System Architecture Group (http://dsa-research.org) GridWay, http://www.gridway.org OpenNEbula, http://www.opennebula.org

5 14

[libvirt] libvirtd 0.6.3 - Kernel Panic - 2.6.27-openvz-briullov.1
by Evan Borgstrom 27 May '09

27 May '09

Hi, I have a machine running 4 OpenVZ VE's and am looking at libvirt as a management tool. My machine is a Sun Fire X2250 with 1 CPU and 4GB of RAM running Gentoo. When I start libvirtd the output below appears in the dmesg output and the machine continues to function for about 30s longer before it starts dumping piles of continuous backtrace onto the console. Can I provide anymore info that will help diagnose this problem or should I open a bug about this? Thanks! -Evan [ 426.613841] WARNING: at fs/sysfs/dir.c:463 sysfs_add_one+0x2a/0x36() [ 426.613843] sysfs: duplicate filename 'lo' can not be created [ 426.613845] Modules linked in: ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 xt_state nf_conntrack ipt_REJECT iptable_filter ip_tables simfs vznetdev vzrst vzcpt tun vzdquota vzethdev vzmon vzdev 8021q bridge stp llc [ 426.613859] Pid: 17966, comm: libvirtd Not tainted 2.6.27-openvz- briullov.1-r1-fb3 #1 [ 426.613863] [<c022291e>] warn_slowpath+0x4b/0x6c [ 426.613869] [<c0333d00>] ? vsnprintf+0x233/0x531 [ 426.613874] [<c02294d1>] ? __sysctl_head_next+0x14/0x99 [ 426.613878] [<c032f826>] ? idr_get_empty_slot+0x13c/0x1f0 [ 426.613883] [<c032f9aa>] ? ida_get_new_above+0xd0/0x171 [ 426.613887] [<c028f9ca>] ? find_inode+0x1f/0x5b [ 426.613891] [<c02bbf5c>] ? sysfs_ilookup_test+0x0/0x11 [ 426.613894] [<c028fac5>] ? ifind+0x32/0x71 [ 426.613897] [<c02bc129>] ? sysfs_find_dirent+0x16/0x27 [ 426.613900] [<c02bc2b9>] sysfs_add_one+0x2a/0x36 [ 426.613903] [<c02bc773>] create_dir+0x43/0x72 [ 426.613906] [<c02bc7e9>] sysfs_create_dir+0x47/0x5b [ 426.613909] [<c033028b>] ? kobject_get+0x12/0x17 [ 426.613912] [<c0330390>] kobject_add_internal+0xb2/0x153 [ 426.613915] [<c03304dc>] kobject_add_varg+0x35/0x41 [ 426.613919] [<c033054d>] kobject_add+0x43/0x49 [ 426.613921] [<c03888e8>] device_add+0x7f/0x470 [ 426.613926] [<c027cd9d>] ? __percpu_alloc_mask+0xb6/0xd5 [ 426.613931] [<c023e5e7>] ? ub_slab_charge+0x4c/0x65 [ 426.613935] [<c03330fe>] ? strlcpy+0x17/0x49 [ 426.613938] [<c045a40c>] netdev_register_kobject+0x59/0x5c [ 426.613943] [<c0451afe>] register_netdevice+0x270/0x332 [ 426.613947] [<c0451bf2>] register_netdev+0x32/0x3f [ 426.613950] [<c03ad540>] loopback_net_init+0x34/0x63 [ 426.613955] [<c044d1eb>] setup_net+0x71/0xbb [ 426.613958] [<c044d534>] copy_net_ns+0x3d/0x99 [ 426.613960] [<c023712b>] create_new_namespaces+0x109/0x196 [ 426.613965] [<c0237370>] copy_namespaces+0x62/0x92 [ 426.613967] [<c0221a50>] copy_process+0x8df/0x105a [ 426.613971] [<c02222b6>] do_fork_pid+0xeb/0x25a [ 426.613973] [<c027f8a2>] ? __fput+0x138/0x140 [ 426.613977] [<c0222438>] do_fork+0x13/0x15 [ 426.613980] [<c02023cb>] sys_clone+0x1f/0x21 [ 426.613983] [<c020399e>] syscall_call+0x7/0xb [ 426.613986] [<c04f0000>] ? init_scattered_cpuid_features+0x4f/0x7d [ 426.613992] ======================= [ 426.613994] ---[ end trace 3809b0ba52b812c7 ]--- [ 426.613997] kobject_add_internal failed for lo with -EEXIST, don't try to register things with the same name in the same directory. [ 426.614001] Pid: 17966, comm: libvirtd Tainted: G W 2.6.27- openvz-briullov.1-r1-fb3 #1 [ 426.614004] [<c033041f>] kobject_add_internal+0x141/0x153 [ 426.614008] [<c03304dc>] kobject_add_varg+0x35/0x41 [ 426.614011] [<c033054d>] kobject_add+0x43/0x49 [ 426.614014] [<c03888e8>] device_add+0x7f/0x470 [ 426.614017] [<c027cd9d>] ? __percpu_alloc_mask+0xb6/0xd5 [ 426.614020] [<c023e5e7>] ? ub_slab_charge+0x4c/0x65 [ 426.614024] [<c03330fe>] ? strlcpy+0x17/0x49 [ 426.614027] [<c045a40c>] netdev_register_kobject+0x59/0x5c [ 426.614030] [<c0451afe>] register_netdevice+0x270/0x332 [ 426.614033] [<c0451bf2>] register_netdev+0x32/0x3f [ 426.614036] [<c03ad540>] loopback_net_init+0x34/0x63 [ 426.614040] [<c044d1eb>] setup_net+0x71/0xbb [ 426.614042] [<c044d534>] copy_net_ns+0x3d/0x99 [ 426.614045] [<c023712b>] create_new_namespaces+0x109/0x196 [ 426.614048] [<c0237370>] copy_namespaces+0x62/0x92 [ 426.614051] [<c0221a50>] copy_process+0x8df/0x105a [ 426.614054] [<c02222b6>] do_fork_pid+0xeb/0x25a [ 426.614057] [<c027f8a2>] ? __fput+0x138/0x140 [ 426.614060] [<c0222438>] do_fork+0x13/0x15 [ 426.614063] [<c02023cb>] sys_clone+0x1f/0x21 [ 426.614066] [<c020399e>] syscall_call+0x7/0xb [ 426.614068] [<c04f0000>] ? init_scattered_cpuid_features+0x4f/0x7d [ 426.614073] ======================= -- Evan Borgstrom <evan(a)fatbox.ca> - FatBox Inc. Find me on LinkedIn - http://www.linkedin.com/in/evanb

2 1

[libvirt] staggered guest startup / startup order
by Gerry Reno 26 May '09

26 May '09

Is there a way that you can set the guests startup order and stagger their startup at boot? Regards, Gerry

6 8

[libvirt] RFC / Braindump: public APIs needing data streams
by Daniel P. Berrange 26 May '09

26 May '09

The patches for secure migration raise an interesting question wrt the handling of data streams and their effects on the internal driver API and the public API. Although the migration helper APIs are not technically public, they do map onto the remote wire protocol and as such we have the same long term compatability issues to worry about. The way the migration APIs fit together are obscuring the picture a little, so for the sake of clarity, the remainder of this mail is going to talk about a ficticious public API 'virDomainRestoreStream' which allows a guest domain to be restored from a generic data stream, rather than a named file. If we can solve this API problem, then the design will trivially apply to secure migration. I'll now outline some possible approaches at public API level: 1. Pass a file handle to the public API Application usage: fd = open(filename); ret = virDomainRestoreStream(dom, fd); Driver internal usage: int virDomainRestoreStreamImpl(virDomainPtr dom, int fd) char buf[4096]; int ret; int qemuFD; qemuFD = runQEMUWithIncomingFD(dom); do { ret = read(fd, buf, sizeof buf); if (ret > 0) write(qemuFD, buf, ret); } while (ret > 0); } Good: Restore functionality all in one driver method Good: Public API is very simple Good: Internal driver can poll() on the FD to avoid blocking Bad: Application API is blocked Bad: Data read from FD might need transformation eg, uncompress, or decrypt TLS/SASL. 2. Provide public APIs for starting restore, feeding data, and completing. This matches proposal for secure migration patchset. Application usage: fd = open(filename); ret = virDomainRestorePrepare(dom); do { char buf[4096]; ret = read(fd, buf, sizeof buf); virDomainRestoreData(dom, buf, ret); } while (ret > 0); virDomainRestoreFinish(dom, ret == 0 ? 0 : 1); Driver internal usage: int virDomainRestorePrepareImpl(virDomainPtr dom) { qemuFD = runQEMUWithIncomingFD(dom); } int virDomainRestoreDataImpl(virDomainPtr dom, const char *buf, int buflen) { qemudFD = ...find previously opened qemuFD ... write(qemuFD, buf, buflen) } int virDomainRestoreFinishImpl(virDomainPtr dom, int error) { if (error) ...kill QEMU ... else qemuFD = ...find previously opened qemuFD ... close(qemuFD); } Good: Application can easily decrypt input data Good: Application can use an event loop to feed in data as it becomes available. eg poll in socket() Good: Application API never blocks execution for long time Bad: Driver has to maintain state across calls indefinitely Bad: Cannot guarentee that same client calls prepare/data. ie Different clients can get mixed up feeding data. Bad: Public API is fairly complex Bad: Lots of public API entry points for each method needing streams. 3. Provide a stream object for feeding data to driver from application. Similar to option 2, but provides easier state mgmt for driver. The driver will set callbacks on the data stream to receive data from client. Application usage: virDataStream stream = virDataStreamNew(); ret = virDomainRestore(dom, stream); do { char buf[4096]; ret = read(fd, buf, sizeof buf); virDataStreamWrite(stream, buf, ret); } while (ret > 0); virDataStreamFinish(dom, ret == 0 ? 0 : 1); Driver internal usage: int virDomainRestoreStreamImpl(virDomainPtr dom, virDataStream stream) { qemuFD = runQEMUWithIncomingFD(dom); virDataStreamSetCallbacks(stream, virDomainRestoreDataImpl, virDomainRestoreFinishImpl, (void *)qemudFD); } int virDomainRestoreDataImpl(virDomainPtr dom, const char *buf, int buflen, void *opaque) { int qemudFD = (int)opaque; write(qemuFD, buf, buflen) } int virDomainRestoreFinishImpl(virDomainPtr dom, int error, void *opaque) { if (error) ...kill QEMU ... else int qemudFD = (int)opaque; close(qemuFD); } Good: Application can easily decrypt input data Good: Application can use an event loop to feed in data as it becomes available. eg poll in socket() Good: Application API never blocks execution for long time Good: New APIs reusable for any public API with data stream Bad: Public API is fairly complex Bad: Driver has to maintain state across calls indefinitely 4. Provide a callback for driver to fetch data from the client app. Similar to option 1, but avoids need to expose concept of a 'fd' in public API directly. Application usage: int appreader(virDomainPtr dom, char *buf, int buflen, void *opaque) { int fd = (int)opaque; return read(fd, buf, buflen) } fd = open(filename); ret = virDomainRestoreStream(dom, appreader, (void *)fd); Driver internal usage int virDomainRestoreStreamImpl(virDomainPtr dom, int (*reader)(virDomainPtr, char *, int, voi d*), void *opaque) char buf[4096]; int ret; int qemuFD; qemuFD = runQEMUWithIncomingFD(dom); do { ret = (*reader)(dom, buf, sizeof buf, opaque); if (ret > 0) write(qemuFD, buf, ret); } while (ret > 0); } Good: Restore functionality all in one driver method Good: Public API is very simple Good: Client app callback can decrypt data Bad: Application API is blocked Bad: Internal driver code will block on executing callback if not data is available. Can't integrate with event loop. 5. Provide a generic public stream API to fetch data from the client app. Similar to option 4, but adding an stream object to manage the callback - allows more functionality to be added to public API later without changing restore API contract. Application usage: int appreader(virDomainPtr dom, char *buf, int buflen, void *opaque) { int fd = (int)opaque; return read(fd, buf, buflen) } fd = open(filename); stream = virDataStreamNewReader(appreader, (void*)fd); ret = virDomainRestoreStream(dom, stream); Driver internal usage int virDomainRestoreStreamImpl(virDomainPtr dom, virDataStream stream) { char buf[4096]; int ret; int qemuFD; qemuFD = runQEMUWithIncomingFD(dom); do { ret = virDataStreamRead(dom, buf, sizeof buf); if (ret > 0) write(qemuFD, buf, ret); } while (ret > 0); } Good: Restore functionality all in one driver method Good: Public API is fairly simple Good: Client app callback can decrypt data Bad: Application API is blocked Bad: Internal driver code will block on executing callback if not data is available. Can't integrate with event loop. All the APIs have good and bad points to them, in particular there is a difficult tradeoff between simplicity of the public API application code, vs the internal API implementation code. Some important goals though: - There must be a way to invoke the public API without blocking the application code - The driver must be able to receive data from an encrypted channel, because in libvirtd the FD might be the SASL/TLS socket - Internal driver API should not block on callbacks to app code, since it might need to be polling on another FD concurrently with reading data. - The number of new APIs to support streaming should not increase for each new method needing stream support. Ultimately I think options 3 or 5 are the most promising, because the addition of a generic 'virDataStream' public object makes it easier to manage the processing of the data stream without adding huge numbers of new APIs. Option 3 is a little more cumbersome to use from application code, but it avoids blocking either the client app, or the internal driver. The downside is the driver impl code is split across several methods. With option 5 it is harder to avoid blocking the client and internal driver, since it'd require the driver to integrate with an event loop, but there is no direct FD for the driver to poll() on. The choices made also have possible implications on the design of the remote wire protocol to support these methods. Ignoring the design of the public API, there are a handful of ways to stream data between client and server 1. Invoke primary method eg "restore domain", then feed the data in a sequence of following RPC calls. C --------------> S Restore domain call C <-------------- S Restore domain reply C --------------> S Restore data call 1 C <-------------- S Restore data reply 1 C --------------> S Restore data call 2 C <-------------- S Restore data reply 2 ............... C --------------> S Restore data call n C <-------------- S Restore data reply n C --------------> S Restore data complete C <-------------- S Restore data reply If server wants to abort a restore operation, it'll send an error on one of the replies. 2. Invoke primary method eg "restore domain", then feed the data in a sequence of following async messages. C --------------> S Restore domain call C <-------------- S Restore domain reply C --------------> S Restore data msg 1 C --------------> S Restore data msg 2 ............... C --------------> S Restore data msg n C --------------> S Restore data complete C <-------------- S Restore data reply If server wants to stop the client without closing the socket, it needs an async 'stop' message from server to client. This is prety much same as option 2, but is killing off the explicit replies for each data packet. 3. Invoke primary method eg "restore domain", but require the data to be stream to server, before the reply is sent back C --------------> S Restore domain call C --------------> S Stream data msg 1 C --------------> S Stream data msg 2 ............... C --------------> S Stream data msg n C --------------> S Stream finish msg C <-------------- S Restore domain reply If server wants to stop the client without closing the socket, it simply sends back the 'restore domain reply' message as an error before client finishes sending data, and ignore any further data messages. Options 2 or 3 have potential benefits on links with noticable latency, since they're not blocking the client on synchronous replies from the server. That said, the remote protocol does allow for interleaving of calls & replies, so with Option 1 the client could send multiple data packets without waiting for their replies, and deal with possible delayed error replies. If doing that though, the benefit of having a 1-to-1 call-to-reply ratio is minimal, miht as well go for a n-to-1, call-to-reply approach. It is hard to match public API option 3, with wire protocol option 3, because of the delayed 'restore domain reply' message. The options I'm really thinking are most viable are - Public API 3 + RPC 2 - Public API 5 + RPC 3 Both of these are a little more complex to implement in the libvirtd daemon that Chris' current secure migration patches, but then then also have functional & design benefits Daniel -- |: 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] suspend/hibernate guests on host shutdown
by Gerry Reno 26 May '09

26 May '09

There are times when you just have to reboot the host machine to clear a problem or after some maintenance. The problem right now is that this forces all the guests to go through an entire reboot as well. What would be good is if the host shutdown would invoke a suspend/hibernate of the guests and then restore the guests to their same condition on the reboot. The guests should notice nothing other that a small loss of wallclock time. Regards, Gerry

1 0

[libvirt] HELP: after host upgrade to F11, guest runs extremely slow
by Gerry Reno 26 May '09

26 May '09

I upgraded the host from F10 to F11 (x86_64) with no issues. Now when I start a F10 (i386) guest it runs very very slow. I also see messages on the guest boot console about "clocksource tsc unstable" and some kernel oops. Once it got far enough to start network I logged in and checked the clocksource and it currently is 'acpi_pm' even though the kernel line says clocksource=pit. The available clocksources are acpi_pm, jiffies, and tsc. I do not see 'pit' in the list. How do I fix this issue? Regards, Gerry

4 7

[libvirt] VMware ESX driver announcement
by Matthias Bolte 26 May '09

26 May '09

Hello, I'm participate in a project of the Paderborn Center for Parallel Computing, an institute of the University of Paderborn: http://pc2.uni-paderborn.de The project's goal is to use virtualization in a supercomputer environment. We've decided to use libvirt to manage different hypervisor. A subgoal is to extend the driver base of libvirt. We've started an VMware ESX driver and are investigating Hyper-V support (see next mail). The ESX driver isn't complete yet, currently it supports: - domain lookup by ID, UUID and name - domain listing - domain suspend and resume - domain reboot, if the VMware tools are installed inside the domain - domain start and shutdown - domain migration The driver uses the SOAP based VMware VI API. We've tried to generate SOAP client code with gSOAP and looked at other SOAP libraries, but the VI API uses inheritance in a way that gSOAP fails to generate C code for. Because of this we wrote a minimal SOAP client based on libcurl and libxml2 that can handle this inheritance problem in C. The next item on the todo list is domain creation, because currently the driver can only deal with prior existing domains. We think this code might be useful for others and would be glad if the driver could be merged into libvirt in medium term. All of our work is licensed under LGPLv2+.

4 7

[libvirt] Koan, KVM and PXE
by Fabien Dupont 25 May '09

25 May '09

Hi all. I use Cobbler to manage my PXE boot. I would like to extend my use to manage VM deployment with Koan. But I have a problem related to network and my VM can't boot. I have already posted on Cobbler mailing-list but it's probably on kvm/libvirt side... I am on Fedora 10 with Cobbler 1.6.4 and Koan 1.6.3 (latest available from stable repos), and libvirt 0.5.1-2.fc10. I would like to create VMs using KVM thus I have imported FC10 DVD, added Everything and Updates repos and created a host using the profile created during import. The system has the following properties : root# cobbler system report vmtest system : vmtest profile : fedora-core-10-x86_64 comment : created : Fri May 8 13:43:40 2009 gateway : 192.168.1.254 hostname : vmtest image : kernel options : {} kernel options post : {} kickstart : <<inherit>> ks metadata : {} mgmt classes : [] modified : Sat May 23 18:42:59 2009 name servers : [] name servers search : [] netboot enabled? : True owners : ['admin'] redhat mgmt key : <<inherit>> redhat mgmt server : <<inherit>> server : <<inherit>> template files : {} virt cpus : <<inherit>> virt file size : <<inherit>> virt path : <<inherit>> virt ram : <<inherit>> virt type : <<inherit>> power type : ipmitool power address : power user : power password : power id : interface : eth0 mac address : ff:00:00:01:00:00 bonding : bonding_master : bonding_opts : is static? : True ip address : 192.168.1.201 subnet : 255.255.255.0 static routes : [] dns name : vmtest.local dhcp tag : virt bridge : br0 As you can see, I use a bridged network with a real bridge create with the method described on the wiki (eth0 is the real interface and br0 the bridge). Then I create the VM using : koan --server=cobbler.evenit.info --virt --system=vmtest The VM is correctly created and started : kernel and initrd are correctly set, virtual hard drive is right and network interface seems right. root# ps -edf | grep kvm root 19484 23655 67 21:54 ? 00:00:06 /usr/bin/qemu-kvm -S -M pc -m 256 -smp 1 -name vmtest -monitor pty -no-reboot -boot c -kernel /var/lib/libvirt/boot/virtinst-vmlinuz.omv9yr -initrd /var/lib/libvirt/boot/virtinst-initrd.img.Ufj-qc -append ks= http://cobbler.evenit.info/cblr/svc/op/ks/system/vmtest ksdevice=link kssendmac lang= text method= http://cobbler.evenit.info:80/cblr/links/fedora-core-10-x86_64/<http://cobbler.evenit.info/cblr/links/fedora-core-10-x86_64/>-drive file=/var/lib/libvirt/images/vmtest-disk0,if=virtio,index=0,boot=on -net nic,macaddr=ff:00:00:01:00:00,vlan=0,model=virtio -net tap,fd=14,script=,vlan=0,ifname=vnet0 -serial pty -parallel none -usb -vnc 127.0.0.1:0 -k en-us But, when I open the VM display with virt-manager, I see that installation can't start as DHCP is not answering... There's no trace of the DHCP requests on DHCP server and vnet0 seems to have no trafic : [root@lilith ~]# netstat -i Table d'interfaces noyau Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg br0 1500 0 173524 0 0 0 261005 0 0 0 BMRU eth0 1500 0 173589 0 0 0 260909 0 0 0 BMPRU lo 16436 0 29105 0 0 0 29105 0 0 0 LRU vnet0 1500 0 0 0 0 0 1 0 0 0 BMRU As far as I can see, it seems vnet0 doesn't forward its trafic to br0 like there's no link. I have also seen that the vnet0 interface seen from host (opposed to guest) doesn't have the MAC address asked for vnet0, but this may be normal. -- Fabien

1 0

[libvirt] PATCH: add support for -snapshot
by Geert Jansen 25 May '09

25 May '09

Hi, i'm working on some infrastructure to run unit tests in a virtual environment. For this, I need to be able to pass a "snapshot=on" argument to a qemu virtual disk so that I know I start with the same state all the time. The attached patch implements this. It adds a boolean <snapshot/> to the <disk> section in the XML. Please consider for inclusion. Regards, Geert Jansen

2 1

[libvirt] [PATCH 1/1] fixed the event-test.c example to check for return values
by Pritesh Kothari 25 May '09

25 May '09

Hi All, The event-test.c example doesn't check for the return values while registering for the callbacks, this patch just checks for them along with a correcting a small typo. (Unpaused => Paused) Regards, Pritesh

3 2

[libvirt] migration
by Zvi Dubitzky 25 May '09

25 May '09

Does anybody know if migration within a host from one domain to another works today It did not work for me for libvirt 0.6.1 thanks Zvi Dubitzky Virtualization and System Architecture Email:dubi@il.ibm.com IBM Haifa Research Laboratory Phone: +972-4-8296182 Haifa, 31905, ISRAEL

1 0

[libvirt] save/restore for KVM
by Christian Weyermann 24 May '09

24 May '09

Hello everybody, I try to save and restore a virtual machine, but I always get this error message: ~$ virsh save test1 test1.vm Domain test1 nach test1.vm gespeichert [german for test1 successfully saved to test1.vm] ~$ virsh restore test1.vm 17:53:10.341: error : this function is not supported by the hypervisor: STDIO migration is not supported with this QEMU binary libvir: QEMU error : this function is not supported by the hypervisor: STDIO migration is not supported with this QEMU binary 17:53:10.341: error : operation failed: failed to start VM libvir: QEMU error : operation failed: failed to start VM Fehler: Wiederherstellen der Domain aus test1.vm gescheitert [german: Restoring test1.vm failed!] Fehler: operation failed: failed to start VM I am using libvirt 0.6.3, KVM-84 with qemu 0.9.1. Does anyone have an idea, how to solve this issue? Thanks in advance and kind regards, Christian

1 0

[libvirt] libvirt native parameters
by Zvi Dubitzky 24 May '09

24 May '09

can anybody remind me where is the native qemu parameters that result from libvirt translation of an XML file stored (file path). thanks 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] error: failed to connect to the hypervisor
by Erkan Unal 24 May '09

24 May '09

Hi, I installed the libvirt with the following configure options as an unprivileged user, I am planning to use it just for qemu/kvm: ./configure --without-xen --without-lxc --without-uml --without-openvz --without-vbox --without-numactl --prefix=/some/nonstandard/dir make make install --without-numactl is added because of a compilation error. I am not sure whether it is completely necessary or not. If you think it has effect on the error, please state the reason. After installation I got the following error when I tried to run the virsh without any options: error: failed to connect to the hypervisor With the following command line error was "Segmentation Fault": virsh -c qemu:///session. Qemu executable path: /usr/local/bin/qemu-system-x86_64 and it is defined on the path. Libvirt daemon is failing with the same error too. System ---> Scientific Linux SL release 4.7 (Beryllium), Kernel version: 2.6.28.2, libvirt version: 0.6.3 Any ideas? P.S.: Is there a way to compile static virsh executable? I tried altering make files, configure options, linker flags and compiler flags but no luck. "ldd virsh" command should say "not a dynamic executable" after compilation. Thanks, Erkan Unal

2 1

[libvirt] SetMaxMemory vs. SetMemory
by Matthias Bolte 24 May '09

24 May '09

Hello, I just took a look at the driver functions for SetMaxMemory and SetMemory, as they are not implemented yet for the ESX driver and Daniel Veillard was a bit surprised that they are missing, as he expects them to be simple to implement. The problem is that I'm not sure how the memory model of ESX maps to SetMaxMemory vs. SetMemory. An ESX virtual machine has a defined memory size. That's the size reported to the guest OS as the available "physical" memory size. Beside this ESX allows the user to control how the hypervisor satisfies this "physical" memory size. You can define a reservation and an upper limit. The hypervisor will at least use the reserved amount of real physical memory to satisfy the "physical" memory size, but will not use more than the upper limit. How does this map to SetMaxMemory and SetMemory? My first assumption was, SetMaxMemory defines the "physical" memory size and SetMemory defines the upper limit of real physical memory to satisfy the "physical" memory size. This assumption seems to be in sync with the QEMU driver from just looking at the code. But with Xen it seems to be different. If I call SetMaxMemory and SetMemory with 2GB than free inside the domain reports 2GB total memory. After I call SetMemory with 1GB, free reports 1GB of total memory. I'm confused. So, what is the intended semantic for SetMaxMemory and SetMemory? Regards, Matthias

4 6

[libvirt] Re: BUG REPORT: -net tap, fd=X does not work correctly in kvm-86
by Anthony Liguori 24 May '09

24 May '09

Josh Wilsdon wrote: > We are doing work with libvirt 0.6.3 through which we have started > virtual machines. Using the same "create" command with the same > storage, the same everything else this configuration works with both > kvm-84 and kvm-85. When I built a fresh version of kvm-86 this > stopped working with an error: > > qemu: invalid parameter '15' in 'fd=15,script=,vlan=0,ifname=vnet0' > It's a libvirt bug. script and ifname have never been valid parameters for -net tap. Historically, -net has ignored unknown options but recently, it now throws an error when encountering an unsupported option. Regards, Anthony Liguori

4 3

[libvirt] PATCH: Ensure filename/funcname/linenr gets passed to error func
by Daniel P. Berrange 22 May '09

22 May '09

The current virRaiseError() function does not accept any information about these source location of the error. The various virReportSystemError and virReportOOMError wrappers all collect this info, but then discard it. This patch turns virRaiseError into virRaiseErrorFull() and adds params for linenr, filename & funcname, and then adds a macro providing the original virRaiseError() API contract, and collecting source location info. The other wrappers are changed to call virRaiseErrorFull() directly preserving their source location data. Finally the source location is passed into the virLogMessage call. This should address the issue that Mattias mentioned in the VMWare driver thread. Regards, Daniel diff -r 625ffe1918a4 src/virterror.c --- a/src/virterror.c Thu May 21 15:56:27 2009 +0100 +++ b/src/virterror.c Thu May 21 16:13:49 2009 +0100 @@ -587,10 +587,11 @@ virSetConnError(virConnectPtr conn) /** - * virRaiseError: + * virRaiseErrorFull: * @conn: the connection to the hypervisor if available - * @dom: the domain if available - * @net: the network if available + * @filename: filename where error was raised + * @funcname: function name where error was raised + * @linenr: line number where error was raised * @domain: the virErrorDomain indicating where it's coming from * @code: the virErrorNumber code for the error * @level: the virErrorLevel for the error @@ -606,12 +607,19 @@ virSetConnError(virConnectPtr conn) * immediately if a callback is found and store it for later handling. */ void -virRaiseError(virConnectPtr conn, - virDomainPtr dom ATTRIBUTE_UNUSED, - virNetworkPtr net ATTRIBUTE_UNUSED, - int domain, int code, virErrorLevel level, - const char *str1, const char *str2, const char *str3, - int int1, int int2, const char *msg, ...) +virRaiseErrorFull(virConnectPtr conn, + const char *filename ATTRIBUTE_UNUSED, + const char *funcname, + size_t linenr, + int domain, + int code, + virErrorLevel level, + const char *str1, + const char *str2, + const char *str3, + int int1, + int int2, + const char *fmt, ...) { virErrorPtr to; void *userData = virUserData; @@ -647,18 +655,18 @@ virRaiseError(virConnectPtr conn, /* * formats the message */ - if (msg == NULL) { + if (fmt == NULL) { str = strdup(_("No error message provided")); } else { - VIR_GET_VAR_STR(msg, str); + VIR_GET_VAR_STR(fmt, str); } /* * Hook up the error or warning to the logging facility - * TODO: pass function name and lineno + * XXXX should we include filename as 'category' instead of domain name ? */ virLogMessage(virErrorDomainName(domain), virErrorLevelPriority(level), - NULL, 0, 1, "%s", str); + funcname, linenr, 1, "%s", str); /* * Save the information about the error @@ -1064,10 +1072,12 @@ virErrorMsg(virErrorNumber error, const * Helper function to do most of the grunt work for individual driver * ReportError */ -void virReportErrorHelper(virConnectPtr conn, int domcode, int errcode, - const char *filename ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, - size_t linenr ATTRIBUTE_UNUSED, +void virReportErrorHelper(virConnectPtr conn, + int domcode, + int errcode, + const char *filename, + const char *funcname, + size_t linenr, const char *fmt, ...) { va_list args; @@ -1083,8 +1093,10 @@ void virReportErrorHelper(virConnectPtr } virerr = virErrorMsg(errcode, (errorMessage[0] ? errorMessage : NULL)); - virRaiseError(conn, NULL, NULL, domcode, errcode, VIR_ERR_ERROR, - virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); + virRaiseErrorFull(conn, filename, funcname, linenr, + domcode, errcode, VIR_ERR_ERROR, + virerr, errorMessage, NULL, + -1, -1, virerr, errorMessage); } @@ -1113,9 +1125,9 @@ const char *virStrerror(int theerrno, ch void virReportSystemErrorFull(virConnectPtr conn, int domcode, int theerrno, - const char *filename ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, - size_t linenr ATTRIBUTE_UNUSED, + const char *filename, + const char *funcname, + size_t linenr, const char *fmt, ...) { char strerror_buf[1024]; @@ -1145,19 +1157,21 @@ void virReportSystemErrorFull(virConnect if (!msgDetail) msgDetail = errnoDetail; - virRaiseError(conn, NULL, NULL, domcode, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR, - msg, msgDetail, NULL, -1, -1, msg, msgDetail); + virRaiseErrorFull(conn, filename, funcname, linenr, + domcode, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR, + msg, msgDetail, NULL, -1, -1, msg, msgDetail); } void virReportOOMErrorFull(virConnectPtr conn, int domcode, - const char *filename ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, - size_t linenr ATTRIBUTE_UNUSED) + const char *filename, + const char *funcname, + size_t linenr) { const char *virerr; virerr = virErrorMsg(VIR_ERR_NO_MEMORY, NULL); - virRaiseError(conn, NULL, NULL, domcode, VIR_ERR_NO_MEMORY, VIR_ERR_ERROR, - virerr, NULL, NULL, -1, -1, virerr, NULL); + virRaiseErrorFull(conn, filename, funcname, linenr, + domcode, VIR_ERR_NO_MEMORY, VIR_ERR_ERROR, + virerr, NULL, NULL, -1, -1, virerr, NULL); } diff -r 625ffe1918a4 src/virterror_internal.h --- a/src/virterror_internal.h Thu May 21 15:56:27 2009 +0100 +++ b/src/virterror_internal.h Thu May 21 16:13:49 2009 +0100 @@ -33,17 +33,28 @@ extern void *virUserData; * * ************************************************************************/ int virErrorInitialize(void); -void virRaiseError(virConnectPtr conn, - virDomainPtr dom, - virNetworkPtr net, - int domain, - int code, - virErrorLevel level, - const char *str1, - const char *str2, - const char *str3, - int int1, int int2, const char *msg, ...) - ATTRIBUTE_FORMAT(printf, 12, 13); +void virRaiseErrorFull(virConnectPtr conn, + const char *filename, + const char *funcname, + size_t linenr, + int domain, + int code, + virErrorLevel level, + const char *str1, + const char *str2, + const char *str3, + int int1, + int int2, + const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 13, 14); + +/* Includes 'dom' and 'net' for compatbility, but they're ignored */ +#define virRaiseError(conn, dom, net, domain, code, level, \ + str1, str2, str3, int1, int2, msg, ...) \ + virRaiseErrorFull(conn, __FILE__, __FUNCTION__, __LINE__, \ + domain, code, level, str1, str2, str3, int1, int2, \ + msg, __VA_ARGS__) + const char *virErrorMsg(virErrorNumber error, const char *info); void virReportErrorHelper(virConnectPtr conn, int domcode, int errcode, const char *filename ATTRIBUTE_UNUSED, -- |: 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] storage: inconsistent in 'format' scheme between document and implementation
by Ryota Ozaki 22 May '09

22 May '09

Hi, I've found a problem that a 'format' element in storage-{pool,vol} XML doesn't behave as described in the document. The document says that a format of {pool,vol} is specified as the value of a format element, like: <target> <path>/var/lib/virt/images/sparse.img</path> <format>qcow2</format> <permissions> However, the implementation doesn't follow this: if (options->formatFromString) { char *format = virXPathString(conn, "string(/volume/target/format/@type)", ctxt); if (format == NULL) ret->target.format = options->defaultFormat; else ret->target.format = (options->formatFromString)(format); if (ret->target.format < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, _("unknown volume format type %s"), format); VIR_FREE(format); goto cleanup; } VIR_FREE(format); } The implementation assumes that a format of {pool,vol} is specified as the attribute of a format element, like: <target> <path>/var/lib/virt/images/sparse.img</path> <format type='qcow2' /> <permissions> Thus, we need to fix either the document or the implementation. (I guess the implementation is correct, right?) Thanks, ozaki-r

3 10

[libvirt] [PATH 0/5] CORRECTED - Interface Config Public APIs and remote stubs, with MAC addresses in string format
by Laine Stump 21 May '09

21 May '09

MY APOLOGIES! Yesterday I accidentally sent the old patchset rather than the corrected set. This time it's right. These patches are based on those I sent last week (the public virInterface*() API definition, the local plumbing, and the RPC glue), but with suggestions incorporated: 1) MAC address is always used in null-terminated ASCII string format. This eliminates any potential problems with extra long addresses. 2) no comments in libvirt.h 3) flags arguments are all unsigned.

3 17

[libvirt] PATCH: Impl python bindings for virInterface
by Daniel P. Berrange 21 May '09

21 May '09

We forgot that adding the virInterface APIs would break the build of the python bindings. Here is the patch to wire up the code generator for the new APIs. This is actually surprisingly easy, since we ditched the raw unsigned char MAC address APIs, no special cases were needed. Daniel Index: generator.py =================================================================== RCS file: /data/cvs/libvirt/python/generator.py,v retrieving revision 1.42 diff -u -p -r1.42 generator.py --- generator.py 1 Apr 2009 10:39:12 -0000 1.42 +++ generator.py 20 May 2009 16:43:58 -0000 @@ -246,6 +246,11 @@ py_types = { 'virNetwork *': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr"), 'const virNetwork *': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr"), + 'virInterfacePtr': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr"), + 'const virInterfacePtr': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr"), + 'virInterface *': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr"), + 'const virInterface *': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr"), + 'virStoragePoolPtr': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr"), 'const virStoragePoolPtr': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr"), 'virStoragePool *': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr"), @@ -289,6 +294,8 @@ skip_impl = ( 'virConnectListDefinedDomains', 'virConnectListNetworks', 'virConnectListDefinedNetworks', + 'virConnectListInterfaces', + 'virConnectListDefinedInterfaces', 'virConnectListStoragePools', 'virConnectListDefinedStoragePools', 'virConnectListStorageVols', @@ -608,6 +615,8 @@ classes_type = { "virDomain *": ("._o", "virDomain(self, _obj=%s)", "virDomain"), "virNetworkPtr": ("._o", "virNetwork(self, _obj=%s)", "virNetwork"), "virNetwork *": ("._o", "virNetwork(self, _obj=%s)", "virNetwork"), + "virInterfacePtr": ("._o", "virInterface(self, _obj=%s)", "virInterface"), + "virInterface *": ("._o", "virInterface(self, _obj=%s)", "virInterface"), "virStoragePoolPtr": ("._o", "virStoragePool(self, _obj=%s)", "virStoragePool"), "virStoragePool *": ("._o", "virStoragePool(self, _obj=%s)", "virStoragePool"), "virStorageVolPtr": ("._o", "virStorageVol(self, _obj=%s)", "virStorageVol"), @@ -621,7 +630,8 @@ classes_type = { converter_type = { } -primary_classes = ["virDomain", "virNetwork", "virStoragePool", "virStorageVol", +primary_classes = ["virDomain", "virNetwork", "virInterface", + "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice" ] classes_ancestor = { @@ -629,6 +639,7 @@ classes_ancestor = { classes_destructors = { "virDomain": "virDomainFree", "virNetwork": "virNetworkFree", + "virInterface": "virInterfaceFree", "virStoragePool": "virStoragePoolFree", "virStorageVol": "virStorageVolFree", "virNodeDevice" : "virNodeDeviceFree" @@ -638,6 +649,7 @@ functions_noexcept = { 'virDomainGetID': True, 'virDomainGetName': True, 'virNetworkGetName': True, + 'virInterfaceGetName': True, 'virStoragePoolGetName': True, 'virStorageVolGetName': True, 'virStorageVolGetkey': True, @@ -690,6 +702,15 @@ def nameFixup(name, classe, type, file): elif name[0:16] == "virNetworkLookup": func = name[3:] func = string.lower(func[0:1]) + func[1:] + elif name[0:18] == "virInterfaceDefine": + func = name[3:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:21] == "virInterfaceCreateXML": + func = name[3:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:18] == "virInterfaceLookup": + func = name[3:] + func = string.lower(func[0:1]) + func[1:] elif name[0:20] == "virStoragePoolDefine": func = name[3:] func = string.lower(func[0:1]) + func[1:] @@ -717,6 +738,12 @@ def nameFixup(name, classe, type, file): elif name[0:10] == "virNetwork": func = name[10:] func = string.lower(func[0:1]) + func[1:] + elif name[0:15] == "virInterfaceGet": + func = name[13:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:12] == "virInterface": + func = name[10:] + func = string.lower(func[0:1]) + func[1:] elif name[0:17] == "virStoragePoolGet": func = name[17:] func = string.lower(func[0:1]) + func[1:] @@ -988,7 +1015,7 @@ def buildWrappers(): else: txt.write("Class %s()\n" % (classname)) classes.write("class %s:\n" % (classname)) - if classname in [ "virDomain", "virNetwork", "virStoragePool", "virStorageVol", "virNodeDevice" ]: + if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virNodeDevice" ]: classes.write(" def __init__(self, conn, _obj=None):\n") else: classes.write(" def __init__(self, _obj=None):\n") @@ -996,7 +1023,7 @@ def buildWrappers(): list = reference_keepers[classname] for ref in list: classes.write(" self.%s = None\n" % ref[1]) - if classname in [ "virDomain", "virNetwork", "virNodeDevice" ]: + if classname in [ "virDomain", "virNetwork", "virInterface", "virNodeDevice" ]: classes.write(" self._conn = conn\n") elif classname in [ "virStorageVol", "virStoragePool" ]: classes.write(" self._conn = conn\n" + \ @@ -1097,6 +1124,10 @@ def buildWrappers(): classes.write( " if ret is None:raise libvirtError('%s() failed', net=self)\n" % (name)) + elif classname == "virInterface": + classes.write( + " if ret is None:raise libvirtError('%s() failed', net=self)\n" % + (name)) elif classname == "virStoragePool": classes.write( " if ret is None:raise libvirtError('%s() failed', pool=self)\n" % @@ -1177,6 +1208,10 @@ def buildWrappers(): classes.write ((" if " + test + ": raise libvirtError ('%s() failed', net=self)\n") % ("ret", name)) + elif classname == "virInterface": + classes.write ((" if " + test + + ": raise libvirtError ('%s() failed', net=self)\n") % + ("ret", name)) elif classname == "virStoragePool": classes.write ((" if " + test + ": raise libvirtError ('%s() failed', pool=self)\n") % @@ -1215,6 +1250,10 @@ def buildWrappers(): classes.write ((" if " + test + ": raise libvirtError ('%s() failed', net=self)\n") % ("ret", name)) + elif classname == "virInterface": + classes.write ((" if " + test + + ": raise libvirtError ('%s() failed', net=self)\n") % + ("ret", name)) elif classname == "virStoragePool": classes.write ((" if " + test + ": raise libvirtError ('%s() failed', pool=self)\n") % Index: libvirt_wrap.h =================================================================== RCS file: /data/cvs/libvirt/python/libvirt_wrap.h,v retrieving revision 1.15 diff -u -p -r1.15 libvirt_wrap.h --- libvirt_wrap.h 24 Nov 2008 19:28:12 -0000 1.15 +++ libvirt_wrap.h 20 May 2009 16:43:58 -0000 @@ -48,6 +48,15 @@ typedef struct { } PyvirNetwork_Object; +#define PyvirInterface_Get(v) (((v) == Py_None) ? NULL : \ + (((PyvirInterface_Object *)(v))->obj)) + +typedef struct { + PyObject_HEAD + virInterfacePtr obj; +} PyvirInterface_Object; + + #define PyvirStoragePool_Get(v) (((v) == Py_None) ? NULL : \ (((PyvirStoragePool_Object *)(v))->obj)) @@ -118,6 +127,7 @@ PyObject * libvirt_charPtrConstWrap(cons PyObject * libvirt_virConnectPtrWrap(virConnectPtr node); PyObject * libvirt_virDomainPtrWrap(virDomainPtr node); PyObject * libvirt_virNetworkPtrWrap(virNetworkPtr node); +PyObject * libvirt_virInterfacePtrWrap(virInterfacePtr node); PyObject * libvirt_virStoragePoolPtrWrap(virStoragePoolPtr node); PyObject * libvirt_virStorageVolPtrWrap(virStorageVolPtr node); PyObject * libvirt_virEventHandleCallbackWrap(virEventHandleCallback node); Index: types.c =================================================================== RCS file: /data/cvs/libvirt/python/types.c,v retrieving revision 1.17 diff -u -p -r1.17 types.c --- types.c 18 Dec 2008 12:25:11 -0000 1.17 +++ types.c 20 May 2009 16:43:58 -0000 @@ -119,6 +119,21 @@ libvirt_virNetworkPtrWrap(virNetworkPtr } PyObject * +libvirt_virInterfacePtrWrap(virInterfacePtr node) +{ + PyObject *ret; + + if (node == NULL) { + Py_INCREF(Py_None); + return (Py_None); + } + ret = + PyCObject_FromVoidPtrAndDesc((void *) node, (char *) "virInterfacePtr", + NULL); + return (ret); +} + +PyObject * libvirt_virStoragePoolPtrWrap(virStoragePoolPtr node) { PyObject *ret; -- |: 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 :|

3 3

[libvirt] PATCH: Work in progress suport for video device config
by Daniel P. Berrange 21 May '09

21 May '09

We discussed adding a new XML element for representing video devices a few weeks back. This is my work in progress patch for the XML parsing routines supporting <video> <model type='vga|cirrus|vmvga|xen' vram='64' heads='1'/> </video> For compatability, if an existing guest has a <graphics> tag, but no <video> tag, then the parser automatically adds a <video> tag for type=cirrus. Still todo - Tweak the addition of default <video> tag a little so it uses the correct type for the type of guest - eg it should use type=xen in some cases. - Add RNG XML schemas & website docs - Make QEMU driver use this info for setting -vga argument - Make Xen drivers use this info for setting stdvga=1|0 config arg - Make VirtualBox use this info in whatever way it needs Daniel domain_conf.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain_conf.h | 26 ++++++++ 2 files changed, 194 insertions(+) diff -r 66fa9bfc797c src/domain_conf.c --- a/src/domain_conf.c Mon May 18 11:28:46 2009 +0100 +++ b/src/domain_conf.c Mon May 18 11:29:00 2009 +0100 @@ -80,6 +80,7 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAI "interface", "input", "sound", + "video", "hostdev") VIR_ENUM_IMPL(virDomainDisk, VIR_DOMAIN_DISK_TYPE_LAST, @@ -140,6 +141,12 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_D "pcspk", "ac97") +VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, + "vga", + "cirrus", + "vmvga", + "xen") + VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", "tablet") @@ -372,6 +379,14 @@ void virDomainSoundDefFree(virDomainSoun VIR_FREE(def); } +void virDomainVideoDefFree(virDomainVideoDefPtr def) +{ + if (!def) + return; + + VIR_FREE(def); +} + void virDomainHostdevDefFree(virDomainHostdevDefPtr def) { if (!def) @@ -399,6 +414,9 @@ void virDomainDeviceDefFree(virDomainDev case VIR_DOMAIN_DEVICE_SOUND: virDomainSoundDefFree(def->data.sound); break; + case VIR_DOMAIN_DEVICE_VIDEO: + virDomainVideoDefFree(def->data.video); + break; case VIR_DOMAIN_DEVICE_HOSTDEV: virDomainHostdevDefFree(def->data.hostdev); break; @@ -456,6 +474,10 @@ void virDomainDefFree(virDomainDefPtr de virDomainSoundDefFree(def->sounds[i]); VIR_FREE(def->sounds); + for (i = 0 ; i < def->nvideos ; i++) + virDomainVideoDefFree(def->videos[i]); + VIR_FREE(def->videos); + for (i = 0 ; i < def->nhostdevs ; i++) virDomainHostdevDefFree(def->hostdevs[i]); VIR_FREE(def->hostdevs); @@ -1638,6 +1660,84 @@ error: goto cleanup; } +static virDomainVideoDefPtr +virDomainVideoDefParseXML(virConnectPtr conn, + const xmlNodePtr node, + int flags ATTRIBUTE_UNUSED) { + virDomainVideoDefPtr def; + xmlNodePtr cur; + char *type = NULL; + char *heads = NULL; + char *vram = NULL; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(conn); + return NULL; + } + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if ((type == NULL) && (vram == NULL) && (heads == NULL) && + xmlStrEqual(cur->name, BAD_CAST "model")) { + type = virXMLPropString(cur, "type"); + vram = virXMLPropString(cur, "vram"); + heads = virXMLPropString(cur, "heads"); + } + } + cur = cur->next; + } + + if (type && + (def->type = virDomainVideoTypeFromString(type)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown video model '%s'"), type); + goto error; + } + + if (vram && + virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse video ram '%s'"), vram); + goto error; + } else { + switch (def->type) { + /* Wierd, QEMU defaults to 9 MB ??! */ + case VIR_DOMAIN_VIDEO_TYPE_VGA: + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + case VIR_DOMAIN_VIDEO_TYPE_VMVGA: + def->vram = 9 * 1024; + break; + case VIR_DOMAIN_VIDEO_TYPE_XEN: + /* Original PVFB hardcoded to 4 MB */ + def->vram = 4 * 1024; + break; + } + } + + if (heads && + virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse video heads '%s'"), heads); + goto error; + } else { + def->heads = 1; + } + + VIR_FREE(type); + VIR_FREE(vram); + VIR_FREE(heads); + + return def; + +error: + virDomainVideoDefFree(def); + VIR_FREE(type); + VIR_FREE(vram); + VIR_FREE(heads); + return NULL; +} + static int virDomainHostdevSubsysUsbDefParseXML(virConnectPtr conn, const xmlNodePtr node, @@ -2064,6 +2164,10 @@ virDomainDeviceDefPtr virDomainDeviceDef dev->type = VIR_DOMAIN_DEVICE_SOUND; if (!(dev->data.sound = virDomainSoundDefParseXML(conn, node, flags))) goto error; + } else if (xmlStrEqual(node->name, BAD_CAST "video")) { + dev->type = VIR_DOMAIN_DEVICE_VIDEO; + if (!(dev->data.video = virDomainVideoDefParseXML(conn, node, flags))) + goto error; } else if (xmlStrEqual(node->name, BAD_CAST "hostdev")) { dev->type = VIR_DOMAIN_DEVICE_HOSTDEV; if (!(dev->data.hostdev = virDomainHostdevDefParseXML(conn, node, flags))) @@ -2584,6 +2688,40 @@ static virDomainDefPtr virDomainDefParse } VIR_FREE(nodes); + /* analysis of the video devices */ + if ((n = virXPathNodeSet(conn, "./devices/video", ctxt, &nodes)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot extract video devices")); + goto error; + } + if (n && VIR_ALLOC_N(def->videos, n) < 0) + goto no_memory; + for (i = 0 ; i < n ; i++) { + virDomainVideoDefPtr video = virDomainVideoDefParseXML(conn, + nodes[i], + flags); + if (!video) + goto error; + def->videos[def->nvideos++] = video; + } + VIR_FREE(nodes); + + /* For backwards compatability, if no <video> tag is set but there + * is a <graphics> tag, then we add a single video tag */ + if (def->ngraphics && !def->nvideos) { + virDomainVideoDefPtr video; + if (VIR_ALLOC(video) < 0) + goto no_memory; + video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; + video->vram = 9 * 1024; + video->heads = 1; + if (VIR_ALLOC_N(def->videos, 1) < 0) { + virDomainVideoDefFree(video); + goto no_memory; + } + def->videos[def->nvideos++] = video; + } + /* analysis of the host devices */ if ((n = virXPathNodeSet(conn, "./devices/hostdev", ctxt, &nodes)) < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, @@ -3286,6 +3424,32 @@ virDomainSoundDefFormat(virConnectPtr co } static int +virDomainVideoDefFormat(virConnectPtr conn, + virBufferPtr buf, + virDomainVideoDefPtr def) +{ + const char *model = virDomainVideoTypeToString(def->type); + + if (!model) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected video model %d"), def->type); + return -1; + } + + virBufferAddLit(buf, " <video>\n"); + virBufferVSprintf(buf, " <model type='%s'", + model); + if (def->vram) + virBufferVSprintf(buf, " vram='%u'", def->vram); + if (def->heads) + virBufferVSprintf(buf, " heads='%u'", def->heads); + virBufferAddLit(buf, "/>\n"); + virBufferAddLit(buf, " </video>\n"); + + return 0; +} + +static int virDomainInputDefFormat(virConnectPtr conn, virBufferPtr buf, virDomainInputDefPtr def) @@ -3660,6 +3824,10 @@ char *virDomainDefFormat(virConnectPtr c if (virDomainSoundDefFormat(conn, &buf, def->sounds[n]) < 0) goto cleanup; + for (n = 0 ; n < def->nvideos ; n++) + if (virDomainVideoDefFormat(conn, &buf, def->videos[n]) < 0) + goto cleanup; + for (n = 0 ; n < def->nhostdevs ; n++) if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n]) < 0) goto cleanup; diff -r 66fa9bfc797c src/domain_conf.h --- a/src/domain_conf.h Mon May 18 11:28:46 2009 +0100 +++ b/src/domain_conf.h Mon May 18 11:29:00 2009 +0100 @@ -264,6 +264,25 @@ struct _virDomainSoundDef { int model; }; + +enum virDomainVideoType { + VIR_DOMAIN_VIDEO_TYPE_VGA, + VIR_DOMAIN_VIDEO_TYPE_CIRRUS, + VIR_DOMAIN_VIDEO_TYPE_VMVGA, + VIR_DOMAIN_VIDEO_TYPE_XEN, + + VIR_DOMAIN_VIDEO_TYPE_LAST +}; + + +typedef struct _virDomainVideoDef virDomainVideoDef; +typedef virDomainVideoDef *virDomainVideoDefPtr; +struct _virDomainVideoDef { + int type; + unsigned int vram; + unsigned int heads; +}; + /* 3 possible graphics console modes */ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_SDL, @@ -360,6 +379,7 @@ enum virDomainDeviceType { VIR_DOMAIN_DEVICE_NET, VIR_DOMAIN_DEVICE_INPUT, VIR_DOMAIN_DEVICE_SOUND, + VIR_DOMAIN_DEVICE_VIDEO, VIR_DOMAIN_DEVICE_HOSTDEV, VIR_DOMAIN_DEVICE_LAST, @@ -375,6 +395,7 @@ struct _virDomainDeviceDef { virDomainNetDefPtr net; virDomainInputDefPtr input; virDomainSoundDefPtr sound; + virDomainVideoDefPtr video; virDomainHostdevDefPtr hostdev; } data; }; @@ -491,6 +512,9 @@ struct _virDomainDef { int nsounds; virDomainSoundDefPtr *sounds; + int nvideos; + virDomainVideoDefPtr *videos; + int nhostdevs; virDomainHostdevDefPtr *hostdevs; @@ -557,6 +581,7 @@ void virDomainFSDefFree(virDomainFSDefPt void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainChrDefFree(virDomainChrDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); +void virDomainVideoDefFree(virDomainVideoDefPtr def); void virDomainHostdevDefFree(virDomainHostdevDefPtr def); void virDomainDeviceDefFree(virDomainDeviceDefPtr def); void virDomainDefFree(virDomainDefPtr vm); @@ -671,6 +696,7 @@ VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainChr) VIR_ENUM_DECL(virDomainSoundModel) +VIR_ENUM_DECL(virDomainVideo) VIR_ENUM_DECL(virDomainHostdevMode) VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) -- |: 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 :|

3 3

[libvirt] [PATCH]: Secure migration support for KVM
by Chris Lalancette 21 May '09

21 May '09

All, Attached is the secure migration patch for libvirt. What this patch implements is a new remote RPC call for secure migration. On the source of the migration, we do a migration from the qemu process to the libvirtd on localhost. As each read() in libvirtd completes, it issues an RPC message to the remote libvirtd, using the standard libvirt RPC mechanisms. On the destination, we do essentially the mirror; the libvirtd accepts the data from RPC, and then writes it to a qemu container process listening on localhost. In order to actually use this, the command-line is pretty complex. If you want to use standard live migration, the command-line looks something like: # virsh -c qemu+tls://source.example.org/system migrate --live guest qemu+tls://dest.example.org/system This says to a live migration of "guest" from "source.example.org" to "dest.example.org", connecting to each of the remote libvirtd via TLS. Note that in this model, the virsh process connects to the remote libvirtd's via the -c argument (source) and the destination argument (dest). To do secure live migration, this becomes: # virsh -c qemu+tls://source.example.org/system migrate --live --secure guest qemu+tls://dest.example.org/system qemu+tls://dest.example.org/system This says to do a secure live migration of "guest" from "source.example.org" to "dest.example.org". The virsh process figures out how to connect to the remote libvirtd's via the -c argument (source) and the destination argument (dest). The second "qemu+tls://dest.example.org/system" is the secure channel from the source libvirtd to the destination libvirtd. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> docs/apibuild.py | 1 include/libvirt/libvirt.h | 1 include/libvirt/libvirt.h.in | 1 qemud/remote.c | 34 +++ qemud/remote_dispatch_args.h | 1 qemud/remote_dispatch_prototypes.h | 7 qemud/remote_dispatch_table.h | 5 qemud/remote_protocol.c | 13 + qemud/remote_protocol.h | 17 + qemud/remote_protocol.x | 12 + src/driver.h | 10 + src/libvirt.c | 55 ++++- src/libvirt_internal.h | 5 src/libvirt_private.syms | 1 src/lxc_driver.c | 1 src/openvz_driver.c | 1 src/qemu_driver.c | 367 ++++++++++++++++++++++++++++++++----- src/remote_internal.c | 33 +++ src/test.c | 1 src/uml_driver.c | 1 src/virsh.c | 4 src/xen_unified.c | 1 22 files changed, 518 insertions(+), 54 deletions(-)

2 1

[libvirt] Hyper-V driver advise request
by Matthias Bolte 21 May '09

21 May '09

Hello, I mentioned Hyper-V in my last mail. We are currently investigating Hyper-V support for libvirt. Basically there seem to be two options: - use the DCE/RPC library from the Samba project for Hyper-V's WMI protocol - write a Windows based Hyper-V driver and use it from a Windows based libvirt client only or port libvirtd to Windows We're currently not sure which way to go and if any of this will actually work. So, we just want to ask for advise.

2 2

[libvirt] Incomplete cleanup in storage backend for physical disks?
by Henrik Persson E 20 May '09

20 May '09

Hi all, I have some questions related to the storage backend for physical disks. If I try to create a new storage pool connected to a physical disk that doesn't have a partition table I get the following error messages: error: Failed to create pool from /root/physical_disk_pool.xml error: internal error non-zero exit status from command 2 However, the pool is still exists in inactive state. If I check the code some part of the pool is freed: cleanup: virStoragePoolDefFree(def); if (pool) { virStoragePoolObjUnlock(pool); } storageDriverUnlock(driver); return ret; but not the pool object itself. It feels like I end up with an non-complete pool. What is the story here, shouldn't the pool object also be freed in this case? And what is the suggested to create and start up a storage pool connected to a physical disk that doesn't have a partition table yet? Regards, Henrik

2 1

[libvirt] [PATCH] cleanup of direct stderr logging
by Daniel Veillard 20 May '09

20 May '09

In a number of places we still had direct output of logs, warnings or errors, instead of using the existing error and logging infrastructure. This patches tries to clean this up, 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] Works: libvirt client on OS X 10.5.6
by Schley Andrew Kutz 20 May '09

20 May '09

Getting libvirt-0.6.3 (client) to compile on OS X - Use MacPorts to install gnutls (and its several dependencies) - Set environment variables: export LDFLAGS="-L/opt/local/lib" export CPPFLAGS="-I/opt/local/include" export MACOSX_DEPLOYMENT_TARGET=10.4 - Configure --prefix=/opt/libvirt/ --without-sasl --without-avahi --without-polkit --without-python --without-xen --without-qemu --without-lxc --without- openvz --without-libvirtd --without-uml - Apply patches src/pci.c #ifndef MODPROBE #define MODPROBE 0 #endif src/virsh.c:5665 if (command_ret != 0 /* WEXITSTATUS (0) */) { - Compile The MACOSX_DEPLOYMENT_TARGET variable is very important, otherwise you will get symbol errors when linking. -- -a "Ideally, a code library must be immediately usable by naive developers, easily customized by more sophisticated developers, and readily extensible by experts." -- L. Stein

3 7

[libvirt] [PATCH]: Add a flag to let live migration be persistent
by Chris Lalancette 20 May '09

20 May '09

As pointed out by Łukasz Mierzwa <l.mierzwa(a)gmail.com>, it would be nice if there was an option to automatically make a domain persistent on the destination during a live migration. The attached patch adds this simple capability. Note that this has to be applied on top of my previous secure migration patch, otherwise you'll have conflicts. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 5

[libvirt] PATCH: Test the QEMU argv -> XML convertor
by Daniel P. Berrange 20 May '09

20 May '09

This patch adds a test case which validates the argv -> XML convertor for QEMU. This re-uses the existing XML data files from the XML -> argv test. This has a few complications though because we can't roundtrip all the data. So I have a couple really seriously evil regexes which splice out the XML lines we know won't match - name, uuid, memory and disk sharing modes. This isn't ideal, but I figure it is better todo this and get coverage over 90% of the code, than to have no test coverage. Thanks to Cole for this testsuite suggestion Daniel diff -r 453b896e0e3f .hgignore --- a/.hgignore Tue May 19 18:43:32 2009 +0100 +++ b/.hgignore Tue May 19 18:43:50 2009 +0100 @@ -270,6 +270,7 @@ tests/object-locking tests/object-locking-files.txt tests/object-locking.cmi tests/object-locking.cmx +tests/qemuargv2xmltest tests/qemuxml2argvtest tests/qemuxml2xmltest tests/qparamtest diff -r 453b896e0e3f tests/.cvsignore --- a/tests/.cvsignore Tue May 19 18:43:32 2009 +0100 +++ b/tests/.cvsignore Tue May 19 18:43:50 2009 +0100 @@ -11,6 +11,7 @@ xmconfigtest xencapstest qemuxml2xmltest qemuxml2argvtest +qemuargv2xmltest nodedevxml2xmltest nodeinfotest statstest diff -r 453b896e0e3f tests/.gitignore --- a/tests/.gitignore Tue May 19 18:43:32 2009 +0100 +++ b/tests/.gitignore Tue May 19 18:43:50 2009 +0100 @@ -11,6 +11,7 @@ xmconfigtest xencapstest qemuxml2xmltest qemuxml2argvtest +qemuargv2xmltest nodedevxml2xmltest nodeinfotest statstest diff -r 453b896e0e3f tests/Makefile.am --- a/tests/Makefile.am Tue May 19 18:43:32 2009 +0100 +++ b/tests/Makefile.am Tue May 19 18:43:50 2009 +0100 @@ -61,7 +61,7 @@ noinst_PROGRAMS += xml2sexprtest sexpr2x reconnect xmconfigtest xencapstest endif if WITH_QEMU -noinst_PROGRAMS += qemuxml2argvtest qemuxml2xmltest +noinst_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest endif if WITH_SECDRIVER_SELINUX @@ -119,7 +119,7 @@ endif endif if WITH_QEMU -TESTS += qemuxml2argvtest qemuxml2xmltest +TESTS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest endif if WITH_SECDRIVER_SELINUX @@ -194,8 +194,13 @@ qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h qemuxml2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) + +qemuargv2xmltest_SOURCES = \ + qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \ + testutils.c testutils.h +qemuargv2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) else -EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h +EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h endif nodedevxml2xmltest_SOURCES = \ diff -r 453b896e0e3f tests/qemuargv2xmltest.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuargv2xmltest.c Tue May 19 18:43:50 2009 +0100 @@ -0,0 +1,235 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> + +#include <sys/types.h> +#include <fcntl.h> + +#ifdef WITH_QEMU + +#include "internal.h" +#include "testutils.h" +#include "qemu_conf.h" + +#include "testutilsqemu.h" + +static char *progname; +static char *abs_srcdir; +static struct qemud_driver driver; + +#define MAX_FILE 4096 + +static int blankProblemElements(char *data) +{ + if (virtTestClearLineRegex("<name>[[:alnum:]]+</name>", data) < 0 || + virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0 || + virtTestClearLineRegex("<memory>[[:digit:]]+</memory>", data) < 0 || + virtTestClearLineRegex("<currentMemory>[[:digit:]]+</currentMemory>", data) < 0 || + virtTestClearLineRegex("<readonly/>", data) < 0 || + virtTestClearLineRegex("<sharable/>", data) < 0) + return -1; + return 0; +} + +static int testCompareXMLToArgvFiles(const char *xml, + const char *cmdfile) { + char xmlData[MAX_FILE]; + char cmdData[MAX_FILE]; + char *expectxml = &(xmlData[0]); + char *actualxml = NULL; + char *cmd = &(cmdData[0]); + int ret = -1; + virDomainDefPtr vmdef = NULL; + + if (virtTestLoadFile(cmdfile, &cmd, MAX_FILE) < 0) + goto fail; + if (virtTestLoadFile(xml, &expectxml, MAX_FILE) < 0) + goto fail; + + if (!(vmdef = qemuParseCommandLineString(NULL, cmd))) + goto fail; + + if (!(actualxml = virDomainDefFormat(NULL, vmdef, 0))) + goto fail; + + if (blankProblemElements(expectxml) < 0 || + blankProblemElements(actualxml) < 0) + goto fail; + + if (STRNEQ(expectxml, actualxml)) { + virtTestDifference(stderr, expectxml, actualxml); + goto fail; + } + + ret = 0; + + fail: + free(actualxml); + virDomainDefFree(vmdef); + return ret; +} + + +struct testInfo { + const char *name; + int extraFlags; + const char *migrateFrom; +}; + +static int testCompareXMLToArgvHelper(const void *data) { + const struct testInfo *info = data; + char xml[PATH_MAX]; + char args[PATH_MAX]; + snprintf(xml, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml", + abs_srcdir, info->name); + snprintf(args, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.args", + abs_srcdir, info->name); + return testCompareXMLToArgvFiles(xml, args); +} + + + +static int +mymain(int argc, char **argv) +{ + int ret = 0; + char cwd[PATH_MAX]; + + progname = argv[0]; + + if (argc > 1) { + fprintf(stderr, "Usage: %s\n", progname); + return (EXIT_FAILURE); + } + + abs_srcdir = getenv("abs_srcdir"); + if (!abs_srcdir) + abs_srcdir = getcwd(cwd, sizeof(cwd)); + + if ((driver.caps = testQemuCapsInit()) == NULL) + return EXIT_FAILURE; + if((driver.stateDir = strdup("/nowhere")) == NULL) + return EXIT_FAILURE; + +#define DO_TEST_FULL(name, extraFlags, migrateFrom) \ + do { \ + const struct testInfo info = { name, extraFlags, migrateFrom }; \ + if (virtTestRun("QEMU ARGV-2-XML " name, \ + 1, testCompareXMLToArgvHelper, &info) < 0) \ + ret = -1; \ + } while (0) + +#define DO_TEST(name, extraFlags) \ + DO_TEST_FULL(name, extraFlags, NULL) + + setenv("PATH", "/bin", 1); + setenv("USER", "test", 1); + setenv("LOGNAME", "test", 1); + setenv("HOME", "/home/test", 1); + unsetenv("TMPDIR"); + unsetenv("LD_PRELOAD"); + unsetenv("LD_LIBRARY_PATH"); + + /* Can't roundtrip vcpu cpuset attribute */ + /*DO_TEST("minimal", QEMUD_CMD_FLAG_NAME);*/ + DO_TEST("boot-cdrom", 0); + DO_TEST("boot-network", 0); + DO_TEST("boot-floppy", 0); + /* Can't roundtrip xenner arch */ + /*DO_TEST("bootloader", 0);*/ + DO_TEST("clock-utc", 0); + DO_TEST("clock-localtime", 0); + DO_TEST("disk-cdrom", 0); + DO_TEST("disk-cdrom-empty", QEMUD_CMD_FLAG_DRIVE); + DO_TEST("disk-floppy", 0); + DO_TEST("disk-many", 0); + DO_TEST("disk-virtio", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-fmt-qcow", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + /* Can't roundtrip shareable+cache mode option */ + /*DO_TEST("disk-drive-shared", QEMUD_CMD_FLAG_DRIVE);*/ + /* Can't roundtrip v1 writethrough option */ + /*DO_TEST("disk-drive-cache-v1-wt", QEMUD_CMD_FLAG_DRIVE);*/ + DO_TEST("disk-drive-cache-v1-wb", QEMUD_CMD_FLAG_DRIVE); + DO_TEST("disk-drive-cache-v1-none", QEMUD_CMD_FLAG_DRIVE); + DO_TEST("disk-drive-cache-v2-wt", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_CACHE_V2); + DO_TEST("disk-drive-cache-v2-wb", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_CACHE_V2); + DO_TEST("disk-drive-cache-v2-none", QEMUD_CMD_FLAG_DRIVE | + 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); + DO_TEST("input-usbtablet", 0); + /* Can't rountrip xenner arch */ + /*DO_TEST("input-xen", 0);*/ + DO_TEST("misc-acpi", 0); + DO_TEST("misc-no-reboot", 0); + DO_TEST("misc-uuid", QEMUD_CMD_FLAG_NAME | + QEMUD_CMD_FLAG_UUID | QEMUD_CMD_FLAG_DOMID); + DO_TEST("net-user", 0); + DO_TEST("net-virtio", 0); + DO_TEST("net-eth", 0); + DO_TEST("net-eth-ifname", 0); + + DO_TEST("serial-vc", 0); + DO_TEST("serial-pty", 0); + DO_TEST("serial-dev", 0); + DO_TEST("serial-file", 0); + DO_TEST("serial-unix", 0); + DO_TEST("serial-tcp", 0); + DO_TEST("serial-udp", 0); + DO_TEST("serial-tcp-telnet", 0); + DO_TEST("serial-many", 0); + DO_TEST("parallel-tcp", 0); + DO_TEST("console-compat", 0); + DO_TEST("sound", 0); + + DO_TEST("hostdev-usb-product", 0); + DO_TEST("hostdev-usb-address", 0); + + DO_TEST("hostdev-pci-address", 0); + + DO_TEST_FULL("restore-v1", QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO, "stdio"); + DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "stdio"); + DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "exec:cat"); + DO_TEST_FULL("migrate", QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP, "tcp:10.0.0.1:5000"); + + virCapabilitiesFree(driver.caps); + + return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +VIRT_TEST_MAIN(mymain) + +#else + +int main (void) { return (77); /* means 'test skipped' for automake */ } + +#endif /* WITH_QEMU */ diff -r 453b896e0e3f tests/qemuxml2argvdata/qemuxml2argv-bootloader.args --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args Tue May 19 18:43:32 2009 +0100 +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args Tue May 19 18:43:50 2009 +0100 @@ -1,1 +1,1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-kvm -S -M xenner -m 214 -smp 1 -nographic -monitor pty -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -nographic -monitor pty -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none -serial none -parallel none -usb diff -r 453b896e0e3f tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml Tue May 19 18:43:32 2009 +0100 +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml Tue May 19 18:43:50 2009 +0100 @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-kvm</emulator> + <emulator>/usr/bin/xenner</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff -r 453b896e0e3f tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml Tue May 19 18:43:32 2009 +0100 +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml Tue May 19 18:43:50 2009 +0100 @@ -24,4 +24,3 @@ </disk> </devices> </domain> - diff -r 453b896e0e3f tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml Tue May 19 18:43:32 2009 +0100 +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml Tue May 19 18:43:50 2009 +0100 @@ -18,7 +18,7 @@ <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> </disk> - <hostdev mode='subsystem' type='pci' managed='no'> + <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> </source> diff -r 453b896e0e3f tests/testutils.c --- a/tests/testutils.c Tue May 19 18:43:32 2009 +0100 +++ b/tests/testutils.c Tue May 19 18:43:50 2009 +0100 @@ -18,6 +18,7 @@ #ifndef WIN32 #include <sys/wait.h> #endif +#include <regex.h> #include <unistd.h> #include <string.h> #include <fcntl.h> @@ -457,3 +458,48 @@ cleanup: virResetLastError(); return ret; } + + +int virtTestClearLineRegex(const char *pattern, + char *str) +{ + regex_t reg; + char *lineStart = str; + char *lineEnd = strchr(str, '\n'); + + if (regcomp(&reg, pattern, REG_EXTENDED | REG_NOSUB) != 0) + return -1; + + while (lineStart) { + int ret; + if (lineEnd) + *lineEnd = '\0'; + + + ret = regexec(&reg, lineStart, 0, NULL, 0); + //fprintf(stderr, "Match %d '%s' '%s'\n", ret, lineStart, pattern); + if (ret == 0) { + if (lineEnd) { + memmove(lineStart, lineEnd + 1, strlen(lineEnd+1) + 1); + /* Don't update lineStart - just iterate again on this + location */ + lineEnd = strchr(lineStart, '\n'); + } else { + *lineStart = '\0'; + lineStart = NULL; + } + } else { + if (lineEnd) { + *lineEnd = '\n'; + lineStart = lineEnd + 1; + lineEnd = strchr(lineStart, '\n'); + } else { + lineStart = NULL; + } + } + } + + regfree(&reg); + + return 0; +} diff -r 453b896e0e3f tests/testutils.h --- a/tests/testutils.h Tue May 19 18:43:32 2009 +0100 +++ b/tests/testutils.h Tue May 19 18:43:50 2009 +0100 @@ -27,6 +27,8 @@ int virtTestCaptureProgramOutput(const c char **buf, int buflen); +int virtTestClearLineRegex(const char *pattern, + char *string); int virtTestDifference(FILE *stream, const char *expect, -- |: 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] kvm migration
by Łukasz Mierzwa 20 May '09

20 May '09

Hi, can someone explain me how migration works in libvirt? I got 2 machines with ubuntu 9.04 (libvirt 0.6.1 and kvm 84), disk images are stored on nfs share so both machines can access them. When I run live migration (virsh migrate --live domain uri) my domain is migrated to second host but: 1. domain is defined on both hosts after migration, it does not disappear from original host 2. when I shutdown this domain on second host it gets undefined so I guess that migration is only temporary but this is not what I want. When I migrate domain to other host I want it to stay there, how can I do that? I can't find anything about it in documentation on libvirt website, google does not seem to know anything either. Łukasz Mierzwa

3 5

[libvirt] [RFC][PATCH] lxc: fix for ns cgroups subsystem
by Ryota Ozaki 20 May '09

20 May '09

Hi, lxc does not work if ns cgroups subsystem is enabled because of two factors; one is that ns has a special rule to create a group[*] unlike other subsystems and the other is lxc controller creates a new namespace for /dev/pts prior to create a new group for a domain. Unfortunately the new namespace breaks the rule of ns and that prevents a lxc controller from creating a new group. This patch addresses the problem by creating a new group before creating a new namespace (i.e. call unshare syscall). Note that this patch is only for the case ns is enabled and current code works well if it disabled. However, I think this patch makes sense because not just a few users know much about cgroups and likely to enable all of subsystems without notions (i.e. mount cgroups without any options). [*] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=k… Thanks, ozaki-r Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> >From 46531182708dc3eb132b14ce2f23fbc639430176 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Fri, 8 May 2009 05:31:03 +0900 Subject: [PATCH] lxc: fix for ns cgroups subsystem lxc does not work if ns cgroups subsystem is enabled because of two factors; one is that ns has a special rule to create a group[*] unlike other subsystems and the other is lxc controller creates a new namespace for /dev/pts prior to create a new group for a domain. Unfortunately the new namespace breaks the rule of ns and that prevents a lxc controller from creating a new group. This patch addresses the problem by creating a new group before creating a new namespace (i.e. call unshare syscall). Note that this patch is only for the case ns is enabled and current code works well if it disabled. However, I think this patch makes sense because not just a few users know much about cgroups and likely to enable all of subsystems without notions (i.e. mount cgroups without any options). [*] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=k… --- src/lxc_controller.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc_controller.c b/src/lxc_controller.c index e0fb05d..1231817 100644 --- a/src/lxc_controller.c +++ b/src/lxc_controller.c @@ -458,6 +458,9 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } + if (lxcSetContainerResources(def) < 0) + goto cleanup; + root = virDomainGetRootFilesystem(def); /* @@ -543,9 +546,6 @@ lxcControllerRun(virDomainDefPtr def, } - if (lxcSetContainerResources(def) < 0) - goto cleanup; - if ((container = lxcContainerStart(def, nveths, veths, -- 1.6.0.6

4 12

[libvirt] PATCH: 0/5: API for converting domain XML to/from native config formats
by Daniel P. Berrange 20 May '09

20 May '09

This is a long overdue update to the idea I described here http://www.redhat.com/archives/libvir-list/2009-April/msg00266.html And the initial patch posted here http://www.redhat.com/archives/libvir-list/2009-April/msg00401.html Daniel -- |: 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 :|

3 17