- Devel - libvirt List Archives

[libvirt] [PATCH] storage: conf: Fix memory leak in encryption parsing
by Cole Robinson 03 Nov '09

03 Nov '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/storage_encryption_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index b97b989..a329622 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -112,6 +112,7 @@ virStorageEncryptionSecretParse(virConnectPtr conn, xmlXPathContextPtr ctxt, uuidstr); goto cleanup; } + VIR_FREE(uuidstr); } else { virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s", _("missing volume encryption uuid")); -- 1.6.5.1

2 2

[libvirt] [PATCH] Various error reporting fixes
by Cole Robinson 03 Nov '09

03 Nov '09

- Don't duplicate SystemError - Use proper error code in domain_conf - Fix a broken error call in qemu_conf - Don't use VIR_ERR_ERROR in security driver (isn't a valid code in this case) Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/conf/storage_conf.c | 6 +++--- src/qemu/qemu_conf.c | 6 ++---- src/qemu/qemu_driver.c | 2 +- src/security/security_apparmor.c | 30 +++++++++++++++--------------- src/security/security_driver.c | 2 +- src/security/security_selinux.c | 10 +++++----- src/xen/xen_hypervisor.c | 4 +--- tests/cpuset | 2 +- 9 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ba6b28d..ca141e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3705,7 +3705,7 @@ virDomainCpuSetParse(virConnectPtr conn, const char **str, char sep, return (ret); parse_error: - virDomainReportError(conn, VIR_ERR_XEN_CALL, + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("topology cpuset syntax error")); return (-1); } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2924a0d..065cd04 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1593,9 +1593,9 @@ virStoragePoolObjSaveDef(virConnectPtr conn, char path[PATH_MAX]; if ((err = virFileMakePath(driver->configDir))) { - virStorageReportError(conn, err, - _("cannot create config directory %s"), - driver->configDir); + virReportSystemError(conn, err, + _("cannot create config directory %s"), + driver->configDir); return -1; } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 59873d7..71b3550 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1106,10 +1106,8 @@ int qemudExtractVersion(virConnectPtr conn, return -1; if (stat(binary, &sb) < 0) { - char ebuf[1024]; - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Cannot find QEMU binary %s: %s"), binary, - virStrerror(errno, ebuf, sizeof ebuf)); + virReportSystemError(conn, errno, + _("Cannot find QEMU binary %s"), binary); return -1; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0470315..e8606c8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1773,7 +1773,7 @@ static int qemuDomainSetHostdevOwnership(virConnectPtr conn, } return 0; #else - qemudReportError(conn, NULL, NULL, "%s", + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, "%s", _("unable to set host device ownership on this platform")); return -1; #endif diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 16de0f2..6db51cd 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -112,7 +112,7 @@ profile_status_file(const char *str) if (snprintf(profile, PATH_MAX, "%s/%s", APPARMOR_DIR "/libvirt", str) > PATH_MAX - 1) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("profile name exceeds maximum length")); } @@ -204,7 +204,7 @@ load_profile(virConnectPtr conn, const char *profile, virDomainObjPtr vm, if (errno == EINTR) goto rewait; - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("Unexpected exit status from virt-aa-helper " "%d pid %lu"), WEXITSTATUS(status), (unsigned long)child); @@ -265,7 +265,7 @@ use_apparmor(void) if ((len = readlink("/proc/self/exe", libvirt_daemon, PATH_MAX - 1)) < 0) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("could not find libvirtd")); return rc; } @@ -289,13 +289,13 @@ AppArmorSecurityDriverProbe(void) /* see if template file exists */ if (snprintf(template, PATH_MAX, "%s/TEMPLATE", APPARMOR_DIR "/libvirt") > PATH_MAX - 1) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("template too large")); return SECURITY_DRIVER_DISABLE; } if (!virFileExists(template)) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, _("template \'%s\' does not exist"), template); return SECURITY_DRIVER_DISABLE; } @@ -326,7 +326,7 @@ AppArmorGenSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) if ((vm->def->seclabel.label) || (vm->def->seclabel.model) || (vm->def->seclabel.imagelabel)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("security label already defined for VM")); return rc; @@ -338,7 +338,7 @@ AppArmorGenSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) /* if the profile is not already loaded, then load one */ if (profile_loaded(profile_name) < 0) { if (load_profile(conn, profile_name, vm, NULL) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate AppArmor profile " "\'%s\'"), profile_name); goto clean; @@ -395,13 +395,13 @@ AppArmorGetSecurityLabel(virConnectPtr conn, if (virStrcpy(sec->label, profile_name, VIR_SECURITY_LABEL_BUFLEN) == NULL) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("error copying profile name")); goto clean; } if ((sec->enforcing = profile_status(profile_name, 1)) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("error calling profile_status()")); goto clean; } @@ -424,7 +424,7 @@ AppArmorRestoreSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) if (secdef->imagelabel) { if ((rc = remove_profile(secdef->label)) != 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("could not remove profile for \'%s\'"), secdef->label); } @@ -450,7 +450,7 @@ AppArmorSetSecurityLabel(virConnectPtr conn, return rc; if (STRNEQ(drv->name, secdef->model)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "\'%s\' model configured for domain, but " "hypervisor driver is \'%s\'."), @@ -460,7 +460,7 @@ AppArmorSetSecurityLabel(virConnectPtr conn, } if (aa_change_profile(profile_name) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("error calling aa_change_profile()")); goto clean; } @@ -490,7 +490,7 @@ AppArmorRestoreSecurityImageLabel(virConnectPtr conn, /* Update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { if (load_profile(conn, secdef->imagelabel, vm, NULL) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), secdef->imagelabel); @@ -520,7 +520,7 @@ AppArmorSetSecurityImageLabel(virConnectPtr conn, if (secdef->imagelabel) { /* if the device doesn't exist, error out */ if (!virFileExists(disk->src)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("\'%s\' does not exist"), disk->src); return rc; } @@ -531,7 +531,7 @@ AppArmorSetSecurityImageLabel(virConnectPtr conn, /* update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { if (load_profile(conn, secdef->imagelabel, vm, disk) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), secdef->imagelabel); diff --git a/src/security/security_driver.c b/src/security/security_driver.c index 43d52b1..4e6172d 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -123,7 +123,7 @@ virSecurityDriverSetDOI(virConnectPtr conn, const char *doi) { if (strlen(doi) >= VIR_SECURITY_DOI_BUFLEN) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("%s: DOI \'%s\' is " "longer than the maximum allowed length of %d"), __func__, doi, VIR_SECURITY_DOI_BUFLEN - 1); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 6a03af7..0e31077 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -189,13 +189,13 @@ SELinuxGenSecurityLabel(virConnectPtr conn, vm->def->seclabel.label = SELinuxGenNewContext(default_domain_context, mcs); if (! vm->def->seclabel.label) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto err; } vm->def->seclabel.imagelabel = SELinuxGenNewContext(default_image_context, mcs); if (! vm->def->seclabel.imagelabel) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto err; } @@ -285,9 +285,9 @@ SELinuxGetSecurityLabel(virConnectPtr conn, } if (strlen((char *) ctx) >= VIR_SECURITY_LABEL_BUFLEN) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label exceeds " - "maximum lenth: %d"), + "maximum length: %d"), VIR_SECURITY_LABEL_BUFLEN - 1); return -1; } @@ -647,7 +647,7 @@ SELinuxSetSecurityLabel(virConnectPtr conn, int i; if (!STREQ(drv->name, secdef->model)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " "hypervisor driver is '%s'."), diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 3aa3c30..e107d1e 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2298,9 +2298,7 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) if ((fd = open("/dev/cpu/self/cpuid", O_RDONLY)) == -1 || pread(fd, &regs, sizeof(regs), 0) != sizeof(regs)) { - char ebuf[1024]; - virXenError(conn, VIR_ERR_SYSTEM_ERROR, - "couldn't read CPU flags: %s", virStrerror(errno, ebuf, sizeof ebuf)); + virReportSystemError(conn, errno, "%s", _("could not read CPU flags")); goto out; } diff --git a/tests/cpuset b/tests/cpuset index 9f43269..89c19e0 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -41,7 +41,7 @@ sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 $abs_top_builddir/tools/virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 cat <<\EOF > exp || fail=1 error: Failed to define domain from xml-invalid -error: failed Xen syscall topology cpuset syntax error +error: internal error topology cpuset syntax error EOF compare exp out || fail=1 -- 1.6.5.1

2 2

[libvirt] [PATCH v2] Improve error reporting for virConnectGetHostname calls
by Cole Robinson 03 Nov '09

03 Nov '09

All drivers have copy + pasted inadequate error reporting which wraps util.c:virGetHostname. Move all error reporting to this function, and improve what we report. Changes from v1: Drop the driver wrappers around virGetHostname. This means we still need to keep the new conn argument to virGetHostname, but I think it's worth it. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.c | 7 +++---- src/lxc/lxc_driver.c | 16 +--------------- src/qemu/qemu_driver.c | 22 ++-------------------- src/test/test_driver.c | 16 +--------------- src/uml/uml_driver.c | 17 +---------------- src/util/util.c | 18 +++++++++++++++--- src/util/util.h | 2 +- src/vbox/vbox_tmpl.c | 16 +--------------- src/xen/xen_driver.c | 20 +------------------- src/xen/xend_internal.c | 6 ++---- tools/virsh.c | 2 +- 11 files changed, 29 insertions(+), 113 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 0615cd2..322a320 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -993,11 +993,10 @@ static int qemudNetworkInit(struct qemud_server *server) { if (!mdns_name) { char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - localhost = virGetHostname(); - if (localhost == NULL) { - virReportOOMError(NULL); + localhost = virGetHostname(NULL); + if (localhost == NULL) goto cleanup; - } + if ((tmp = strchr(localhost, '.'))) *tmp = '\0'; snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 47e59f6..05fc48d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2027,20 +2027,6 @@ cleanup: return ret; } -static char *lxcGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) { int timeout = 1000; /* In milliseconds */ @@ -2258,7 +2244,7 @@ static virDriver lxcDriver = { NULL, /* supports_feature */ NULL, /* type */ lxcVersion, /* version */ - lxcGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ lxcGetCapabilities, /* getCapabilities */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 437a1b4..0470315 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2610,21 +2610,6 @@ cleanup: return ret; } -static char * -qemudGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int qemudListDomains(virConnectPtr conn, int *ids, int nids) { struct qemud_driver *driver = conn->privateData; int n; @@ -6248,11 +6233,8 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ - if ((hostname = virGetHostname()) == NULL) { - virReportSystemError (dconn, errno, - "%s", _("failed to determine host name")); + if ((hostname = virGetHostname(dconn)) == NULL) goto cleanup; - } /* XXX this really should have been a properly well-formed * URI, but we can't add in tcp:// now without breaking @@ -7084,7 +7066,7 @@ static virDriver qemuDriver = { qemudSupportsFeature, /* supports_feature */ qemudGetType, /* type */ qemudGetVersion, /* version */ - qemudGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ qemudGetMaxVCPUs, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ qemudGetCapabilities, /* getCapabilities */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7e19072..31b5ad3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1023,20 +1023,6 @@ static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, return (0); } -static char *testGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED) { @@ -4674,7 +4660,7 @@ static virDriver testDriver = { NULL, /* supports_feature */ NULL, /* type */ testGetVersion, /* version */ - testGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ testGetMaxVCPUs, /* getMaxVcpus */ testNodeGetInfo, /* nodeGetInfo */ testGetCapabilities, /* getCapabilities */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index fac3c4c..2455b92 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1146,21 +1146,6 @@ cleanup: return ret; } -static char * -umlGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int umlListDomains(virConnectPtr conn, int *ids, int nids) { struct uml_driver *driver = conn->privateData; int n; @@ -1790,7 +1775,7 @@ static virDriver umlDriver = { NULL, /* supports_feature */ umlGetType, /* type */ umlGetVersion, /* version */ - umlGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ umlGetCapabilities, /* getCapabilities */ diff --git a/src/util/util.c b/src/util/util.c index 08070da..853d3a0 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1805,30 +1805,42 @@ int virDiskNameToIndex(const char *name) { #define AI_CANONIDN 0 #endif -char *virGetHostname(void) +char *virGetHostname(virConnectPtr conn) { int r; char hostname[HOST_NAME_MAX+1], *result; struct addrinfo hints, *info; r = gethostname (hostname, sizeof(hostname)); - if (r == -1) + if (r == -1) { + virReportSystemError (conn, errno, + "%s", _("failed to determine host name")); return NULL; + } NUL_TERMINATE(hostname); memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); - if (r != 0) + if (r != 0) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("getaddrinfo failed for '%s': %s"), + hostname, gai_strerror(r)); return NULL; + } if (info->ai_canonname == NULL) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("could not determine canonical host name")); freeaddrinfo(info); return NULL; } /* Caller frees this string. */ result = strdup (info->ai_canonname); + if (!result) + virReportOOMError(conn); + freeaddrinfo(info); return result; } diff --git a/src/util/util.h b/src/util/util.h index 3ef26e6..f4e395e 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -222,7 +222,7 @@ static inline int getuid (void) { return 0; } static inline int getgid (void) { return 0; } #endif -char *virGetHostname(void); +char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index aecda23..c6305ac 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -591,20 +591,6 @@ static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { return 0; } -static char *vboxGetHostname(virConnectPtr conn) { - char *hostname; - - /* the return string should be freed by caller */ - hostname = virGetHostname(); - if (hostname == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s", - "failed to determine host name"); - return NULL; - } - - return hostname; -} - static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { vboxGlobalData *data = conn->privateData; PRUint32 maxCPUCount = 0; @@ -6402,7 +6388,7 @@ virDriver NAME(Driver) = { NULL, /* supports_feature */ NULL, /* type */ vboxGetVersion, /* version */ - vboxGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ vboxGetMaxVcpus, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ vboxGetCapabilities, /* getCapabilities */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f2744b0..6dc4ac0 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -478,24 +478,6 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer) return -1; } -/* NB: Even if connected to the proxy, we're still on the - * same machine. - */ -static char * -xenUnifiedGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int xenUnifiedGetMaxVcpus (virConnectPtr conn, const char *type) { @@ -1659,7 +1641,7 @@ static virDriver xenUnifiedDriver = { xenUnifiedSupportsFeature, /* supports_feature */ xenUnifiedType, /* type */ xenUnifiedGetVersion, /* version */ - xenUnifiedGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ xenUnifiedGetMaxVcpus, /* getMaxVcpus */ xenUnifiedNodeGetInfo, /* nodeGetInfo */ xenUnifiedGetCapabilities, /* getCapabilities */ diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d3ab019..9080754 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4347,11 +4347,9 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, * deallocates this string. */ if (uri_in == NULL) { - *uri_out = virGetHostname(); - if (*uri_out == NULL) { - virReportOOMError(dconn); + *uri_out = virGetHostname(dconn); + if (*uri_out == NULL) return -1; - } } return 0; diff --git a/tools/virsh.c b/tools/virsh.c index 6b93405..3c668da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -524,7 +524,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) char *thatHost = NULL; char *thisHost = NULL; - if (!(thisHost = virGetHostname())) { + if (!(thisHost = virGetHostname(ctl->conn))) { vshError(ctl, "%s", _("Failed to get local hostname")); goto cleanup; } -- 1.6.5.1

2 2

[libvirt] [PATCH] Make monitor type (miimon/arpmon) optional in bond xml.
by Laine Stump 03 Nov '09

03 Nov '09

Lack of one of these in the live xml output was causing the parse to fail. --- src/conf/interface_conf.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 31af957..31abf12 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -631,13 +631,17 @@ static int virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr node; - int ret = 0; + int ret = -1; unsigned long tmp; def->data.bond.mode = virInterfaceDefParseBondMode(conn, ctxt); if (def->data.bond.mode < 0) goto error; + ret = virInterfaceDefParseBondItfs(conn, def, ctxt); + if (ret != 0) + goto error; + node = virXPathNode(conn, "./miimon[1]", ctxt); if (node != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_MII; @@ -669,15 +673,13 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, } def->data.bond.carrier = virInterfaceDefParseBondMiiCarrier(conn, ctxt); - if (def->data.bond.carrier < 0) + if (def->data.bond.carrier < 0) { + ret = -1; goto error; + } - ret = virInterfaceDefParseBondItfs(conn, def, ctxt); + } else if ((node = virXPathNode(conn, "./arpmon[1]", ctxt)) != NULL) { - goto done; - } - node = virXPathNode(conn, "./arpmon[1]", ctxt); - if (node != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_ARP; ret = virXPathULong(conn, "string(./arpmon/@interval)", ctxt, &tmp); @@ -693,23 +695,17 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, if (def->data.bond.target == NULL) { virInterfaceReportError(conn, VIR_ERR_XML_ERROR, "%s", _("bond interface arpmon target missing")); + ret = -1; goto error; } def->data.bond.validate = virInterfaceDefParseBondArpValid(conn, ctxt); - if (def->data.bond.validate < 0) + if (def->data.bond.validate < 0) { + ret = -1; goto error; - - ret = virInterfaceDefParseBondItfs(conn, def, ctxt); - - goto done; + } } - - virInterfaceReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("bond interface need miimon or arpmon element")); error: - ret = -1; -done: return(ret); } @@ -1109,11 +1105,6 @@ virInterfaceBondDefFormat(virConnectPtr conn, virBufferPtr buf, else if (def->data.bond.validate == VIR_INTERFACE_BOND_ARP_ALL) virBufferAddLit(buf, " validate='all'"); virBufferAddLit(buf, "/>\n"); - } else { - virInterfaceReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("bond monitoring type %d unknown"), - def->data.bond.monit); - return(-1); } for (i = 0;i < def->data.bond.nbItf;i++) { if (virInterfaceBareDevDefFormat(conn, buf, def->data.bond.itf[i]) < 0) -- 1.6.5.15.gc274d

2 1

[libvirt] [PATCH 0/3] IPv6 / multi address / report live config in virInterface
by laine＠laine.org 03 Nov '09

03 Nov '09

This is the 2nd iteration of this patchset incorporating danpb's suggestions. Along with a couple other minor things, the type attribute is again a required attribute, and netcf support will be omitted in the build unless you have netcf-devel-0.1.3 or greater. Since there is no netcf-devel-0.1.3 yet, I tested this by changing the appropriate strings to 0.1.2. 0.1.3 will be released "soon" (I want to try and get IPv6 address reporting in before lutter cuts another release). I just wanted to get the patches to the list early to get some visual review in case I screwed up anything new ;-) Note that (unless you're building/installing netcf from the head of git) if you try to fake out the version of netcf yourself you'll get runtime errors from virInterfaceGetXMLDesc (iface-dumpxml) due to there being no "type" attribute in the interface xml.

