- Devel - libvirt List Archives

[libvirt] [PATCH] fix numa-related (and kernel-dependent) test failures
by Jim Meyering 21 Dec '08

21 Dec '08

Following up on this thread, http://thread.gmane.org/gmane.comp.emulators.libvirt/10402 Here's a patch that appears to work for kernels before and after the CONFIG_NR_CPUS change. I've tested it via a small stand-alone program on both kernels, but via libvirt only on rawhide. Dave, can you confirm the tests pass for you on the 2.6.27.x-based kernel? >From b78a48c7a401ecdf37de95b0b01435578ad30e12 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 12 Dec 2008 16:22:34 +0100 Subject: [PATCH] fix numa-related (and kernel-dependent) test failures This change is required on some kernels due to the way a change in the kernel's CONFIG_NR_CPUS propagates through the numa library. * src/qemu_conf.c (qemudCapsInitNUMA): Pass numa_all_cpus_ptr->size/8 as the buffer-length-in-bytes in the call to numa_node_to_cpus, since that's what is required on second and subseqent calls. * src/uml_conf.c (umlCapsInitNUMA): Likewise. --- src/qemu_conf.c | 2 +- src/uml_conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 59171e7..206fb0b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -324,7 +324,7 @@ qemudCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) diff --git a/src/uml_conf.c b/src/uml_conf.c index 3659c6b..7eb630d 100644 --- a/src/uml_conf.c +++ b/src/uml_conf.c @@ -80,7 +80,7 @@ umlCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) -- 1.6.1.rc2.316.geb2f0

4 9

[libvirt] [PATCH] avoid testcase failures due to LANG!=C
by Guido Günther 20 Dec '08

20 Dec '08

Hi, some checks compare to the english error messages: --- out 2008-12-18 15:36:44.000000000 +0100 +++ exp 2008-12-18 15:36:44.000000000 +0100 @@ -1,3 +1,3 @@ -libvir: Domain Config Fehler : failed Xen syscall Topologie-Syntaxfehler beim Cpuset -Fehler: Fehler beim Definieren einer Domain von xml-invalid +libvir: Domain Config error : failed Xen syscall topology cpuset syntax error +error: Failed to define domain from xml-invalid FAIL: cpuset so we should set LC_ALL=C in the checks. Possible patch attached. -- Guido

2 2

[libvirt] virDomainInterfaceStats why is there a size?
by Stefan de Konink 20 Dec '08

20 Dec '08

Another simple question, what is the reasoning about the size field in this call. I would really be a happy boy if anyone said: if you put in path == NULL, it will fill your stats structure up to size interfaces. ...but since this is not the case (yet) what is the reason behind it? Stefan

3 2

[libvirt] [PATCH 4/5] save domain status during vm creation and remove it on shutdown.
by Guido Günther 20 Dec '08

20 Dec '08

This patch does the actual saving and removal of the vm status. It does so only at vm creation time at the moment. We need to update the config every time the life config changes later. --- src/qemu_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 7804094..d8b87e4 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -182,6 +182,44 @@ qemudAutostartConfigs(struct qemud_driver *driver) { virConnectClose(conn); } + +/** + * qemudRemoveDomainStatus + * + * remove all state files of a domain from statedir + * + * Returns 0 on success + */ +static int +qemudRemoveDomainStatus(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm) +{ + int rc = -1; + char *file = NULL; + + if (asprintf(&file, "%s/%s.xml", driver->stateDir, vm->def->name) < 0) { + qemudReportError(conn, vm, NULL, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for status file")); + goto cleanup; + } + + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) { + qemudReportError(conn, vm, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to unlink status file %s"), file); + goto cleanup; + } + + if(virFileDeletePid(driver->stateDir, vm->def->name)) + goto cleanup; + + rc = 0; +cleanup: + VIR_FREE(file); + return rc; +} + + /** * qemudStartup: * @@ -532,6 +570,12 @@ static int qemudOpenMonitor(virConnectPtr conn, qemudCheckMonitorPrompt, "monitor", 10000); + if (!(vm->monitorpath = strdup(monitor))) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for monitor path")); + goto error; + } + /* Keep monitor open upon success */ if (ret == 0) return ret; @@ -1046,6 +1090,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, return -1; } } + qemudSaveDomainStatus(conn, qemu_driver, vm); return ret; } @@ -1108,6 +1153,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, /* shut it off for sure */ kill(vm->pid, SIGKILL); + qemudRemoveDomainStatus(conn, driver, vm); vm->pid = -1; vm->def->id = -1; -- 1.6.0.2

4 7

[libvirt] [PATCH 3/5] add XML parsing for vm status file
by Guido Günther 20 Dec '08

20 Dec '08

