- Devel - libvirt List Archives

[libvirt] [PATCH 0/1] Fix NPIV on older kernels
by David Allan 19 Jun '09

19 Jun '09

Ok, I redid the patch into a minimal change that fixes NPIV on older kernels. I'll resubmit the rest of it when I decide how I want to deal with the problem of things moving around in /sys. Dave

3 3

[libvirt] [PATCH] Add virsh commands for virInterface* functions - Take 2
by Laine Stump 19 Jun '09

19 Jun '09

This is a resubmission of the virsh commands to expose virInterface* functionality. I've made the following changes from the original: 1) command names changed from if-* to iface-* 2) "if-create" is now "iface-start" 3) iface-edit implementation is manually included directly in virsh.c rather than being generated with a makefile rule. 4) iface-list now has options --inactive and --all, similar to net-list. (4) depends on new functions contained in the patch I submitted yesterday. All of this builds and appears to be correct, but is non-functional until either the netcf backend or test driver backend is committed. The netcf backend is waiting on something in netcf to provide the functionality required for virConnectListDefinedInterfaces(), and the test driver is waiting on XML parsing/formatting functions (and needs a small amount of rework to support inactive interfaces). --- src/virsh.c | 536 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 536 insertions(+), 0 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index f5248d9..6ab6182 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -228,6 +228,7 @@ static int vshCommandOptBool(const vshCmd *cmd, const char *name); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) #define VSH_BYNAME (1 << 3) +#define VSH_BYMAC (1 << 4) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, char **name, int flag); @@ -244,6 +245,14 @@ static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptNetworkBy(_ctl, _cmd, _name, \ VSH_BYUUID|VSH_BYNAME) +static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag); + +/* default is lookup by Name and MAC */ +#define vshCommandOptInterface(_ctl, _cmd, _name) \ + vshCommandOptInterfaceBy(_ctl, _cmd, _name, \ + VSH_BYMAC|VSH_BYNAME) + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); @@ -275,6 +284,10 @@ static const char *vshDomainVcpuStateToString(int state); static int vshConnectionUsability(vshControl *ctl, virConnectPtr conn, int showerror); +static char *editWriteToTempFile (vshControl *ctl, const char *doc); +static int editFile (vshControl *ctl, const char *filename); +static char *editReadBackFile (vshControl *ctl, const char *filename); + static void *_vshMalloc(vshControl *ctl, size_t sz, const char *filename, int line); #define vshMalloc(_ctl, _sz) _vshMalloc(_ctl, _sz, __FILE__, __LINE__) @@ -2690,6 +2703,106 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) /* + * "iface-edit" command + */ +static const vshCmdInfo info_interface_edit[] = { + {"help", gettext_noop("edit XML configuration for a physical host interface")}, + {"desc", gettext_noop("Edit the XML configuration for a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_edit[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) +{ + int ret = FALSE; + virInterfacePtr iface = NULL; + char *tmp = NULL; + char *doc = NULL; + char *doc_edited = NULL; + char *doc_reread = NULL; + int flags = 0; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + goto cleanup; + + iface = vshCommandOptInterface (ctl, cmd, NULL); + if (iface == NULL) + goto cleanup; + + /* Get the XML configuration of the interface. */ + doc = virInterfaceGetXMLDesc (iface, flags); + if (!doc) + goto cleanup; + + /* Create and open the temporary file. */ + tmp = editWriteToTempFile (ctl, doc); + if (!tmp) goto cleanup; + + /* Start the editor. */ + if (editFile (ctl, tmp) == -1) goto cleanup; + + /* Read back the edited file. */ + doc_edited = editReadBackFile (ctl, tmp); + if (!doc_edited) goto cleanup; + + unlink (tmp); + tmp = NULL; + + /* Compare original XML with edited. Has it changed at all? */ + if (STREQ (doc, doc_edited)) { + vshPrint (ctl, _("Interface %s XML configuration not changed.\n"), + virInterfaceGetName (iface)); + ret = TRUE; + goto cleanup; + } + + /* Now re-read the interface XML. Did someone else change it while + * it was being edited? This also catches problems such as us + * losing a connection or the interface going away. + */ + doc_reread = virInterfaceGetXMLDesc (iface, flags); + if (!doc_reread) + goto cleanup; + + if (STRNEQ (doc, doc_reread)) { + vshError (ctl, FALSE, + "%s", _("ERROR: the XML configuration was changed by another user")); + goto cleanup; + } + + /* Everything checks out, so redefine the interface. */ + virInterfaceFree (iface); + iface = virInterfaceDefineXML (ctl->conn, doc_edited, 0); + if (!iface) + goto cleanup; + + vshPrint (ctl, _("Interface %s XML configuration edited.\n"), + virInterfaceGetName(iface)); + + ret = TRUE; + +cleanup: + if (iface) + virInterfaceFree (iface); + + free (doc); + free (doc_edited); + free (doc_reread); + + if (tmp) { + unlink (tmp); + free (tmp); + } + + return ret; +} + +/* * "net-list" command */ static const vshCmdInfo info_network_list[] = { @@ -2955,6 +3068,378 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) } +/**************************************************************************/ +/* + * "iface-list" command + */ +static const vshCmdInfo info_interface_list[] = { + {"help", gettext_noop("list physical host interfaces")}, + {"desc", gettext_noop("Returns list of physical host interfaces.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_list[] = { + {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive interfaces")}, + {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active interfaces")}, + {NULL, 0, 0, NULL} +}; +static int +cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + int inactive = vshCommandOptBool(cmd, "inactive"); + int all = vshCommandOptBool(cmd, "all"); + int active = !inactive || all ? 1 : 0; + int maxactive = 0, maxinactive = 0, i; + char **activeNames = NULL, **inactiveNames = NULL; + inactive |= all; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (active) { + maxactive = virConnectNumOfInterfaces(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active interfaces")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); + + if ((maxactive = virConnectListInterfaces(ctl->conn, activeNames, + maxactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active interfaces")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + } + } + if (inactive) { + maxinactive = virConnectNumOfDefinedInterfaces(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive interfaces")); + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedInterfaces(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive interfaces")); + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + } + vshPrintExtra(ctl, "%-20s %-10s %s\n", _("Name"), _("State"), _("MAC Address")); + vshPrintExtra(ctl, "--------------------------------------------\n"); + + for (i = 0; i < maxactive; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, activeNames[i]); + const char *autostartStr; + int autostart = 0; + + /* this kind of work with interfaces is not atomic */ + if (!iface) { + free(activeNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-10s %s\n", + virInterfaceGetName(iface), + _("active"), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, inactiveNames[i]); + const char *autostartStr; + int autostart = 0; + + /* this kind of work with interfaces is not atomic */ + if (!iface) { + free(inactiveNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-10s %s\n", + virInterfaceGetName(iface), + _("inactive"), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(inactiveNames[i]); + } + free(activeNames); + free(inactiveNames); + return TRUE; + +} + +/* + * "iface-name" command + */ +static const vshCmdInfo info_interface_name[] = { + {"help", gettext_noop("convert an interface MAC address to interface name")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_name[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface mac")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceName(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYMAC))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetName(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "iface-mac" command + */ +static const vshCmdInfo info_interface_mac[] = { + {"help", gettext_noop("convert an interface name to interface MAC address")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_mac[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceMAC(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYNAME))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "iface-dumpxml" command + */ +static const vshCmdInfo info_interface_dumpxml[] = { + {"help", gettext_noop("interface information in XML")}, + {"desc", gettext_noop("Output the physical host interface information as an XML dump to stdout.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_dumpxml[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *dump; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, NULL))) + return FALSE; + + dump = virInterfaceGetXMLDesc(iface, 0); + if (dump != NULL) { + printf("%s", dump); + free(dump); + } else { + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-define" command + */ +static const vshCmdInfo info_interface_define[] = { + {"help", gettext_noop("define (but don't start) a physical host interface from an XML file")}, + {"desc", gettext_noop("Define a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_define[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML interface description")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr interface; + char *from; + int found; + int ret = TRUE; + char *buffer; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + from = vshCommandOptString(cmd, "file", &found); + if (!found) + return FALSE; + + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; + + interface = virInterfaceDefineXML(ctl->conn, buffer, 0); + free (buffer); + + if (interface != NULL) { + vshPrint(ctl, _("Interface %s defined from %s\n"), + virInterfaceGetName(interface), from); + } else { + vshError(ctl, FALSE, _("Failed to define interface from %s"), from); + ret = FALSE; + } + return ret; +} + +/* + * "iface-undefine" command + */ +static const vshCmdInfo info_interface_undefine[] = { + {"help", gettext_noop("undefine a physical host interface (remove it from configuration)")}, + {"desc", gettext_noop("undefine an interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_undefine[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceUndefine(iface) == 0) { + vshPrint(ctl, _("Interface %s undefined\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to undefine interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-start" command + */ +static const vshCmdInfo info_interface_start[] = { + {"help", gettext_noop("start a physical host interface (enable it / \"if-up\")")}, + {"desc", gettext_noop("start a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_start[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceCreate(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s started\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to start interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-destroy" command + */ +static const vshCmdInfo info_interface_destroy[] = { + {"help", gettext_noop("destroy a physical host interface (disable it / \"if-down\")")}, + {"desc", gettext_noop("destroy a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_destroy[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceDestroy(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s destroyed\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to destroy interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/**************************************************************************/ /* * "pool-autostart" command */ @@ -6247,6 +6732,17 @@ static const vshCmdDef commands[] = { {"net-start", cmdNetworkStart, opts_network_start, info_network_start}, {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine}, {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid}, + + {"iface-list", cmdInterfaceList, opts_interface_list, info_interface_list}, + {"iface-name", cmdInterfaceName, opts_interface_name, info_interface_name}, + {"iface-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac}, + {"iface-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml, info_interface_dumpxml}, + {"iface-define", cmdInterfaceDefine, opts_interface_define, info_interface_define}, + {"iface-undefine", cmdInterfaceUndefine, opts_interface_undefine, info_interface_undefine}, + {"iface-edit", cmdInterfaceEdit, opts_interface_edit, info_interface_edit}, + {"iface-start", cmdInterfaceStart, opts_interface_start, info_interface_start}, + {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, + {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, @@ -6698,6 +7194,46 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, return network; } +static virInterfacePtr +vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag) +{ + virInterfacePtr iface = NULL; + char *n; + const char *optname = "interface"; + if (!cmd_has_option (ctl, cmd, optname)) + return NULL; + + if (!(n = vshCommandOptString(cmd, optname, NULL))) { + vshError(ctl, FALSE, "%s", _("undefined interface identifier")); + return NULL; + } + + vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); + + if (name) + *name = n; + + /* try it by MAC */ + if ((iface == NULL) && (flag & VSH_BYMAC)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface MAC\n", + cmd->def->name, optname); + iface = virInterfaceLookupByMACString(ctl->conn, n); + } + /* try it by NAME */ + if ((iface == NULL) && (flag & VSH_BYNAME)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface NAME\n", + cmd->def->name, optname); + iface = virInterfaceLookupByName(ctl->conn, n); + } + + if (!iface) + vshError(ctl, FALSE, _("failed to get interface '%s'"), n); + + return iface; +} + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) -- 1.6.0.6

3 2

[libvirt] [PATCH] Fix logging in libvirt_lxc controller
by Amy Griffis 19 Jun '09

19 Jun '09

The lxc controller can't see libvirtd's log level setting so it needs to re-query it from the environment. The parsing code has a few users now, so I added a new function to the internal API, virLogParseDefaultPriority() along the lines of the other parse functions. Signed-off-by: Amy Griffis <amy.griffis(a)hp.com> diff --git a/qemud/qemud.c b/qemud/qemud.c index a58a767..bd17ccb 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2465,16 +2465,8 @@ qemudSetLogging(virConfPtr conf, const char *filename) { */ GET_CONF_INT (conf, filename, log_level); debugEnv = getenv("LIBVIRT_DEBUG"); - if (debugEnv && *debugEnv && *debugEnv != '0') { - if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info")) - log_level = VIR_LOG_INFO; - else if (STREQ(debugEnv, "3") || STREQ(debugEnv, "warning")) - log_level = VIR_LOG_WARN; - else if (STREQ(debugEnv, "4") || STREQ(debugEnv, "error")) - log_level = VIR_LOG_ERROR; - else - log_level = VIR_LOG_DEBUG; - } + if (debugEnv && *debugEnv && *debugEnv != '0') + log_level = virLogParseDefaultPriority(debugEnv); if ((verbose) && (log_level >= VIR_LOG_WARN)) log_level = VIR_LOG_INFO; virLogSetDefaultPriority(log_level); diff --git a/src/libvirt.c b/src/libvirt.c index bf49018..a3f36da 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -258,6 +258,7 @@ virInitialize(void) { #ifdef ENABLE_DEBUG char *debugEnv; + int logPrio; #endif if (initialized) return(0); @@ -272,14 +273,8 @@ virInitialize(void) #ifdef ENABLE_DEBUG debugEnv = getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && *debugEnv != '0') { - if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info")) - virLogSetDefaultPriority(VIR_LOG_INFO); - else if (STREQ(debugEnv, "3") || STREQ(debugEnv, "warning")) - virLogSetDefaultPriority(VIR_LOG_WARN); - else if (STREQ(debugEnv, "4") || STREQ(debugEnv, "error")) - virLogSetDefaultPriority(VIR_LOG_ERROR); - else - virLogSetDefaultPriority(VIR_LOG_DEBUG); + logPrio = virLogParseDefaultPriority(debugEnv); + virLogSetDefaultPriority(logPrio); } debugEnv = getenv("LIBVIRT_LOG_FILTERS"); if (debugEnv) diff --git a/src/libvirt_debug.syms b/src/libvirt_debug.syms index 1742a0b..539d879 100644 --- a/src/libvirt_debug.syms +++ b/src/libvirt_debug.syms @@ -12,6 +12,7 @@ virLogMessage; virLogSetDefaultPriority; virLogDefineFilter; virLogDefineOutput; +virLogParseDefaultPriority; virLogParseFilters; virLogParseOutputs; virLogStartup; diff --git a/src/logging.c b/src/logging.c index 83e07cc..c72d52e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -793,5 +793,30 @@ int virLogParseFilters(const char *filters) { } return(ret); } + +/** + * virLogParseDefaultPriority: + * @priority: string defining the desired logging behavior + * + * It can take a string or number corresponding to the following log + * levels: + * 1: DEBUG + * 2: INFO + * 3: WARNING + * 4: ERROR + * + * DEBUG is returned if @priority doesn't match any of the other values. + */ +int virLogParseDefaultPriority(const char *priority) { + + if (STREQ(priority, "2") || STREQ(priority, "info")) + return VIR_LOG_INFO; + else if (STREQ(priority, "3") || STREQ(priority, "warning")) + return VIR_LOG_WARN; + else if (STREQ(priority, "4") || STREQ(priority, "error")) + return VIR_LOG_ERROR; + else + return VIR_LOG_DEBUG; +} #endif /* ENABLE_DEBUG */ diff --git a/src/logging.h b/src/logging.h index 7ea8935..72b3119 100644 --- a/src/logging.h +++ b/src/logging.h @@ -110,6 +110,7 @@ typedef void (*virLogCloseFunc) (void *data); #ifdef ENABLE_DEBUG +extern int virLogParseDefaultPriority(const char *priority); extern int virLogSetDefaultPriority(int priority); extern int virLogDefineFilter(const char *match, int priority, int flags); extern int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, @@ -130,6 +131,7 @@ extern void virLogMessage(const char *category, int priority, #else /* ENABLE_DEBUG */ +#define virLogParseDefaultPriority(p) #define virLogSetDefaultPriority(p) #define virLogDefineFilter(m, p, f) #define virLogDefineOutput(func, c, d, p, f) diff --git a/src/lxc_controller.c b/src/lxc_controller.c index 356ecb8..9355d39 100644 --- a/src/lxc_controller.c +++ b/src/lxc_controller.c @@ -594,6 +594,8 @@ int main(int argc, char *argv[]) int monitor = -1; int appPty = -1; int bg = 0; + char *debugEnv; + int logPrio; virCapsPtr caps = NULL; virDomainDefPtr def = NULL; char *configFile = NULL; @@ -735,6 +737,13 @@ int main(int argc, char *argv[]) } } + /* New programs need to re-query and set the libvirt log level. */ + debugEnv = getenv("LIBVIRT_DEBUG"); + if (debugEnv && *debugEnv && *debugEnv != '0') { + logPrio = virLogParseDefaultPriority(debugEnv); + virLogSetDefaultPriority(logPrio); + } + /* Accept initial client which is the libvirtd daemon */ if ((client = accept(monitor, NULL, 0)) < 0) { virReportSystemError(NULL, errno, "%s",

4 7

[libvirt] [PATCH 0/1] Make NPIV support work with older kernels
by David Allan 19 Jun '09

19 Jun '09

Here is a patch that makes NPIV support work with older kernels that have vport_create and delete in /sys/class/scsi_host/hostN instead of /sys/class/fc_host/hostN It doesn't look to me like there is a single place to find those files that works with both old and new kernels, so the new code checks both places at runtime. Dave

4 4

[libvirt] KVM root mac address
by Paul Reeves 19 Jun '09

19 Jun '09

A quick question - What is the correct root for dynamically generated KVM mac addresses? The docs (man virt-install) say 54:52:00 and I've seen Ubuntu docs on-line that say 52:54:00. Has someone got these mixed up? Thanks Paul -- Paul Reeves

4 4

[libvirt] domain.info() sometimes returns state zero for running machines
by Andreas Sommer 19 Jun '09

19 Jun '09

I'm using Xen-3.2-1 on Debian 5.0.1-lenny and retrieve information about running domains using domain.info()[0] The domain object is retrieved via connection.lookupByUUIDString(...) and stored as a variable called "domain". Usually the running domains have the state 1 (VIR_DOMAIN_RUNNING) or 2 (VIR_DOMAIN_BLOCKED), but sometimes it happens that 0 (VIR_DOMAIN_NOSTATE) is returned. Why does that happen? I don't think it is an error because then it would've raised an exception... Regards Andreas

2 4

[libvirt] [PATCH] test driver: Fix domain ID after redefining a running VM
by Cole Robinson 19 Jun '09

19 Jun '09

The ID of the existing VM was being unconditionally set to -1, which was upsetting virt-manager. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test.c b/src/test.c index 7dc0840..2a672a3 100644 --- a/src/test.c +++ b/src/test.c @@ -1623,16 +1623,16 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, def)) == NULL) { goto cleanup; } + def = NULL; dom->persistent = 1; - dom->def->id = -1; + event = virDomainEventNewFromObj(dom, VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED_ADDED); - ret = virGetDomain(conn, def->name, def->uuid); - def = NULL; + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); if (ret) - ret->id = -1; + ret->id = dom->def->id; cleanup: virDomainDefFree(def); -- 1.6.0.6

3 2

[libvirt] [PATCH] Fix memory reporting for inactive domains in the qemu driver.
by Cole Robinson 19 Jun '09

19 Jun '09

Currently, 'info' will always report that mem = max mem. Make sure we actually return the correct mem value. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu_driver.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index d3eb3ad..4e3e531 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2553,16 +2553,22 @@ static int qemudDomainGetInfo(virDomainPtr dom, } } - err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon); - if (err < 0) - goto cleanup; - info->maxMem = vm->def->maxmem; - if (err == 0) - /* Balloon not supported, so maxmem is always the allocation */ - info->memory = vm->def->maxmem; - else - info->memory = balloon; + + if (virDomainIsActive(vm)) { + err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon); + if (err < 0) + goto cleanup; + + if (err == 0) + /* Balloon not supported, so maxmem is always the allocation */ + info->memory = vm->def->maxmem; + else + info->memory = balloon; + } else { + info->memory = vm->def->memory; + } + info->nrVirtCpu = vm->def->vcpus; ret = 0; -- 1.6.0.6

3 2

[libvirt] Patch for Ruby Bindings to include attach & detach device
by Martin Gajdos 19 Jun '09

19 Jun '09