4 21

[libvirt] [PATCH] give up python interpreter lock before calling cb
by Dan Kenigsberg 03 Nov '09

03 Nov '09

suggested by danpb on irc --- python/libvirt-override.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 5d24fd2..53e36c0 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2355,7 +2355,9 @@ libvirt_virEventInvokeHandleCallback(PyObject *self ATTRIBUTE_UNUSED, opaque = (void *) PyvirVoidPtr_Get(py_opaque); if(cb) + LIBVIRT_BEGIN_ALLOW_THREADS cb (watch, fd, event, opaque); + LIBVIRT_END_ALLOW_THREADS return VIR_PY_INT_SUCCESS; } @@ -2379,7 +2381,9 @@ libvirt_virEventInvokeTimeoutCallback(PyObject *self ATTRIBUTE_UNUSED, cb = (virEventTimeoutCallback) PyvirEventTimeoutCallback_Get(py_f); opaque = (void *) PyvirVoidPtr_Get(py_opaque); if(cb) + LIBVIRT_BEGIN_ALLOW_THREADS cb (timer, opaque); + LIBVIRT_END_ALLOW_THREADS return VIR_PY_INT_SUCCESS; } -- 1.6.2.5

3 3

[libvirt] The 0.7.3 release schedule
by Daniel Veillard 03 Nov '09

03 Nov '09

Well, clearly we can't keep up with the current plan, we should be in freeze right now and there is an awful lot of patches on the list waiting for review and push. Let's try to push everything by this week-end and have next week as the testing and freeze time. Maybe we can squeeze everything in time, that would allow the release by the Friday 13th (unless we want to avoid that ;-) 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] [PATCH] Allow NULL mac address in virGetInterface.
by Laine Stump 03 Nov '09

03 Nov '09

There are places where an interface will not have a mac address, and netcf returns this as a NULL pointer rather than a pointer to an empty string. Rather than checking for this all over the place in libvirt, just save it in the virInterface object as an empty string. --- src/datatypes.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 89ad309..ecefc59 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -588,10 +588,15 @@ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac) { virInterfacePtr ret = NULL; - if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (mac == NULL)) { + if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } + + /* a NULL mac from caller is okay. Treat it as blank */ + if (mac == NULL) + mac = ""; + virMutexLock(&conn->lock); ret = (virInterfacePtr) virHashLookup(conn->interfaces, name); -- 1.6.5.15.gc274d

2 3

[libvirt] [PATCH] Remove redundant virFileDeletePID() call
by Chris Lalancette 03 Nov '09

03 Nov '09

qemudShutdownVMDaemon() calls qemudRemoveDomainStatus(), which then calls virFileDeletePID(). qemudShutdownVMDaemon() then unnecessarily calls virFileDeletePID() again. Remove this second usage of it, and also slightly refactor qemudRemoveDomainStatus() to VIR_WARN appropriate error messages. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fd064af..38fe19e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -269,7 +269,7 @@ qemudRemoveDomainStatus(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm) { - int rc = -1; + char ebuf[1024]; char *file = NULL; if (virAsprintf(&file, "%s/%s.xml", driver->stateDir, vm->def->name) < 0) { @@ -277,19 +277,14 @@ qemudRemoveDomainStatus(virConnectPtr conn, 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; + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) + VIR_WARN(_("Failed to remove domain XML for %s: %s"), + vm->def->name, virStrerror(errno, buf, sizeof(ebuf))); + if (virFileDeletePid(driver->stateDir, vm->def->name) != 0) + VIR_WARN(_("Failed to remove PID file for %s: %s"), + vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); - rc = 0; -cleanup: - VIR_FREE(file); - return rc; + return 0; } @@ -2224,15 +2219,7 @@ retry: vm->def->name); } - if (qemudRemoveDomainStatus(conn, driver, vm) < 0) { - VIR_WARN(_("Failed to remove domain status for %s"), - vm->def->name); - } - if ((ret = virFileDeletePid(driver->stateDir, vm->def->name)) != 0) { - char ebuf[1024]; - VIR_WARN(_("Failed to remove PID file for %s: %s"), - vm->def->name, virStrerror(errno, ebuf, sizeof ebuf)); - } + qemudRemoveDomainStatus(conn, driver, vm); vm->pid = -1; vm->def->id = -1; -- 1.6.0.6

2 2

[libvirt] [PATCH 00/21] Rewrite the QEMU monitor handling
by Daniel P. Berrange 03 Nov '09

03 Nov '09

This patch series rewrites the QEMU monitor handling almost completely. The key theme here is to move from a totally synchronous way of interacting with the monitor, to a totally asynchronous way. This allows us to handle receipt & dispatch of asychronous events from QEMU. For example a notification of a disk-full error, or VM state change. In the process of doing this re-factoring I have also dropped in basic support/infrastructure for the JSON based monitor. The basic JSON parsing/formatting is working, but this needs to wait until QEMU community finalize their monitor syntax for the new commands & what args they accept. Daniel

5 45

[libvirt] cannot get virt-manager to see VM
by Gerry Reno 02 Nov '09

02 Nov '09

I used qemu-img to create a raw image. I then create an xml file with no uuid but a new name and new mac address. Then I did a 'virsh define NEW.img'. When I do a 'virsh list --all' the new VM is there but shut_off. But this new machine does not appear in virt-manager. What do I need to do to get the new machine to appear in the list of machines in virt-manager? I want to start this machine using virt-manager. This is on F11 with libvirt 0.6.2. -Gerry

1 0