Functions to read and write vm status in $(statedir)/qemu/<domain>.xml. Keeps the necessary to reconnect to a running domain state within <domstate>...</domstate>. I kept most of the code in qemu_config.c for now. We can easily move it should another hypervisor need to do something similar. --- src/domain_conf.c | 36 ++++++--- src/domain_conf.h | 6 ++ src/libvirt_sym.version.in | 2 + src/qemu_conf.c | 191 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu_conf.h | 17 ++++ 5 files changed, 241 insertions(+), 11 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 32ed59f..1b53c09 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -430,6 +430,7 @@ void virDomainObjFree(virDomainObjPtr dom) virDomainDefFree(dom->def); virDomainDefFree(dom->newDef); + VIR_FREE(dom->monitorpath); VIR_FREE(dom->vcpupids); VIR_FREE(dom); @@ -3224,11 +3225,11 @@ char *virDomainDefFormat(virConnectPtr conn, #ifndef PROXY -int virDomainSaveConfig(virConnectPtr conn, - const char *configDir, - virDomainDefPtr def) +int virDomainSaveXML(virConnectPtr conn, + const char *configDir, + virDomainDefPtr def, + const char *xml) { - char *xml; char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; @@ -3237,11 +3238,6 @@ int virDomainSaveConfig(virConnectPtr conn, if ((configFile = virDomainConfigFile(conn, configDir, def->name)) == NULL) goto cleanup; - if (!(xml = virDomainDefFormat(conn, - def, - VIR_DOMAIN_XML_SECURE))) - goto cleanup; - if ((err = virFileMakePath(configDir))) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot create config directory %s: %s"), @@ -3274,12 +3270,30 @@ int virDomainSaveConfig(virConnectPtr conn, } ret = 0; - cleanup: - VIR_FREE(xml); if (fd != -1) close(fd); + return ret; +} + +int virDomainSaveConfig(virConnectPtr conn, + const char *configDir, + virDomainDefPtr def) +{ + int ret = -1; + char *xml; + if (!(xml = virDomainDefFormat(conn, + def, + VIR_DOMAIN_XML_SECURE))) + goto cleanup; + + if (virDomainSaveXML(conn, configDir, def, xml)) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(xml); return ret; } diff --git a/src/domain_conf.h b/src/domain_conf.h index 51cf6d5..d44e2ad 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -462,6 +462,7 @@ struct _virDomainObj { int stderr_fd; int stderr_watch; int monitor; + char *monitorpath; int monitorWatch; int logfile; int pid; @@ -553,6 +554,11 @@ int virDomainDiskQSort(const void *a, const void *b); int virDomainDiskCompare(virDomainDiskDefPtr a, virDomainDiskDefPtr b); +int virDomainSaveXML(virConnectPtr conn, + const char *configDir, + virDomainDefPtr def, + const char *xml); + int virDomainSaveConfig(virConnectPtr conn, const char *configDir, virDomainDefPtr def); diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index 1eff790..e7b352d 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -368,6 +368,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virDomainObjFree; virDomainObjListFree; virDomainRemoveInactive; + virDomainSaveXML; virDomainSaveConfig; virDomainSoundDefFree; virDomainSoundModelTypeFromString; @@ -614,6 +615,7 @@ LIBVIRT_PRIVATE_@VERSION@ { /* xml.h */ virXPathLong; + virXPathNode; virXPathNodeSet; virXPathString; virXMLPropString; diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 218aefa..4cede63 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -49,6 +49,8 @@ #include "util.h" #include "memory.h" #include "verify.h" +#include "datatypes.h" +#include "xml.h" VIR_ENUM_DECL(virDomainDiskQEMUBus) VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, @@ -1335,3 +1337,192 @@ int qemudBuildCommandLine(virConnectPtr conn, #undef ADD_ENV_LIT #undef ADD_ENV_SPACE } + + +/* 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) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for vm status")); + 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) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); + 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((virXPathLong(conn, "string(./@state)", ctxt, &val)) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("invalid domain state")); + goto error; + } else + status->state = (int)val; + + 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='%d' pid='%d'>\n", vm->state, vm->pid); + virBufferVSprintf(&buf, " <monitor path='%s'/>\n", vm->monitorpath); + + if (!(config_xml = virDomainDefFormat(conn, + vm->def, + VIR_DOMAIN_XML_SECURE))) + goto cleanup; + + virBufferVSprintf(&buf, "%s", config_xml); + virBufferVSprintf(&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 index ffbd0e7..70d9394 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -77,6 +77,16 @@ struct qemud_driver { int domainEventDispatching; }; +/* 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 #define QEMUD_MIGRATION_NUM_PORTS 64 @@ -108,5 +118,12 @@ int qemudBuildCommandLine (virConnectPtr conn, const char *migrateFrom); 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 */ -- 1.6.0.2

3 6

[libvirt] libvirt autostart VM is broken
by Dr. Michael J. Chudobiak 19 Dec '08

19 Dec '08

Hi all, The libvirtd autostart VM option seems to be broken [1,2], so I need a work-around. How can I start the libvirtd service, and then (after the service has fully started) start a particular VM from the command line? (I can do this from the gui of course, but I want to stick it in a script). - Mike [1] https://bugzilla.redhat.com/show_bug.cgi?id=477025 [2] http://www.mail-archive.com/libvir-list@redhat.com/msg09937.html

1 0

Re: [libvirt] libvirt remote connection failing
by Richard W.M. Jones 19 Dec '08

19 Dec '08

On Fri, Dec 19, 2008 at 11:44:47AM +0530, Shanmuga Rajan wrote: > i am getting the following error > > >>> dcconn = libvirt.open('qemu://192.168.1.82/system') Try: LIBVIRT_DEBUG=1 virsh -c qemu://192.168.1.82/system nodeinfo Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

1 0

[libvirt] [PATCH] fix device hotplug
by Guido Günther 18 Dec '08

18 Dec '08

Hi, due to some restructuring we free the device structure so devices are plugged correctly but "dumpxml" fails since the dev structure is already freed. Cheers, -- Guido

3 4

[libvirt] Website typo
by Richard W.M. Jones 18 Dec '08

18 Dec '08

Spotted by 'aozturk' on #virt ... Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

2 1

[libvirt] libvirt remote connection failing
by Shanmuga Rajan 18 Dec '08

18 Dec '08

hi I was trying to migrate KVM based vM between two machine. when i tried to make connection with destination machine but it is not working for me. i got some error. i tried the following uri qemu://192.168.1.22/ qemu://hostname/ everything is failed. Can any one help me with correct uri to connect with remote machine. i am using python binding of libvirt. KVM-79 libvirt 5.0 Thanks and Regards, - Shan

3 2