Hi David Lutterkort asked me to send this patch to the list so it could be reviewed. What this small patch does is, it adds two functions to call "virDomainAttachDevice" & "virDomainDetachDevice" which allow devices to be attached & detached at run-time. The Ruby methods are called "attach_device" & "detach_device" and belong to the Domain class. Martin --- orig_libvirt.c 2009-06-18 12:17:47.000000000 +0200 +++ mine_libvirt.c 2009-06-18 12:22:25.000000000 +0200 @@ -970,6 +970,22 @@ } /* + * Call +virDomainAttachDevice+[ http://www.libvirt.org/html/libvirt-libvirt.html#virDomainAttachDevice] + */ +VALUE libvirt_dom_attach_device(VALUE s, VALUE xml) { + gen_call_void(virDomainAttachDevice, conn(s), + domain_get(s), StringValueCStr(xml)); +} + +/* + * Call +virDomainDetachDevice+[ http://www.libvirt.org/html/libvirt-libvirt.html#virDomainDetachDevice] + */ +VALUE libvirt_dom_detach_device(VALUE s, VALUE xml) { + gen_call_void(virDomainDetachDevice, conn(s), + domain_get(s), StringValueCStr(xml)); +} + +/* * Call +virDomainCreateLinux+[ http://www.libvirt.org/html/libvirt-libvirt.html#virDomainCreateLinux] */ VALUE libvirt_conn_create_linux(int argc, VALUE *argv, VALUE c) { @@ -1921,6 +1937,8 @@ rb_define_method(c_domain, "autostart", libvirt_dom_autostart, 0); rb_define_method(c_domain, "autostart=", libvirt_dom_autostart_set, 1); rb_define_method(c_domain, "free", libvirt_dom_free, 0); + rb_define_method(c_domain, "attach_device", libvirt_dom_attach_device, 1); + rb_define_method(c_domain, "detach_device", libvirt_dom_detach_device, 1); /* * Class Libvirt::Domain::Info

3 2

[libvirt] PATCH: Fix QEMU security model info after capabilities refresh
by Daniel P. Berrange 18 Jun '09

18 Jun '09

A recent patch made the qemudGetCapabilities() method blow away and re-create the QEMU driver's capabilities object. Unfortunately it did not re-initialize the security model capabilities data. It also left open the possibility that the QEMU driver could be left with no active capabilities object at all in the case of OOM. Thus, this patch . - Splits the security capabilities init code out to be callable independantly of init of the security driver itself - Makes qemudGetCapabilities repopopulate security driver info - Don't free the existing capabilities object until we have successfully created a new one Daniel Index: src/qemu_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_driver.c,v retrieving revision 1.255 diff -u -p -r1.255 qemu_driver.c --- src/qemu_driver.c 16 Jun 2009 15:42:46 -0000 1.255 +++ src/qemu_driver.c 18 Jun 2009 11:38:10 -0000 @@ -347,12 +347,43 @@ qemuReconnectDomains(struct qemud_driver } } + +static int +qemudSecurityCapsInit(virSecurityDriverPtr secdrv, + virCapsPtr caps) +{ + const char *doi, *model; + + doi = virSecurityDriverGetDOI(secdrv); + model = virSecurityDriverGetModel(secdrv); + + caps->host.secModel.model = strdup(model); + if (!caps->host.secModel.model) { + char ebuf[1024]; + VIR_ERROR(_("Failed to copy secModel model: %s"), + virStrerror(errno, ebuf, sizeof ebuf)); + return -1; + } + + caps->host.secModel.doi = strdup(doi); + if (!caps->host.secModel.doi) { + char ebuf[1024]; + VIR_ERROR(_("Failed to copy secModel DOI: %s"), + virStrerror(errno, ebuf, sizeof ebuf)); + return -1; + } + + VIR_DEBUG("Initialized caps for security driver \"%s\" with " + "DOI \"%s\"", model, doi); + + return 0; +} + + static int qemudSecurityInit(struct qemud_driver *qemud_drv) { int ret; - const char *doi, *model; - virCapsPtr caps; virSecurityDriverPtr security_drv; ret = virSecurityDriverStartup(&security_drv, @@ -368,36 +399,17 @@ qemudSecurityInit(struct qemud_driver *q } qemud_drv->securityDriver = security_drv; - doi = virSecurityDriverGetDOI(security_drv); - model = virSecurityDriverGetModel(security_drv); - VIR_DEBUG("Initialized security driver \"%s\" with " - "DOI \"%s\"", model, doi); + VIR_INFO("Initialized security driver %s", security_drv->name); /* * Add security policy host caps now that the security driver is * initialized. */ - caps = qemud_drv->caps; - - caps->host.secModel.model = strdup(model); - if (!caps->host.secModel.model) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel model: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); - return -1; - } + return qemudSecurityCapsInit(security_drv, qemud_drv->caps); +} - caps->host.secModel.doi = strdup(doi); - if (!caps->host.secModel.doi) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel DOI: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); - return -1; - } - return 0; -} /** * qemudStartup: @@ -1866,13 +1878,29 @@ static int qemudGetMaxVCPUs(virConnectPt static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; + virCapsPtr caps; char *xml = NULL; qemuDriverLock(driver); + if ((caps = qemudCapsInit()) == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + if (qemu_driver->securityDriver && + qemudSecurityCapsInit(qemu_driver->securityDriver, caps) < 0) { + virCapabilitiesFree(caps); + virReportOOMError(conn); + goto cleanup; + } + virCapabilitiesFree(qemu_driver->caps); - if ((qemu_driver->caps = qemudCapsInit()) == NULL || - (xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + qemu_driver->caps = caps; + + if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) virReportOOMError(conn); + +cleanup: qemuDriverUnlock(driver); return xml; -- |: 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] Future release schedule
by Daniel Veillard 17 Jun '09

17 Jun '09

I realize I forgot to post any plan on the topic, oops ! I guess we should shoot for another release around the end of the month, Friday is a good day for release and freezes, and since I didn't gave any heads-up, the best is to shoot for a July 3rd release, which mean we would enter the freeze around the end of next week. Content wise so far we have mostly bug fixes and update/completion on existing drivers or APIs so I guess a libvirt-0.6.5 will be fine. One thing I wonder is about progresses on the ESX driver front, it was looking fairly close to be commiteable, basically only XML import/export was needed but I didnt see any news recently, Matthias do you have a schedule for that missing part ? Any help is needed ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] Undefined symbol: virNodeDeviceWaitForDevices
by Matthias Bolte 17 Jun '09

17 Jun '09

Hi, GIT commit f7b12afc7b67b6727151f74683e7cb9d6fc2b36f adds a new function: virNodeDeviceWaitForDevices In storage_backend.c virStorageBackendWaitForDevices was changed to call virNodeDeviceWaitForDevices, but the code for virNodeDeviceWaitForDevices is only compiled and linked into libvirtd if the nodedev driver is build, but the nodedev driver is only build if the hal or devkit development packages are installed. If neither hal nor devkit is installed, compiling libvirt yields an undefined symbol error for virNodeDeviceWaitForDevices Regards, Matthias

3 3

[libvirt] Problem compiling latest code from libvirt CVS
by Fischer, Anna 17 Jun '09

17 Jun '09

I am trying to build the latest libvirt checked out from CVS this morning, but I get an error message. I ran ./autostart, ./configure and then make. Any idea what the problem here could be? gcc -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../src -I/usr/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -g -O2 -MT libvirtd-remote_protocol.o -MD -MP -MF .deps/libvirtd-remote_protocol.Tpo -c -o libvirtd-remote_protocol.o `test -f 'remote_protocol.c' || echo './'`remote_protocol.c mv -f .deps/libvirtd-remote_protocol.Tpo .deps/libvirtd-remote_protocol.Po /bin/sh ../mylibtool --tag=CC --mode=link gcc -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../src -I/usr/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -g -O2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -o libvirtd libvirtd-event.o libvirtd-qemud.o libvirtd-remote.o libvirtd-remote_protocol.o -lxml2 -lgnutls -lpthread -lsasl2 ../src/libvirt_driver_qemu.la ../src/libvirt_driver_lxc.la ../src/libvirt_driver_uml.la ../src/libvirt_driver_storage.la ../src/libvirt_driver_network.la ../src/libvirt.la ../gnulib/lib/libgnu.la -lpthread (LD) -o libvirtd libvirtd-event.o libvirtd-qemud.o libvirtd-remote.o libvirtd-remote_protocol.o ../src/.libs/libvirt_driver_storage.a(storage_backend.o): In function `virStorageBackendWaitForDevices': /home/af/vepa/libvirt/libvirt/src/storage_backend.c:262: undefined reference to `virNodeDeviceWaitForDevices' collect2: ld returned 1 exit status make[3]: *** [libvirtd] Error 1

4 12

[libvirt] [PATCH] Fix qemu command flags fetching
by Cole Robinson 16 Jun '09

16 Jun '09

New function qemudParseHelpStr was being called with arguments in the wrong order, so command flags == kvm_version :/ Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 22f315c..a669c11 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -597,7 +597,7 @@ int qemudExtractVersionInfo(const char *qemu, goto cleanup2; } - if (qemudParseHelpStr(help, &version, &kvm_version, &is_kvm, &flags) == -1) + if (qemudParseHelpStr(help, &flags, &version, &is_kvm, &kvm_version) == -1) goto cleanup2; if (retversion) -- 1.6.0.6

3 21

[libvirt] Xen: How to describe bridged network adapter in libvirt-XML?
by Andreas Sommer 16 Jun '09

16 Jun '09

Hi, I'm looking for a solution to convert the Xen configuration line vif = ["bridge=eth0"] to the libvirt XML description format which can be used by the createLinux() function (using Python). I tried several things like <interface type="bridge"> <source bridge="eth0" /> <target dev="eth0" /> <mac address="aa:00:00:00:00:12" /> <script path="/etc/xen/scripts/vif-bridge" /> </interface> but they didn't work. Everytime I start up the guest using libvirt, no virtual network device is created (= there's no "vifXX.0" when running "brctl show"). It works perfectly with the Xen configuration line mentioned above. Hope you can help me with that. Best regards, Andreas

2 2

[libvirt] virDomainDefineXML forbidden for read only access
by Kenneth Nagin 16 Jun '09

16 Jun '09

I am running an application that invokes the java method virDomainDefineXML. But virDomainDefineXML is throwing the exception "forbidden for read only access". I'm running as root. I can successfully define domain xml and create VMs with virsh. Any suggestion of what I am do wrong? Exception details: exception caught:org.libvirt.LibvirtException: operation virDomainDefineXML forbidden for read only access level:VIR_ERR_ERROR code:VIR_ERR_OPERATION_DENIED domain:VIR_FROM_NONE hasConn:false hasDom:false hasNet:false message:operation virDomainDefineXML forbidden for read only access str1:operation %s forbidden for read only access str2:virDomainDefineXML str3:null int1:0 int2:0 Kenneth Nagin

3 3

[libvirt] [PATCH] Add virsh commands for virInterface* functions.
by Laine Stump 16 Jun '09

16 Jun '09

I think this is complete (can't really try it out until the test driver is running), but have a few questions about it: 1) Does the command set look complete? 2) Do you agree with the naming (using "if-", and following the libvirt convention for if-create/if-destroy, rather than the fedora convention (if-up/if-down)? 3) I'm all for eliminating unnecessary copy/paste in code, but the way that cmdNetworkEdit() and cmdPoolEdit() are created (by awking/seding virsh.c to create a modified version of the cmdEdit function that lives in a separate .c which is #included by virsh.c) seems just a bit convoluted to me. I've made it one step worse for cmdInterfaceEdit because virInterfaceDefineXML has an extra argument (flags) that virDomainDefineXML doesn't. What are your opinions? Should I continue on in the tradition for consistency's sake (as I've done in this patch), or manually put cmdInterfaceEdit() directly into virsh.c? --- src/Makefile.am | 18 +++- src/virsh.c | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 414 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d4f7ea1..7601611 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -585,7 +585,7 @@ virsh_LDADD = \ ../gnulib/lib/libgnu.la \ $(VIRSH_LIBS) virsh_CFLAGS = $(COVERAGE_CFLAGS) $(READLINE_CFLAGS) $(NUMACTL_CFLAGS) -BUILT_SOURCES = virsh-net-edit.c virsh-pool-edit.c libvirt.syms +BUILT_SOURCES = virsh-net-edit.c virsh-if-edit.c virsh-pool-edit.c libvirt.syms virsh-net-edit.c: virsh.c Makefile.am rm -f $@-tmp @@ -602,6 +602,22 @@ virsh-net-edit.c: virsh.c Makefile.am rm -f $@ mv $@-tmp $@ +virsh-if-edit.c: virsh.c Makefile.am + rm -f $@-tmp + echo '/* Automatically generated from: $^ */' > $@-tmp + echo 'static int' >> $@-tmp + awk '/^cmdEdit/, /^}/' $< \ + | sed -e 's/domain/interface/g' \ + -e 's/Domain/Interface/g' \ + -e 's/cmdEdit/cmdInterfaceEdit/g' \ + -e 's/dom/iface/g' \ + -e 's/int flags.*/int flags = 0;/g' \ + -e 's/DefineXML$.*$)/DefineXML\1, 0)/' \ + >> $@-tmp + chmod a-w $@-tmp + rm -f $@ + mv $@-tmp $@ + virsh-pool-edit.c: virsh.c Makefile.am rm -f $@-tmp echo '/* Automatically generated from: $^ */' > $@-tmp diff --git a/src/virsh.c b/src/virsh.c index f5248d9..6fd090c 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -228,6 +228,7 @@ static int vshCommandOptBool(const vshCmd *cmd, const char *name); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) #define VSH_BYNAME (1 << 3) +#define VSH_BYMAC (1 << 4) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, char **name, int flag); @@ -244,6 +245,14 @@ static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptNetworkBy(_ctl, _cmd, _name, \ VSH_BYUUID|VSH_BYNAME) +static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag); + +/* default is lookup by Name and MAC */ +#define vshCommandOptInterface(_ctl, _cmd, _name) \ + vshCommandOptInterfaceBy(_ctl, _cmd, _name, \ + VSH_BYMAC|VSH_BYNAME) + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); @@ -2955,6 +2964,325 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) } +/**************************************************************************/ +/* + * "if-list" command + */ +static const vshCmdInfo info_interface_list[] = { + {"help", gettext_noop("list physical host interfaces")}, + {"desc", gettext_noop("Returns list of physical host interfaces.")}, + {NULL, NULL} +}; + +static int +cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + int ifCount = 0, i; + char **ifNames = NULL; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + ifCount = virConnectNumOfInterfaces(ctl->conn); + if (ifCount < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list interfaces")); + return FALSE; + } + if (ifCount) { + ifNames = vshMalloc(ctl, sizeof(char *) * ifCount); + + if ((ifCount = virConnectListInterfaces(ctl->conn, + ifNames, ifCount)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list interfaces")); + free(ifNames); + return FALSE; + } + + qsort(&ifNames[0], ifCount, sizeof(char *), namesorter); + } + + vshPrintExtra(ctl, "%-20s %-30s\n", _("Name"), _("MAC Address")); + vshPrintExtra(ctl, "--------------------------------------------------\n"); + + for (i = 0; i < ifCount; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, ifNames[i]); + + /* this kind of work with interfaces is not atomic operation */ + if (!iface) { + free(ifNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-30s\n", + virInterfaceGetName(iface), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(ifNames[i]); + } + free(ifNames); + return TRUE; +} + +/* + * "if-name" command + */ +static const vshCmdInfo info_interface_name[] = { + {"help", gettext_noop("convert an interface MAC address to interface name")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_name[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface mac")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceName(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYMAC))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetName(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "if-mac" command + */ +static const vshCmdInfo info_interface_mac[] = { + {"help", gettext_noop("convert an interface name to interface MAC address")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_mac[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceMAC(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYNAME))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "if-dumpxml" command + */ +static const vshCmdInfo info_interface_dumpxml[] = { + {"help", gettext_noop("interface information in XML")}, + {"desc", gettext_noop("Output the physical host interface information as an XML dump to stdout.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_dumpxml[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *dump; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, NULL))) + return FALSE; + + dump = virInterfaceGetXMLDesc(iface, 0); + if (dump != NULL) { + printf("%s", dump); + free(dump); + } else { + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "if-define" command + */ +static const vshCmdInfo info_interface_define[] = { + {"help", gettext_noop("define (but don't start) a physical host interface from an XML file")}, + {"desc", gettext_noop("Define a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_define[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML interface description")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr interface; + char *from; + int found; + int ret = TRUE; + char *buffer; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + from = vshCommandOptString(cmd, "file", &found); + if (!found) + return FALSE; + + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; + + interface = virInterfaceDefineXML(ctl->conn, buffer, 0); + free (buffer); + + if (interface != NULL) { + vshPrint(ctl, _("Interface %s defined from %s\n"), + virInterfaceGetName(interface), from); + } else { + vshError(ctl, FALSE, _("Failed to define interface from %s"), from); + ret = FALSE; + } + return ret; +} + +/* + * "if-undefine" command + */ +static const vshCmdInfo info_interface_undefine[] = { + {"help", gettext_noop("undefine a physical host interface (remove it from configuration)")}, + {"desc", gettext_noop("undefine an interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_undefine[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceUndefine(iface) == 0) { + vshPrint(ctl, _("Interface %s undefined\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to undefine interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "if-create" command + */ +static const vshCmdInfo info_interface_create[] = { + {"help", gettext_noop("create a physical host interface (enable it / \"if-up\")")}, + {"desc", gettext_noop("create a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_create[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceCreate(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceCreate(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s created\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to create interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "if-destroy" command + */ +static const vshCmdInfo info_interface_destroy[] = { + {"help", gettext_noop("destroy a physical host interface (disable it / \"if-down\")")}, + {"desc", gettext_noop("destroy a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_destroy[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceDestroy(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s destroyed\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to destroy interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/**************************************************************************/ /* * "pool-autostart" command */ @@ -6059,7 +6387,7 @@ static const vshCmdOptDef opts_edit[] = { }; /* This function also acts as a template to generate cmdNetworkEdit - * and cmdPoolEdit functions (below) using a sed script in the Makefile. + * cmdInterfaceEdit and cmdPoolEdit functions (below) using a sed script in the Makefile. */ static int cmdEdit (vshControl *ctl, const vshCmd *cmd) @@ -6165,6 +6493,23 @@ static const vshCmdOptDef opts_network_edit[] = { #include "virsh-net-edit.c" /* + * "if-edit" command + */ +static const vshCmdInfo info_interface_edit[] = { + {"help", gettext_noop("edit XML configuration for a physical host interface")}, + {"desc", gettext_noop("Edit the XML configuration for a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_edit[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +/* This is generated from this file by a sed script in the Makefile. */ +#include "virsh-if-edit.c" + +/* * "pool-edit" command */ static const vshCmdInfo info_pool_edit[] = { @@ -6247,6 +6592,17 @@ static const vshCmdDef commands[] = { {"net-start", cmdNetworkStart, opts_network_start, info_network_start}, {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine}, {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid}, + + {"if-list", cmdInterfaceList, NULL, info_interface_list}, + {"if-name", cmdInterfaceName, opts_interface_name, info_interface_name}, + {"if-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac}, + {"if-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml, info_interface_dumpxml}, + {"if-define", cmdInterfaceDefine, opts_interface_define, info_interface_define}, + {"if-undefine", cmdInterfaceUndefine, opts_interface_undefine, info_interface_undefine}, + {"if-edit", cmdInterfaceEdit, opts_interface_edit, info_interface_edit}, + {"if-create", cmdInterfaceCreate, opts_interface_create, info_interface_create}, + {"if-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, + {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, @@ -6698,6 +7054,46 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, return network; } +static virInterfacePtr +vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag) +{ + virInterfacePtr iface = NULL; + char *n; + const char *optname = "interface"; + if (!cmd_has_option (ctl, cmd, optname)) + return NULL; + + if (!(n = vshCommandOptString(cmd, optname, NULL))) { + vshError(ctl, FALSE, "%s", _("undefined interface identifier")); + return NULL; + } + + vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); + + if (name) + *name = n; + + /* try it by MAC */ + if ((iface == NULL) && (flag & VSH_BYMAC)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface MAC\n", + cmd->def->name, optname); + iface = virInterfaceLookupByMACString(ctl->conn, n); + } + /* try it by NAME */ + if ((iface == NULL) && (flag & VSH_BYNAME)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface NAME\n", + cmd->def->name, optname); + iface = virInterfaceLookupByName(ctl->conn, n); + } + + if (!iface) + vshError(ctl, FALSE, _("failed to get interface '%s'"), n); + + return iface; +} + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) -- 1.6.0.6

2 3

[libvirt] getFreeMemory reporting incorrectly?
by Hany Fahim 15 Jun '09

15 Jun '09

Hi, I'm currently running 2 CentOS 5.3 systems, one running Xen 3.3 and libvirt 0.6.4 (called node1) and the other running Xen 3.0.3 (stock CentOS) and libvirt 0.6.4 (called node2). The machines are practically identical except for the upgraded Xen installation. When using the libvirt-python module, I'm getting strange values from getFreeMemory() on the Xen 3.3 machine. See below: Xen 3.0.3: [root@node2 ~]# python Python 2.4.3 (#1, Jan 21 2009, 01:10:13) [GCC 4.1.2 20071124 (Red Hat 4.1.2-42)] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import libvirt >>> conn = libvirt.open('xen:///') >>> print(conn.getFreeMemory()) 268959744 >>> Which is correct since there's approximately 256MB free. Now in the Xen 3.3 box: Xen 3.3: [root@node1 ~]# python Python 2.4.3 (#1, Jan 21 2009, 01:10:13) [GCC 4.1.2 20071124 (Red Hat 4.1.2-42)] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import libvirt >>> conn = libvirt.open('xen:///') >>> print(conn.getFreeMemory()) 576460752303423488 >>> node1 should actually be reporting 0MB free, but instead I'm getting this huge number. It would be nice if I had this much memory though... Anybody else run into this? Hany

3 10

[libvirt] attach-disk (cdrom) requirements
by Francesco Latino 15 Jun '09

15 Jun '09

Hello, if the guest is powered off and I run the following command to attach a CD-ROM virsh attach-disk QEmu-fedora-i686-3 myCDROM.iso hdc --driver file --type cdrom --mode readonly I got error: libvir: QEMU error : internal error cannot attach device on inactive domain Is it a requirement to have the guest running to attach a CDROM ? Is there a way to attache a CDROM to a guest powered off with VIRSH I have Compiled against library: libvir 0.6.0 Using library: libvir 0.6.0 Using API: QEMU 0.6.0 Running hypervisor: QEMU 0.10.0 Consider that the above command works if the guest is running. Thanks in advance, Francesco

2 1

[libvirt] [PATCH] [v2] Support kvm-img or qemu-img dynamically
by Doug Goldstein 15 Jun '09

15 Jun '09

This patch adds a new function virFindFileInPath() and uses it to find where a binary lives in the PATH environment variable. Using this, we can dynamically find where utility functions exist (and if they even exists). So such we remove the build-time check for qemu-img and make it dynamic for kvm-img and qemu-img. Several distros uses kvm-img over qemu-img when installing KVM. kvm-img also includes several patches which Red Hat is trying to upstream with QEMU so this patch supports those features which are commented out in libvirt when using kvm-img Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- configure.in | 15 --------- src/libvirt_private.syms | 1 + src/storage_backend_fs.c | 76 ++++++++++++++++++++++++++++++++------------- src/util.c | 28 +++++++++++++++++ src/util.h | 2 + 5 files changed, 85 insertions(+), 37 deletions(-)

5 6

[libvirt] Vserver driver patch for libvirt
by Ajay EP 15 Jun '09

15 Jun '09

Hi, I was looking at Daniels patch for integrating Vserver driver in libvirt long back in 2007 . Checking libvirt-0.6.4 I find that its not yet integrated. Is there any issues if I apply the patch to libvirt-0.6.4 & try using the Vserver driver ? Also will the below commands work straightforward ? As I new to libvirt , any pointers in understanding the support of Vserver on Libvirt is appreciated virsh --create ( i dont know if this command is supported) virsh --connect vserver:/// define v1.xml Thanks, Ajay ______________________________________________________________________

2 1

[libvirt] python-libvirt get vnc port
by lizardkings 14 Jun '09

14 Jun '09

Hwdy, Is it possible to get the VNC port number of a virtual machine via the python libvirt? Thanx, DG

2 1

[Libvirt] SSH with certificates
by Christian Weyermann 14 Jun '09

14 Jun '09

Hello everybody, We are trying to use libvirt with qemu over ssh and our goal is to have authentication done by certificates. Therefore I created a keypair on the client and send the public key to the server. Std. SSH connections work without an password prompt as expected (ssh <ip> -l user), but if I try "sudo virsh -c qemu+ssh://user@<ip>/system" it prompts for a password (Beside that password prompt it works as expected). Is there anything else I have to do beside registering the public key at the server? Thanks for your help and best regards, Christian

5 18

[libvirt] qemu-kvm-0.10.5, kvm-kmod-2.6.30, libvirt-0.6.4 - save/restore still unreliable
by Nikola Ciprich 12 Jun '09

12 Jun '09

Hi, I'm very sorry for crossposting, but I'm not sure whether my problem is related to libvirt or kvm itself. I've spent some time testing save/restore and it seems it's still not really reliable. Starting guest, loading it with some applications (ie kernel compilation) and saving/restoring it for few times usually leads to error: [root@vbox4 hibernated]# virsh save vmroo55 /home/LVS/hibernated/vmroo55.vm Domain vmroo55 saved to /home/LVS/hibernated/vmroo55.vm [root@vbox4 hibernated]# virsh restore /home/LVS/hibernated/vmroo55.vm Domain restored from /home/LVS/hibernated/vmroo55.vm [root@vbox4 hibernated]# virsh save vmroo55 /home/LVS/hibernated/vmroo55.vm Domain vmroo55 saved to /home/LVS/hibernated/vmroo55.vm [root@vbox4 hibernated]# virsh restore /home/LVS/hibernated/vmroo55.vm error: Failed to restore domain from /home/LVS/hibernated/vmroo55.vm error: internal error unable to start guest: char device redirected to /dev/pts/2 in /var/log/messages, i see: Jun 12 15:18:30 vbox4 libvirtd: 15:18:30.793: error : qemudReadMonitorOutput:696 : internal error Timed out while reading monitor startup output Jun 12 15:18:30 vbox4 libvirtd: 15:18:30.820: error : qemudWaitForMonitor:994 : internal error unable to start guest: char device redirected to /dev/pts/2 /var/log/libvirt/vmroo55.log: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/ /usr/bin/qemu-kvm -S -M pc -m 768 -smp 2 -name vmroo55 -uuid 987e7a85-0e15-11de-a522-00304892f672 -monitor pty -boot c -kernel /home/LVS/boot/vmlinuz-2.6.29lb.00_01_PRE14-x86_64 -initrd /home/LVS/boot/kvm-initrd-2.6.29lb.00_01_PRE14-x86_64.cpio.gz -append root=/dev/sda ro vmhostname=vmroo55 -drive file=/dev/vgshared/vmroo55-1,if=ide,index=0,boot=on -drive file=/dev/vgshared/vmroo55-2,if=ide,index=1 -drive file=/dev/vgshared/vmroo55-3,if=virtio,index=0 -net nic,macaddr=00:16:3e:18:37:00,vlan=0,model=virtio -net tap,fd=15,vlan=0 -serial none -parallel none -usb -vnc 0.0.0.0:24155 -incoming exec:cat char device redirected to /dev/pts/2 qemu_popen: returning result of qemu_fopen_ops qemu_popen: returning result of qemu_fopen_ops I wanted to try it using just kvm, but for some reason, I can't figure the proper way to execute it, is the -incoming exec:cat somewhere properly documented? I tried doing cat .../img.vm | qemu-kvm ... -incoming exec:cat but this doesn't seem to be the proper way. Could somebody give me a hint on how to debug this? thanks a lot in advance! nik -- ------------------------------------- Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

2 2

[libvirt] [PATCH] Fix a compilation problem with LXC drop capabilities
by Daniel Veillard 12 Jun '09

12 Jun '09

The lxcContainerDropCapabilities() function requires PR_CAPBSET_DROP to be defined in order to compile, but it may not be defined in older kernels. So I made the compilation of the core of the function conditional, raise an error but still return 0 to not make the container initialization fail. But I'm unsure, should we just fail and return -1 if we can't drop capabilities instead ? 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/

4 10

[libvirt] PATCH: Improve URI error reporting
by Daniel P. Berrange 12 Jun '09

12 Jun '09

There are currently far too many cases where a correct URI returns an generic 'failed to connect to hypervisor' error message. This gives the user no idea why they could not connect. Of particular importance is that they cannot distinguish a correct URI + plus a driver problem, vs incorrect URI. Consider the following examples virsh -c qemu:///bogus error: could not connect to qemu:///bogus error: failed to connect to the hypervisor virsh -c qemu:// error: could not connect to qemu:// error: failed to connect to the hypervisor virsh -c /var/lib/xen/xend-socket error: could not connect to /var/lib/xen/xend-socket error: failed to connect to the hypervisor virsh -c /bogus error: could not connect to /bogus error: failed to connect to the hypervisor virsh -c bogus error: could not connect to bogus error: failed to connect to the hypervisor virsh -c uml:///bogus error: could not connect to uml:///bogus error: failed to connect to the hypervisor virsh -c uml:// error: could not connect to uml:// error: failed to connect to the hypervisor virsh -c openvz:///system error: could not connect to openvz:///system error: failed to connect to the hypervisor virsh -c openvz:///bogus error: could not connect to openvz:///bogus error: failed to connect to the hypervisor virsh -c openvz:/// error: could not connect to openvz:/// error: failed to connect to the hypervisor virsh -c bogus:/// error: could not connect to bogus:/// error: failed to connect to the hypervisor virsh -c qemu+tls:///system error: unable to connect to 'localhost': Connection refused error: failed to connect to the hypervisor virsh -c qemu://localhost/system error: could not connect to qemu://localhost/system error: failed to connect to the hypervisor virsh -c bogus+unix:/// error: could not connect to bogus:/// error: failed to connect to the hypervisor The core problem here is that far too many places are using the return code VIR_DRV_OPEN_DECLINED instead of VIR_DRV_OPEN_ERROR. The former provides no way to give any error info to the user. With this patch I have taken the view that a driver must *only* ever use the return code VIR_DRV_OPEN_DECLINED when: - Auto-probe of a driver URI, and this driver is not active - Explicit URI with 'server' specified - URI scheme does not match the driver The remote driver is special in that it *must* accept all URIs given to it, no matter what, unless of course it is running inside the daemon already. The result is that if you give a correct URI, but there is a real problem opening the driver you are now guarenteed to get a useful error message back. Consider the same examples again virsh -c qemu:///bogus error: internal error unexpected QEMU URI path '/bogus', try qemu:///system error: failed to connect to the hypervisor virsh -c qemu:// error: internal error unexpected QEMU URI path '', try qemu:///system error: failed to connect to the hypervisor virsh -c xen:/// error: unable to connect to 'localhost:8000': Connection refused error: failed to connect to the hypervisor virsh -c xen:///bogus error: internal error unexpected Xen URI path '/bogus', try xen:/// error: failed to connect to the hypervisor virsh -c /var/lib/xen/xend-socket error: internal error failed to connect to xend error: failed to connect to the hypervisor virsh -c /bogus error: internal error failed to connect to xend error: failed to connect to the hypervisor virsh -c bogus error: internal error unexpected Xen URI path 'bogus', try ///var/lib/xen/xend-socket error: failed to connect to the hypervisor virsh -c uml:///bogus error: internal error unexpected UML URI path '/bogus', try uml:///system error: failed to connect to the hypervisor virsh -c uml:// error: internal error unexpected UML URI path '', try uml:///system error: failed to connect to the hypervisor virsh -c lxc:// error: internal error unexpected LXC URI path '', try lxc:/// error: failed to connect to the hypervisor virsh -c lxc:///bogus error: internal error unexpected LXC URI path '/bogus', try lxc:/// error: failed to connect to the hypervisor virsh -c openvz:///system error: internal error OpenVZ control file /proc/vz does not exist error: failed to connect to the hypervisor virsh -c openvz:///bogus error: internal error unexpected OpenVZ URI path '/bogus', try openvz:///system error: failed to connect to the hypervisor virsh -c openvz:/// error: internal error unexpected OpenVZ URI path '/', try openvz:///system error: failed to connect to the hypervisor virsh -c vbox:///system error: internal error unknown driver path '/system' specified (try vbox:///session) error: failed to connect to the hypervisor virsh -c vbox:///bogus error: internal error unknown driver path '/bogus' specified (try vbox:///session) error: failed to connect to the hypervisor virsh -c vbox:// error: internal error no VirtualBox driver path specified (try vbox:///session) error: failed to connect to the hypervisor virsh -c bogus:/// error: no hypervisor driver available for bogus:/// error: failed to connect to the hypervisor virsh -c qemu+tls:///system error: unable to connect to libvirtd at 'localhost': Connection refused error: failed to connect to the hypervisor virsh -c qemu://localhost/system error: unable to connect to libvirtd at 'localhost': Connection refused error: failed to connect to the hypervisor virsh -c bogus+unix:/// error: no hypervisor driver available for bogus:/// error: failed to connect to the hypervisor In every case there is now a useful error message. lxc_driver.c | 48 ++++++++++---------- openvz_driver.c | 57 ++++++++++++++++------- qemu_driver.c | 83 +++++++++++++++++----------------- remote_internal.c | 129 ++++++++++++++++++++++++++++-------------------------- test.c | 3 - uml_driver.c | 62 ++++++++++++++++--------- virterror.c | 4 - xen_unified.c | 55 +++++++++++++++-------- xend_internal.c | 7 ++ 9 files changed, 259 insertions(+), 189 deletions(-) Daniel diff -r 3c35f3b77286 src/lxc_driver.c --- a/src/lxc_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/lxc_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -68,46 +68,48 @@ 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) { - if (lxc_driver == NULL) - goto declineConnection; - /* Verify uri was specified */ if (conn->uri == NULL) { - if (!lxcProbe()) - goto declineConnection; + if (lxc_driver == NULL) + return VIR_DRV_OPEN_DECLINED; conn->uri = xmlParseURI("lxc:///"); if (!conn->uri) { virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; } - } else if (conn->uri->scheme == NULL || - STRNEQ(conn->uri->scheme, "lxc")) { - goto declineConnection; - } else if (!lxcProbe()) { - goto declineConnection; + } else { + if (conn->uri->scheme == NULL || + STRNEQ(conn->uri->scheme, "lxc")) + return VIR_DRV_OPEN_DECLINED; + + /* Leave for remote driver */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + /* If path isn't '/' then they typoed, tell them correct path */ + if (STRNEQ(conn->uri->path, "/")) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected LXC URI path '%s', try lxc:///"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + /* URI was good, but driver isn't active */ + if (lxc_driver == NULL) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + _("lxc state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } } - conn->privateData = lxc_driver; return VIR_DRV_OPEN_SUCCESS; - -declineConnection: - return VIR_DRV_OPEN_DECLINED; } static int lxcClose(virConnectPtr conn) diff -r 3c35f3b77286 src/openvz_driver.c --- a/src/openvz_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/openvz_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -1070,36 +1070,59 @@ cleanup: return ret; } -static int openvzProbe(void) -{ - if (geteuid() == 0 && - virFileExists("/proc/vz")) - return 1; - - return 0; -} - static virDrvOpenStatus openvzOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { struct openvz_driver *driver; - if (!openvzProbe()) - return VIR_DRV_OPEN_DECLINED; if (conn->uri == NULL) { + if (!virFileExists("/proc/vz")) + return VIR_DRV_OPEN_DECLINED; + + if (access("/proc/vz", W_OK) < 0) + return VIR_DRV_OPEN_DECLINED; + conn->uri = xmlParseURI("openvz:///system"); if (conn->uri == NULL) { - openvzError(conn, VIR_ERR_NO_DOMAIN, NULL); + virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; } - } else if (conn->uri->scheme == NULL || - conn->uri->path == NULL || - STRNEQ (conn->uri->scheme, "openvz") || - STRNEQ (conn->uri->path, "/system")) { - return VIR_DRV_OPEN_DECLINED; + } else { + /* If scheme isn't 'openvz', then its for another driver */ + if (conn->uri->scheme == NULL || + STRNEQ (conn->uri->scheme, "openvz")) + return VIR_DRV_OPEN_DECLINED; + + /* If server name is given, its for remote driver */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + /* If path isn't /system, then they typoed, so tell them correct path */ + if (conn->uri->path == NULL || + STRNEQ (conn->uri->path, "/system")) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected OpenVZ URI path '%s', try openvz:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + if (!virFileExists("/proc/vz")) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("OpenVZ control file /proc/vz does not exist")); + return VIR_DRV_OPEN_ERROR; + } + + if (access("/proc/vz", W_OK) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("OpenVZ control file /proc/vz is not accessible")); + return VIR_DRV_OPEN_ERROR; + } } + /* We now know the URI is definitely for this driver, so beyond + * here, don't return DECLINED, always use ERROR */ + if (VIR_ALLOC(driver) < 0) { virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; diff -r 3c35f3b77286 src/qemu_driver.c --- a/src/qemu_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/qemu_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -1743,62 +1743,61 @@ qemudMonitorCommand(const virDomainObjPt } -/** - * qemudProbe: - * - * Probe for the availability of the qemu driver, assume the - * presence of QEmu emulation if the binaries are installed - */ -static int qemudProbe(void) -{ - if ((virFileExists("/usr/bin/qemu")) || - (virFileExists("/usr/bin/qemu-kvm")) || - (virFileExists("/usr/bin/kvm")) || - (virFileExists("/usr/bin/xenner"))) - return 1; - - return 0; -} static virDrvOpenStatus qemudOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { uid_t uid = getuid(); - if (qemu_driver == NULL) - goto decline; - - if (!qemudProbe()) - goto decline; - if (conn->uri == NULL) { - conn->uri = xmlParseURI(uid ? "qemu:///session" : "qemu:///system"); + if (qemu_driver == NULL) + return VIR_DRV_OPEN_DECLINED; + + conn->uri = xmlParseURI(uid == 0 ? + "qemu:///system" : + "qemu:///session"); if (!conn->uri) { virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; } - } else if (conn->uri->scheme == NULL || - conn->uri->path == NULL) - goto decline; - - if (STRNEQ (conn->uri->scheme, "qemu")) - goto decline; - - if (uid != 0) { - if (STRNEQ (conn->uri->path, "/session")) - goto decline; - } else { /* root */ - if (STRNEQ (conn->uri->path, "/system") && - STRNEQ (conn->uri->path, "/session")) - goto decline; - } - + } else { + /* If URI isn't 'qemu' its definitely not for us */ + if (conn->uri->scheme == NULL || + STRNEQ(conn->uri->scheme, "qemu")) + return VIR_DRV_OPEN_DECLINED; + + /* Allow remote driver to deal with URIs with hostname server */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + if (!uid) { + if (STRNEQ (conn->uri->path, "/system") && + STRNEQ (conn->uri->path, "/session")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected QEMU URI path '%s', try qemu:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } else { + if (STRNEQ (conn->uri->path, "/session")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected QEMU URI path '%s', try qemu:///session"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } + + /* URI was good, but driver isn't active */ + if (qemu_driver == NULL) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } + + } conn->privateData = qemu_driver; return VIR_DRV_OPEN_SUCCESS; - - decline: - return VIR_DRV_OPEN_DECLINED; } static int qemudClose(virConnectPtr conn) { diff -r 3c35f3b77286 src/remote_internal.c --- a/src/remote_internal.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/remote_internal.c Wed Jun 03 17:31:17 2009 +0100 @@ -305,21 +305,28 @@ remoteForkDaemon(virConnectPtr conn) enum virDrvOpenRemoteFlags { VIR_DRV_OPEN_REMOTE_RO = (1 << 0), - VIR_DRV_OPEN_REMOTE_UNIX = (1 << 1), - VIR_DRV_OPEN_REMOTE_USER = (1 << 2), - VIR_DRV_OPEN_REMOTE_AUTOSTART = (1 << 3), -}; - -/* What transport? */ -enum { - trans_tls, - trans_unix, - trans_ssh, - trans_ext, - trans_tcp, -} transport; - - + VIR_DRV_OPEN_REMOTE_USER = (1 << 1), /* Use the per-user socket path */ + VIR_DRV_OPEN_REMOTE_AUTOSTART = (1 << 2), /* Autostart a per-user daemon */ +}; + + +/* + * URIs that this driver needs to handle: + * + * The easy answer: + * - Everything that no one else has yet claimed, but nothing if + * we're inside the libvirtd daemon + * + * The hard answer: + * - Plain paths (///var/lib/xen/xend-socket) -> UNIX domain socket + * - xxx://servername/ -> TLS connection + * - xxx+tls://servername/ -> TLS connection + * - xxx+tls:/// -> TLS connection to localhost + * - xxx+tcp://servername/ -> TCP connection + * - xxx+tcp:/// -> TCP connection to localhost + * - xxx+unix:/// -> UNIX domain socket + * - xxx:/// -> UNIX domain socket + */ static int doRemoteOpen (virConnectPtr conn, struct private_data *priv, @@ -328,37 +335,51 @@ doRemoteOpen (virConnectPtr conn, { int wakeupFD[2] = { -1, -1 }; char *transport_str = NULL; + enum { + trans_tls, + trans_unix, + trans_ssh, + trans_ext, + trans_tcp, + } transport; + + /* We handle *ALL* URIs here. The caller has rejected any + * URIs we don't care about */ if (conn->uri) { - if (!conn->uri->scheme) - return VIR_DRV_OPEN_DECLINED; - - transport_str = get_transport_from_scheme (conn->uri->scheme); - - if (!transport_str || STRCASEEQ (transport_str, "tls")) - transport = trans_tls; - else if (STRCASEEQ (transport_str, "unix")) + if (!conn->uri->scheme) { + /* This is the ///var/lib/xen/xend-socket local path style */ transport = trans_unix; - else if (STRCASEEQ (transport_str, "ssh")) - transport = trans_ssh; - else if (STRCASEEQ (transport_str, "ext")) - transport = trans_ext; - else if (STRCASEEQ (transport_str, "tcp")) - transport = trans_tcp; - else { - error (conn, VIR_ERR_INVALID_ARG, - _("remote_open: transport in URL not recognised " - "(should be tls|unix|ssh|ext|tcp)")); - return VIR_DRV_OPEN_ERROR; - } - } - - if (!transport_str) { - if ((!conn->uri || !conn->uri->server) && - (flags & VIR_DRV_OPEN_REMOTE_UNIX)) - transport = trans_unix; - else - return VIR_DRV_OPEN_DECLINED; /* Decline - not a remote URL. */ + } else { + transport_str = get_transport_from_scheme (conn->uri->scheme); + + if (!transport_str) { + if (conn->uri->server) + transport = trans_tls; + else + transport = trans_unix; + } else { + if (STRCASEEQ (transport_str, "tls")) + transport = trans_tls; + else if (STRCASEEQ (transport_str, "unix")) + transport = trans_unix; + else if (STRCASEEQ (transport_str, "ssh")) + transport = trans_ssh; + else if (STRCASEEQ (transport_str, "ext")) + transport = trans_ext; + else if (STRCASEEQ (transport_str, "tcp")) + transport = trans_tcp; + else { + error (conn, VIR_ERR_INVALID_ARG, + _("remote_open: transport in URL not recognised " + "(should be tls|unix|ssh|ext|tcp)")); + return VIR_DRV_OPEN_ERROR; + } + } + } + } else { + /* No URI, then must be probing so use UNIX socket */ + transport = trans_unix; } /* Local variables which we will initialise. These can @@ -455,8 +476,9 @@ doRemoteOpen (virConnectPtr conn, /* Construct the original name. */ if (!name) { - if (STREQ(conn->uri->scheme, "remote") || - STRPREFIX(conn->uri->scheme, "remote+")) { + if (conn->uri->scheme && + (STREQ(conn->uri->scheme, "remote") || + STRPREFIX(conn->uri->scheme, "remote+"))) { /* Allow remote serve to probe */ name = strdup(""); } else { @@ -580,7 +602,7 @@ doRemoteOpen (virConnectPtr conn, freeaddrinfo (res); virReportSystemError(conn, saved_errno, - _("unable to connect to '%s'"), + _("unable to connect to libvirtd at '%s'"), priv->hostname); goto failed; @@ -925,7 +947,6 @@ remoteOpenSecondaryDriver(virConnectPtr if (flags & VIR_CONNECT_RO) rflags |= VIR_DRV_OPEN_REMOTE_RO; - rflags |= VIR_DRV_OPEN_REMOTE_UNIX; ret = doRemoteOpen(conn, *priv, auth, rflags); if (ret != VIR_DRV_OPEN_SUCCESS) { @@ -958,19 +979,6 @@ remoteOpen (virConnectPtr conn, /* * If no servername is given, and no +XXX - * transport is listed, then force to a - * local UNIX socket connection - */ - if (conn->uri && - !conn->uri->server && - conn->uri->scheme && - !strchr(conn->uri->scheme, '+')) { - DEBUG0("Auto-remote UNIX socket"); - rflags |= VIR_DRV_OPEN_REMOTE_UNIX; - } - - /* - * If no servername is given, and no +XXX * transport is listed, or transport is unix, * and path is /session, and uid is unprivileged * then auto-spawn a daemon. @@ -996,7 +1004,6 @@ remoteOpen (virConnectPtr conn, */ if (!conn->uri) { DEBUG0("Auto-probe remote URI"); - rflags |= VIR_DRV_OPEN_REMOTE_UNIX; #ifndef __sun if (getuid() > 0) { DEBUG0("Auto-spawn user daemon instance"); diff -r 3c35f3b77286 src/test.c --- a/src/test.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/test.c Wed Jun 03 17:31:17 2009 +0100 @@ -639,9 +639,6 @@ static virDrvOpenStatus testOpen(virConn if (conn->uri->server) return VIR_DRV_OPEN_DECLINED; - if (conn->uri->server) - return VIR_DRV_OPEN_DECLINED; - /* From this point on, the connection is for us. */ if (!conn->uri->path || conn->uri->path[0] == '\0' diff -r 3c35f3b77286 src/uml_driver.c --- a/src/uml_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/uml_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -913,28 +913,49 @@ static virDrvOpenStatus umlOpen(virConne int flags ATTRIBUTE_UNUSED) { uid_t uid = getuid(); - if (uml_driver == NULL) - goto decline; + if (conn->uri == NULL) { + if (uml_driver == NULL) + return VIR_DRV_OPEN_DECLINED; - if (conn->uri != NULL) { - if (conn->uri->scheme == NULL || conn->uri->path == NULL) - goto decline; - - if (STRNEQ (conn->uri->scheme, "uml")) - goto decline; - - if (uid != 0) { - if (STRNEQ (conn->uri->path, "/session")) - goto decline; - } else { /* root */ - if (STRNEQ (conn->uri->path, "/system") && - STRNEQ (conn->uri->path, "/session")) - goto decline; + conn->uri = xmlParseURI(uid == 0 ? + "uml:///system" : + "uml:///session"); + if (!conn->uri) { + virReportOOMError(conn); + return VIR_DRV_OPEN_ERROR; } } else { - conn->uri = xmlParseURI(uid ? "uml:///session" : "uml:///system"); - if (!conn->uri) { - virReportOOMError(conn); + if (conn->uri->scheme == NULL || + STRNEQ (conn->uri->scheme, "uml")) + return VIR_DRV_OPEN_DECLINED; + + /* Allow remote driver to deal with URIs with hostname server */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + + /* Check path and tell them correct path if they made a mistake */ + if (uid == 0) { + if (STRNEQ (conn->uri->path, "/system") && + STRNEQ (conn->uri->path, "/session")) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected UML URI path '%s', try uml:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } else { + if (STRNEQ (conn->uri->path, "/session")) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected UML URI path '%s', try uml:///session"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } + + /* URI was good, but driver isn't active */ + if (uml_driver == NULL) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("uml state driver is not active")); return VIR_DRV_OPEN_ERROR; } } @@ -942,9 +963,6 @@ static virDrvOpenStatus umlOpen(virConne conn->privateData = uml_driver; return VIR_DRV_OPEN_SUCCESS; - - decline: - return VIR_DRV_OPEN_DECLINED; } static int umlClose(virConnectPtr conn) { diff -r 3c35f3b77286 src/virterror.c --- a/src/virterror.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/virterror.c Wed Jun 03 17:31:17 2009 +0100 @@ -737,9 +737,9 @@ virErrorMsg(virErrorNumber error, const break; case VIR_ERR_NO_CONNECT: if (info == NULL) - errmsg = _("could not connect to hypervisor"); + errmsg = _("no hypervisor driver available"); else - errmsg = _("could not connect to %s"); + errmsg = _("no hypervisor driver available for %s"); break; case VIR_ERR_INVALID_CONN: if (info == NULL) diff -r 3c35f3b77286 src/xen_unified.c --- a/src/xen_unified.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/xen_unified.c Wed Jun 03 17:31:17 2009 +0100 @@ -241,25 +241,46 @@ xenUnifiedOpen (virConnectPtr conn, virC virReportOOMError (NULL); return VIR_DRV_OPEN_ERROR; } + } else { + if (conn->uri->scheme) { + /* Decline any scheme which isn't "xen://" or "http://". */ + if (STRCASENEQ(conn->uri->scheme, "xen") && + STRCASENEQ(conn->uri->scheme, "http")) + return VIR_DRV_OPEN_DECLINED; + + + /* Return an error if the path isn't '' or '/' */ + if (conn->uri->path && + STRNEQ(conn->uri->path, "") && + STRNEQ(conn->uri->path, "/")) { + xenUnifiedError(NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected Xen URI path '%s', try xen:///"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + /* Decline any xen:// URI with a server specified, allowing remote + * driver to handle, but keep any http:/// URIs */ + if (STRCASEEQ(conn->uri->scheme, "xen") && + conn->uri->server) + return VIR_DRV_OPEN_DECLINED; + } else { + /* Special case URI for Xen driver only: + * + * Treat a plain path as a Xen UNIX socket path, and give + * error unless path is absolute + */ + if (!conn->uri->path || conn->uri->path[0] != '/') { + xenUnifiedError(NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected Xen URI path '%s', try ///var/lib/xen/xend-socket"), + NULLSTR(conn->uri->path)); + return VIR_DRV_OPEN_ERROR; + } + } } - /* Refuse any scheme which isn't "xen://" or "http://". */ - if (conn->uri->scheme && - STRCASENEQ(conn->uri->scheme, "xen") && - STRCASENEQ(conn->uri->scheme, "http")) - return VIR_DRV_OPEN_DECLINED; - - /* xmlParseURI will parse a naked string like "foo" as a URI with - * a NULL scheme. That's not useful for us because we want to only - * allow full pathnames (eg. ///var/lib/xen/xend-socket). Decline - * anything else. - */ - if (!conn->uri->scheme && (!conn->uri->path || conn->uri->path[0] != '/')) - return VIR_DRV_OPEN_DECLINED; - - /* Refuse any xen:// URI with a server specified - allow remote to do it */ - if (conn->uri->scheme && STRCASEEQ(conn->uri->scheme, "xen") && conn->uri->server) - return VIR_DRV_OPEN_DECLINED; + /* We now know the URI is definitely for this driver, so beyond + * here, don't return DECLINED, always use ERROR */ /* Allocate per-connection private data. */ if (VIR_ALLOC(priv) < 0) { diff -r 3c35f3b77286 src/xend_internal.c --- a/src/xend_internal.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/xend_internal.c Wed Jun 03 17:31:17 2009 +0100 @@ -2927,10 +2927,13 @@ xenDaemonOpen(virConnectPtr conn, xend_detect_config_version(conn) == -1) goto failed; } else if (STRCASEEQ (conn->uri->scheme, "http")) { - if (virAsprintf(&port, "%d", conn->uri->port) == -1) + if (conn->uri->port && + virAsprintf(&port, "%d", conn->uri->port) == -1) goto failed; - if (xenDaemonOpen_tcp(conn, conn->uri->server, port) < 0 || + if (xenDaemonOpen_tcp(conn, + conn->uri->server ? conn->uri->server : "localhost", + port ? port : "8000") < 0 || xend_detect_config_version(conn) == -1) goto failed; } else { -- |: 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] Latest kvm packages for CentOS 5.3
by Federico Simoncelli 11 Jun '09

11 Jun '09

Hi all, I've been working quite extensively with kvm on CentOS 5.3 lately. If you are interested in the latest rpm of kvm-kmod-2.6.30-rc8, qemu-kvm-0.10.5 and libvirt-0.6.4 you can temporary find them here: http://update.nethesis.it/kvm/ I've had no problem so far using these packages. Feedback is welcome. -- Federico.

4 4

[libvirt] [PATCH 0/1] Add support for disk serial number in node device code
by David Allan 11 Jun '09

11 Jun '09

This small patch extends the information for storage devices to include their serial number. This information is useful in figuring out which devices are actually multiple paths to the same backend device, as well as identifying devices uniquely across nodes. This code will be used by the multipath support that I'm working on, but since it's capable of standing alone, and might be useful for other reasons, I'm submitting it separately. Dave

4 7

[libvirt] [PATCH 1/3] Re-factor qemu version parsing
by Mark McLoughlin 11 Jun '09

11 Jun '09

This patch is purely re-factoring without any functional changes to make way for the next patch. The main thing achieved by the refactoring is that we now have easier access to the parenthesised string that KVM folks seem to delight in changing. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- src/qemu_conf.c | 92 +++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 20 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 2c1eefc..f6a8390 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -412,6 +412,73 @@ virCapsPtr qemudCapsInit(void) { return NULL; } +/* We parse the output of 'qemu -help' to get the QEMU + * version number. The first bit is easy, just parse + * 'QEMU PC emulator version x.y.z'. + * + * With qemu-kvm, however, that is followed by a kvm-XX + * string in parenthesis. + */ +#define QEMU_VERSION_STR "QEMU PC emulator version " +#define KVM_VER_PREFIX " (kvm-" + +static int qemudParseVersionStr(const char *str, + unsigned int *version, + unsigned int *kvm_version) +{ + unsigned major, minor, micro; + const char *p = str; + + *version = *kvm_version = 0; + + if (!STRPREFIX(p, QEMU_VERSION_STR)) + goto fail; + + p += strlen(QEMU_VERSION_STR); + + major = virParseNumber(&p); + if (major == -1 || *p != '.') + goto fail; + + ++p; + + minor = virParseNumber(&p); + if (major == -1 || *p != '.') + goto fail; + + ++p; + + micro = virParseNumber(&p); + if (major == -1) + goto fail; + + if (STRPREFIX(p, KVM_VER_PREFIX)) { + int ret; + + p += strlen(KVM_VER_PREFIX); + + ret = virParseNumber(&p); + if (ret == -1) + goto fail; + + *kvm_version = ret; + } + + *version = (major * 1000 * 1000) + (minor * 1000) + micro; + + qemudDebug("Version %d.%d.%d - cooked version: %d", + major, minor, micro, *version); + if (*kvm_version) + qemudDebug("KVM version %d detected", *kvm_version); + + return 0; + +fail: + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot parse QEMU version number in '%s'"), + str); + return -1; +} int qemudExtractVersionInfo(const char *qemu, unsigned int *retversion, @@ -421,7 +488,6 @@ int qemudExtractVersionInfo(const char *qemu, pid_t child; int newstdout = -1; int ret = -1, status; - unsigned int major, minor, micro; unsigned int version, kvm_version; unsigned int flags = 0; @@ -443,22 +509,11 @@ int qemudExtractVersionInfo(const char *qemu, goto cleanup2; } - if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)", - &major, &minor, &micro, &kvm_version) != 4) - kvm_version = 0; + char *eol = strchr(help, '\n'); + if (eol) *eol = '\0'; - if (!kvm_version && - sscanf(help, "QEMU PC emulator version %u.%u.%u", - &major, &minor, &micro) != 3) { - char *eol = strchr(help, '\n'); - if (eol) *eol = '\0'; - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("cannot parse QEMU version number in '%s'"), - help); + if (qemudParseVersionStr(help, &version, &kvm_version) == -1) goto cleanup2; - } - - version = (major * 1000 * 1000) + (minor * 1000) + micro; if (strstr(help, "-no-kqemu")) flags |= QEMUD_CMD_FLAG_KQEMU; @@ -512,10 +567,7 @@ int qemudExtractVersionInfo(const char *qemu, ret = 0; - qemudDebug("Version %d %d %d Cooked version: %d, with flags ? %d", - major, minor, micro, version, flags); - if (kvm_version) - qemudDebug("KVM version %d detected", kvm_version); + qemudDebug("QEMU supported cmdline flags = %d", flags); cleanup2: VIR_FREE(help); -- 1.6.0.6

3 19

[libvirt][qemu] Ho to get a 'boot=on' parameter to appear on kvm command line
by Anton Protopopov 10 Jun '09

10 Jun '09

Hi, all. Can someone tell me how to get boot=on parameter to appear on my kvm cmdline? I define domain with the following xml <domain type="kvm"> <name>kvm-1</name> <memory>524288</memory> <vcpu>1</vcpu> <os> <type arch="x86_64" machine="pc">hvm</type> <boot dev="hd"/> </os> <devices> <emulator>/usr/bin/kvm</emulator> <graphics type="vnc" port="-1"/> <disk device="disk" type="file"> <source file="test.img"/> <target dev="sda"/> </disk> <interface type="bridge"> <source bridge="breth0"/> </interface> </devices> </domain> and get /usr/bin/kvm -S -M pc -m 512 -smp 1 -name kvm-1 -uuid b462e575-4044-146c-193a-9a70523b4258 -monitor pty -no-acpi -boot c -drive file=test.img,if=scsi,index=0 -net nic,macaddr=52:54:00:09:9b:19,vlan=0 -net tap,fd=15,vlan=0 -serial none -parallel none -usb But I want to get -drive file=test.img,if=scsi,index=0,boot=on instead.

4 6

[libvirt] [PATCH] Support kvm-img or qemu-img dynamically
by Doug Goldstein 10 Jun '09

10 Jun '09

This patch adds a new function virFindFileInPath() and uses it to find where a binary lives in the PATH environment variable. Using this, we can dynamically find where utility functions exist (and if they even exists). So such we remove the build-time check for qemu-img and make it dynamic for kvm-img and qemu-img. Several distros uses kvm-img over qemu-img when installing KVM. kvm-img also includes several patches which Red Hat is trying to upstream with QEMU so this patch supports those features which are commented out in libvirt when using kvm-img Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- configure.in | 15 --------- src/libvirt_private.syms | 1 + src/storage_backend_fs.c | 74 ++++++++++++++++++++++++++++++++------------- src/util.c | 28 +++++++++++++++++ src/util.h | 2 + 5 files changed, 83 insertions(+), 37 deletions(-)

2 1

[libvirt] PATCH: Fix typo in XML documentation regarding VNC password
by Garry Dolley 10 Jun '09

10 Jun '09

Excuse my previous post, I didn't know the website was in docs/ and I could submit a real patch ;) So here it is: diff --git a/docs/formatdomain.html b/docs/formatdomain.html index 27e42ac..817fd7e 100644 --- a/docs/formatdomain.html +++ b/docs/formatdomain.html @@ -746,7 +746,7 @@ qemu-kvm -net nic,model=? /dev/null auto-allocated). The <code>autoport</code> attribute is the new preferred syntax for indicating autoallocation of the TCP port to use. The <code>listen</code> attribute is an IP address for the server to - listen on. The <code>password</code> attribute provides a VNC password + listen on. The <code>passwd</code> attribute provides a VNC password in clear text. The <code>keymap</code> attribute specifies the keymap to use.</dd></dl> <h4> -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

2 3

[libvirt] [PATCH] (not for inclusion) add virDomainRename API
by Doug Goldstein 09 Jun '09

09 Jun '09

The following patch stubs out virDomainRename() as an available API function. I'm just making sure I'm doing this right. I know there were some plans to include documentation about adding API to the website but I don't see it. The included patch does not include my example driver for qemu and test. Just looking for a thumbs up/down whether I should continue or not and whether I'm adding it right. -- Doug Goldstein

4 4

[libvirt] Typo in XML documentation regarding VNC password
by Garry Dolley 09 Jun '09

09 Jun '09

On this page: http://libvirt.org/formatdomain.html#elementsGraphics There is a typo stating how to set VNC passwords per domain. Patch: -The password attribute provides a VNC password in clear text. +The passwd attribute provides a VNC password in clear text. -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

2 1

[libvirt] Remote Xen and libvirt >= 0.5.0 Issues
by Hany Fahim 08 Jun '09

08 Jun '09

Hi, I'm currently running a few servers with CentOS 5.3 (i386) with the stock Xen version: # rpm -q kernel-xen xen libvirt kernel-xen-2.6.18-92.1.22.el5 kernel-xen-2.6.18-128.1.6.el5 xen-3.0.3-80.el5_3.2 libvirt-0.6.3-1 libvirt was compiled from the src RPM from libvirt.org to run on i386 architecture without issue. I'm having a problem when trying to connect to remote Xen installations using versions of libvirt starting from 0.5.0 and above. When issuing virsh commands to query the local instance, it works without issue, but any remote sources gives 'error: failed to connect to the hypervisor'. Here's what LIBVIRT_DEBUG reveals: # LIBVIRT_DEBUG=6 virsh -d 5 -c xen://node3/ list command: "list " 13:53:17.132: debug : virInitialize:290 : register drivers 13:53:17.132: debug : virRegisterDriver:667 : registering Test as driver 0 13:53:17.132: debug : virRegisterNetworkDriver:567 : registering Test as network driver 0 13:53:17.132: debug : virRegisterStorageDriver:598 : registering Test as storage driver 0 13:53:17.132: debug : virRegisterDeviceMonitor:629 : registering Test as device driver 0 13:53:17.132: debug : xenHypervisorInit:1922 : Using new hypervisor call: 30001 13:53:17.132: debug : xenHypervisorInit:1991 : Using hypervisor call v2, sys ver3 dom ver5 13:53:17.132: debug : virRegisterDriver:667 : registering Xen as driver 1 13:53:17.132: debug : virRegisterDriver:667 : registering OPENVZ as driver 2 13:53:17.133: debug : vboxRegister:68 : VBoxCGlueInit failed: 0.0.0, errorval=-1 13:53:17.133: debug : virRegisterDriver:667 : registering VBOX as driver 3 13:53:17.133: debug : virRegisterDriver:667 : registering remote as driver 4 13:53:17.133: debug : virRegisterNetworkDriver:567 : registering remote as network driver 1 13:53:17.133: debug : virRegisterStorageDriver:598 : registering remote as storage driver 1 13:53:17.133: debug : virRegisterDeviceMonitor:629 : registering remote as device driver 1 13:53:17.133: debug : virConnectOpenAuth:1100 : name=xen://node3/, auth=0x67d0080, flags=0 13:53:17.133: debug : do_open:920 : name "xen://node3/" to URI components: scheme xen opaque (null) authority (null) server node3 user (null) port 0 path / 13:53:17.133: debug : do_open:930 : trying driver 0 (Test) ... 13:53:17.133: debug : do_open:936 : driver 0 Test returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 1 (Xen) ... 13:53:17.133: debug : do_open:936 : driver 1 Xen returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 2 (OPENVZ) ... 13:53:17.133: debug : do_open:936 : driver 2 OPENVZ returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 3 (VBOX) ... 13:53:17.133: debug : do_open:936 : driver 3 VBOX returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 4 (remote) ... 13:53:17.133: debug : do_open:936 : driver 4 remote returned DECLINED 13:53:17.133: debug : virUnrefConnect:210 : unref connection 0x93275d0 1 13:53:17.134: debug : virReleaseConnect:171 : release connection 0x93275d0 error: failed to connect to the hypervisor But when connecting to localhost, it works just fine: # LIBVIRT_DEBUG=6 virsh -d 5 -c xen:/// list command: "list " 13:53:23.558: debug : virInitialize:290 : register drivers 13:53:23.558: debug : virRegisterDriver:667 : registering Test as driver 0 13:53:23.558: debug : virRegisterNetworkDriver:567 : registering Test as network driver 0 13:53:23.558: debug : virRegisterStorageDriver:598 : registering Test as storage driver 0 13:53:23.558: debug : virRegisterDeviceMonitor:629 : registering Test as device driver 0 13:53:23.559: debug : xenHypervisorInit:1922 : Using new hypervisor call: 30001 13:53:23.559: debug : xenHypervisorInit:1991 : Using hypervisor call v2, sys ver3 dom ver5 13:53:23.559: debug : virRegisterDriver:667 : registering Xen as driver 1 13:53:23.559: debug : virRegisterDriver:667 : registering OPENVZ as driver 2 13:53:23.559: debug : vboxRegister:68 : VBoxCGlueInit failed: 0.0.0, errorval=-1 13:53:23.559: debug : virRegisterDriver:667 : registering VBOX as driver 3 13:53:23.559: debug : virRegisterDriver:667 : registering remote as driver 4 13:53:23.559: debug : virRegisterNetworkDriver:567 : registering remote as network driver 1 13:53:23.560: debug : virRegisterStorageDriver:598 : registering remote as storage driver 1 13:53:23.560: debug : virRegisterDeviceMonitor:629 : registering remote as device driver 1 13:53:23.560: debug : virConnectOpenAuth:1100 : name=xen:///, auth=0x67d0080, flags=0 13:53:23.560: debug : do_open:920 : name "xen:///" to URI components: scheme xen opaque (null) authority (null) server (null) user (null) port 0 path / 13:53:23.560: debug : do_open:930 : trying driver 0 (Test) ... 13:53:23.560: debug : do_open:936 : driver 0 Test returned DECLINED 13:53:23.560: debug : do_open:930 : trying driver 1 (Xen) ... 13:53:23.560: debug : xenUnifiedOpen:295 : Trying hypervisor sub-driver 13:53:23.560: debug : xenUnifiedOpen:298 : Activated hypervisor sub-driver 13:53:23.560: debug : xenUnifiedOpen:306 : Trying XenD sub-driver 13:53:23.563: debug : xenUnifiedOpen:309 : Activated XenD sub-driver 13:53:23.563: debug : xenUnifiedOpen:315 : Trying XM sub-driver 13:53:23.563: debug : xenUnifiedOpen:318 : Activated XM sub-driver 13:53:23.563: debug : xenUnifiedOpen:322 : Trying XS sub-driver 13:53:23.564: debug : xenStoreOpen:346 : Failed to add event handle, disabling events 13:53:23.564: debug : xenUnifiedOpen:325 : Activated XS sub-driver 13:53:23.570: debug : xenUnifiedOpen:361 : Trying Xen inotify sub-driver 13:53:23.571: debug : xenInotifyOpen:439 : Adding a watch on /etc/xen 13:53:23.571: debug : xenInotifyOpen:451 : Building initial config cache 13:53:23.571: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/centos 13:53:23.571: debug : xenXMConfigCacheAddFile:436 : Failed to read /etc/xen/centos 13:53:23.571: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/test3 13:53:23.571: debug : xenXMConfigCacheAddFile:465 : Added config test3 /etc/xen/test3 13:53:23.571: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/hany 13:53:23.571: debug : xenXMConfigCacheAddFile:465 : Added config hany /etc/xen/hany 13:53:23.572: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/hany2 13:53:23.572: debug : xenXMConfigCacheAddFile:465 : Added config hany4 /etc/xen/hany2 13:53:23.572: debug : xenInotifyOpen:458 : Registering with event loop 13:53:23.572: debug : xenInotifyOpen:462 : Failed to add inotify handle, disabling events 13:53:23.572: debug : virConnectRef:1165 : conn=0x996b5c8 refs=3 13:53:23.572: debug : xenUnifiedOpen:364 : Activated Xen inotify sub-driver 13:53:23.572: debug : do_open:936 : driver 1 Xen returned SUCCESS 13:53:23.572: debug : do_open:956 : network driver 0 Test returned DECLINED 13:53:23.572: debug : doRemoteOpen:511 : proceeding with name = xen:/// 13:53:23.572: debug : call:6543 : Doing call 66 (nil) 13:53:23.573: debug : call:6613 : We have the buck 66 0xb736c008 0xb736c008 13:53:23.573: debug : processCallRecvLen:6201 : Got length, now need 36 total (32 more) 13:53:23.573: debug : processCalls:6469 : Giving up the buck 66 0xb736c008 (nil) 13:53:23.573: debug : call:6644 : All done with our call 66 (nil) 0xb736c008 13:53:23.573: debug : call:6543 : Doing call 1 (nil) 13:53:23.573: debug : call:6613 : We have the buck 1 0x997f3b0 0x997f3b0 13:53:23.584: debug : processCallRecvLen:6201 : Got length, now need 28 total (24 more) 13:53:23.585: debug : processCalls:6469 : Giving up the buck 1 0x997f3b0 (nil) 13:53:23.585: debug : call:6644 : All done with our call 1 (nil) 0x997f3b0 13:53:23.585: debug : doRemoteOpen:822 : Adding Handler for remote events 13:53:23.585: debug : doRemoteOpen:829 : virEventAddHandle failed: No addHandleImpl defined. continuing without events. 13:53:23.585: debug : do_open:956 : network driver 1 remote returned SUCCESS 13:53:23.585: debug : do_open:978 : storage driver 0 Test returned DECLINED 13:53:23.585: debug : do_open:978 : storage driver 1 remote returned SUCCESS 13:53:23.585: debug : do_open:999 : node driver 0 Test returned DECLINED 13:53:23.585: debug : do_open:999 : node driver 1 remote returned SUCCESS 13:53:23.585: debug : virConnectNumOfDomains:1440 : conn=0x996b5c8 13:53:23.585: debug : virConnectListDomains:1401 : conn=0x996b5c8, ids=0x997a6d0, maxids=1 Id Name State ---------------------------------- 13:53:23.586: debug : virDomainLookupByID:1576 : conn=0x996b5c8, id=0 13:53:23.586: debug : virGetDomain:271 : New hash entry 0x997b300 13:53:23.586: debug : virDomainGetInfo:2569 : domain=0x997b300, info=0xbfc34c64 13:53:23.586: debug : virDomainGetName:2268 : domain=0x997b300 13:53:23.586: debug : virDomainGetID:2361 : domain=0x997b300 0 Domain-0 running 13:53:23.586: debug : virDomainFree:1806 : domain=0x997b300 13:53:23.586: debug : virUnrefDomain:345 : unref domain 0x997b300 Domain-0 1 13:53:23.586: debug : virReleaseDomain:303 : release domain 0x997b300 Domain-0 13:53:23.587: debug : virReleaseDomain:315 : unref connection 0x996b5c8 5 13:53:23.587: debug : virConnectClose:1118 : conn=0x996b5c8 13:53:23.587: debug : call:6543 : Doing call 2 (nil) 13:53:23.587: debug : call:6613 : We have the buck 2 0x997f3b0 0x997f3b0 13:53:23.588: debug : processCallRecvLen:6201 : Got length, now need 28 total (24 more) 13:53:23.588: debug : processCalls:6469 : Giving up the buck 2 0x997f3b0 (nil) 13:53:23.588: debug : call:6644 : All done with our call 2 (nil) 0x997f3b0 13:53:23.588: debug : virUnrefConnect:210 : unref connection 0x996b5c8 4 13:53:23.588: debug : virUnrefConnect:210 : unref connection 0x996b5c8 3 13:53:23.589: debug : virUnrefConnect:210 : unref connection 0x996b5c8 2 13:53:23.589: debug : virUnrefConnect:210 : unref connection 0x996b5c8 1 13:53:23.589: debug : virReleaseConnect:171 : release connection 0x996b5c8 Anybody else run into this? Any help would be greatly appreciated. Thanks, Hany

2 6

[libvirt] Checkpoint VMs
by Maximilian Wilhelm 08 Jun '09

08 Jun '09

Hi! Some months ago there were some mails about ideas of adding new API functions for checkpointing of domains. For the project group Virtualized SuperComputer (the crazy guys with the ESX driver) we would like to have such a feature and would be willing to propose API patches and anything the like. As we have to deal with many VMs at the same time which belong to one computation job (think: virtualized HPC cluster) we are facing the problem to checkpoint a set of VMs at the same time. So besides a usual checkpoint we would be interested in something like checkpointAt (host, vm, timestamp) restoreFromCheckpointAt (host, vm, timestamp) an let the hypervisor / libvirtd / whatever piece of software on the host face the problem to execute the checkpoint/restore command at <timestamp>. The main idea behind this is to checkpoint or restore the set of VMs as simultaniously as possible. As far as I got it ESX for examples is able to execute tasks at a given point of time once or recurring as far as you have a Virtual Center with all your hosts belong^Wconnected to it. Any opinions on such new functions? I guess more people could be interested in this functionality. Comments welcome. Ciao Max -- Follow the white penguin.

2 1

[libvirt] Can't Pass Through USB Device To Ubuntu 9.05 Guest OS
by Robert L Cochran 08 Jun '09

08 Jun '09

Greetings! I created Bug 504444 <https://bugzilla.redhat.com/show_bug.cgi?id=504444> which is partially quoted in this post: ---------------------------------------------------------------- Coding this xml: <hostdev mode='subsystem' type='usb'> <source> <vendor id='0x0403'/> <product id='0x6001'/> </source> </hostdev> should let my Ubuntu 9.04 guest have access to the device, which in this case is a USB-to-Serial UART (based on an FTDI FT232RL chip.) However the guest does not "see" the device or recognize it in any way. It does not show up in the guest's /var/log/messages or in the output of lsusb. I would like the guest to have access to this device. This is what virsh seems to be seeing: # virsh dumpxml Ubuntu9 <domain type='kvm'> <name>Ubuntu9</name> <uuid>cb8c3d15-fe92-1bf2-5676-03370743e815</uuid> <memory>1572864</memory> <currentMemory>1572864</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> <disk type='file' device='disk'> <source file='/var/lib/libvirt/images/Ubuntu9.img'/> <target dev='vda' bus='virtio'/> </disk> <interface type='network'> <mac address='54:52:00:74:32:2f'/> <source network='default'/> <model type='virtio'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <sound model='es1370'/> <hostdev mode='subsystem' type='usb' managed='no'> <source> <vendor id='0x0403'/> <product id='0x6001'/> </source> </hostdev> </devices> </domain> Version-Release number of selected component (if applicable): libvirt-0.6.2-11.fc11.x86_64 ---------------------------------- Any suggestions for fixing this problem? Is there a clear procedure for getting a Fedora virtualization guest to recognize a USB device? Thanks for your help! Bob Cochran

2 1

[libvirt] Release of libvirt-0.6.4
by Daniel Veillard 06 Jun '09

06 Jun '09

The monthly release is out ! There is a number of new things in that release, but as happens in time-based releases some are not fully complete, for example the OpenNebula driver was added but it still need a bit of work on the detection code and a bit of cleanup to avoid a GPL/AFS licencing issue, so please don't enable it except for test builds. We also have a new set of Interface config APIs but they are not yet implemented by a driver and the XML import/export routines are not there yet. Still there is a lot of things to use and discover in this release as you can see below: * New features: - new API virStorageVolCreateXMLFrom (Cole Robinson) - full VBox graphic capabilities (Pritesh Kothari) - Interface config APIs (Laine Stump) - APIs for domain XML conversions (Daniel Berrange) - initial version of OpenNebula driver (Abel Miguez Rodriguez) * Portability: - better compiler warning selection (Daniel Berrange) - Win32 portability fixes (Daniel Berrange) * Documentation: - documentation for <sound> device XML format (Cole Robinson) - storage format documentation fixes (Ryota Ozaki) - docs for XML conversion APIs (Daniel Berrange) - inconsistencies in storage volume docs and schemas (Ryota Ozaki) * Bug fixes: - fix hostdev managed handling (Mark McLoughlin) - lxc_controller should not cash without args (Guido Gunther) - bug fixes in I/O routines (Guido Gunther) - fix migrationsave/restore for QEmu 0.10.0 (Daniel Berrange) - avoid crash on VBox init (Guido Gunther) - fix dev and cgroup init in LXC (Ryota Ozaki) - QEmu startup fix (Cole Robinson) - block node reboots from LXCs (Ryota Ozaki) - QEmu argv detection fix for recent kvm (Daniel Berrange) - fix watch/timer event deletion (Daniel Berrange) - fix XML escaping bug - various locking bugs (Daniel Berrange) - avoid a deadlock in HAL nodedev driver (Cole Robinson) - detection of node device media insert/eject (Cole Robinson) - broken networking with new QEMU/KVM >= 86 (Daniel Berrange) - various fixes in domain and network startup error report (Cole Robinson) - double free on unexpected client disconnect (Daniel Berrange) * Improvements: - cleanups and doc on virExec (Cole Robinson) - error reporting in QEmu migrations (Cole Robinson) - better path and driver detection in VBox (Pritesh Kothari) - avoid caching QEMU driver capabilities(Cole Robinson) - multiple graphics elements definitions (Pritesh Kothari) - LSB init header init.d improvements (Frederik Himpe) - special erro code for invalid operations (Daniel Berrange) - dlopen error logging (Daniel Berrange) - fix UUID and name uniqueness (Daniel Berrange) - improvement on VBox initialization (Pritesh Kothari and Dan Berrange) - "Host only" and "Internal" network in VBox (Pritesh Kothari) - add utility virExecDaemonize (Cole Robinson) - enable bridges without IP (Ludwig Nussel) - 'make -s' silencing (Daniel Berrange) - test case for exercising the event loop (Daniel Berrange) - virsh commands vol-clone and vol-create-from (Cole Robinson) - new xend don't use [] around cpumaps (Tatsuro Enokura) - add the CIL mutex lock checker (Daniel Berrange) - fix some LXC error code (Amy Griffis) - virInterface python bindings (Daniel Berrange) - fix to the example code for event handling (Pritesh Kothari) - always add location informations to logging (Daniel Berrange) - python domain events example and binding (Daniel Berrange) - PPC Qemu Machine Type update (Thomas Baker) * Cleanups: - strings bug in virsh (Daniel Berrange) - various cleanups in storage code (Cole Robinson) - rpm spec cleanups - destructors data cleanups (Laine Stump) - some QEmu code refactoring (Daniel Berrange) - avoid dependancy on libcap (Daniel Berrange) - python import cleanup (Cole Robinson) - virAsprintf based cleanups in storage code (Cole Robinson) - fix some direct stderr logging - OpenNebula driver cleanups (Daniel Berrange) Thanks everybody for the contributions for this new release ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 8

[libvirt] Regression in createQemuImg()@storage_backend_fs.c of 0.6.4
by Ryota Ozaki 05 Jun '09

05 Jun '09

Hi, I've found a regression in using a backing store of a volume (qcow2) in a pool (dir). The following code of 0.6.4 hits my system that works with 0.6.3. static int createQemuImg(virConnectPtr conn, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol) { (snip) const char *inputBackingPath = (inputvol ? inputvol->backingStore.path : NULL); (snip) /* XXX: Not strictly required: qemu-img has an option a different * backing store, not really sure what use it serves though, and it * may cause issues with lvm. Untested essentially. */ if (!inputBackingPath || !STREQ(inputBackingPath, vol->backingStore.path)) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("a different backing store can not " "be specified.")); return -1; } The inputBackingPath will be always NULL when it is called via virStorageBackendFileSystemVolBuild(). (The third argument is passed to that of createQemuImg as it is.) static int virStorageBackendFileSystemVolBuild(virConnectPtr conn, virStorageVolDefPtr vol) { return _virStorageBackendFileSystemVolBuild(conn, vol, NULL); } I've addressed the regression with the patch - if (!inputBackingPath || + if (inputBackingPath && However, I'm not sure whether this fix satisfies the aim of the original code. Any idea? Thanks in advance, ozaki-r

2 2

[libvirt] IPv6 subnet on virbr0
by Bernie Innocenti 05 Jun '09

05 Jun '09

Hello, in a common scenario where there aren't enough public IPv4 addresses for all domains, I have elaborated this workaround: - the host operates a sixxs.net IPv6 tunnel with aiccu. - the virbr0 interface is manually configured an IPv6 address within a /64 subnet delegated by sixxs.net. (I do this from /etc/rc.local for lack of a better place) - radvd runs on the host to autoconfigure IPv6 for the guests on virbr0 and advertise the host as a gateway With this setup, all machines are globally addressable from the IPv6 internet, which is still quite useful for backstage services such as a build farm. In order to automate this setup, libvirt should support configuring an IPv6 address on bridged interfaces, and possibly multiple addresses for dual stack setups. Automatically running radvd would make a nice goodie. -- // Bernie Innocenti - http://codewiz.org/ \X/ Sugar Labs - http://sugarlabs.org/

2 3

[libvirt] virsh edit error
by Doug Goldstein 05 Jun '09

05 Jun '09

In an attempt to rename a kvm vm (which was powered off) I performed the following: $ virsh edit old-name Then changed <name>old-name</name> to <name>new-name</name> and saved and quit from the editor. $ virsh list --all Id Name State ---------------------------------- - old-name shut off - new-name shut off Performing an edit on each of these shows they're completely identical. Even the <name> section shows the old-name on both of them. I've performed restarts of libvirtd as well. If the action I did is truly invalid, we should catch that an error out on it. However I think VM renaming can be a valid use case and we have the UUID to match off of for the rename. Basically, I'm contacting the list to see if my use case was invalid and I should write my patch to spit an error, or if I should write my patch to correct the improper handling. Patch to follow based on responses. Thanks all. -- Doug Goldstein

3 3

[libvirt] [PATCH] fix a realloc problem
by Daniel Veillard 04 Jun '09

04 Jun '09

The xen code for detaching devices had a mistake in the resize compaction code, the size of the data copied was improper, moving N bytes, instead of sizeof(device) * N bytes. The attached patch by Dan Berrange fixes it, it's trivial so I commited it, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] PATCH: Fix redetection of transient QEMU VMs on daemon restarts
by Daniel P. Berrange 04 Jun '09

04 Jun '09

When the libvirtd daemon starts up, it reads all config files from /etc/libvirt/qemu. For each config file loaded, it then probes for a pidfile / live status XML config in /var/run/libvirt/qemu. In retrospect there is an obvious problem with this approach: it misses all transient VMs which don't ever have config files in /etc/libvirt/qemu. The core goal of this patch, is thus to change the way we deal with startup to apply the following logic. - Scan & load all status files in /var/run/libvirt/qemu for running VMs - Reconnect to the monitor for all VMs, and re-detect VCPU threads. - Scan & load all inactive configs in /etc/libvirt/qemu This ensures we always re-detect all inactive and running VMs, whether transient or persistent. It also fixes two other bugs, first we forgot to detect VCPU threads, so vCPU affinity functions were broken, and it also re-reserves the MCS category with selinux so it is not re-used later. Finally, if the attempt to reconnect to the QEMU monitor for a running VM fails, then we explicitly kill off that VM, rather than just ignoring it. This avoids leaving orphaned QEMU processes. The patch is larger than anticipated, because I moved all the status file code out of QEMU driver into the generic domain_conf.c file. This enables both scanning loops to be done via the single method virDomainLoadAllConfigs, just by pasing different directories. I also want to re-use this code in the LXC and UML drivers to improve bugs in their logic domain_conf.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++----- domain_conf.h | 17 ++ libvirt_private.syms | 1 lxc_driver.c | 2 qemu_conf.c | 190 ------------------------------ qemu_conf.h | 18 -- qemu_driver.c | 178 +++++++++++++--------------- security.h | 3 security_selinux.c | 39 ++++++ uml_driver.c | 4 10 files changed, 431 insertions(+), 335 deletions(-) Daniel diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -39,6 +39,7 @@ #include "util.h" #include "buf.h" #include "c-ctype.h" +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -511,6 +512,31 @@ void virDomainObjListFree(virDomainObjLi vms->count = 0; } + +static virDomainObjPtr virDomainObjNew(virConnectPtr conn) +{ + virDomainObjPtr domain; + + if (VIR_ALLOC(domain) < 0) { + virReportOOMError(conn); + return NULL; + } + + if (virMutexInit(&domain->lock) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot initialize mutex")); + VIR_FREE(domain); + return NULL; + } + + virDomainObjLock(domain); + domain->state = VIR_DOMAIN_SHUTOFF; + domain->monitorWatch = -1; + domain->monitor = -1; + + return domain; +} + virDomainObjPtr virDomainAssignDef(virConnectPtr conn, virDomainObjListPtr doms, const virDomainDefPtr def) @@ -530,29 +556,15 @@ virDomainObjPtr virDomainAssignDef(virCo return domain; } - if (VIR_ALLOC(domain) < 0) { - virReportOOMError(conn); - return NULL; - } - - if (virMutexInit(&domain->lock) < 0) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialize mutex")); - VIR_FREE(domain); - return NULL; - } - - virDomainObjLock(domain); - domain->state = VIR_DOMAIN_SHUTOFF; + if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { + virReportOOMError(conn); + return NULL; + } + + if (!(domain = virDomainObjNew(conn))) + return NULL; + domain->def = def; - domain->monitorWatch = -1; - domain->monitor = -1; - - if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { - virReportOOMError(conn); - VIR_FREE(domain); - return NULL; - } doms->objs[doms->count] = domain; doms->count++; @@ -2621,6 +2633,68 @@ no_memory: return NULL; } + +static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, + virCapsPtr caps, + xmlXPathContextPtr ctxt) +{ + char *tmp = NULL; + long val; + xmlNodePtr config; + xmlNodePtr oldctxt; + virDomainObjPtr obj; + + if (!(obj = virDomainObjNew(conn))) + return NULL; + + if (!(config = virXPathNode(conn, "./domain", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no domain config")); + goto error; + } + + oldctxt = ctxt->node; + ctxt->node = config; + obj->def = virDomainDefParseXML(conn, caps, ctxt, 0); + ctxt->node = oldctxt; + if (!obj->def) + goto error; + + if (!(tmp = virXPathString(conn, "string(./@state)", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing domain state")); + goto error; + } + if ((obj->state = virDomainStateTypeFromString(tmp)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("invalid domain state '%s'"), tmp); + VIR_FREE(tmp); + goto error; + } + VIR_FREE(tmp); + + if ((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("invalid pid")); + goto error; + } + obj->pid = (pid_t)val; + + if(!(obj->monitorpath = + virXPathString(conn, "string(./monitor[1]/@path)", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no monitor path")); + goto error; + } + + return obj; + +error: + virDomainObjFree(obj); + return NULL; +} + + /* Called from SAX on parsing errors in the XML. */ static void catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) @@ -2753,6 +2827,78 @@ cleanup: xmlXPathFreeContext(ctxt); return def; } + + +virDomainObjPtr virDomainObjParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename) +{ + xmlParserCtxtPtr pctxt; + xmlDocPtr xml = NULL; + xmlNodePtr root; + virDomainObjPtr obj = NULL; + + /* Set up a parser context so we can catch the details of XML errors. */ + pctxt = xmlNewParserCtxt (); + if (!pctxt || !pctxt->sax) + goto cleanup; + pctxt->sax->error = catchXMLError; + pctxt->_private = conn; + + if (conn) virResetError (&conn->err); + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + if (!xml) { + if (virGetLastError() == NULL) + virDomainReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("failed to parse xml document")); + goto cleanup; + } + + if ((root = xmlDocGetRootElement(xml)) == NULL) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing root element")); + goto cleanup; + } + + obj = virDomainObjParseNode(conn, caps, xml, root); + +cleanup: + xmlFreeParserCtxt (pctxt); + xmlFreeDoc (xml); + return obj; +} + + +virDomainObjPtr virDomainObjParseNode(virConnectPtr conn, + virCapsPtr caps, + xmlDocPtr xml, + xmlNodePtr root) +{ + xmlXPathContextPtr ctxt = NULL; + virDomainObjPtr obj = NULL; + + if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("incorrect root element")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + ctxt->node = root; + obj = virDomainObjParseXML(conn, caps, ctxt); + +cleanup: + xmlXPathFreeContext(ctxt); + return obj; +} + #endif /* ! PROXY */ /************************************************************************ @@ -3704,6 +3850,33 @@ char *virDomainDefFormat(virConnectPtr c return NULL; } +char *virDomainObjFormat(virConnectPtr conn, + virDomainObjPtr obj, + int flags) +{ + char *config_xml = NULL, *xml = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&buf, "<domstatus state='%s' pid='%d'>\n", + virDomainStateTypeToString(obj->state), + obj->pid); + virBufferEscapeString(&buf, " <monitor path='%s'/>\n", obj->monitorpath); + + if (!(config_xml = virDomainDefFormat(conn, + obj->def, + flags))) + goto cleanup; + + virBufferAdd(&buf, config_xml, strlen(config_xml)); + virBufferAddLit(&buf, "</domstatus>\n"); + + xml = virBufferContentAndReset(&buf); +cleanup: + VIR_FREE(config_xml); + return xml; + +} + #ifndef PROXY @@ -3779,6 +3952,27 @@ cleanup: return ret; } +int virDomainSaveStatus(virConnectPtr conn, + const char *statusDir, + virDomainObjPtr obj) +{ + int ret = -1; + char *xml; + + if (!(xml = virDomainObjFormat(conn, + obj, + VIR_DOMAIN_XML_SECURE))) + goto cleanup; + + if (virDomainSaveXML(conn, statusDir, obj->def, xml)) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(xml); + return ret; +} + virDomainObjPtr virDomainLoadConfig(virConnectPtr conn, virCapsPtr caps, @@ -3832,17 +4026,67 @@ error: return NULL; } +static virDomainObjPtr virDomainLoadStatus(virConnectPtr conn, + virCapsPtr caps, + virDomainObjListPtr doms, + const char *statusDir, + const char *name, + virDomainLoadConfigNotify notify, + void *opaque) +{ + char *statusFile = NULL; + virDomainObjPtr obj = NULL; + virDomainObjPtr tmp = NULL; + + if ((statusFile = virDomainConfigFile(conn, statusDir, name)) == NULL) + goto error; + + if (!(obj = virDomainObjParseFile(conn, caps, statusFile))) + goto error; + + tmp = virDomainFindByName(doms, obj->def->name); + if (tmp) { + virDomainObjUnlock(obj); + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected domain %s already exists"), obj->def->name); + goto error; + } + + if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { + virReportOOMError(conn); + goto error; + } + + doms->objs[doms->count] = obj; + doms->count++; + + if (notify) + (*notify)(obj, 1, opaque); + + VIR_FREE(statusFile); + return obj; + +error: + virDomainObjFree(obj); + VIR_FREE(statusFile); + return NULL; +} + int virDomainLoadAllConfigs(virConnectPtr conn, virCapsPtr caps, virDomainObjListPtr doms, const char *configDir, const char *autostartDir, + int liveStatus, virDomainLoadConfigNotify notify, void *opaque) { DIR *dir; struct dirent *entry; + VIR_INFO("Scanning for %s configs in %s", + liveStatus ? "live" : "persistent", configDir); + if (!(dir = opendir(configDir))) { if (errno == ENOENT) return 0; @@ -3863,14 +4107,24 @@ int virDomainLoadAllConfigs(virConnectPt /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ - dom = virDomainLoadConfig(conn, - caps, - doms, - configDir, - autostartDir, - entry->d_name, - notify, - opaque); + VIR_INFO("Loading config file '%s.xml'", entry->d_name); + if (liveStatus) + dom = virDomainLoadStatus(conn, + caps, + doms, + configDir, + entry->d_name, + notify, + opaque); + else + dom = virDomainLoadConfig(conn, + caps, + doms, + configDir, + autostartDir, + entry->d_name, + notify, + opaque); if (dom) { virDomainObjUnlock(dom); dom->persistent = 1; diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -515,7 +515,6 @@ struct _virDomainObj { int monitor; char *monitorpath; int monitorWatch; - int logfile; int pid; int state; @@ -589,10 +588,22 @@ virDomainDefPtr virDomainDefParseNode(vi xmlDocPtr doc, xmlNodePtr root, int flags); + +virDomainObjPtr virDomainObjParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename); +virDomainObjPtr virDomainObjParseNode(virConnectPtr conn, + virCapsPtr caps, + xmlDocPtr xml, + xmlNodePtr root); + #endif char *virDomainDefFormat(virConnectPtr conn, virDomainDefPtr def, int flags); +char *virDomainObjFormat(virConnectPtr conn, + virDomainObjPtr obj, + int flags); int virDomainCpuSetParse(virConnectPtr conn, const char **str, @@ -615,6 +626,9 @@ int virDomainSaveXML(virConnectPtr conn, int virDomainSaveConfig(virConnectPtr conn, const char *configDir, virDomainDefPtr def); +int virDomainSaveStatus(virConnectPtr conn, + const char *statusDir, + virDomainObjPtr obj); typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, int newDomain, @@ -634,6 +648,7 @@ int virDomainLoadAllConfigs(virConnectPt virDomainObjListPtr doms, const char *configDir, const char *autostartDir, + int liveStatus, virDomainLoadConfigNotify notify, void *opaque); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -94,6 +94,7 @@ virDomainObjListFree; virDomainRemoveInactive; virDomainSaveXML; virDomainSaveConfig; +virDomainSaveStatus; virDomainSoundDefFree; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; diff --git a/src/lxc_driver.c b/src/lxc_driver.c --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -1176,7 +1176,7 @@ static int lxcStartup(void) &lxc_driver->domains, lxc_driver->configDir, lxc_driver->autostartDir, - NULL, NULL) < 0) + 0, NULL, NULL) < 0) goto cleanup; for (i = 0 ; i < lxc_driver->domains.count ; i++) { diff --git a/src/qemu_conf.c b/src/qemu_conf.c --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -2765,193 +2765,3 @@ cleanup: return def; } - -/* Called from SAX on parsing errors in the XML. */ -static void -catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) -{ - xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; - - if (ctxt) { - virConnectPtr conn = ctxt->_private; - - if (ctxt->lastError.level == XML_ERR_FATAL && - ctxt->lastError.message != NULL) { - qemudReportError (conn, NULL, NULL, VIR_ERR_XML_DETAIL, - _("at line %d: %s"), - ctxt->lastError.line, - ctxt->lastError.message); - } - } -} - - -/** - * qemudDomainStatusParseFile - * - * read the last known status of a domain - * - * Returns 0 on success - */ -qemudDomainStatusPtr -qemudDomainStatusParseFile(virConnectPtr conn, - virCapsPtr caps, - const char *filename, int flags) -{ - xmlParserCtxtPtr pctxt = NULL; - xmlXPathContextPtr ctxt = NULL; - xmlDocPtr xml = NULL; - xmlNodePtr root, config_root; - virDomainDefPtr def = NULL; - char *tmp = NULL; - long val; - qemudDomainStatusPtr status = NULL; - - if (VIR_ALLOC(status) < 0) { - virReportOOMError(conn); - goto error; - } - - /* Set up a parser context so we can catch the details of XML errors. */ - pctxt = xmlNewParserCtxt (); - if (!pctxt || !pctxt->sax) - goto error; - pctxt->sax->error = catchXMLError; - pctxt->_private = conn; - - if (conn) virResetError (&conn->err); - xml = xmlCtxtReadFile (pctxt, filename, NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); - if (!xml) { - if (conn && conn->err.code == VIR_ERR_NONE) - qemudReportError(conn, NULL, NULL, VIR_ERR_XML_ERROR, - "%s", _("failed to parse xml document")); - goto error; - } - - if ((root = xmlDocGetRootElement(xml)) == NULL) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("missing root element")); - goto error; - } - - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(conn); - goto error; - } - - if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); - goto error; - } - - ctxt->node = root; - if(!(tmp = virXPathString(conn, "string(./@state)", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid domain state")); - goto error; - } else { - status->state = virDomainStateTypeFromString(tmp); - VIR_FREE(tmp); - } - - if((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid pid")); - goto error; - } else - status->pid = (pid_t)val; - - if(!(tmp = virXPathString(conn, "string(./monitor[1]/@path)", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("no monitor path")); - goto error; - } else - status->monitorpath = tmp; - - if(!(config_root = virXPathNode(conn, "./domain", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("no domain config")); - goto error; - } - if(!(def = virDomainDefParseNode(conn, caps, xml, config_root, flags))) - goto error; - else - status->def = def; - -cleanup: - xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); - xmlFreeDoc (xml); - return status; - -error: - VIR_FREE(tmp); - VIR_FREE(status); - goto cleanup; -} - - -/** - * qemudDomainStatusFormat - * - * Get the state of a running domain as XML - * - * Returns xml on success - */ -static char* -qemudDomainStatusFormat(virConnectPtr conn, - virDomainObjPtr vm) -{ - char *config_xml = NULL, *xml = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferVSprintf(&buf, "<domstatus state='%s' pid='%d'>\n", - virDomainStateTypeToString(vm->state), - vm->pid); - virBufferEscapeString(&buf, " <monitor path='%s'/>\n", vm->monitorpath); - - if (!(config_xml = virDomainDefFormat(conn, - vm->def, - VIR_DOMAIN_XML_SECURE))) - goto cleanup; - - virBufferAdd(&buf, config_xml, strlen(config_xml)); - virBufferAddLit(&buf, "</domstatus>\n"); - - xml = virBufferContentAndReset(&buf); -cleanup: - VIR_FREE(config_xml); - return xml; -} - - -/** - * qemudSaveDomainStatus - * - * Save the current status of a running domain - * - * Returns 0 on success - */ -int -qemudSaveDomainStatus(virConnectPtr conn, - struct qemud_driver *driver, - virDomainObjPtr vm) -{ - int ret = -1; - char *xml = NULL; - - if (!(xml = qemudDomainStatusFormat(conn, vm))) - goto cleanup; - - if ((ret = virDomainSaveXML(conn, driver->stateDir, vm->def, xml))) - goto cleanup; - - ret = 0; -cleanup: - VIR_FREE(xml); - return ret; -} diff --git a/src/qemu_conf.h b/src/qemu_conf.h --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -92,15 +92,6 @@ struct qemud_driver { virSecurityDriverPtr securityDriver; }; -/* Status needed to reconenct to running VMs */ -typedef struct _qemudDomainStatus qemudDomainStatus; -typedef qemudDomainStatus *qemudDomainStatusPtr; -struct _qemudDomainStatus { - char *monitorpath; - pid_t pid; - int state; - virDomainDefPtr def; -}; /* Port numbers used for KVM migration. */ #define QEMUD_MIGRATION_FIRST_PORT 49152 @@ -141,13 +132,4 @@ virDomainDefPtr qemuParseCommandLine(vir virDomainDefPtr qemuParseCommandLineString(virConnectPtr conn, const char *args); -const char *qemudVirtTypeToString (int type); -qemudDomainStatusPtr qemudDomainStatusParseFile(virConnectPtr conn, - virCapsPtr caps, - const char *filename, - int flags); -int qemudSaveDomainStatus(virConnectPtr conn, - struct qemud_driver *driver, - virDomainObjPtr vm); - #endif /* __QEMUD_CONF_H */ diff --git a/src/qemu_driver.c b/src/qemu_driver.c --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -125,6 +125,8 @@ static int qemudMonitorCommandExtra(cons static int qemudDomainSetMemoryBalloon(virConnectPtr conn, virDomainObjPtr vm, unsigned long newmem); +static int qemudDetectVcpuPIDs(virConnectPtr conn, + virDomainObjPtr vm); static struct qemud_driver *qemu_driver = NULL; @@ -287,79 +289,65 @@ static int qemudOpenMonitor(virConnectPt const char *monitor, int reconnect); + +/* + * Open an existing VM's monitor, and re-detect VCPUs + * threads + */ +static int +qemuReconnectDomain(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + int rc; + + if ((rc = qemudOpenMonitor(NULL, driver, obj, obj->monitorpath, 1)) != 0) { + VIR_ERROR(_("Failed to reconnect monitor for %s: %d\n"), + obj->def->name, rc); + goto error; + } + + if (qemudDetectVcpuPIDs(NULL, obj) < 0) { + goto error; + } + + if (obj->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && + driver->securityDriver && + driver->securityDriver->domainReserveSecurityLabel && + driver->securityDriver->domainReserveSecurityLabel(NULL, obj) < 0) + return -1; + + if (obj->def->id >= driver->nextvmid) + driver->nextvmid = obj->def->id + 1; + + return 0; + +error: + return -1; +} + /** * qemudReconnectVMs * - * Reconnect running vms to the daemon process - */ -static int -qemudReconnectVMs(struct qemud_driver *driver) + * Try to re-open the resources for live VMs that we care + * about. + */ +static void +qemuReconnectDomains(struct qemud_driver *driver) { int i; for (i = 0 ; i < driver->domains.count ; i++) { - virDomainObjPtr vm = driver->domains.objs[i]; - qemudDomainStatusPtr status = NULL; - char *config = NULL; - int rc; - - virDomainObjLock(vm); - if ((rc = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) - DEBUG("Found pid %d for '%s'", vm->pid, vm->def->name); - else - goto next; - - if ((config = virDomainConfigFile(NULL, - driver->stateDir, - vm->def->name)) == NULL) { - VIR_ERROR(_("Failed to read domain status for %s\n"), - vm->def->name); - goto next_error; - } - - status = qemudDomainStatusParseFile(NULL, driver->caps, config, 0); - if (status) { - vm->newDef = vm->def; - vm->def = status->def; - } else { - VIR_ERROR(_("Failed to parse domain status for %s\n"), - vm->def->name); - goto next_error; - } - - if ((rc = qemudOpenMonitor(NULL, driver, vm, status->monitorpath, 1)) != 0) { - VIR_ERROR(_("Failed to reconnect monitor for %s: %d\n"), - vm->def->name, rc); - goto next_error; - } - - if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0) - goto next_error; - - if (vm->def->id >= driver->nextvmid) - driver->nextvmid = vm->def->id + 1; - - vm->state = status->state; - goto next; - -next_error: - /* we failed to reconnect the vm so remove it's traces */ - vm->def->id = -1; - qemudRemoveDomainStatus(NULL, driver, vm); - /* Restore orignal def, if we'd loaded a live one */ - if (vm->newDef) { - virDomainDefFree(vm->def); - vm->def = vm->newDef; - vm->newDef = NULL; - } -next: - virDomainObjUnlock(vm); - if (status) - VIR_FREE(status->monitorpath); - VIR_FREE(status); - VIR_FREE(config); - } - return 0; + virDomainObjPtr obj = driver->domains.objs[i]; + + virDomainObjLock(obj); + if (qemuReconnectDomain(driver, obj) < 0) { + /* If we can't get the monitor back, then kill the VM + * so user has ability to start it again later without + * danger of ending up running twice */ + qemudShutdownVMDaemon(NULL, driver, obj); + } + virDomainObjUnlock(obj); + } } static int @@ -513,14 +501,25 @@ qemudStartup(void) { goto error; } + /* Get all the running persistent or transient configs first */ + if (virDomainLoadAllConfigs(NULL, + qemu_driver->caps, + &qemu_driver->domains, + qemu_driver->stateDir, + NULL, + 1, NULL, NULL) < 0) + goto error; + + qemuReconnectDomains(qemu_driver); + + /* Then inactive persistent configs */ if (virDomainLoadAllConfigs(NULL, qemu_driver->caps, &qemu_driver->domains, qemu_driver->configDir, qemu_driver->autostartDir, - NULL, NULL) < 0) - goto error; - qemudReconnectVMs(qemu_driver); + 0, NULL, NULL) < 0) + goto error; qemuDriverUnlock(qemu_driver); qemudAutostartConfigs(qemu_driver); @@ -569,7 +568,7 @@ qemudReload(void) { &qemu_driver->domains, qemu_driver->configDir, qemu_driver->autostartDir, - qemudNotifyLoadDomain, qemu_driver); + 0, qemudNotifyLoadDomain, qemu_driver); qemuDriverUnlock(qemu_driver); qemudAutostartConfigs(qemu_driver); @@ -1331,6 +1330,7 @@ static int qemudStartVMDaemon(virConnect int pos = -1; char ebuf[1024]; char *pidfile = NULL; + int logfile; struct gemudHookData hookData; hookData.conn = conn; @@ -1372,7 +1372,7 @@ static int qemudStartVMDaemon(virConnect goto cleanup; } - if((vm->logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) + if ((logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) goto cleanup; emulator = vm->def->emulator; @@ -1421,29 +1421,29 @@ static int qemudStartVMDaemon(virConnect tmp = progenv; while (*tmp) { - if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) VIR_WARN(_("Unable to write envv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if (safewrite(vm->logfile, " ", 1) < 0) + if (safewrite(logfile, " ", 1) < 0) VIR_WARN(_("Unable to write envv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { - if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if (safewrite(vm->logfile, " ", 1) < 0) + if (safewrite(logfile, " ", 1) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } - if (safewrite(vm->logfile, "\n", 1) < 0) + if (safewrite(logfile, "\n", 1) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if ((pos = lseek(vm->logfile, 0, SEEK_END)) < 0) + if ((pos = lseek(logfile, 0, SEEK_END)) < 0) VIR_WARN(_("Unable to seek to end of logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); @@ -1451,7 +1451,7 @@ static int qemudStartVMDaemon(virConnect FD_SET(tapfds[i], &keepfd); ret = virExecDaemonize(conn, argv, progenv, &keepfd, &child, - stdin_fd, &vm->logfile, &vm->logfile, + stdin_fd, &logfile, &logfile, VIR_EXEC_NONBLOCK, qemudSecurityHook, &hookData, pidfile); @@ -1501,7 +1501,7 @@ static int qemudStartVMDaemon(virConnect (qemudInitCpus(conn, vm, migrateFrom) < 0) || (qemudInitPasswords(conn, driver, vm) < 0) || (qemudDomainSetMemoryBalloon(conn, vm, vm->def->memory) < 0) || - (qemudSaveDomainStatus(conn, qemu_driver, vm) < 0)) { + (virDomainSaveStatus(conn, driver->stateDir, vm) < 0)) { qemudShutdownVMDaemon(conn, driver, vm); ret = -1; /* No need for 'goto cleanup' now since qemudShutdownVMDaemon does enough */ @@ -1519,10 +1519,8 @@ cleanup: vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && vm->def->graphics[0]->data.vnc.autoport) vm->def->graphics[0]->data.vnc.port = -1; - if (vm->logfile != -1) { - close(vm->logfile); - vm->logfile = -1; - } + if (logfile != -1) + close(logfile); vm->def->id = -1; return -1; } @@ -1549,14 +1547,8 @@ static void qemudShutdownVMDaemon(virCon vm->monitorWatch = -1; } - if (close(vm->logfile) < 0) { - char ebuf[1024]; - VIR_WARN(_("Unable to close logfile: %s\n"), - virStrerror(errno, ebuf, sizeof ebuf)); - } if (vm->monitor != -1) close(vm->monitor); - vm->logfile = -1; vm->monitor = -1; /* shut it off for sure */ @@ -2260,7 +2252,7 @@ static int qemudDomainSuspend(virDomainP VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_FREE(info); } - if (qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) goto cleanup; ret = 0; @@ -2310,7 +2302,7 @@ static int qemudDomainResume(virDomainPt VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_FREE(info); } - if (qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) goto cleanup; ret = 0; @@ -4192,7 +4184,7 @@ static int qemudDomainAttachDevice(virDo goto cleanup; } - if (!ret && qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (!ret && virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) ret = -1; cleanup: @@ -4314,7 +4306,7 @@ static int qemudDomainDetachDevice(virDo qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s", _("only SCSI or virtio disk device can be detached dynamically")); - if (!ret && qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (!ret && virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) ret = -1; cleanup: diff --git a/src/security.h b/src/security.h --- a/src/security.h +++ b/src/security.h @@ -38,6 +38,8 @@ typedef int (*virSecurityDomainSetImageL virDomainDiskDefPtr disk); typedef int (*virSecurityDomainGenLabel) (virConnectPtr conn, virDomainObjPtr sec); +typedef int (*virSecurityDomainReserveLabel) (virConnectPtr conn, + virDomainObjPtr sec); typedef int (*virSecurityDomainGetLabel) (virConnectPtr conn, virDomainObjPtr vm, virSecurityLabelPtr sec); @@ -57,6 +59,7 @@ struct _virSecurityDriver { virSecurityDomainRestoreImageLabel domainRestoreSecurityImageLabel; virSecurityDomainSetImageLabel domainSetSecurityImageLabel; virSecurityDomainGenLabel domainGenSecurityLabel; + virSecurityDomainReserveLabel domainReserveSecurityLabel; virSecurityDomainGetLabel domainGetSecurityLabel; virSecurityDomainSetLabel domainSetSecurityLabel; virSecurityDomainRestoreLabel domainRestoreSecurityLabel; diff --git a/src/security_selinux.c b/src/security_selinux.c --- a/src/security_selinux.c +++ b/src/security_selinux.c @@ -216,6 +216,44 @@ done: } static int +SELinuxReserveSecurityLabel(virConnectPtr conn, + virDomainObjPtr vm) +{ + security_context_t pctx; + context_t ctx = NULL; + const char *mcs; + + if (getpidcon(vm->pid, &pctx) == -1) { + char ebuf[1024]; + virSecurityReportError(conn, VIR_ERR_ERROR, _("%s: error calling " + "getpidcon(): %s"), __func__, + virStrerror(errno, ebuf, sizeof ebuf)); + return -1; + } + + ctx = context_new(pctx); + VIR_FREE(pctx); + if (!ctx) + goto err; + + mcs = context_range_get(ctx); + if (!mcs) + goto err; + + mcsAdd(mcs); + + context_free(ctx); + + return 0; + +err: + context_free(ctx); + return -1; +} + + + +static int SELinuxSecurityDriverProbe(void) { return is_selinux_enabled() ? SECURITY_DRIVER_ENABLE : SECURITY_DRIVER_DISABLE; @@ -422,6 +460,7 @@ virSecurityDriver virSELinuxSecurityDriv .domainSetSecurityImageLabel = SELinuxSetSecurityImageLabel, .domainRestoreSecurityImageLabel = SELinuxRestoreSecurityImageLabel, .domainGenSecurityLabel = SELinuxGenSecurityLabel, + .domainReserveSecurityLabel = SELinuxReserveSecurityLabel, .domainGetSecurityLabel = SELinuxGetSecurityLabel, .domainRestoreSecurityLabel = SELinuxRestoreSecurityLabel, .domainSetSecurityLabel = SELinuxSetSecurityLabel, diff --git a/src/uml_driver.c b/src/uml_driver.c --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -399,7 +399,7 @@ umlStartup(void) { &uml_driver->domains, uml_driver->configDir, uml_driver->autostartDir, - NULL, NULL) < 0) + 0, NULL, NULL) < 0) goto error; umlAutostartConfigs(uml_driver); @@ -438,7 +438,7 @@ umlReload(void) { &uml_driver->domains, uml_driver->configDir, uml_driver->autostartDir, - NULL, NULL); + 0, NULL, NULL); umlAutostartConfigs(uml_driver); umlDriverUnlock(uml_driver); -- |: 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 3

[libvirt] libvirt one driver problem
by Thirupalu Annam 04 Jun '09

04 Jun '09

HI I have downloaded and tried with both libvirt-0-6-2 %libvirt-0-6-4 versions to build the One Driver from the source directory I executed the following commands to install libvirt >./autogen.sh -with-one=yes ------------>success >make -----------------------> also succeeded >make install -----------------------> also succeeded >virsh -c one:/// execution is giving me the following error hexagrid@hexagrid-desktop:~$ virsh -c one:/// error: failed to connect to the hypervisor hexagrid@hexagrid-desktop:~$ let me know whether I have performed the right steps to install or anything is missing. but I am able to connect to QEMU driver and the out of the execution is as follows hexagrid@hexagrid-desktop:~$ virsh -c qemu:///session Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit -- Thanks and Regards Thirupalu Annam ---------------------------------------- Hexagrid Networks Office :23350089, 40144654 Mob:9908377725

2 1

[libvirt] Libtool problem
by Eduardo Otubo 04 Jun '09

04 Jun '09

Hello all, I found this when compiling the last git commit (0a29f59e3b8e2c1fb797d2fa93831f21a3e1711e). This is the first compilation from my new Ubuntu instalation (9.04) so I cannot figure out if it is a libvirt problem or if it is any configuration problem. I configured the compilation with './configure --with-phyp=yes --with-xen=no' and the make exit is the following: otubo@lisa ~/develop/libvirt/src $ make make all-recursive make[1]: Entering directory `/home/otubo/develop/libvirt/src' Making all in gnulib/lib make[2]: Entering directory `/home/otubo/develop/libvirt/src/gnulib/lib' make all-recursive make[3]: Entering directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[4]: Entering directory `/home/otubo/develop/libvirt/src/gnulib/lib' /bin/bash ../../mylibtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../intl -g -O2 -MT c-ctype.lo -MD -MP -MF .deps/c-ctype.Tpo -c -o c-ctype.lo c-ctype.c (CC) -o c-ctype.lo c-ctype.c /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 847: X--tag=CC: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 880: libtool: ignoring unknown tag : command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 847: X--mode=compile: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1014: *** Warning: inferring the mode of operation is deprecated.: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1015: *** Future versions of Libtool will require --mode=MODE be specified.: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: Xgcc: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-DHAVE_CONFIG_H: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-I.: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-I../..: No such file or directory /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-I../../intl: No such file or directory /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-g: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-O2: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MT: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: Xc-ctype.lo: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MD: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MP: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MF: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X.deps/c-ctype.Tpo: No such file or directory /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-c: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1211: Xc-ctype.lo: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1216: libtool: compile: cannot determine name of library object from `': command not found make[4]: *** [c-ctype.lo] Error 1 make[4]: Leaving directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/otubo/develop/libvirt/src' make: *** [all] Error 2 It seems there is a strange error form libtool, it's not recognizing some options, or some malformed options there is being passed to libtool. I am not acquainted to libtool so, if you guys could help me understanding this issue I would be very glad. Thanks, []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 otubo(a)linux.vnet.ibm.com

2 1

[libvirt] [PATCH] forbid autostart on transcient networks
by Daniel Veillard 03 Jun '09

03 Jun '09

As the operation doesn't make sense, really, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] Problem compiling libvirt-0.6.3
by Rohit Bhoj 03 Jun '09

03 Jun '09

Hello, I am facing problems getting the libvirt dependancies resolved. I am trying to compile libvirt-0.6.3 on a 64-bit SLES 11 machine. I have manually tried to resolve many dependancies, but am stuck at the GnuTLS library dependancy. The machine contains gnutls-2.4.1-24.15 installed, but still the configure script of libvirt gives an error saying : 'checking for gnutls_handshake in -lgnutls... no configure: error: You must install the GnuTLS library in order to compile and run libvirt' Can you please help me resolve this dependancy. Is there any place where I can get all the dependancy rpms needed for libvirt? Regards, Rohit Bhoj Bollywood news, movie reviews, film trailers and more! Go to http://in.movies.yahoo.com/

2 1

[libvirt] PATCH: Centralize some duplicated NUMA code
by Daniel P. Berrange 03 Jun '09

03 Jun '09

The QEMU and UML drivers currently duplicate a non-trivial chunk of NUMA code. This patch moves it all into src/nodeinfo.c which already has some other common NUMA code for capabilities initialization. In doing so it changes the functions to have a common 'nodeXXXX' naming scheme, to avoid clash with the public APIs using 'virXXXX'. Finally, these central functions can be directly used in the driver function tables, so we kill off some pointless wrappers and just add these funtions directly to drivers. libvirt_private.syms | 6 +- lxc_conf.c | 2 nodeinfo.c | 127 +++++++++++++++++++++++++++++++++++++++++++-------- nodeinfo.h | 11 +++- openvz_conf.c | 7 -- openvz_driver.c | 7 -- qemu_conf.c | 2 qemu_driver.c | 97 ++------------------------------------ uml_conf.c | 2 uml_driver.c | 84 +-------------------------------- vbox/vbox_tmpl.c | 7 -- 11 files changed, 138 insertions(+), 214 deletions(-) Daniel diff -r 91d1b6ebc112 src/libvirt_private.syms --- a/src/libvirt_private.syms Wed May 27 22:57:21 2009 +0100 +++ b/src/libvirt_private.syms Thu May 28 11:33:16 2009 +0100 @@ -220,8 +220,10 @@ virNetworkObjUnlock; # nodeinfo.h -virNodeInfoPopulate; -virCapsInitNUMA; +nodeGetInfo; +nodeCapsInitNUMA; +nodeGetCellsFreeMemory; +nodeGetFreeMemory; # node_device_conf.h diff -r 91d1b6ebc112 src/lxc_conf.c --- a/src/lxc_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/lxc_conf.c Thu May 28 11:33:16 2009 +0100 @@ -46,7 +46,7 @@ virCapsPtr lxcCapsInit(void) 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; /* XXX shouldn't 'borrow' KVM's prefix */ diff -r 91d1b6ebc112 src/nodeinfo.c --- a/src/nodeinfo.c Wed May 27 22:57:21 2009 +0100 +++ b/src/nodeinfo.c Thu May 28 11:33:16 2009 +0100 @@ -48,6 +48,10 @@ #define VIR_FROM_THIS VIR_FROM_NONE +#define nodeReportError(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ + __FUNCTION__, __LINE__, fmt) + #ifdef __linux__ #define CPUINFO_PATH "/proc/cpuinfo" @@ -73,9 +77,8 @@ int linuxNodeInfoCPUPopulate(virConnectP while (*buf && c_isspace(*buf)) buf++; if (*buf != ':') { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s", _("parsing cpuinfo processor")); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("parsing cpuinfo processor")); return -1; } nodeinfo->cpus++; @@ -86,9 +89,8 @@ int linuxNodeInfoCPUPopulate(virConnectP while (*buf && c_isspace(*buf)) buf++; if (*buf != ':' || !buf[1]) { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s", _("parsing cpuinfo cpu MHz")); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("parsing cpuinfo cpu MHz")); return -1; } if (virStrToLong_ui(buf+1, &p, 10, &ui) == 0 @@ -102,9 +104,8 @@ int linuxNodeInfoCPUPopulate(virConnectP while (*buf && c_isspace(*buf)) buf++; if (*buf != ':' || !buf[1]) { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "parsing cpuinfo cpu cores %c", *buf); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "parsing cpuinfo cpu cores %c", *buf); return -1; } if (virStrToLong_ui(buf+1, &p, 10, &id) == 0 @@ -115,9 +116,8 @@ int linuxNodeInfoCPUPopulate(virConnectP } if (!nodeinfo->cpus) { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s", _("no cpus found")); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no cpus found")); return -1; } @@ -133,8 +133,8 @@ int linuxNodeInfoCPUPopulate(virConnectP #endif -int virNodeInfoPopulate(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { +int nodeGetInfo(virConnectPtr conn, + virNodeInfoPtr nodeinfo) { #ifdef HAVE_UNAME struct utsname info; @@ -170,9 +170,8 @@ int virNodeInfoPopulate(virConnectPtr co } #else /* XXX Solaris will need an impl later if they port QEMU driver */ - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s:%s not implemented on this platform\n", __FILE__, __FUNCTION__); + nodeError(conn, VIR_ERR_NO_SUPPORT, "%s" + _("node info not implemented on this platform")); return -1; #endif } @@ -189,7 +188,7 @@ int virNodeInfoPopulate(virConnectPtr co (((mask)[((cpu) / n_bits(*(mask)))] >> ((cpu) % n_bits(*(mask)))) & 1) int -virCapsInitNUMA(virCapsPtr caps) +nodeCapsInitNUMA(virCapsPtr caps) { int n; unsigned long *mask = NULL; @@ -237,6 +236,96 @@ cleanup: VIR_FREE(mask); return ret; } + + +int +nodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems, + int startCell, + int maxCells) +{ + int n, lastCell, numCells; + int ret = -1; + int maxCell; + + if (numa_available() < 0) { + nodeReportError(conn, VIR_ERR_NO_SUPPORT, + "%s", _("NUMA not supported on this host")); + goto cleanup; + } + maxCell = numa_max_node(); + if (startCell > maxCell) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("start cell %d out of range (0-%d)"), + startCell, maxCell); + goto cleanup; + } + lastCell = startCell + maxCells - 1; + if (lastCell > maxCell) + lastCell = maxCell; + + for (numCells = 0, n = startCell ; n <= lastCell ; n++) { + long long mem; + if (numa_node_size64(n, &mem) < 0) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to query NUMA free memory")); + goto cleanup; + } + freeMems[numCells++] = mem; + } + ret = numCells; + +cleanup: + return ret; +} + +unsigned long long +nodeGetFreeMemory(virConnectPtr conn) +{ + unsigned long long freeMem = 0; + int n; + + if (numa_available() < 0) { + nodeReportError(conn, VIR_ERR_NO_SUPPORT, + "%s", _("NUMA not supported on this host")); + goto cleanup; + } + + for (n = 0 ; n <= numa_max_node() ; n++) { + long long mem; + if (numa_node_size64(n, &mem) < 0) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to query NUMA free memory")); + goto cleanup; + } + freeMem += mem; + } + +cleanup: + return freeMem; +} + #else -int virCapsInitNUMA(virCapsPtr caps ATTRIBUTE_UNUSED) { return 0; } +int nodeCapsInitNUMA(virCapsPtr caps ATTRIBUTE_UNUSED) { + return 0; +} + +int nodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems ATTRIBUTE_UNUSED, + int startCell ATTRIBUTE_UNUSED, + int maxCells ATTRIBUTE_UNUSED) +{ + nodeReportError(conn, VIR_ERR_NO_SUPPORT, "%s", + _("NUMA memory information not available on this platform")); + return -1; +} + +unsigned long long nodeGetFreeMemory(virConnectPtr conn) +{ + nodeReportError(conn, VIR_ERR_NO_SUPPORT, "%s", + _("NUMA memory information not available on this platform")); + return 0; +} #endif + + diff -r 91d1b6ebc112 src/nodeinfo.h --- a/src/nodeinfo.h Wed May 27 22:57:21 2009 +0100 +++ b/src/nodeinfo.h Thu May 28 11:33:16 2009 +0100 @@ -27,7 +27,14 @@ #include "libvirt/libvirt.h" #include "capabilities.h" -int virNodeInfoPopulate(virConnectPtr conn, virNodeInfoPtr nodeinfo); -int virCapsInitNUMA(virCapsPtr caps); +int nodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo); +int nodeCapsInitNUMA(virCapsPtr caps); + + +int nodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems, + int startCell, + int maxCells); +unsigned long long nodeGetFreeMemory(virConnectPtr conn); #endif /* __VIR_NODEINFO_H__*/ diff -r 91d1b6ebc112 src/openvz_conf.c --- a/src/openvz_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/openvz_conf.c Thu May 28 11:33:16 2009 +0100 @@ -148,7 +148,7 @@ virCapsPtr openvzCapsInit(void) 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 }); @@ -527,11 +527,8 @@ openvzGetNodeCPUs(void) { virNodeInfo nodeinfo; - if (virNodeInfoPopulate(NULL, &nodeinfo) < 0) { - openvzError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Cound not read nodeinfo")); + if (nodeGetInfo(NULL, &nodeinfo) < 0) return 0; - } return nodeinfo.cpus; } diff -r 91d1b6ebc112 src/openvz_driver.c --- a/src/openvz_driver.c Wed May 27 22:57:21 2009 +0100 +++ b/src/openvz_driver.c Thu May 28 11:33:16 2009 +0100 @@ -1136,11 +1136,6 @@ static const char *openvzGetType(virConn return strdup("OpenVZ"); } -static int openvzGetNodeInfo(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} - static char *openvzGetCapabilities(virConnectPtr conn) { struct openvz_driver *driver = conn->privateData; char *ret; @@ -1316,7 +1311,7 @@ static virDriver openvzDriver = { openvzGetVersion, /* version */ NULL, /* getHostname */ openvzGetMaxVCPUs, /* getMaxVcpus */ - openvzGetNodeInfo, /* nodeGetInfo */ + nodeGetInfo, /* nodeGetInfo */ openvzGetCapabilities, /* getCapabilities */ openvzListDomains, /* listDomains */ openvzNumDomains, /* numOfDomains */ diff -r 91d1b6ebc112 src/qemu_conf.c --- a/src/qemu_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/qemu_conf.c Thu May 28 11:33:16 2009 +0100 @@ -377,7 +377,7 @@ virCapsPtr qemudCapsInit(void) { /* Using KVM's mac prefix for QEMU too */ virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 }); - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; virCapabilitiesAddHostMigrateTransport(caps, diff -r 91d1b6ebc112 src/qemu_driver.c --- a/src/qemu_driver.c Wed May 27 22:57:21 2009 +0100 +++ b/src/qemu_driver.c Thu May 28 11:33:16 2009 +0100 @@ -44,11 +44,6 @@ #include <sys/wait.h> #include <sys/ioctl.h> -#if HAVE_NUMACTL -#define NUMA_VERSION1_COMPATIBILITY 1 -#include <numa.h> -#endif - #if HAVE_SCHED_H #include <sched.h> #endif @@ -1099,7 +1094,7 @@ qemudInitCpus(virConnectPtr conn, int i, maxcpu = QEMUD_CPUMASK_LEN; virNodeInfo nodeinfo; - if (virNodeInfoPopulate(conn, &nodeinfo) < 0) + if (nodeGetInfo(conn, &nodeinfo) < 0) return -1; /* setaffinity fails if you set bits for CPUs which @@ -1869,11 +1864,6 @@ static int qemudGetMaxVCPUs(virConnectPt return -1; } -static int qemudGetNodeInfo(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} - static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; @@ -1890,76 +1880,6 @@ static char *qemudGetCapabilities(virCon } -#if HAVE_NUMACTL -static int -qemudNodeGetCellsFreeMemory(virConnectPtr conn, - unsigned long long *freeMems, - int startCell, - int maxCells) -{ - int n, lastCell, numCells; - int ret = -1; - int maxCell; - - if (numa_available() < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - maxCell = numa_max_node(); - if (startCell > maxCell) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("start cell %d out of range (0-%d)"), - startCell, maxCell); - goto cleanup; - } - lastCell = startCell + maxCells - 1; - if (lastCell > maxCell) - lastCell = maxCell; - - for (numCells = 0, n = startCell ; n <= lastCell ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMems[numCells++] = mem; - } - ret = numCells; - -cleanup: - return ret; -} - -static unsigned long long -qemudNodeGetFreeMemory (virConnectPtr conn) -{ - unsigned long long freeMem = 0; - int n; - - if (numa_available() < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - - for (n = 0 ; n <= numa_max_node() ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMem += mem; - } - -cleanup: - return freeMem; -} - -#endif - static int qemudGetProcessInfo(unsigned long long *cpuTime, int pid) { char proc[PATH_MAX]; FILE *pidinfo; @@ -2984,7 +2904,7 @@ qemudDomainPinVcpu(virDomainPtr dom, goto cleanup; } - if (virNodeInfoPopulate(dom->conn, &nodeinfo) < 0) + if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; maxcpu = maplen * 8; @@ -3046,7 +2966,7 @@ qemudDomainGetVcpus(virDomainPtr dom, goto cleanup; } - if (virNodeInfoPopulate(dom->conn, &nodeinfo) < 0) + if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; maxcpu = maplen * 8; @@ -5338,7 +5258,7 @@ static virDriver qemuDriver = { qemudGetVersion, /* version */ qemudGetHostname, /* getHostname */ qemudGetMaxVCPUs, /* getMaxVcpus */ - qemudGetNodeInfo, /* nodeGetInfo */ + nodeGetInfo, /* nodeGetInfo */ qemudGetCapabilities, /* getCapabilities */ qemudListDomains, /* listDomains */ qemudNumDomains, /* numOfDomains */ @@ -5392,13 +5312,8 @@ static virDriver qemuDriver = { qemudDomainInterfaceStats, /* domainInterfaceStats */ qemudDomainBlockPeek, /* domainBlockPeek */ qemudDomainMemoryPeek, /* domainMemoryPeek */ -#if HAVE_NUMACTL - qemudNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - qemudNodeGetFreeMemory, /* getFreeMemory */ -#else - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ -#endif + nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ + nodeGetFreeMemory, /* getFreeMemory */ qemudDomainEventRegister, /* domainEventRegister */ qemudDomainEventDeregister, /* domainEventDeregister */ qemudDomainMigratePrepare2, /* domainMigratePrepare2 */ diff -r 91d1b6ebc112 src/uml_conf.c --- a/src/uml_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/uml_conf.c Thu May 28 11:33:16 2009 +0100 @@ -62,7 +62,7 @@ virCapsPtr umlCapsInit(void) { 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; if ((guest = virCapabilitiesAddGuest(caps, diff -r 91d1b6ebc112 src/uml_driver.c --- a/src/uml_driver.c Wed May 27 22:57:21 2009 +0100 +++ b/src/uml_driver.c Thu May 28 11:33:16 2009 +0100 @@ -45,11 +45,6 @@ #include <sys/ioctl.h> #include <sys/inotify.h> -#if HAVE_NUMACTL -#define NUMA_VERSION1_COMPATIBILITY 1 -#include <numa.h> -#endif - #include "uml_driver.h" #include "uml_conf.h" #include "event.h" @@ -935,11 +930,6 @@ static const char *umlGetType(virConnect return "UML"; } -static int umlGetNodeInfo(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} - static char *umlGetCapabilities(virConnectPtr conn) { struct uml_driver *driver = (struct uml_driver *)conn->privateData; @@ -954,69 +944,6 @@ static char *umlGetCapabilities(virConne } -#if HAVE_NUMACTL -static int -umlNodeGetCellsFreeMemory(virConnectPtr conn, - unsigned long long *freeMems, - int startCell, - int maxCells) -{ - int n, lastCell, numCells; - int ret = -1; - - if (numa_available() < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - lastCell = startCell + maxCells - 1; - if (lastCell > numa_max_node()) - lastCell = numa_max_node(); - - for (numCells = 0, n = startCell ; n <= lastCell ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMems[numCells++] = mem; - } - ret = numCells; - -cleanup: - return ret; -} - -static unsigned long long -umlNodeGetFreeMemory (virConnectPtr conn) -{ - unsigned long long freeMem = 0; - unsigned long long ret = -1; - int n; - - if (numa_available() < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - - for (n = 0 ; n <= numa_max_node() ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMem += mem; - } - ret = freeMem; - -cleanup: - return ret; -} - -#endif static int umlGetProcessInfo(unsigned long long *cpuTime, int pid) { char proc[PATH_MAX]; @@ -1826,7 +1753,7 @@ static virDriver umlDriver = { umlGetVersion, /* version */ umlGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ - umlGetNodeInfo, /* nodeGetInfo */ + nodeGetInfo, /* nodeGetInfo */ umlGetCapabilities, /* getCapabilities */ umlListDomains, /* listDomains */ umlNumDomains, /* numOfDomains */ @@ -1875,13 +1802,8 @@ static virDriver umlDriver = { NULL, /* domainInterfaceStats */ umlDomainBlockPeek, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ -#if HAVE_NUMACTL - umlNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - umlNodeGetFreeMemory, /* getFreeMemory */ -#else - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ -#endif + virNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ + virNodeGetFreeMemory, /* getFreeMemory */ NULL, /* domainEventRegister */ NULL, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ diff -r 91d1b6ebc112 src/vbox/vbox_tmpl.c --- a/src/vbox/vbox_tmpl.c Wed May 27 22:57:21 2009 +0100 +++ b/src/vbox/vbox_tmpl.c Thu May 28 11:33:16 2009 +0100 @@ -186,7 +186,7 @@ static virCapsPtr vboxCapsInit(void) { 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x08, 0x00, 0x27 }); @@ -413,9 +413,6 @@ static int vboxGetMaxVcpus(virConnectPtr return ret; } -static int vboxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} static char *vboxGetCapabilities(virConnectPtr conn) { vboxGlobalData *data = conn->privateData; @@ -4909,7 +4906,7 @@ virDriver NAME(Driver) = { .version = vboxGetVersion, .getHostname = vboxGetHostname, .getMaxVcpus = vboxGetMaxVcpus, - .nodeGetInfo = vboxNodeGetInfo, + .nodeGetInfo = nodeGetInfo, .getCapabilities = vboxGetCapabilities, .listDomains = vboxListDomains, .numOfDomains = vboxNumOfDomains, -- |: 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: Include OS driver name in device information
by Daniel P. Berrange 03 Jun '09

03 Jun '09

This patch extends the node device XML from $ virsh nodedev-dumpxml pci_8086_27d6 <device> <name>pci_8086_27d6</name> <parent>computer</parent> <capability type='pci'> <domain>0</domain> <bus>0</bus> <slot>28</slot> <function>3</function> <product id='0x27d6'>82801G (ICH7 Family) PCI Express Port 4</product> <vendor id='0x8086'>Intel Corporation</vendor> </capability> </device> To, also include the operating system driver name. $ virsh nodedev-dumpxml pci_8086_27d6 <device> <name>pci_8086_27d6</name> <parent>computer</parent> <driver> <name>pcieport-driver</name> </driver> <capability type='pci'> <domain>0</domain> <bus>0</bus> <slot>28</slot> <function>3</function> <product id='0x27d6'>82801G (ICH7 Family) PCI Express Port 4</product> <vendor id='0x8086'>Intel Corporation</vendor> </capability> </device> We're not defining any particular semantics for the driver name, it is just a opaque string following rules of the OS in question. Daniel diff -r ec78a5d6c00c src/node_device.c --- a/src/node_device.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device.c Thu May 28 16:00:12 2009 +0100 @@ -46,6 +46,60 @@ static int dev_has_cap(const virNodeDevi return 0; } +#ifdef __linux__ +static int update_driver_name(virConnectPtr conn, + virNodeDeviceObjPtr dev) +{ + char *driver_link = NULL; + char devpath[PATH_MAX]; + char *p; + int ret = -1; + int n; + + VIR_FREE(dev->def->driver); + + if (virAsprintf(&driver_link, "%s/driver", dev->devicePath) < 0) { + virReportOOMError(conn); + goto cleanup; + } + + /* Some devices don't have an explicit driver, so just return + without a name */ + if (access(driver_link, R_OK) < 0) { + ret = 0; + goto cleanup; + } + + if ((n = readlink(driver_link, devpath, sizeof devpath)) < 0) { + virReportSystemError(conn, errno, + _("cannot resolve driver link %s"), driver_link); + goto cleanup; + } + devpath[n] = '\0'; + + p = strrchr(devpath, '/'); + if (p) { + dev->def->driver = strdup(p+1); + if (!dev->def->driver) { + virReportOOMError(conn); + goto cleanup; + } + } + ret = 0; + +cleanup: + VIR_FREE(driver_link); + return ret; +} +#else +/* XXX: Implement me for non-linux */ +static int update_driver_name(virConnectPtr conn ATTRIBUTE_UNUSED, + virNodeDeviceObjPtr dev ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif + void nodeDeviceLock(virDeviceMonitorStatePtr driver) { @@ -150,6 +204,7 @@ static char *nodeDeviceDumpXML(virNodeDe goto cleanup; } + update_driver_name(dev->conn, obj); ret = virNodeDeviceDefFormat(dev->conn, obj->def); cleanup: diff -r ec78a5d6c00c src/node_device_conf.c --- a/src/node_device_conf.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_conf.c Thu May 28 16:00:12 2009 +0100 @@ -78,6 +78,7 @@ void virNodeDeviceDefFree(virNodeDeviceD VIR_FREE(def->name); VIR_FREE(def->parent); + VIR_FREE(def->driver); caps = def->caps; while (caps) { @@ -94,6 +95,7 @@ void virNodeDeviceObjFree(virNodeDeviceO if (!dev) return; + VIR_FREE(dev->devicePath); virNodeDeviceDefFree(dev->def); if (dev->privateFree) (*dev->privateFree)(dev->privateData); @@ -191,6 +193,11 @@ char *virNodeDeviceDefFormat(virConnectP if (def->parent) virBufferEscapeString(&buf, " <parent>%s</parent>\n", def->parent); + if (def->driver) { + virBufferAddLit(&buf, " <driver>\n"); + virBufferEscapeString(&buf, " <name>%s</name>\n", def->driver); + virBufferAddLit(&buf, " </driver>\n"); + } for (caps = def->caps; caps; caps = caps->next) { char uuidstr[VIR_UUID_STRING_BUFLEN]; diff -r ec78a5d6c00c src/node_device_conf.h --- a/src/node_device_conf.h Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_conf.h Thu May 28 16:00:12 2009 +0100 @@ -136,6 +136,7 @@ typedef virNodeDeviceDef *virNodeDeviceD struct _virNodeDeviceDef { char *name; /* device name (unique on node) */ char *parent; /* optional parent device name */ + char *driver; /* optional driver name */ virNodeDevCapsDefPtr caps; /* optional device capabilities */ }; @@ -145,6 +146,7 @@ typedef virNodeDeviceObj *virNodeDeviceO struct _virNodeDeviceObj { virMutex lock; + char *devicePath; /* OS specific path to device metadat, eg sysfs */ virNodeDeviceDefPtr def; /* device definition */ void *privateData; /* driver-specific private data */ void (*privateFree)(void *data); /* destructor for private data */ diff -r ec78a5d6c00c src/node_device_hal.c --- a/src/node_device_hal.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_hal.c Thu May 28 16:00:12 2009 +0100 @@ -413,6 +413,7 @@ static void dev_create(const char *udi) const char *name = hal_name(udi); int rv; char *privData = strdup(udi); + char *devicePath = NULL; if (!privData) return; @@ -439,15 +440,22 @@ static void dev_create(const char *udi) if (def->caps == NULL) goto cleanup; + /* Some devices don't have a path in sysfs, so ignore failure */ + get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath); + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); - if (!dev) + if (!dev) { + VIR_FREE(devicePath); goto failure; + } dev->privateData = privData; dev->privateFree = free_udi; + dev->devicePath = devicePath; + virNodeDeviceObjUnlock(dev); nodeDeviceUnlock(driverState); -- |: 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] Anyway to configure multiple boot devices?
by Matty 03 Jun '09

03 Jun '09

I am running a number of KVM guests on a physical machine, and want to configure the hosts to boot from the network if the internal disk isn't bootable. After reading through a number of documents, I came across the following bug report: https://bugzilla.redhat.com/show_bug.cgi?id=472236 According to that document (and the libvirt Domain XML format document), I should be able to configure two boot device statements by adding two boot tags to the domain configuration: <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <boot dev='network'/> </os> When I attempt to start a guest with this configuration (I added the new line using virsh's edit command), I receive the following error: virsh # start kvmnode2 libvir: QEMU error : internal error Failure while reading monitor startup output: Input/output error error: Failed to start domain kvmnode2 Has anyone bumped into this? I checked the KVM, libvirt and fedora ML archives, but wasn't able to locate a solution to this. I am using Fedora 10 with the latest updates. Thanks for any insight, - Ryan

2 1

[libvirt] Upgrade and PCI Passthrough
by Aaron Clausen 03 Jun '09

03 Jun '09

I upgraded my Debian host to KVM 72 and libvirt 0.6.3-4 in the hopes of gaining use of PCI passthrough. I suspect that the upgrade may have gone a bit awry, because when I attempt to enable passthrough, I get the following error: /usr/bin/kvm: invalid option -- '-pcidevice' Is the version of KVM that I installed too old or is something else going on? -- Aaron Clausen mightymartianca(a)gmail.com

2 1

[libvirt] PATCH: Wire up NUMA APIs in VirtualBox driver
by Daniel P. Berrange 02 Jun '09

02 Jun '09

This patch simply wires up the shared NUMA API implementations in the virtualbox driver Daniel diff -r 8b34df5f9ddf src/vbox/vbox_tmpl.c --- a/src/vbox/vbox_tmpl.c Thu May 28 11:55:49 2009 +0100 +++ b/src/vbox/vbox_tmpl.c Thu May 28 11:56:10 2009 +0100 @@ -4955,8 +4955,8 @@ virDriver NAME(Driver) = { 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 :|

3 2

[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