[libvirt] [REPOST] Fix --with-init-script configure option
by Matthew Booth 02 Nov '09

02 Nov '09

Looks like this one might have dropped off the radar.

3 3

[libvirt] [PATCH] ESX: Don't automatically follow redirects.
by Matthias Bolte 02 Nov '09

02 Nov '09

The default transport for the VI API is HTTPS. If the server redirects from HTTPS to HTTP the driver would silently follow that redirection. The user assumes to communicate with the server over a secure transport but isn't. This patch disables automatical redirection following. The driver reports an error if the server tries to redirect. * src/esx/esx_vi.c: refactor the call to curl_easy_perform() into a function and do error handling there, disable automatical redirection following for curl * src/esx/esx_vi.h: change the type of responseCode to int --- src/esx/esx_vi.c | 166 +++++++++++++++++++++++++++--------------------------- src/esx/esx_vi.h | 2 +- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index dc51e20..bcf110f 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -216,6 +216,68 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, } #endif +static int +esxVI_CURL_Perform(virConnectPtr conn, esxVI_Context *ctx, const char *url) +{ + CURLcode errorCode; + long responseCode = 0; +#if LIBCURL_VERSION_NUM >= 0x071202 /* 7.18.2 */ + const char *redirectUrl = NULL; +#endif + + errorCode = curl_easy_perform(ctx->curl_handle); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_perform() returned an error: %s (%d)", + curl_easy_strerror(errorCode), errorCode); + return -1; + } + + errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, + &responseCode); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " + "error: %s (%d)", curl_easy_strerror(errorCode), + errorCode); + return -1; + } + + if (responseCode < 0) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned a " + "negative response code"); + return -1; + } + + if (responseCode == 301) { +#if LIBCURL_VERSION_NUM >= 0x071202 /* 7.18.2 */ + errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_REDIRECT_URL, + &redirectUrl); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " + "an error: %s (%d)", curl_easy_strerror(errorCode), + errorCode); + } else { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "The server redirects from '%s' to '%s'", url, + redirectUrl); + } +#else + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "The server redirects from '%s'", url); +#endif + + return -1; + } + + return responseCode; +} + int esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, @@ -269,7 +331,7 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, ctx->url); curl_easy_setopt(ctx->curl_handle, CURLOPT_USERAGENT, "libvirt-esx"); curl_easy_setopt(ctx->curl_handle, CURLOPT_HEADER, 0); - curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYPEER, noVerify ? 0 : 1); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYHOST, noVerify ? 0 : 2); curl_easy_setopt(ctx->curl_handle, CURLOPT_COOKIEFILE, ""); @@ -433,8 +495,7 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, const char *url, char **content) { virBuffer buffer = VIR_BUFFER_INITIALIZER; - CURLcode errorCode; - long responseCode; + int responseCode = 0; if (content == NULL || *content != NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -448,27 +509,19 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPGET, 1); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + responseCode = esxVI_CURL_Perform(conn, ctx, url); - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &responseCode); + virMutexUnlock(&ctx->curl_lock); - if (errorCode != CURLE_OK) { + if (responseCode < 0) { + goto failure; + } else if (responseCode != 200) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; + "HTTP response code %d while trying to download '%s'", + responseCode, url); + goto failure; } - virMutexUnlock(&ctx->curl_lock); - if (virBufferError(&buffer)) { virReportOOMError(conn); goto failure; @@ -476,32 +529,19 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, *content = virBufferContentAndReset(&buffer); - if (responseCode != 200) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d while trying to download '%s'", - (int)responseCode, url); - goto failure; - } - return 0; failure: free(virBufferContentAndReset(&buffer)); return -1; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - goto failure; } int esxVI_Context_UploadFile(virConnectPtr conn, esxVI_Context *ctx, const char *url, const char *content) { - CURLcode errorCode; - long responseCode; + int responseCode = 0; if (content == NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -515,40 +555,20 @@ esxVI_Context_UploadFile(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 1); curl_easy_setopt(ctx->curl_handle, CURLOPT_INFILESIZE, strlen(content)); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } - - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &responseCode); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + responseCode = esxVI_CURL_Perform(conn, ctx, url); virMutexUnlock(&ctx->curl_lock); - if (responseCode != 200 && responseCode != 201) { + if (responseCode < 0) { + return -1; + } else if (responseCode != 200 && responseCode != 201) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "HTTP response code %d while trying to upload to '%s'", - (int)responseCode, url); + responseCode, url); return -1; } return 0; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - return -1; } int @@ -558,7 +578,6 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, { virBuffer buffer = VIR_BUFFER_INITIALIZER; esxVI_Fault *fault = NULL; - CURLcode errorCode; if (request == NULL || response == NULL || *response != NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -577,27 +596,14 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDS, request); curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDSIZE, strlen(request)); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + (*response)->responseCode = esxVI_CURL_Perform(conn, ctx, ctx->url); - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &(*response)->responseCode); + virMutexUnlock(&ctx->curl_lock); - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; + if ((*response)->responseCode < 0) { + goto failure; } - virMutexUnlock(&ctx->curl_lock); - if (virBufferError(&buffer)) { virReportOOMError(conn); goto failure; @@ -695,8 +701,7 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, } } else if ((*response)->responseCode != 200) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d", (int)(*response)->responseCode); - + "HTTP response code %d", (*response)->responseCode); goto failure; } @@ -708,11 +713,6 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, esxVI_Fault_Free(&fault); return -1; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - goto failure; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4892fde..4b3005e 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -110,7 +110,7 @@ int esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, */ struct _esxVI_Response { - long responseCode; /* required */ + int responseCode; /* required */ char *content; /* required */ xmlDocPtr document; /* optional */ xmlXPathContextPtr xpathContext; /* optional */ -- 1.6.0.4

3 5

[libvirt] [patch] Add openvzDomainSetMemoryInternal
by Yuji NISHIDA 02 Nov '09

02 Nov '09

