- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: check actual access to the cert
by Doug Goldstein 06 May '11

06 May '11

Instead of calling stat(), check that we'll actually be able to access and read the file. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/remote/remote_driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9965d38..c4e43aa 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1140,8 +1140,7 @@ static gnutls_certificate_credentials_t x509_cred; static int check_cert_file(const char *type, const char *file) { - struct stat sb; - if (stat(file, &sb) < 0) { + if (access(file, F_OK|R_OK)) { virReportSystemError(errno, _("Cannot access %s '%s'"), type, file); -- 1.7.5.rc3

2 1

[libvirt] [PATCH] maint: avoid comparisons to bool constants
by Eric Blake 06 May '11

06 May '11

HACKING already mentions that comparisons against literal 'true' are unsafe; for consistency, also shorten comparisons against 'false'. * src/conf/domain_conf.c (virDomainNetDefParseXML): Simplify. * src/nwfilter/nwfilter_gentech_driver.c (virNWFilterDomainFWUpdateCB): Likewise. * tools/virsh.c (cmdVolDownload, vshCommandRun, vshPrintExtra): Likewise. --- src/conf/domain_conf.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- tools/virsh.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70ea350..a936ea4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2581,7 +2581,7 @@ virDomainNetDefParseXML(virCapsPtr caps, xmlStrEqual(cur->name, BAD_CAST "source")) { dev = virXMLPropString(cur, "dev"); mode = virXMLPropString(cur, "mode"); - } else if ((virtPortParsed == false) && + } else if (!virtPortParsed && (def->type == VIR_DOMAIN_NET_TYPE_DIRECT) && xmlStrEqual(cur->name, BAD_CAST "virtualport")) { if (virVirtualPortProfileParamsParseXML(cur, &virtPort)) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index f89fb79..3e8961d 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -1032,7 +1032,7 @@ virNWFilterDomainFWUpdateCB(void *payload, cb->err = virNWFilterUpdateInstantiateFilter(cb->conn, net, &skipIface); - if (cb->err == 0 && skipIface == true) { + if (cb->err == 0 && skipIface) { /* filter tree unchanged -- no update needed */ cb->err = virHashAddEntry(cb->skipInterfaces, net->ifname, diff --git a/tools/virsh.c b/tools/virsh.c index e32680c..2b16714 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7318,7 +7318,7 @@ cmdVolDownload (vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FORCE_CLOSE(fd); - if (ret == false && created) + if (!ret && created) unlink(file); if (vol) virStorageVolFree(vol); @@ -11697,11 +11697,11 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) if (enable_timing) GETTIMEOFDAY(&after); - if (ret == false) + if (!ret) virshReportError(ctl); /* try to automatically catch disconnections */ - if ((ret == false) && + if (!ret && ((disconnected != 0) || ((last_error != NULL) && (((last_error->code == VIR_ERR_SYSTEM_ERROR) && @@ -12105,7 +12105,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) va_list ap; char *str; - if (ctl && ctl->quiet == true) + if (ctl && ctl->quiet) return; va_start(ap, format); -- 1.7.4.4

2 2

[libvirt] [PATCH 1/3] command: Add virCommandEnvAddFormat
by Cole Robinson 06 May '11

06 May '11

Similar to virCommandArgAddFormat. We will use this shortly. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/command.c | 30 ++++++++++++++++++++++++++++++ src/util/command.h | 7 +++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1b22be6..d89b191 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -99,6 +99,7 @@ virCommandAddArgList; virCommandAddArgPair; virCommandAddArgSet; virCommandAddEnvBuffer; +virCommandAddEnvFormat; virCommandAddEnvPair; virCommandAddEnvPass; virCommandAddEnvPassCommon; diff --git a/src/util/command.c b/src/util/command.c index 862a913..f382cc5 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -259,6 +259,36 @@ virCommandNonblockingFDs(virCommandPtr cmd) } /* + * Add an environment variable to the child created by a printf-style format + */ +void +virCommandAddEnvFormat(virCommandPtr cmd, const char *format, ...) +{ + char *env; + va_list list; + + if (!cmd || cmd->has_error) + return; + + va_start(list, format); + if (virVasprintf(&env, format, list) < 0) { + cmd->has_error = ENOMEM; + va_end(list); + return; + } + va_end(list); + + /* Arg plus trailing NULL. */ + if (VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1) < 0) { + VIR_FREE(env); + cmd->has_error = ENOMEM; + return; + } + + cmd->env[cmd->nenv++] = env; +} + +/* * Add an environment variable to the child * using separate name & value strings */ diff --git a/src/util/command.h b/src/util/command.h index ff8ccf5..69e9169 100644 --- a/src/util/command.h +++ b/src/util/command.h @@ -98,6 +98,13 @@ void virCommandDaemonize(virCommandPtr cmd); void virCommandNonblockingFDs(virCommandPtr cmd); /* + * Add an environment variable to the child created by a printf-style format + */ +void +virCommandAddEnvFormat(virCommandPtr cmd, const char *format, ...) + ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); + +/* * Add an environment variable to the child * using separate name & value strings */ -- 1.7.4.4

2 6

[libvirt] [PATCH v3] Add warning message to XML definition files stored on disk
by Michal Privoznik 06 May '11

06 May '11

Users often edit XML file stored in configuration directory thinking of modifying a domain/network/pool/etc. Thus it is wise to let them know they are using the wrong way and give them hint. --- diff to v2: - remove redundant flag VIR_XML_EMIT_WARNING - remove enum, pass const string instead - don't translate warning message diff to v1: - instead of pointing users to web, write down the actual virsh command - write to passed FD instead of buffer src/conf/domain_conf.c | 2 ++ src/conf/network_conf.c | 2 ++ src/conf/nwfilter_conf.c | 4 ++++ src/conf/storage_conf.c | 2 ++ src/libvirt_private.syms | 1 + src/util/util.c | 37 +++++++++++++++++++++++++++++++++++++ src/util/util.h | 4 ++++ 7 files changed, 52 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index eae178b..e98af0f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8561,6 +8561,8 @@ int virDomainSaveXML(const char *configDir, goto cleanup; } + virEmitXMLWarning(fd, def->name, "edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 08f7b77..4eb46fa 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -925,6 +925,8 @@ int virNetworkSaveXML(const char *configDir, goto cleanup; } + virEmitXMLWarning(fd, def->name, "net-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 5ba2972..eb75bad 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2249,6 +2249,8 @@ int virNWFilterSaveXML(const char *configDir, goto cleanup; } + virEmitXMLWarning(fd, def->name, "nwfilter-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, @@ -2645,6 +2647,8 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, goto cleanup; } + virEmitXMLWarning(fd, def->name, "nwfilter-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) != towrite) { virReportSystemError(errno, diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index aeb1596..9be4cae 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1551,6 +1551,8 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, goto cleanup; } + virEmitXMLWarning(fd, def->name, "pool-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) != towrite) { virReportSystemError(errno, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ea4bf74..e2e706d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -901,6 +901,7 @@ virArgvToString; virAsprintf; virBuildPathInternal; virDirCreate; +virEmitXMLWarning; virEnumFromString; virEnumToString; virEventAddHandle; diff --git a/src/util/util.c b/src/util/util.c index 9041ab6..3b151f4 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3207,3 +3207,40 @@ bool virIsDevMapperDevice(const char *devname ATTRIBUTE_UNUSED) return false; } #endif + +int virEmitXMLWarning(int fd, + const char *name, + const char *cmd) { + size_t len; + const char *prologue = "\n\n"; + + if (fd < 0 || !name || !cmd) + return -1; + + len = strlen(prologue); + if (safewrite(fd, prologue, len) != len) + return -1; + + len = strlen(cmd); + if (safewrite(fd, cmd, len) != len) + return -1; + + if (safewrite(fd, " ", 1) != 1) + return -1; + + len = strlen(name); + if (safewrite(fd, name, len) != len) + return -1; + + len = strlen(epilogue); + if (safewrite(fd, epilogue, len) != len) + return -1; + + return 0; +} diff --git a/src/util/util.h b/src/util/util.h index d320c40..9d8df06 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -299,4 +299,8 @@ int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; char *virTimestamp(void); bool virIsDevMapperDevice(const char *devname) ATTRIBUTE_NONNULL(1); + +int virEmitXMLWarning(int fd, + const char *name, + const char *cmd) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); #endif /* __VIR_UTIL_H__ */ -- 1.7.4.4

3 2

[libvirt] [PATCH] qemu: Don't flag domain running when qemu dies
by Michal Privoznik 06 May '11

06 May '11

When we try to stop domain's CPUs and qemu crash meanwhile, a cleanup of domain is performed and domain gets into state VIR_DOMAIN_SHUTOFF. But this is later overwritten and thus results in domain marked as running but with negative ID. --- src/qemu/qemu_process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7691cbe..539e4f3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1919,7 +1919,7 @@ int qemuProcessStopCPUs(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorStopCPUs(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); - if (ret < 0) { + if (ret < 0 && vm->state == VIR_DOMAIN_PAUSED) { vm->state = oldState; } return ret; -- 1.7.4.4

3 2

[libvirt] [PATCH 0/8] Introduce virDomainGetState API
by Jiri Denemark 06 May '11

06 May '11

This new API solves several problems: - calling virDomainGetInfo for just getting domain status is an overkill since it may result in sending requests to guest OS - since virDomainGetInfo can hang when guest OS is not responding and it is used by virsh list, listing domains can hang - virDomainGetState provides additional info about what action led to domain's current state, which can be used instead of listening to domain events I'm undecided whether this API should support flags parameter or not. On one hand the API seems simple and focused enough not to allow any fine-tuning but on the other hand we've already had too many issues with APIs that didn't support flags. Another thing is that it would be nice to somehow report that a domain is running but libvirt is currently waiting for reply from hypervisor and is not able to do anything else with the domain until it gets the reply. In case of qemu driver, this translates to the driver being stuck in comunication with qemu monitor. I'm not sure if we should somehow integrate this into virDomainGetState API. Probably not. Jiri Denemark (8): virDomainGetState public API Internal driver API for virDomainGetState virDomainGetState public API implementation Wire protocol format and dispatcher for virDomainGetState virsh: Prefer virDomainGetState over virDomainGetInfo remote: Implement virDomainGetState Implement basic virDomainGetState in all drivers Implement domain state reason daemon/remote.c | 33 ++++++ daemon/remote_dispatch_prototypes.h | 8 ++ daemon/remote_dispatch_table.h | 5 + include/libvirt/libvirt.h.in | 55 ++++++++++ python/generator.py | 1 + python/libvirt-override-api.xml | 5 + python/libvirt-override.c | 26 +++++ src/conf/domain_conf.c | 163 ++++++++++++++++++++++++++++- src/conf/domain_conf.h | 26 +++++- src/driver.h | 5 + src/esx/esx_driver.c | 53 ++++++++++ src/libvirt.c | 47 +++++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 5 + src/libxl/libxl_driver.c | 75 ++++++++++--- src/lxc/lxc_driver.c | 76 ++++++++++---- src/openvz/openvz_conf.c | 16 ++- src/openvz/openvz_driver.c | 52 ++++++++-- src/phyp/phyp_driver.c | 11 ++ src/qemu/qemu_driver.c | 90 ++++++++++++----- src/qemu/qemu_migration.c | 24 +++-- src/qemu/qemu_process.c | 61 +++++++----- src/qemu/qemu_process.h | 12 ++- src/remote/remote_driver.c | 30 ++++++ src/remote/remote_protocol.c | 20 ++++ src/remote/remote_protocol.h | 16 +++ src/remote/remote_protocol.x | 12 ++- src/remote_protocol-structs | 7 ++ src/test/test_driver.c | 102 +++++++++++++------ src/uml/uml_driver.c | 53 ++++++++-- src/vbox/vbox_tmpl.c | 55 ++++++++++ src/vmware/vmware_conf.c | 3 +- src/vmware/vmware_driver.c | 55 ++++++++--- src/xen/xen_driver.c | 17 +++ src/xen/xen_driver.h | 1 + src/xen/xen_hypervisor.c | 33 ++++++ src/xen/xen_hypervisor.h | 4 + src/xen/xen_inotify.c | 1 + src/xen/xend_internal.c | 96 +++++++++++++----- src/xen/xend_internal.h | 1 + src/xen/xm_internal.c | 18 +++ src/xen/xm_internal.h | 1 + src/xen/xs_internal.c | 31 ++++++ src/xen/xs_internal.h | 3 + src/xenapi/xenapi_driver.c | 44 ++++++++ tools/virsh.c | 195 +++++++++++++++++++++++++++++------ 46 files changed, 1415 insertions(+), 236 deletions(-) -- 1.7.5.rc3

3 21

[libvirt] libvirt commands during migration
by Dan Kenigsberg 06 May '11

06 May '11

Hi, We've noticed that most of libvirt domain-specific calls block while qemu is migrating. Isn't it kind-of-a-bug? Migration can take a while; qemu allows to do it in the background, and accepts monitor commands. So why should a libvirt user be blocked from his favorite domblkstat? Regards, Dan.

2 1

Re: [libvirt] failure to build on rawhide
by Ludovic Courtès 06 May '11

06 May '11

Hi Eric, Eric Blake <eblake(a)redhat.com> writes: > I'm getting this when trying to build libvirt on rawhide (using the > package gnutls-devel-2.12.3-1.fc16.x86_64): > > remote/remote_driver.c: In function 'negotiate_gnutls_on_connection': > remote/remote_driver.c:1361:9: error: > 'gnutls_certificate_type_set_priority' is deprecated (declared at > /usr/include/gnutls/compat.h:347) [-Werror=deprecated-declarations] > > but I can't find anything in the gnutls man pages that says why it is > deprecated or what to use in its place. Any ideas? This has been replaced by “priority strings” (info "(gnutls) Priority Strings"). ‘NEWS’ doesn’t seem to mention it, but I agree that it should. Thanks, Ludo’.

1 0

[libvirt] converting save/dump output into physical memory image
by Andrew Tappert 06 May '11

06 May '11

A lot of people in the security community, myself included, are interested in memory forensics these days. Virtualization is a natural fit with memory forensics because it allows one to get access to a guest's memory without having to introduce any extra software into the guest or otherwise interfere with it. Incident responders are particularly interested in getting memory dumps from systems they're investigating. Virsh has "save" and "dump" commands for storing the state of a guest to a file on disk, but memory of KVM guests doesn't get saved in the "standard" input format for memory forensics tools, which is a raw physical memory image. (This is what you'd get via the classical "dd /dev/mem" approach or the contemporary equivalent using the crash driver; and VMware Server and Workstation produce .vmem files, which are such raw physical memory images, when a guest is paused or snapshotted.) In order to analyze the memory of Libvirt/KVM guests with my Linux memory forensics software, Second Look, I've created a tool for converting Libvirt-QEMU-save files (output of virsh save command) or QEMU-savevm files (output of virsh dump command) to raw physical memory images. I've got a basic working capability, though I'm still tracking down some problems with a guest allocated 8GB RAM--not all the memory seems to be present in the save or dump file. And I haven't tested very extensively yet, version support is limited to what I myself am currently running, etc. I'd like to know if this is a capability that others are interested in. Is this something that would be of interest to the Libvirt project if I were to contribute the code, or to the KVM project, or do you think it best exists as a separate project? I've also got a proof-of-concept tool for converting hibernate images to raw physical memory images. Perhaps a collection of tools for converting various memory dump formats would be a good project. Anyone else interested in this kind of stuff? As an author of commercial memory forensics software I've got a vested interest in availability of good memory acquisition capabilities. But there are a number of people working on FOSS Linux memory analysis tools, too... Andrew

3 3

[libvirt] [PATCH 0/5] Support for marking domains as "tainted" (v2)
by Daniel P. Berrange 06 May '11

06 May '11

There are various configurations for virtual domains that we allow, but do not wish to actively support in production environments. The support situation is similar to that of binary only or non-GPL kernel modules, so borrow the kernel's idea of "tainting". When an undesirable configuration is used on a running VM, set a suitable taint flag and log a warning. OS distro bug triagers can see these warnings and decide whether to support users filing bugs in this scenarios In v2: - Split up the 3rd patch into 3 pieces - Add a dedicated API for appending a formatted string to the domain logfile (optionally opening the log if not already opened) - Use 'enum virDomainTaintFlags' for parameters instead of 'int'

2 11