Hi all, This patch is to set KMEMSIZE for OpenVZ. This function is used for initializing the parameter of KMEMSIZE to start container. openvzDomainSetMemory should be left for another purpose so I added new one. I think users should specify memory as kbyte ( or bigger ). --- src/openvz/openvz_driver.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f64ad1e..5c1fefa 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -69,6 +69,7 @@ static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type); static int openvzDomainGetMaxVcpus(virDomainPtr dom); static int openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus); static int openvzDomainSetVcpusInternal(virConnectPtr conn, virDomainObjPtr vm, unsigned int nvcpus); +static int openvzDomainSetMemoryInternal(virConnectPtr conn, virDomainObjPtr vm, unsigned long memory); static void openvzDriverLock(struct openvz_driver *driver) { @@ -803,6 +804,14 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) } } + if (vm->def->memory > 0) { + if (openvzDomainSetMemoryInternal(conn, vm, vm->def->memory) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not set memory size")); + goto cleanup; + } + } + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = -1; @@ -1364,6 +1373,29 @@ static int openvzNumDefinedDomains (virConnectPtr conn) { return ninactive; } +static int openvzDomainSetMemoryInternal(virConnectPtr conn, virDomainObjPtr vm, + unsigned long mem) { + struct openvz_driver *driver = conn->privateData; + char str_mem[16]; + const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINAL, + "--kmemsize", str_mem, "--save", NULL }; + + /* memory has to be changed its format from kbyte to byte */ + snprintf( str_mem, sizeof(str_mem), "%lu", mem * 1024 ); + + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(conn, prog, NULL) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + _("Could not exec %s"), VZCTL); + goto cleanup; + } + + return 0; + +cleanup: + return -1; +} + static virDriver openvzDriver = { VIR_DRV_OPENVZ, "OPENVZ", -- 1.5.3.4 ----- Yuji Nishida nishidy(a)nict.go.jp

2 1

[libvirt] Don't use private struct member names of in6_addr
by Matthias Bolte 02 Nov '09

02 Nov '09

__in6_u.__u6_addr16 is the private name for this struct member, s6_addr16 is the public one. Our buildserver revealed this problem, because for some reason the internal names are missing the __ prefix there. Matthias

2 2

[libvirt] Remaining interface state reporting issue - bond options
by Laine Stump 02 Nov '09

02 Nov '09

With the patches I sent to netcf-devel last night, along with lutter's (or DV's, take your pick ;-) netcf patch to eliminate the segfault, my patches for reporting interface info now pass make check with no errors. I believe lutter will be making a netcf release tomorrow or so, after he gets back on solid ground. There is one issue left that I'm unsure what to do about - while the xml returned from netcf for bond interfaces does list all the slave interfaces of the bond and their types (and any required info for that type), the parser for bond info in libvirt requires either an miimon or arpmode node inside the bond, eg: <interface type="bond" name="bond0"> <bond> <miimon freq="100" updelay="10" carrier="ioctl"/> <interface type="ethernet" name="eth1"/> <interface type="ethernet" name="eth0"/> </bond> </interface> I haven't been able to find a source of this information yet and, while it may be useful, I don't see it as necessary. Once again I'm proposing that we make these optional in the XML, such that this would be acceptable: <interface type="bond" name="bond0"> <bond> <interface type="ethernet" name="eth1"/> <interface type="ethernet" name="eth0"/> </bond> </interface> Once we do that, the netcf-reported state of all 4 supported interface types (ethernet, bridge, vlan, bond) will pass libvirt's parsing test.

2 2

[libvirt] Add support for qemu's guestfwd
by Matthew Booth 02 Nov '09

02 Nov '09

This series adds support for a vmchannel using qemu's guestfwd. I'll be following up with support for virtio-serial and RHEL5's vmchannel. A vmchannel is specified as: <vmchannel type='pipe'> <source path='/tmp/vmchannel'/> <target type='guestfwd' address='10.0.2.1' port='4600'/> </vmchannel> There are a couple of minor complications. Firstly, the existing chrdev structure assumes that all front-ends take only a port. There's a bit of code churn adding a second union to this struct to allow for different data for different backends. Secondly, it turns out that the existing syntax for character devices doesn't really work for guestfwd. Specifically it won't allow common options to be added. This is fixed in qemu git with the new -chardev syntax. Consequently, this patch only adds support for guestfwd using -chardev. We add detection for -chardev, and a new internal utility function to output -chardev command lines for all existing character device backends. Matt

1 4

[libvirt] [PATCH] drop the -logrotate.conf from /etc/logrotate.d/ovirt-logrotate.conf
by Dan Kenigsberg 01 Nov '09

01 Nov '09

No Fedora package uses .conf in that directory; furthermore, rpmlint protests about it: the file name should match the name of the containing rpm. Let us conform. --- logrotate/ovirt-logrotate | 2 +- ovirt-node.spec.in | 4 ++-- scripts/ovirt-config-logging | 2 +- scripts/ovirt-functions | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logrotate/ovirt-logrotate b/logrotate/ovirt-logrotate index a61af6f..ad32951 100644 --- a/logrotate/ovirt-logrotate +++ b/logrotate/ovirt-logrotate @@ -1,3 +1,3 @@ # Run each log rotation every 10 minutes -*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-logrotate.conf +*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-node-stateless */10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/syslog diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 3a8266e..20fea25 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -180,7 +180,7 @@ cd - %{__install} -p -m0755 kinit/ovirt-kinit %{buildroot}%{_sysconfdir}/cron.hourly %{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d -%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d +%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node-stateless echo "oVirt Node release %{version}-%{release}" > %{buildroot}%{_sysconfdir}/ovirt-release mkdir -p %{buildroot}/%{_sysconfdir}/default @@ -310,7 +310,7 @@ fi %{_initrddir}/ovirt %{_initrddir}/ovirt-post %config %{_sysconfdir}/cron.hourly/ovirt-kinit -%config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf +%config %{_sysconfdir}/logrotate.d/ovirt-node-stateless %config %{_sysconfdir}/cron.d/ovirt-logrotate %{_sysconfdir}/ovirt-config-boot.d %{_sysconfdir}/ovirt-config-setup.d diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging index 464dfcb..de238b7 100755 --- a/scripts/ovirt-config-logging +++ b/scripts/ovirt-config-logging @@ -158,7 +158,7 @@ function prompt_user { $syslog_server_protocol fi sed -c -i -e "s/^size=.*/size=${max_log_size}k/" \ - /etc/logrotate.d/ovirt-logrotate.conf + /etc/logrotate.d/ovirt-node-stateless return ;; 1) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 98e88e7..7e84415 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -28,7 +28,7 @@ OVIRT_CONFIG_FILES="\ /etc/default/ovirt \ /etc/sysconfig/network \ /etc/collectd.conf \ - /etc/logrotate.d/ovirt-logrotate.conf + /etc/logrotate.d/ovirt-node-stateless " # Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr -- 1.6.2.5

2 2

Re: [libvirt] [PATCH 10/21] Don't let parent of daemon exit until basic initialization is done
by Laurent Léonard 01 Nov '09

01 Nov '09

Hi, I'm not a C expert, but I see there is a use of an unitialized variable: default: { int got, exitstatus = 0; int ret; char status; close(statuspipe[1]); /* We wait to make sure the first child forked successfully */ if ((got = waitpid(pid, &exitstatus, 0)) < 0 || got != pid || status != 0) { <<< here return -1; } That explains the issue described by Guido, because he uses an i386 system. It was impossible for me to reproduce the issue because I use an amd64 system. char test; if (test == 0) puts("ok"); else puts("ko"); produces: - "ok" on amd64 system - "ko" on i386 system If I use the exitstatus variable in the test it seems to work great on both architectures. -- Laurent Léonard

2 1

[libvirt] [PATCH] network utilities
by Daniel Veillard 30 Oct '09

30 Oct '09

Revamping my previous patches to parse IPv4/6 numeric addresses, adding range computation and netmask checking entries too. As suggested I used an union for the socket address type: typedef union { struct sockaddr_storage stor; struct sockaddr_in inet4; struct sockaddr_in6 inet6; } virSocketAddr; typedef virSocketAddr *virSocketAddrPtr; But I wonder if it's not better to make it a struct and add the lenght of the address as this is usually needed when passing one of the struct sockaddr_* and that lenght is returned as part of parsing, keeping both together is probably more useful. A macro to get the type AF_INET/AF_INET6 out of a virSocketAddr might be useful instead of having the users manually guess that ->stor.ss_family is teh filed to look at. Also I wonder how useful the Ipv6 code for netmask and ranges really is, it seems that IPv6 mostly go with prefix and never use netmasks, maybe that's just dead code, maybe that's just wrong, anyway here it is. I named the header and file network.[ch] as I think other network related utilities like validation or generation of MAC addresses could well be moved in that file too. 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] [PATCH] Fix up a bogus TLS message.
by Chris Lalancette 30 Oct '09

30 Oct '09

When working with the TLS transport, I noticed that every single time a remote stream was closed, I would get a message like: 09:09:40.793: error : remoteIOReadBuffer:7328 : failed to read from TLS socket A TLS packet with unexpected length was received. libvir: QEMU error : failed to read from TLS socket A TLS packet with unexpected length was received. in the logs. This happens because of a race in libvirtd; one thread handles the doRemoteClose(), which calls gnutls_bye() followed by close() while another thread is poll()'ing on the same fd. Once the close() happens, the poll returns with revents set to POLLIN, and we would poll one more time for data from the now-closed fd. Fix this situation by setting poll->session to NULL when we clean up, and check for that in remoteIOHandleInput(). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/remote/remote_driver.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index bf001eb..335f44b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1389,6 +1389,7 @@ doRemoteClose (virConnectPtr conn, struct private_data *priv) if (priv->uses_tls && priv->session) { gnutls_bye (priv->session, GNUTLS_SHUT_RDWR); gnutls_deinit (priv->session); + priv->session = NULL; } #if HAVE_SASL if (priv->saslconn) @@ -7223,6 +7224,12 @@ remoteIOReadBuffer(virConnectPtr conn, int ret; if (priv->uses_tls) { + if (!priv->session) { + /* we may have reached here one more time after gnutls_bye() + * was called, so just return here + */ + return 0; + } tls_resend: ret = gnutls_record_recv (priv->session, bytes, len); if (ret == GNUTLS_E_INTERRUPTED) -- 1.6.0.6

3 3

[libvirt] Restore after restart libvirtd
by Diego Woitasen 30 Oct '09

30 Oct '09

Hi, I 'm playing with save/restore domains. It's working, but if I restart libvirtd after 'save domain file' and then try to restore it I get: error: Failed to restore domain from /tmp/domain.out error: operation failed: domain 'domainname' is already defined with uuid 17c77406-b6e3-621a-1fae-420affce8f48 If I move domainname.xml out of libvirt config. directory it works, but I think this should not be necessary. Regards, Diego -- Diego Woitasen

2 3

[libvirt] 0.7.1 compile fails on opensuse 11.1
by Dominik Klein 30 Oct '09

30 Oct '09

Hi it seems openSuSE 11.1 does not come with a pkgconfig for the device-mapper-devel package. I created a bug [1] for opensuse but was also told to mention it here so configure.in could be patched once the bug was fixed. Regards Dominik 1 https://bugzilla.novell.com/show_bug.cgi?id=54094

4 9

[libvirt] [PATCH] Priority of vzctl create should be lower
by Yuji NISHIDA 30 Oct '09

30 Oct '09

Hi all About OpenVZ, it uses vzctl command that produces tar/gzip commands. I think we should lower these commands for running other procedures prior to them. This is the patch to achieve it with nice/ionice commands. From ff3cf022995ef541136bd40579af2eeb20aeafdb Mon Sep 17 00:00:00 2001 From: root <root(a)node13.nvlab.org> Date: Mon, 26 Oct 2009 02:44:43 +0000 Subject: [PATCH] lower priority for running tar and gzip during vzctl create --- src/openvz/openvz_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f64ad1e..59d38ae 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -130,6 +130,14 @@ openvzDomainDefineCmd(virConnectPtr conn, } while (0) narg = 0; + + /* lower priority for running tar and gzip */ + ADD_ARG_LIT("nice"); + ADD_ARG_LIT("-n"); + ADD_ARG_LIT("19"); + ADD_ARG_LIT("ionice"); + ADD_ARG_LIT("-c3"); + ADD_ARG_LIT(VZCTL); ADD_ARG_LIT("--quiet"); ADD_ARG_LIT("create"); -- 1.5.3.4 ----- Yuji Nishida nishidy(a)nict.go.jp

3 3

[libvirt] QEMU driver thread safety rules
by Daniel P. Berrange 30 Oct '09

30 Oct '09

The current QEMU driver makes use of 2 locks - The driver lock - The virDomainObjPtr lock The idea is the driver lock is not held for long periods of time. Unfortunately we don't always deal with this very well - some code needs todo quite alot with the driver - particularly starting and stopping of guests. The bigger problem is that the virDomainObjPtr lock is often held for long periods, specifically whenever we invoke a monitor command. Some of these commands can take a very long time (even infinite if someone has send SIGSTOP to QEMU). This very quickly blocks the whole driver. I've realized that even with the series of monitor patches I sent out, changing the driver mutex to a RWLock, and adding a separate lock on the qemuMonitorPtr object iself, there's still a major concurrency problem: the virDomainObjPtr lock is held for too long. I propose to drop the RWLock patch, and do something totally different instead.... We fundamentally need to drop the virDomainObjPtr lock whenever we invoke a monitor command. Unfortunately, merely dropping the virDomainObjPtr and acquiring the qemuMonitorPtr is not safe. An API call which changes the VM state typically has 3 phases 1. Check what state/config the VM is in 2. Invoke the monitor command 3. Update the state/config of the VM If we release the virDomainObjPtr, and acquire qemuMonitorPtr at step 2, then other APIs calls will be able to complete their own step 1 checks, and get blocked at step 2. This is not safe, because when the original call moves onto step 3 and changes the state, this will have invalidated the checks the other sleeping API calls made in step 1. We need to prevent any API call starting step 1, for as long as there is a monitor command being run, even if the lock on virDomainObjPtr is not held. The only way I see todo this, is to introduce a condition variable indicating that a state change is to be made. Any API call which intends to make a state change must acquire this condition prior to step 1. They can thus safely do their checks, and move onto step 2, releasing the virDomainObj lock whle the monitor command is running, and reacquiring it after. All other API calls making changes get safely queued up at step 1, but API calls which simply wish to query information can run without being blocked at all. This fixes the major concurrency problem with running monitor commands. The use of a condition variable at the start of step 1, also allows us to time out API calls, if some other thread get stuck in the monitor for too long. I think this also makes the use of a RWLock on the QEMU driver unneccessary, since no code will ever be holding a mutex in any place that sleeps/wait. Only the condition variable will be held during sleeps/waits. Since we'll now effectively have 3 locks, and 1 condition variable this is getting kind of complex. So the rest of this mail is a file I propose to put in src/qemu/THREADS.txt describing what is going on, and showing the recommended design patterns to use. Daniel QEMU Driver Threading: The Rules ================================= This document describes how thread safety is ensured throughout the QEMU driver. The criteria for this model are: - Objects must never be exclusively locked for any pro-longed time - Code which sleeps must be able to time out after suitable period - Must be safe against dispatch asynchronous events from monitor Basic locking primitives ------------------------ There are a number of locks on various objects * struct qemud_driver: RWLock This is the top level lock on the entire driver. Every API call in the QEMU driver is blocked while this is held, though some internal callbacks may still run asynchronously. This lock must never be held for anything which sleeps/waits (ie monitor commands) When obtaining the driver lock, under *NO* circumstances must any lock be held on a virDomainObjPtr. This *WILL* result in deadlock. * virDomainObjPtr: Mutex Will be locked after calling any of the virDomainFindBy{ID,Name,UUID} methods. Lock must be held when changing/reading any variable in the virDomainObjPtr Once the lock is held, you must *NOT* try to lock the driver. You must release all virDomainObjPtr locks before locking the driver, or deadlock *WILL* occurr. If the lock needs to be dropped & then re-acquired for a short period of time, the reference count must be incremented first using virDomainObjRef(). If the reference count is incremented in this way, it is not neccessary to have the driver locked when re-acquiring the dropped locked, since the reference count prevents it being freed by another thread. This lock must not be held for anything which sleeps/waits (ie monitor commands). * qemuMonitorPrivatePtr: Job condition Since virDomainObjPtr lock must not be held during sleeps, the job condition provides additional protection for code making updates. Immediately after acquiring the virDomainObjPtr lock, any method which intends to update state, must acquire the job condition. The virDomainObjPtr lock is released while blocking on this condition variable. Once the job condition is acquired a method can safely release the virDomainObjPtr lock whenever it hits a piece of code which may sleep/wait, and re-acquire it after the sleep/ wait. * qemuMonitorPtr: Mutex Lock to be used when invoking any monitor command to ensure safety wrt any asynchronous events that may be dispatched from the monitor. It should be acquired before running a command. The job condition *MUST* be held before acquiring the monitor lock The virDomainObjPtr lock *MUST* be held before acquiring the monitor lock. The virDomainObjPtr lock *MUST* then be released when invoking the monitor command. The driver lock *MUST* be released when invoking the monitor commands. This ensures that the virDomainObjPtr & driver are both unlocked while sleeping/waiting for the monitor response. Helper methods -------------- To lock the driver qemuDriverLock() - Acquires the driver lock qemuDriverUnlock() - Releases the driver lock To lock the virDomainObjPtr virDomainObjLock() - Acquires the virDomainObjPtr lock virDomainObjUnlock() - Releases the virDomainObjPtr lock To acquire the job condition variable (int jobActive) qemuDomainObjBeginJob() (if driver is unlocked) - Increments ref count on virDomainObjPtr - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex - Sets jobActive to 1 qemuDomainObjBeginJobWithDriver() (if driver needs to be locked) - Unlocks driver - Increments ref count on virDomainObjPtr - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex - Sets jobActive to 1 - Unlocks virDomainObjPtr - Locks driver - Locks virDomainObjPtr NB: this variant is required in order to comply with lock ordering rules for virDomainObjPtr vs driver qemuDomainObjEndJob() - Set jobActive to 0 - Signal on qemuDomainObjPrivate condition - Decrements ref count on virDomainObjPtr To acquire the QEMU monitor lock qemuDomainObjEnterMonitor() - Acquires the qemuMonitorObjPtr lock - Releases the virDomainObjPtr lock qemuDomainObjExitMonitor() - Acquires the virDomainObjPtr lock - Releases the qemuMonitorObjPtr lock NB: caller must take care to drop the driver lock if neccessary Design patterns --------------- All driver methods must follow one of these design patterns to ensure thread safety and lock correctness. * Accessing or updating something with just the driver qemuDriverLock(driver); ...do work... qemuDriverUnlock(driver); * Accessing something directly todo with a virDomainObjPtr virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); ...do work... virDomainObjUnlock(obj); * Accessing something directly todo with a virDomainObjPtr and driver virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); ...do work... virDomainObjUnlock(obj); qemuDriverUnlock(driver); * Updating something directly todo with a virDomainObjPtr virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); qemuDomainObjBeginJob(obj); ...do work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); * Invoking a monitor command on a virDomainObjPtr virDomainObjPtr obj; qemuDomainObjPrivatePtr priv; qemuDriverLockRO(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); qemuDomainObjBeginJob(obj); ...do prep work... qemuDomainObjEnterMonitor(obj); qemuMonitorXXXX(priv->mon); qemuDomainObjExitMonitor(obj); ...do final work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); * Invoking a monitor command on a virDomainObjPtr with driver locked too virDomainObjPtr obj; qemuDomainObjPrivatePtr priv; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDomainObjBeginJobWithDriver(obj); ...do prep work... qemuDomainObjEnterMonitor(obj); qemuDriverUnlock(driver); qemuMonitorXXXX(priv->mon); qemuDriverLock(driver); qemuDomainObjExitMonitor(obj); ...do final work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); qemuDriverUnlock(driver); Summary ------- * Respect lock ordering rules: never lock driver if anything else is already locked * Don't hold locks in code which sleeps: unlock driver & virDomainObjPtr when using monitor -- |: 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 4

[libvirt] remote clients are non-interruptible
by John Levon 30 Oct '09

30 Oct '09

remoteIOEventLoop() has this: 6974 repoll: 6975 ret = poll(fds, ARRAY_CARDINALITY(fds), -1); 6976 if (ret < 0 && errno == EINTR) 6977 goto repoll; with the result that all clients using the remote driver cannot be control-C'd. Dan, you added this code it seems, why? regards john

4 3

[libvirt] Re: [virt-tools-list] Remote management over SSH fails to connect
by Cole Robinson 30 Oct '09

30 Oct '09

On 10/25/2009 10:25 AM, Jon Nordby wrote: > I get the following errors (skipping "system" yields the same): > [root@jon-laptop ~]# virsh -c qemu+ssh://10.0.0.2/system list > error: server closed connection > error: failed to connect to the hypervisor > > However, SSH and libvirtd both work on their own: > [root@jon-laptop ~]# ssh 10.0.0.2 > Last login: Sun Oct 25 14:06:07 2009 from 10.0.0.143 > [root@server0 ~]# virsh list > Id Name State > ---------------------------------- > 21 family-server running > > The connection is allowed in hosts.allow > libvirt 0.7.2 in both ends, kvm backend, Arch Linux > > What could be the source of this problem? And how can I find it? > ccing libvirt-list This could be an issue of 'nc' incompatibility. Does the 'nc' command on the remote system support the -U option? If you run the virsh command with LIBVIRT_DEBUG=1 virsh ... you should see the ssh command being run. See if running the command by hand produces an error. - Cole

3 2

[libvirt] Release 0.3.1 of libvirt-java
by Bryan Kearney 29 Oct '09

29 Oct '09

I have released version 0.3.1 of libvirt-java. Thanks to Thomas Treutner for his debugging help. You can get the latest from: Latest source tarball, rpm, and srpm: http://libvirt.org/sources/java/ Latest source code: git://libvirt.org/git/libvirt-java.git Maven: http://www.libvirt.org/maven2/ Latest rpms were submitted to Fedora Rawhide and F-11. iBiblio should update soon. -- bk

1 0

[libvirt] Got Windows guests?
by Richard W.M. Jones 29 Oct '09

29 Oct '09

Hello fellow Fedora, libvirt and libguestfs users, If you have any Windows guests, then you can help Fedora to support Windows guests better by spending a few minutes testing the Windows Registry feature we just added to libguestfs 1.0.75. You will need: - A Windows NT/200x/XP/Vista/7/... guest - Fedora 12 or Fedora Rawhide host - libguestfs-tools >= 1.0.75 (from updates or http://koji.fedoraproject.org/koji/packageinfo?packageID=8391 ) - a few minutes of your time The tests: (1) Run the virt-win-reg commands shown in the following web page, where "MyWinGuest" should be replaced with the name of the Windows guest as known to libvirt: http://libguestfs.org/virt-win-reg.1.html#examples Do the commands run without any errors? Does the output look sensible? If you have several Windows guests, please try as many different sorts as possible! (2) Download the registry binary files and try to convert them to XML: guestfish -i MyWinGuest --ro <<'EOF' download win:\windows\system32\config\software software download win:\windows\system32\config\system system download win:\windows\system32\config\sam sam download win:\windows\system32\config\security security EOF hivexml software > software.xml hivexml system > system.xml hivexml sam > sam.xml hivexml security > security.xml Do those commands run without error? If there's an error, try adding the hivexml -k option. Does the XML look complete? (Try running the XML through tidy -xml -indent -quiet < foo.xml | less ) I hope you don't find any bugs, but if you do: Send a reply to this message, or report a bug in Bugzilla: https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virt… It's useful to include the following details: HIVEX_DEBUG=1 hivexml regfile 2>&1 > log.out The Registry file itself that is failing (but note that Registry files can contain sensitive data). It's also useful to have positive feedback ("it worked!"). Thanks for any testing you can give, and if you have any other suggestions for handling Windows guests from Fedora, please let me know. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.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] Application using libvirt crashes when having concurrent TLS connections (gnutls problem)
by Thomas Treutner 29 Oct '09

29 Oct '09

Hi list, I was wondering about the status of this bug: https://bugzilla.redhat.com/show_bug.cgi?id=512367 Is it correct that this is a bug in the libvirt client? I ran into this today, as I've written a kind of a VM scheduler (ressource requirements, placement etc.) in Java (libvirt-java 0.3.0, libvirt 0.6.5) and this is a show-stopper for me right now. I had some troubles with the newest version of libvirt (it couldn't connect to Xen IIRC), so I don't want to mess my setup again for nothing. What is actually causing this problem resp. in which situation is libvirt broken? When a client uses more than one connection at the same time? Or when a client uses more than one connection to the same server at the same time? Are there any recommeded workarounds? TIA & kr, thomas

3 8

[libvirt] [PATCH] ESX: Change disk selection for datastore detection.
by Matthias Bolte 29 Oct '09

29 Oct '09

In order to register a new virtual machine the ESX driver needs to upload a VMX file to a datastore. Try to put this file beside the main VMDK file of the virtual machine. Change the disk selection for datastore detection to choose the first file-based harddisk instead of just the first disk. The first disk may be a CDROM disk and ISO images are normaly not located in the virtual machine's directory. * src/esx/esx_driver.c: change disk selection for datastore detection --- src/esx/esx_driver.c | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e063b46..a0efa5d 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2410,6 +2410,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) esxPrivate *priv = (esxPrivate *)conn->privateData; virDomainDefPtr def = NULL; char *vmx = NULL; + int i; + virDomainDiskDefPtr disk = NULL; esxVI_ObjectContent *virtualMachine = NULL; char *datastoreName = NULL; char *directoryName = NULL; @@ -2458,31 +2460,51 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto failure; } - /* Build VMX datastore URL */ + /* + * Build VMX datastore URL. Use the source of the first file-based harddisk + * to deduce the datastore and path for the VMX file. Don't just use the + * first disk, because it may be CDROM disk and ISO images are normaly not + * located in the virtual machine's directory. This approach to deduce the + * datastore isn't perfect but should work in the majority of cases. + */ if (def->ndisks < 1) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Domain XML doesn't contain a disk, cannot deduce datastore " - "and path for VMX file"); + "Domain XML doesn't contain any disks, cannot deduce " + "datastore and path for VMX file"); goto failure; } - if (def->disks[0]->src == NULL) { + for (i = 0; i < def->ndisks; ++i) { + if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && + def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_FILE) { + disk = def->disks[i]; + break; + } + } + + if (disk == NULL) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "First disk has no source, cannot deduce datastore and path " - "for VMX file"); + "Domain XML doesn't contain any file-based harddisks, " + "cannot deduce datastore and path for VMX file"); goto failure; } - if (esxUtil_ParseDatastoreRelatedPath(conn, def->disks[0]->src, - &datastoreName, &directoryName, - &fileName) < 0) { + if (disk->src == NULL) { + ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "First file-based harddisk has no source, cannot deduce " + "datastore and path for VMX file"); + goto failure; + } + + if (esxUtil_ParseDatastoreRelatedPath(conn, disk->src, &datastoreName, + &directoryName, &fileName) < 0) { goto failure; } if (! virFileHasSuffix(fileName, ".vmdk")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Expecting source of first disk '%s' to be a VMDK image", - def->disks[0]->src); + "Expecting source '%s' of first file-based harddisk to be a " + "VMDK image", disk->src); goto failure; } -- 1.6.0.4

2 2

[libvirt] [PATCH] ESX: Fallback to the preliminary name if the datastore cannot be found.
by Matthias Bolte 28 Oct '09

28 Oct '09

This allows to use domain-xml-from-native with VMX files that reference unavailable datastores. * src/esx/esx_vmx.c: fallback to the preliminary name if the datastore cannot be found --- src/esx/esx_vmx.c | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 8e2bdec..a9ff1b4 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -606,34 +606,37 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(virConnectPtr conn, if (ctx != NULL) { if (esxVI_LookupDatastoreByName(conn, ctx, preliminaryDatastoreName, NULL, &datastore, - esxVI_Occurence_RequiredItem) < 0) { + esxVI_Occurence_OptionalItem) < 0) { goto failure; } - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.accessible")) { - /* Ignore it */ - } else if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, - esxVI_Type_String) < 0) { - goto failure; + if (datastore != NULL) { + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.accessible")) { + /* Ignore it */ + } else if (STREQ(dynamicProperty->name, "summary.name")) { + if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + datastoreName = dynamicProperty->val->string; + break; + } else if (STREQ(dynamicProperty->name, "summary.url")) { + /* Ignore it */ + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } - - datastoreName = dynamicProperty->val->string; - break; - } else if (STREQ(dynamicProperty->name, "summary.url")) { - /* Ignore it */ - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } } if (datastoreName == NULL) { - ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Could not retrieve datastore name for absolute path '%s'", - absolutePath); - goto failure; + VIR_WARN("Could not retrieve datastore name for absolute " + "path '%s', falling back to preliminary name '%s'", + absolutePath, preliminaryDatastoreName); + + datastoreName = preliminaryDatastoreName; } } else { datastoreName = preliminaryDatastoreName; -- 1.6.0.4

2 1

[libvirt] [PATCH] ESX: Unify naming of VI API utility and convenience functions.
by Matthias Bolte 28 Oct '09

28 Oct '09

Unified function naming scheme: - 'lookup' functions query the ESX or vCenter for information - 'get' functions return information from a local object * src/esx/esx_driver.c, src/esx/esx_vi.[ch]: unify function naming --- src/esx/esx_driver.c | 95 ++++++++++++++++++++++++++++---------------------- src/esx/esx_vi.c | 77 +++++++++++++++++++++++----------------- src/esx/esx_vi.h | 32 +++++++++------- 3 files changed, 116 insertions(+), 88 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a0efa5d..93fb5a9 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -90,9 +90,10 @@ esxSupportsLongMode(virConnectPtr conn) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "hardware.cpuFeature") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -522,9 +523,10 @@ esxSupportsVMotion(virConnectPtr conn) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "capability.vmotionSupported") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -653,9 +655,10 @@ esxGetHostname(virConnectPtr conn) (conn, &propertyNameList, "config.network.dnsConfig.hostName\0" "config.network.dnsConfig.domainName\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -750,9 +753,10 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) "hardware.memorySize\0" "hardware.numaInfo.numNodes\0" "summary.hardware.cpuModel\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -914,9 +918,10 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.powerState") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -970,7 +975,7 @@ esxNumberOfDomains(virConnectPtr conn) return -1; } - return esxVI_GetNumberOfDomainsByPowerState + return esxVI_LookupNumberOfDomainsByPowerState (conn, priv->host, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_False); } @@ -999,9 +1004,10 @@ esxDomainLookupByID(virConnectPtr conn, int id) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1082,9 +1088,10 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1168,9 +1175,10 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -2042,10 +2050,10 @@ esxDomainGetMaxVcpus(virDomainPtr domain) if (esxVI_String_AppendValueToList(domain->conn, &propertyNameList, "capability.maxSupportedVcpus") < 0 || - esxVI_GetObjectContent(domain->conn, priv->host, - priv->host->hostFolder, "HostSystem", - propertyNameList, esxVI_Boolean_True, - &hostSystem) < 0) { + esxVI_LookupObjectContentByType(domain->conn, priv->host, + priv->host->hostFolder, "HostSystem", + propertyNameList, esxVI_Boolean_True, + &hostSystem) < 0) { goto failure; } @@ -2270,9 +2278,10 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) if (esxVI_String_AppendValueListToList(conn, &propertyNameList, "name\0" "runtime.powerState\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -2337,7 +2346,7 @@ esxNumberOfDefinedDomains(virConnectPtr conn) return -1; } - return esxVI_GetNumberOfDomainsByPowerState + return esxVI_LookupNumberOfDomainsByPowerState (conn, priv->host, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_True); } @@ -2550,8 +2559,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto failure; } - if (esxVI_GetResourcePool(conn, priv->host, hostSystem, - &resourcePool) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(conn, priv->host, hostSystem, + &resourcePool) < 0) { goto failure; } @@ -3071,8 +3080,8 @@ esxDomainMigratePerform(virDomainPtr domain, goto failure; } - if (esxVI_GetResourcePool(domain->conn, priv->vCenter, hostSystem, - &resourcePool) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(domain->conn, priv->vCenter, + hostSystem, &resourcePool) < 0) { goto failure; } @@ -3172,8 +3181,8 @@ esxNodeGetFreeMemory(virConnectPtr conn) goto failure; } - if (esxVI_GetResourcePool(conn, priv->host, hostSystem, - &managedObjectReference) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(conn, priv->host, hostSystem, + &managedObjectReference) < 0) { goto failure; } @@ -3182,9 +3191,11 @@ esxNodeGetFreeMemory(virConnectPtr conn) /* Get memory usage of resource pool */ if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.memory") < 0 || - esxVI_GetObjectContent(conn, priv->host, managedObjectReference, - "ResourcePool", propertyNameList, - esxVI_Boolean_False, &resourcePool) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + managedObjectReference, + "ResourcePool", propertyNameList, + esxVI_Boolean_False, + &resourcePool) < 0) { goto failure; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index fa971d8..dc51e20 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -374,9 +374,10 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, } /* Get pointer to Datacenter for later use */ - if (esxVI_GetObjectContent(conn, ctx, ctx->service->rootFolder, - "Datacenter", propertyNameList, - esxVI_Boolean_True, &datacenterList) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, ctx->service->rootFolder, + "Datacenter", propertyNameList, + esxVI_Boolean_True, + &datacenterList) < 0) { goto failure; } @@ -1061,6 +1062,10 @@ esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, esxVI_List **list, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Utility and Convenience Functions + * + * Function naming scheme: + * - 'lookup' functions query the ESX or vCenter for information + * - 'get' functions get information from a local object */ int @@ -1301,9 +1306,11 @@ esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx) #else if (esxVI_String_AppendValueToList(conn, &propertyNameList, "currentSession") < 0 || - esxVI_GetObjectContent(conn, ctx, ctx->service->sessionManager, - "SessionManager", propertyNameList, - esxVI_Boolean_False, &sessionManager) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, + ctx->service->sessionManager, + "SessionManager", propertyNameList, + esxVI_Boolean_False, + &sessionManager) < 0) { goto failure; } @@ -1358,11 +1365,12 @@ esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx) int -esxVI_GetObjectContent(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ManagedObjectReference *root, - const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, - esxVI_ObjectContent **objectContentList) +esxVI_LookupObjectContentByType(virConnectPtr conn, esxVI_Context *ctx, + esxVI_ManagedObjectReference *root, + const char *type, + esxVI_String *propertyNameList, + esxVI_Boolean recurse, + esxVI_ObjectContent **objectContentList) { int result = 0; esxVI_ObjectSpec *objectSpec = NULL; @@ -1479,9 +1487,9 @@ esxVI_GetVirtualMachinePowerState(virConnectPtr conn, int -esxVI_GetNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, - esxVI_VirtualMachinePowerState powerState, - esxVI_Boolean inverse) +esxVI_LookupNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, + esxVI_VirtualMachinePowerState powerState, + esxVI_Boolean inverse) { esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; @@ -1492,9 +1500,10 @@ esxVI_GetNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.powerState") < 0 || - esxVI_GetObjectContent(conn, ctx, ctx->vmFolder, "VirtualMachine", - propertyNameList, esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, ctx->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1646,9 +1655,10 @@ esxVI_GetVirtualMachineIdentity(virConnectPtr conn, -int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool) +int +esxVI_LookupResourcePoolByHostSystem + (virConnectPtr conn, esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, + esxVI_ManagedObjectReference **resourcePool) { int result = 0; esxVI_String *propertyNameList = NULL; @@ -1684,9 +1694,10 @@ int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, if (esxVI_String_AppendValueToList(conn, &propertyNameList, "resourcePool") < 0 || - esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "ComputeResource", propertyNameList, - esxVI_Boolean_False, &computeResource) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "ComputeResource", propertyNameList, + esxVI_Boolean_False, + &computeResource) < 0) { goto failure; } @@ -1751,9 +1762,9 @@ esxVI_LookupHostSystemByIp(virConnectPtr conn, esxVI_Context *ctx, goto failure; } - if (esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "HostSystem", propertyNameList, - esxVI_Boolean_False, hostSystem) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "HostSystem", propertyNameList, + esxVI_Boolean_False, hostSystem) < 0) { goto failure; } @@ -1803,9 +1814,10 @@ esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx, } } - if (esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "VirtualMachine", propertyNameList, - esxVI_Boolean_False, virtualMachine) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "VirtualMachine", propertyNameList, + esxVI_Boolean_False, + virtualMachine) < 0) { goto failure; } @@ -1852,9 +1864,10 @@ esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx, goto failure; } - if (esxVI_GetObjectContent(conn, ctx, ctx->datacenter, - "Datastore", completePropertyNameList, - esxVI_Boolean_True, &datastoreList) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, ctx->datacenter, + "Datastore", completePropertyNameList, + esxVI_Boolean_True, + &datastoreList) < 0) { goto failure; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 6ba6bed..4892fde 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -192,29 +192,33 @@ int esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Utility and Convenience Functions + * + * Function naming scheme: + * - 'lookup' functions query the ESX or vCenter for information + * - 'get' functions get information from a local object */ -int -esxVI_Alloc(virConnectPtr conn, void **ptrptr, size_t size); +int esxVI_Alloc(virConnectPtr conn, void **ptrptr, size_t size); -int -esxVI_CheckSerializationNecessity(virConnectPtr conn, const char *element, - esxVI_Boolean required); +int esxVI_CheckSerializationNecessity(virConnectPtr conn, const char *element, + esxVI_Boolean required); int esxVI_BuildFullTraversalSpecItem (virConnectPtr conn, esxVI_SelectionSpec **fullTraversalSpecList, const char *name, const char *type, const char *path, const char *selectSetNames); + int esxVI_BuildFullTraversalSpecList (virConnectPtr conn, esxVI_SelectionSpec **fullTraversalSpecList); int esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx); -int esxVI_GetObjectContent(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ManagedObjectReference *root, - const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, - esxVI_ObjectContent **objectContentList); +int esxVI_LookupObjectContentByType(virConnectPtr conn, esxVI_Context *ctx, + esxVI_ManagedObjectReference *root, + const char *type, + esxVI_String *propertyNameList, + esxVI_Boolean recurse, + esxVI_ObjectContent **objectContentList); int esxVI_GetManagedEntityStatus (virConnectPtr conn, esxVI_ObjectContent *objectContent, @@ -225,7 +229,7 @@ int esxVI_GetVirtualMachinePowerState (virConnectPtr conn, esxVI_ObjectContent *virtualMachine, esxVI_VirtualMachinePowerState *powerState); -int esxVI_GetNumberOfDomainsByPowerState +int esxVI_LookupNumberOfDomainsByPowerState (virConnectPtr conn, esxVI_Context *ctx, esxVI_VirtualMachinePowerState powerState, esxVI_Boolean inverse); @@ -233,9 +237,9 @@ int esxVI_GetVirtualMachineIdentity(virConnectPtr conn, esxVI_ObjectContent *virtualMachine, int *id, char **name, unsigned char *uuid); -int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool); +int esxVI_LookupResourcePoolByHostSystem + (virConnectPtr conn, esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, + esxVI_ManagedObjectReference **resourcePool); int esxVI_LookupHostSystemByIp(virConnectPtr conn, esxVI_Context *ctx, const char *ipAddress, -- 1.6.0.4

2 1

[libvirt] [PATCH] ESX: Fix memory leak in list handling functions.
by Matthias Bolte 28 Oct '09

28 Oct '09

If an error occurs between the allocation of an item and appending it to the list, the item leaks. Free such orphaned items in error cases. * src/esx/esx_vi.c: free orphaned items in error cases --- src/esx/esx_vi.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bcf110f..04860e2 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -959,28 +959,22 @@ esxVI_List_CastFromAnyType(virConnectPtr conn, esxVI_AnyType *anyType, esxVI_AnyType_Free(&childAnyType); - if (esxVI_AnyType_Deserialize(conn, childNode, &childAnyType) < 0) { + if (esxVI_AnyType_Deserialize(conn, childNode, &childAnyType) < 0 || + castFromAnyTypeFunc(conn, childAnyType, &item) < 0 || + esxVI_List_Append(conn, list, item) < 0) { goto failure; } item = NULL; - - if (castFromAnyTypeFunc(conn, childAnyType, &item) < 0) { - goto failure; - } - - if (esxVI_List_Append(conn, list, item) < 0) { - goto failure; - } } - cleanup: esxVI_AnyType_Free(&childAnyType); return result; failure: + freeFunc(&item); freeFunc(list); result = -1; @@ -1039,20 +1033,18 @@ esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, esxVI_List **list, goto failure; } - item = NULL; - - if (deserializeFunc(conn, node, &item) < 0) { + if (deserializeFunc(conn, node, &item) < 0 || + esxVI_List_Append(conn, list, item) < 0) { goto failure; } - if (esxVI_List_Append(conn, list, item) < 0) { - goto failure; - } + item = NULL; } return 0; failure: + freeFunc(&item); freeFunc(list); return -1; -- 1.6.0.4

2 1

[libvirt] [PATCH 0/4] Support for SPICE graphics
by Daniel P. Berrange 28 Oct '09

28 Oct '09

This series of patches adds minimal support for SPICE graphics which is newly introduced in RHEL-5.4's fork of KVM. Since this is not yet merged in upstream QEMU/KVM, I'm not proposing to merge all these patches. The two XML schema patches are straightforward to merge. The two implementation ones are RHEL5 specific and I want to avoid declaring them supported until we have a sign of what the upstream merge will look like, since previous attempst to support KVM args prior to QEMU acceptance have been very painful long term. Daniel

3 14

[libvirt] [PATCH] libvirt-devel should only require libvirt-client
by Mark McLoughlin 28 Oct '09

28 Oct '09

There's a long known issue where if you install libvirt in a guest, the default virtual network will conflict with the default virtual network in the host. That's one of the reasons we have the libvirt-client RPM - it allows you to install the client library without having the host side installed. Rich Jones points out that if you install libvirt-devel in a guest, then you get libvirtd installed and the network conflict: https://bugzilla.redhat.com/531200 libvirt-devel should only require libvirt-client - e.g. nothing in the devel package pertains to anything in the libvirt RPM. The Fedora packaging guidelines say: https://fedoraproject.org/wiki/Packaging/Guidelines#Devel_Packages Devel packages must require the base package using a fully versioned dependency ... But for all intents and purposes, libvirt-client is our base RPM. * libvirt.spec.in: make libvirt-devel require libvirt-client --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6cd0888..7e1550e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -341,7 +341,7 @@ virtualization capabilities of recent versions of Linux (and other OSes). %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries -Requires: libvirt = %{version}-%{release} +Requires: libvirt-client = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel -- 1.6.2.5

2 1

[libvirt] [PATCH] qemu: Fix an error message in GetVcpus
by Cole Robinson 28 Oct '09

28 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 082cb04..a3beedb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3481,7 +3481,8 @@ qemudDomainGetVcpus(virDomainPtr dom, if (!virDomainIsActive(vm)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, - "%s",_("cannot pin vcpus on an inactive domain")); + "%s", + _("cannot list vcpu pinning for an inactive domain")); goto cleanup; } -- 1.6.5.rc2

2 2

[libvirt] [PATCH] Fix p2p migration without a passed uri.
by Cole Robinson 28 Oct '09

28 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 926c539..126675e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3217,7 +3217,7 @@ virDomainMigrate (virDomainPtr domain, char *dstURI = NULL; if (uri == NULL) { dstURI = virConnectGetURI(dconn); - if (!uri) + if (!dstURI) return NULL; } -- 1.6.5.rc2

2 2

[libvirt] [PATCH] virterror: Add a missing 'break' for VIR_ERR_INVALID_SECRET
by Cole Robinson 28 Oct '09

28 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/virterror.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 657cb3f..10f979c 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1082,6 +1082,7 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg = _("Invalid secret"); else errmsg = _("Invalid secret: %s"); + break; case VIR_ERR_NO_SECRET: if (info == NULL) errmsg = _("Secret not found"); -- 1.6.5.rc2

2 2

[libvirt] [PATCH] qemu: migrate: Don't require manual URI to specify a port
by Cole Robinson 28 Oct '09

28 Oct '09

The xen driver will generate a migration port if only a hostname is passed in the optional migrate URI, so let's do the same in qemu. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fb952d8..3ef29a6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6304,15 +6304,32 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, /* Get the port number. */ p = strrchr (uri_in, ':'); - p++; /* definitely has a ':' in it, see above */ - this_port = virParseNumber (&p); - if (this_port == -1 || p-uri_in != strlen (uri_in)) { - qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, - "%s", _("URI did not have ':port' at the end")); - goto cleanup; + if (p == strchr(uri_in, ':')) { + /* Generate a port */ + this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + if (port == QEMUD_MIGRATION_NUM_PORTS) + port = 0; + + /* Caller frees */ + if (virAsprintf(uri_out, "%s:%d", uri_in, this_port) < 0) { + virReportOOMError (dconn); + goto cleanup; + } + + } else { + p++; /* definitely has a ':' in it, see above */ + this_port = virParseNumber (&p); + if (this_port == -1 || p-uri_in != strlen (uri_in)) { + qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, + "%s", _("URI ended with incorrect ':port'")); + goto cleanup; + } } } + if (uri_out && *uri_out) + VIR_DEBUG("Generated uri_out=%s", *uri_out); + /* Parse the domain XML. */ if (!(def = virDomainDefParseString(dconn, driver->caps, dom_xml, VIR_DOMAIN_XML_INACTIVE))) { -- 1.6.5.rc2

2 2

[libvirt] [PATCH 0/4] test: Support virStorageFindPoolSources
by Cole Robinson 28 Oct '09

28 Oct '09

The following series refactors the storage pool parsing code to better facilitate FindPoolSources (both for the test driver, and future pool backend implementations). The last patch implements a FindPoolSources for the test driver, with hardcoded results for test:///default. Thanks, Cole Cole Robinson (4): storage: Break out pool source parsing to a separate function. storage: Break out function to add pool source to a SourceList. storage: Add ParseSourceString function for use with FindPoolSources. test: Support virStorageFindPoolSources src/conf/storage_conf.c | 259 +++++++++++++++++++++++---------- src/conf/storage_conf.h | 7 + src/libvirt_private.syms | 2 + src/storage/storage_backend_fs.c | 65 ++++----- src/storage/storage_backend_logical.c | 9 +- src/test/test_driver.c | 75 +++++++++- 6 files changed, 291 insertions(+), 126 deletions(-)

2 9

[libvirt] [PATCH] Update the documentation for virDomainMigrateToURI
by Chris Lalancette 28 Oct '09

28 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 9e87900..5787f22 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3154,7 +3154,7 @@ virDomainMigrateDirect (virDomainPtr domain, * XML includes details of the support URI schemes. If omitted * the dconn will be asked for a default URI. * - * In either case it is typically only neccessary to specify a + * In either case it is typically only necessary to specify a * URI if the destination host has multiple interfaces and a * specific interface is required to transmit migration data. * @@ -3273,7 +3273,7 @@ error: /** * virDomainMigrateToURI: * @domain: a domain object - * @duri: mandatory URI for the destination host + * @duri: mandatory URI for the destination host (see below) * @flags: flags * @dname: (optional) rename domain to this at destination * @bandwidth: (optional) specify migration bandwidth limit in Mbps @@ -3285,28 +3285,31 @@ error: * VIR_MIGRATE_LIVE Do not pause the VM during migration * VIR_MIGRATE_PEER2PEER Direct connection between source & destination hosts * VIR_MIGRATE_TUNNELLED Tunnel migration data over the libvirt RPC channel + * VIR_MIGRATE_PERSIST_DEST If the migration is successful, persist the domain + * on the destination host. + * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the + * domain on the source host. * - * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. - * Applications using the VIR_MIGRATE_PEER2PEER flag will probably - * prefer to invoke virDomainMigrateToURI, avoiding the need to - * open connection to the destination host themselves. - * - * If a hypervisor supports renaming domains during migration, - * then you may set the dname parameter to the new name (otherwise - * it keeps the same name). If this is not supported by the - * hypervisor, dname must be NULL or else you will get an error. - * - * If the VIR_MIGRATE_PEER2PEER flag is set, the duri parameter - * must be a valid libvirt connection URI, by which the source - * libvirt driver can connect to the destination libvirt. - * + * The operation of this API hinges on the VIR_MIGRATE_PEER2PEER flag. * If the VIR_MIGRATE_PEER2PEER flag is NOT set, the duri parameter * takes a hypervisor specific format. The hypervisor capabilities - * XML includes details of the support URI schemes. Not all hypervisors + * XML includes details of the supported URI schemes. Not all hypervisors * will support this mode of migration, so if the VIR_MIGRATE_PEER2PEER - * flag is not set, then it may be neccessary to use the alternative + * flag is not set, then it may be necessary to use the alternative * virDomainMigrate API providing an explicit virConnectPtr for the - * destination host + * destination host. + * + * If the VIR_MIGRATE_PEER2PEER flag IS set, the duri parameter + * must be a valid libvirt connection URI, by which the source + * libvirt driver can connect to the destination libvirt. + * + * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. + * + * If a hypervisor supports renaming domains during migration, + * the dname parameter specifies the new name for the domain. + * Setting dname to NULL keeps the domain name the same. If domain + * renaming is not supported by the hypervisor, dname must be NULL or + * else an error will be returned. * * The maximum bandwidth (in Mbps) that will be used to do migration * can be specified with the bandwidth parameter. If set to 0, -- 1.6.0.6

3 3

[libvirt] [PATCH] Better error message when libvirtd fails to start.
by Chris Lalancette 28 Oct '09

28 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 78dfb2d..03bc1b4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -2972,7 +2972,9 @@ int main(int argc, char **argv) { if (mkdir (rundir, 0755)) { if (errno != EEXIST) { - VIR_ERROR0 (_("unable to create rundir")); + char ebuf[1024]; + VIR_ERROR(_("unable to create rundir %s: %s"), rundir, + virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } } -- 1.6.0.6

3 3

[libvirt] [PATCH] add <bootp server="...">
by Paolo Bonzini 28 Oct '09

28 Oct '09

This patch adds an optional attribute to the <bootp> tag, that allows to specify a TFTP server address other than the address of the DHCP server itself. This can be used to forward the BOOTP settings of the host down to the guest. This is something that configurations such as Xen's default network achieve naturally, but must be done manually for NAT. 2009-10-22 Paolo Bonzini <pbonzini(a)redhat.com> * docs/formatnetwork.html.in: Document new attribute. * docs/schemas/network.rng: Add it to schema. * src/conf/network_conf.h: Add it to struct. * src/conf/network_conf.c: Add it to parser and pretty printer. * src/network/bridge_driver.c: Put it in the dnsmasq command line. * tests/networkxml2xmlin/netboot-proxy-network.xml: New. * tests/networkxml2xmlout/netboot-proxy-network.xml: New. * tests/networkxml2xmltest.c: Add the new test. --- docs/formatnetwork.html.in | 15 ++++++++++----- docs/schemas/network.rng | 3 +++ src/conf/network_conf.c | 9 ++++++++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 9 +++++++-- tests/networkxml2xmlin/netboot-proxy-network.xml | 13 +++++++++++++ tests/networkxml2xmlout/netboot-proxy-network.xml | 13 +++++++++++++ tests/networkxml2xmltest.c | 1 + 8 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 tests/networkxml2xmlin/netboot-proxy-network.xml create mode 100644 tests/networkxml2xmlout/netboot-proxy-network.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e471385..eb61f15 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -142,11 +142,16 @@ name to be given that host by the DHCP server (via the <code>name</code> attribute). <span class="since">Since 0.4.5</span> </dd><dt><code>bootp</code></dt><dd>The optional <code>bootp</code> - element specifies BOOTP options to be provided by the DHCP server. - Only one attribute is supported, <code>file</code>, giving the file - to be used for the boot image). The BOOTP options currently have to - be the same for all address ranges and statically assigned addresses.<span - class="since">Since 0.7.1.</span> + element specifies BOOTP options to be provided by the DHCP server. + Two attributes are supported: <code>file</code> is mandatory and + gives the file to be used for the boot image; <code>server</code> is + optional and gives the address of the TFTP server from which the boot + image will be fetched. <code>server</code> defaults to the same host + that runs the DHCP server, as is the case when the <code>tftp</code> + element is used. The BOOTP options currently have to be the same + for all address ranges and statically assigned addresses.<span + class="since">Since 0.7.1 (<code>server</code> since 0.7.3).</span> + </dd> </dl> <h2><a name="examples">Example configuration</a></h2> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 7a2d7d4..adef792 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -109,6 +109,9 @@ <optional> <element name="bootp"> <attribute name="file"><text/></attribute> + <optional> + <attribute name="server"><text/></attribute> + </optional> </element> </optional> </element> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 40f5fdd..fd8efb0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -117,6 +117,7 @@ void virNetworkDefFree(virNetworkDefPtr def) VIR_FREE(def->tftproot); VIR_FREE(def->bootfile); + VIR_FREE(def->bootserver); VIR_FREE(def); } @@ -313,6 +314,7 @@ virNetworkDHCPRangeDefParseXML(virConnectPtr conn, } def->bootfile = (char *)file; + def->bootserver = (char *) xmlGetProp(cur, BAD_CAST "server"); } cur = cur->next; @@ -671,8 +673,13 @@ char *virNetworkDefFormat(virConnectPtr conn, virBufferAddLit(&buf, "/>\n"); } if (def->bootfile) { - virBufferEscapeString(&buf, " <bootp file='%s' />\n", + virBufferEscapeString(&buf, " <bootp file='%s' ", def->bootfile); + if (def->bootserver) { + virBufferEscapeString(&buf, "server='%s' ", + def->bootserver); + } + virBufferAddLit(&buf, "/>\n"); } virBufferAddLit(&buf, " </dhcp>\n"); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index e983a01..6175b0f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -81,6 +81,7 @@ struct _virNetworkDef { char *tftproot; char *bootfile; + char *bootserver; }; typedef struct _virNetworkObj virNetworkObj; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 95bc810..bc241ef 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -402,7 +402,7 @@ networkBuildDnsmasqArgv(virConnectPtr conn, (2 * network->def->nhosts) + /* --enable-tftp --tftp-root /srv/tftp */ (network->def->tftproot ? 3 : 0) + - /* --dhcp-boot pxeboot.img */ + /* --dhcp-boot pxeboot.img[,,12.34.56.78] */ (network->def->bootfile ? 2 : 0) + 1; /* NULL */ @@ -488,8 +488,13 @@ networkBuildDnsmasqArgv(virConnectPtr conn, APPEND_ARG(*argv, i++, network->def->tftproot); } if (network->def->bootfile) { + snprintf(buf, sizeof(buf), "%s%s%s", + network->def->bootfile, + network->def->bootserver ? ",," : "", + network->def->bootserver ? network->def->bootserver : ""); + APPEND_ARG(*argv, i++, "--dhcp-boot"); - APPEND_ARG(*argv, i++, network->def->bootfile); + APPEND_ARG(*argv, i++, buf); } #undef APPEND_ARG diff --git a/tests/networkxml2xmlin/netboot-proxy-network.xml b/tests/networkxml2xmlin/netboot-proxy-network.xml new file mode 100644 index 0000000..ecb6738 --- /dev/null +++ b/tests/networkxml2xmlin/netboot-proxy-network.xml @@ -0,0 +1,13 @@ +<network> + <name>netboot</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <bridge name="virbr1" stp='off' delay='1'/> + <domain name="example.com"/> + <forward/> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254" /> + <bootp file="pxeboot.img" server="10.20.30.40" /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml b/tests/networkxml2xmlout/netboot-proxy-network.xml new file mode 100644 index 0000000..e11c50b --- /dev/null +++ b/tests/networkxml2xmlout/netboot-proxy-network.xml @@ -0,0 +1,13 @@ +<network> + <name>netboot</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward mode='nat'/> + <bridge name='virbr1' stp='off' delay='1' /> + <domain name='example.com'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <bootp file='pxeboot.img' server='10.20.30.40' /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index b02d735..957e64b 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -89,6 +89,7 @@ mymain(int argc, char **argv) DO_TEST("routed-network"); DO_TEST("nat-network"); DO_TEST("netboot-network"); + DO_TEST("netboot-proxy-network"); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -- 1.6.2.5

4 5

[libvirt] [PATCH] Improve error reporting for virConnectGetHostname calls
by Cole Robinson 28 Oct '09

28 Oct '09

All drivers have copy + pasted inadequate error reporting which wraps util.c:virGetHostname. Move all error reporting to this function, and improve what we report. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.c | 3 +-- src/lxc/lxc_driver.c | 10 +--------- src/qemu/qemu_driver.c | 14 ++------------ src/test/test_driver.c | 10 +--------- src/uml/uml_driver.c | 10 +--------- src/util/util.c | 18 +++++++++++++++--- src/util/util.h | 2 +- src/vbox/vbox_tmpl.c | 11 +---------- src/xen/xen_driver.c | 10 +--------- src/xen/xend_internal.c | 3 +-- tools/virsh.c | 2 +- 11 files changed, 26 insertions(+), 67 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 03d091a..058e684 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -939,9 +939,8 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) { if (!mdns_name) { char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - localhost = virGetHostname(); + localhost = virGetHostname(NULL); if (localhost == NULL) { - virReportOOMError(NULL); goto cleanup; } if ((tmp = strchr(localhost, '.'))) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef97364..73f1c8e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2058,16 +2058,8 @@ cleanup: static char *lxcGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a3beedb..86546e5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2623,16 +2623,8 @@ cleanup: static char * qemudGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int qemudListDomains(virConnectPtr conn, int *ids, int nids) { @@ -6283,9 +6275,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ - if ((hostname = virGetHostname()) == NULL) { - virReportSystemError (dconn, errno, - "%s", _("failed to determine host name")); + if ((hostname = virGetHostname(dconn)) == NULL) { goto cleanup; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 36f8158..4a081be 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -994,16 +994,8 @@ static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, static char *testGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 9a7fe42..cd92a6b 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1131,16 +1131,8 @@ cleanup: static char * umlGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int umlListDomains(virConnectPtr conn, int *ids, int nids) { diff --git a/src/util/util.c b/src/util/util.c index 98f8a14..49eac6d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1804,30 +1804,42 @@ int virDiskNameToIndex(const char *name) { #define AI_CANONIDN 0 #endif -char *virGetHostname(void) +char *virGetHostname(virConnectPtr conn) { int r; char hostname[HOST_NAME_MAX+1], *result; struct addrinfo hints, *info; r = gethostname (hostname, sizeof(hostname)); - if (r == -1) + if (r == -1) { + virReportSystemError (conn, errno, + "%s", _("failed to determine host name")); return NULL; + } NUL_TERMINATE(hostname); memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); - if (r != 0) + if (r != 0) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("getaddrinfo failed for '%s': %s"), + hostname, gai_strerror(r)); return NULL; + } if (info->ai_canonname == NULL) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("could not determine canonical host name")); freeaddrinfo(info); return NULL; } /* Caller frees this string. */ result = strdup (info->ai_canonname); + if (!result) + virReportOOMError(conn); + freeaddrinfo(info); return result; } diff --git a/src/util/util.h b/src/util/util.h index 8679636..85d5488 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -222,7 +222,7 @@ static inline int getuid (void) { return 0; } static inline int getgid (void) { return 0; } #endif -char *virGetHostname(void); +char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 4f43901..2a17946 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -594,17 +594,8 @@ static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { } static char *vboxGetHostname(virConnectPtr conn) { - char *hostname; - /* the return string should be freed by caller */ - hostname = virGetHostname(); - if (hostname == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s", - "failed to determine host name"); - return NULL; - } - - return hostname; + return virGetHostname(conn); } static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f2744b0..0818cd3 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -484,16 +484,8 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer) static char * xenUnifiedGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d3ab019..6d1d851 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4347,9 +4347,8 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, * deallocates this string. */ if (uri_in == NULL) { - *uri_out = virGetHostname(); + *uri_out = virGetHostname(dconn); if (*uri_out == NULL) { - virReportOOMError(dconn); return -1; } } diff --git a/tools/virsh.c b/tools/virsh.c index 6b93405..3c668da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -524,7 +524,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) char *thatHost = NULL; char *thisHost = NULL; - if (!(thisHost = virGetHostname())) { + if (!(thisHost = virGetHostname(ctl->conn))) { vshError(ctl, "%s", _("Failed to get local hostname")); goto cleanup; } -- 1.6.5.rc2

3 3

[libvirt] [PATCH] qemu: migrate: Error if we collide with an inactive domain
by Cole Robinson 28 Oct '09

28 Oct '09

Currently the check for a VM name/uuid collision on the migrate destination only errors for active domains. Not sure why this wouldn't apply for non running VMs as well, so drop the check. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86546e5..fb952d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6341,13 +6341,10 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (!vm) vm = virDomainFindByName(&driver->domains, dname); if (vm) { - if (virDomainIsActive(vm)) { - qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED, - _("domain with the same name or UUID already exists as '%s'"), - vm->def->name); - goto cleanup; - } - virDomainObjUnlock(vm); + qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED, + _("domain with the same name or UUID already exists as '%s'"), + vm->def->name); + goto cleanup; } if (!(vm = virDomainAssignDef(dconn, -- 1.6.5.rc2

3 2

[libvirt] New APIs for checking some object properties (v2)
by Daniel P. Berrange 28 Oct '09

28 Oct '09

This is a second posting of the proposal from earlier today http://www.redhat.com/archives/libvir-list/2009-October/msg00556.html The changes since last time - Renamed some existing internal APIs which had bad names which clashed with our new public APis. - Fix the comment bugs Daniel mentioned - Change the return status from '> 0' to '1', so we can explicitly add other positive integer return codes if ever required - Implement the new APIs for (nearly) all drivers Daniel

3 12

[libvirt] [PATCH 0/2] Fix a couple problems encountered during virInterface testing
by Laine Stump 28 Oct '09

28 Oct '09

When testing all the different possibilities of interfaces with the new netcf release + my latest libvirt patches (ACKed, but not yet committed), I came across some problems, addressed by the following two patches. The first patch is for a bug that crept in due to a last minute change suggested in danpb's review - I missed changing a couple places to account for changing the initial value of "ret". It could alternately be squashed into this patch, which hasn't yet been committed: https://www.redhat.com/archives/libvir-list/2009-October/msg00689.html The second patch loosens up the parsing of vlan, bond, and bridge interface XML because the live config XML doesn't know how to get those items yet. I believe the necessary items can be learned and included by the time for the *next* libvirt release, but think that the new functionality there already is too useful (and too needy of more hands to test) to delay the entire set for that long.

2 4

[libvirt] Trouble starting a QEMU guest with IPv6 VNC address
by Kaitlin Rupert 28 Oct '09

28 Oct '09

Hello, I am trying to start a QEMU guest with an IPv6 VNC address. I can specify the address and start the guest, but the VNC port shows up under the IPv4 list: # virsh dumpxml domU1 | grep graphics <graphics type='vnc' port='5900' autoport='no' listen='::1' keymap='en-us'/> # cat /proc/net/tcp | grep 170C 2: 00000000:170C 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621103 1 ffff88007a043a80 299 0 0 2 -1 # cat /proc/net/tcp6 | grep 170C # # ps -ef | grep qemu root 16451 1 43 04:17 ? 00:00:18 /usr/bin/qemu-system-x86_64 -S -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0 -k en-us I started the same guest manually, but I appended an ",ipv6' flag to the vnc option (see below). With this change, the port shows up in the IPv6 list. # /usr/bin/qemu-system-x86_64 -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0,ipv6 -k en-us # cat /proc/net/tcp6 | grep 170C 2: 00000000000000000000000000000000:170C 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621485 1 ffff88007a30ad00 299 0 0 2 -1 # cat /proc/net/tcp | grep 170C # I'd like to fix the qemu driver so that it specifies this flag, but I am unsure whether a guest XML change or some other change is appropriate here. Would it be better to have the qemu driver code do some detection on the address that is passed in? Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

3 3

[libvirt] virsh: error: failed to disconnect from the hypervisor in F12/rawhide with Xen
by Pasi Kärkkäinen 28 Oct '09

28 Oct '09

Hello, I have a testbox running current Fedora 12 (rawhide), with custom 2.6.31.4 Xen pv_ops dom0 kernel. [root@f12test ~]# xm list Name ID Mem VCPUs State Time(s) Domain-0 0 1020 4 r----- 33.8 c54test 1024 1 0.0 [root@f12test ~]# virsh list Id Name State ---------------------------------- 0 Domain-0 running virsh: error: failed to disconnect from the hypervisor [root@f12test ~]# virsh --connect xen:/// version Compiled against library: libvir 0.7.1 Using library: libvir 0.7.1 Using API: Xen 3.0.1 Running hypervisor: Xen 3.4.0 virsh: error: failed to disconnect from the hypervisor *** glibc detected *** virsh: double free or corruption (fasttop): 0x0000000000936250 *** ======= Backtrace: ========= /lib64/libc.so.6[0x3d9ec75dc6] virsh[0x406d91] virsh[0x406f29] virsh[0x406de3] virsh[0x414582] /lib64/libc.so.6(__libc_start_main+0xfd)[0x3d9ec1eb4d] virsh[0x405b59] ======= Memory map: ======== <snip, memory map removed> [root@f12test ~]# rpm -qa | grep -i libvirt libvirt-python-0.7.1-13.fc12.x86_64 libvirt-0.7.1-13.fc12.x86_64 libvirt-client-0.7.1-13.fc12.x86_64 [root@f12test ~]# rpm -qa | grep -i xen kernel-2.6.31.4-1.2.73.xendom0.fc12.x86_64 xen-3.4.1-5.fc12.x86_64 xen-runtime-3.4.1-5.fc12.x86_64 kernel-devel-2.6.31.4-1.2.73.xendom0.fc12.x86_64 xen-libs-3.4.1-5.fc12.x86_64 xen-hypervisor-3.4.1-5.fc12.x86_64 Any ideas? -- Pasi

2 3