- Devel - libvirt List Archives

[libvirt] [libvirt-glib][PATCH] Drop unused finalize function
by Michal Privoznik 07 Dec '15

07 Dec '15

After 1225a160ac3b4 where I'm dropping some unused variables, the functions I was touching became sort of redundant too. Specifically, gvir_domain_disk_finalize() and gvir_domain_interface_finalize(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt-gobject/libvirt-gobject-domain-disk.c | 8 -------- libvirt-gobject/libvirt-gobject-domain-interface.c | 8 -------- 2 files changed, 16 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index 7f34ebd..bb2a682 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -49,16 +49,8 @@ gvir_domain_disk_error_quark(void) return g_quark_from_static_string("gvir-domain-disk"); } -static void gvir_domain_disk_finalize(GObject *object) -{ - G_OBJECT_CLASS(gvir_domain_disk_parent_class)->finalize(object); -} - static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gvir_domain_disk_finalize; g_type_class_add_private(klass, sizeof(GVirDomainDiskPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 443a2b6..beae11e 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -49,16 +49,8 @@ gvir_domain_interface_error_quark(void) return g_quark_from_static_string("gvir-domain-interface"); } -static void gvir_domain_interface_finalize(GObject *object) -{ - G_OBJECT_CLASS(gvir_domain_interface_parent_class)->finalize(object); -} - static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gvir_domain_interface_finalize; g_type_class_add_private(klass, sizeof(GVirDomainInterfacePrivate)); } -- 2.4.10

2 1

[libvirt] [libvirt-glib][PATCH] gobject: Drop some unused variables
by Michal Privoznik 07 Dec '15

07 Dec '15

After abe983ddf8a569 there are some variables, that are unused: CC libvirt_gobject_1_0_la-libvirt-gobject-domain-disk.lo CC libvirt_gobject_1_0_la-libvirt-gobject-domain-interface.lo CC libvirt_gobject_1_0_la-libvirt-gobject-domain.lo CC libvirt_gobject_1_0_la-libvirt-gobject-interface.lo ../../libvirt-gobject/libvirt-gobject-domain-interface.c: In function 'gvir_domain_interface_finalize': ../../libvirt-gobject/libvirt-gobject-domain-interface.c:54:26: error: unused variable 'self' [-Werror=unused-variable] GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); ^ cc1: all warnings being treated as errors Makefile:724: recipe for target 'libvirt_gobject_1_0_la-libvirt-gobject-domain-interface.lo' failed make[3]: *** [libvirt_gobject_1_0_la-libvirt-gobject-domain-interface.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... ../../libvirt-gobject/libvirt-gobject-domain-disk.c: In function 'gvir_domain_disk_finalize': ../../libvirt-gobject/libvirt-gobject-domain-disk.c:54:21: error: unused variable 'self' [-Werror=unused-variable] GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); ^ cc1: all warnings being treated as errors Makefile:717: recipe for target 'libvirt_gobject_1_0_la-libvirt-gobject-domain-disk.lo' failed Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. libvirt-gobject/libvirt-gobject-domain-disk.c | 2 -- libvirt-gobject/libvirt-gobject-domain-interface.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index 770acff..7f34ebd 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -51,8 +51,6 @@ gvir_domain_disk_error_quark(void) static void gvir_domain_disk_finalize(GObject *object) { - GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); - G_OBJECT_CLASS(gvir_domain_disk_parent_class)->finalize(object); } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 57896fd..443a2b6 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -51,8 +51,6 @@ gvir_domain_interface_error_quark(void) static void gvir_domain_interface_finalize(GObject *object) { - GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); - G_OBJECT_CLASS(gvir_domain_interface_parent_class)->finalize(object); } -- 2.4.10

2 1

[libvirt] [PATCH v2] libxl: free ifname on libxlDomainMigrationPrepareDef
by Joao Martins 06 Dec '15

06 Dec '15

Commit d2e5538b1 changes virDomainDef to include ifnames that autogenerated by libxl, and that are also cleared on domain cleanup. One place that's missing is on migration, when domain xml is sent to dst libvirtd and would contain ifnames from the source libvirtd. This would lead to erronous behaviour (as seen in osstest CI) such as failing to migrate when a vif with the same name existed (belonging to another domain) on destination. This patch adds a helper libxlDomainFreeIfaceNames for clearing ifnames on both migration prepare phase and domain cleanup. It is done on prepare phase so that we don't affect source domain (specially in cases when the migration fails), while still allowing interface stats to be consulted during the migration. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v1: - Commit message is changed - Clear ifnames on prepare phase as opposed to begin phase. --- src/libxl/libxl_domain.c | 32 ++++++++++++++++++++++---------- src/libxl/libxl_domain.h | 3 +++ src/libxl/libxl_migration.c | 2 ++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ef92974..487589d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -728,16 +728,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } - if ((vm->def->nnets)) { - size_t i; - - for (i = 0; i < vm->def->nnets; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - - if (STRPREFIX(net->ifname, "vif")) - VIR_FREE(net->ifname); - } - } + libxlDomainFreeIfaceNames(vm->def); if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) > 0) { if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) @@ -923,6 +914,27 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) } } +/* + * Removes autogenerated interface names for the network devices in + * parameter def. User-provided interface names are skipped. + */ +void +libxlDomainFreeIfaceNames(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + + if (!net->ifname) + continue; + + if (STRPREFIX(net->ifname, "vif")) + VIR_FREE(net->ifname); + } +} + + /* * Start a domain through libxenlight. diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 44b3e0b..70c139c 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -135,6 +135,9 @@ int libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm); +void +libxlDomainFreeIfaceNames(virDomainDefPtr def); + int libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0d23e5f..1ca31ab 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -288,6 +288,8 @@ libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; + libxlDomainFreeIfaceNames(def); + if (dname) { name = def->name; if (VIR_STRDUP(def->name, dname) < 0) { -- 2.1.4

2 4

[libvirt] [PATCH RFC 0/3] Add a "flags" element to storage pool source
by John Ferlan 04 Dec '15

04 Dec '15

https://bugzilla.redhat.com/show_bug.cgi?id=1265694 Posting as an RFC mainly to get buyin/feedback over the concept of using a <flags> field in the <pool> <source> as a way to allow or direct the pool/storage backend code to use specific algorithms. The issue is described in the bz, but the shorter version is the disk backend needs a way to tell libvirt_parthelper to format output for dm-multipath volumes in a slight different manner. In order to do that I chose a new flag to call libvirt_parthelper to indicate the way to output, but I needed a way to have the disk backend determine whether to add the flag or not. Could have read /etc/multipath.conf - not a good option... Don't want to read their config file. If there was an API to get that data, it would have been nice, but then we'd have to rely on a specific version of multipath that had the API (a dependency that we don't want). So I chose to roll our own. I figure there could be other uses of such kind of flags - for example currently logical volume pools use a model of thin volume support that is "older". A newer model is there, but IIRC the "format" of the lvs output wouldn't mesh. So if there was a way to say, use this format of support in preference, then we could easily add that support with the caveat that one couldn't expect an "old" thin pool to work. IOW, use the much improved algorithm knowing that it's a "new" pool rather than having to mess with "conversions"... Perhaps other pools may find uses, but this one came to mind since I have a long dormant set of changes that uses the new thin pool options... John Ferlan (3): conf: Add flags to the storage pool source storage: Add new flag for libvirt_parthelper conf: Parse/use a flags argument in the storage pool xml docs/formatstorage.html.in | 33 ++++++++++++++++++++ docs/schemas/storagepool.rng | 9 ++++++ src/conf/storage_conf.c | 41 +++++++++++++++++++++++++ src/conf/storage_conf.h | 11 +++++++ src/storage/parthelper.c | 15 +++++++-- src/storage/storage_backend_disk.c | 7 +++++ tests/storagepoolxml2xmlin/pool-disk-flags.xml | 15 +++++++++ tests/storagepoolxml2xmlout/pool-disk-flags.xml | 15 +++++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-disk-flags.xml create mode 100644 tests/storagepoolxml2xmlout/pool-disk-flags.xml -- 2.5.0

1 3

[libvirt] [PATCH] doc: extend virDomainSetMemory semantics
by Nikolay Shirokovskiy 04 Dec '15

04 Dec '15

virDomainSetMemory is documented to change only runtime configuration of running domain. This can't be implemented for vz driver as it always change persistent state too. Let's extend semantics of this function for changes to be hyperviror specific. As a result 'virsh setmem' without parameters (which ends up in virDomainSetMemory call) would be possible for a vz domain. By the way, virsh documentation for this case states that behaviour is hypervisor specific already. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt-domain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index de7eb04..56ab907 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1882,8 +1882,9 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) * to Domain0 i.e. the domain where the application runs. * This function may require privileged access to the hypervisor. * - * This command only changes the runtime configuration of the domain, - * so can only be called on an active domain. + * This command is hypervisor-specific for whether active, persistent, + * or both configurations are changed; for more control, use + * virDomainSetMemoryFlags(). * * Returns 0 in case of success and -1 in case of failure. */ -- 1.7.1

2 1

[libvirt] [PATCH 0/4] Some ABI incompatible changes to virtlogd
by Daniel P. Berrange 04 Dec '15

04 Dec '15

Having looked at the code again there is a wire-ABI incompatible change I think we should make to virtlogd to make it more flexible. Since we've not released 1.3.0 yet, this is the only chance we'll have to change the wire protocol. There are also a couple of fixes in this series we should have before release. Daniel P. Berrange (4): qemu: fix memory leak in opening log file logging: preserve driver, dom name & uuid against log file logging: change log protocol to be more reusable logging: validate flags passed from client in virtlogd src/logging/log_daemon_dispatch.c | 14 ++-- src/logging/log_handler.c | 135 +++++++++++++++++++------------------- src/logging/log_handler.h | 14 ++-- src/logging/log_manager.c | 18 ++--- src/logging/log_manager.h | 9 +-- src/logging/log_protocol.x | 7 +- src/qemu/qemu_domain.c | 47 ++++++------- 7 files changed, 114 insertions(+), 130 deletions(-) -- 2.5.0

2 6

[libvirt] [PATCH] libxl: free ifname on migration begin phase
by Joao Martins 04 Dec '15

04 Dec '15

Commit d2e5538b1 changes virDomainDef to create ifnames that are autogenerated by libxl, and also clearing them up on domain cleanup. One place that was missing was also on migration, when domain xml is sent to dst libvirtd and would contain ifnames from the source libvirtd. This would lead to erronous behaviour (as seen in osstest CI) such as failing to migrate when a vif with the a name that existed on the destination host (belonging to another domain). This patch adds an helper libxlDomainFreeIfaceNames for freeing autogenerated ifnames on both migration begin phase and domain cleanup. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/libxl/libxl_domain.c | 32 ++++++++++++++++++++++---------- src/libxl/libxl_domain.h | 3 +++ src/libxl/libxl_migration.c | 2 ++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ef92974..487589d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -728,16 +728,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } - if ((vm->def->nnets)) { - size_t i; - - for (i = 0; i < vm->def->nnets; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - - if (STRPREFIX(net->ifname, "vif")) - VIR_FREE(net->ifname); - } - } + libxlDomainFreeIfaceNames(vm->def); if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) > 0) { if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) @@ -923,6 +914,27 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) } } +/* + * Removes autogenerated interface names for the network devices in + * parameter def. User-provided interface names are skipped. + */ +void +libxlDomainFreeIfaceNames(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + + if (!net->ifname) + continue; + + if (STRPREFIX(net->ifname, "vif")) + VIR_FREE(net->ifname); + } +} + + /* * Start a domain through libxenlight. diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 44b3e0b..70c139c 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -135,6 +135,9 @@ int libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm); +void +libxlDomainFreeIfaceNames(virDomainDefPtr def); + int libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0d23e5f..1ee19ae 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -249,6 +249,8 @@ libxlDomainMigrationBegin(virConnectPtr conn, def = tmpdef; } else { def = vm->def; + + libxlDomainFreeIfaceNames(def); } if (!libxlDomainMigrationIsAllowed(def)) -- 2.1.4

1 1

[libvirt] [PATCH 0/3] libvirt: Fix automatic SCSI controller create in hotplug
by Boris Fiuczynski 04 Dec '15

04 Dec '15

Trying to hotplug a SCSI device to a domain without the required SCSI controller fails. For hostdev SCSI device hotplug commits 0d8b24f6 and 0785966d rearranged the automatic creation of the required SCSI controllers from the parsing xml code into the post parsing code section of virDomainDefParseXML. In doing so the code will create but not hotplug the missing SCSI controller and on the hotplug path thru the same code the SCSI controller will not get hotplugged since it already exits. Then the SCSI hostdev device is hotplugged and runs into the following internal error error: Failed to attach device from scsidev.xml error: internal error: Device alias was not set for scsi controller with index 0 For disk SCSI device hotplug commit 0260506c added in method qemuBuildDriveDevStr a lookup of the controller alias. The internal error error: Failed to attach device from scsi_disk.xml error: internal error: Could not find scsi controller with index 0 required for device occurs because in method qemuDomainAttachSCSIDisk the automatic creation of the missing SCSI controller occurs after calling qemuBuildDriveDevStr. Boris Fiuczynski (3): conf: Reposition adding SCSI controller for SCSI hostdev hotplug Revert "conf: Try controller add when searching hostdev bus for unit" Automatic SCSI controller creation in SCSI disk hotplug broken src/conf/domain_conf.c | 16 ++++------------ src/qemu/qemu_hotplug.c | 12 ++++++------ 2 files changed, 10 insertions(+), 18 deletions(-) -- 2.3.0

2 16

[libvirt] [PATCH] log: include hostname in initial log message
by Daniel P. Berrange 04 Dec '15

04 Dec '15

On the very first log message we send to any output, we include the libvirt version number and package string. In some bug reports we have been given libvirtd.log files that came from a different host than the corresponding /var/log/libvirt/qemu log files. So extend the initial log message to include the hostname too. eg on first log message we would now see: $ libvirtd 2015-12-04 17:35:36.610+0000: 20917: info : libvirt version: 1.3.0 2015-12-04 17:35:36.610+0000: 20917: info : dhcp-1-180.lcy.redhat.com 2015-12-04 17:35:36.610+0000: 20917: error : qemuMonitorIO:687 : internal error: End of file from monitor Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- cfg.mk | 2 +- src/util/virlog.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 98 insertions(+), 18 deletions(-) diff --git a/cfg.mk b/cfg.mk index cf3f36c..2e3af1a 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1160,7 +1160,7 @@ _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon|loggin exclude_file_name_regexp--sc_prohibit_fork_wrappers = \ (^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$) -exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/virutil\.c$$ +exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/vir(log|util)\.c$$ exclude_file_name_regexp--sc_prohibit_internal_functions = \ ^src/(util/(viralloc|virutil|virfile)\.[hc]|esx/esx_vi\.c)$$ diff --git a/src/util/virlog.c b/src/util/virlog.c index 627f4cb..34e7f2a 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -39,6 +39,7 @@ #if HAVE_SYS_UN_H # include <sys/un.h> #endif +#include <netdb.h> #include "virerror.h" #include "virlog.h" @@ -94,7 +95,7 @@ static int virLogNbFilters; * after filtering, multiple output can be used simultaneously */ struct _virLogOutput { - bool logVersion; + bool logInitMessage; void *data; virLogOutputFunc f; virLogCloseFunc c; @@ -402,7 +403,7 @@ virLogDefineOutput(virLogOutputFunc f, goto cleanup; } ret = virLogNbOutputs++; - virLogOutputs[ret].logVersion = true; + virLogOutputs[ret].logInitMessage = true; virLogOutputs[ret].f = f; virLogOutputs[ret].c = c; virLogOutputs[ret].data = data; @@ -452,6 +453,73 @@ virLogVersionString(const char **rawmsg, return virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_STRING); } +/* Similar to virGetHostname() but avoids use of error + * reporting APIs or logging APIs, to prevent recursion + */ +static int +virLogHostnameString(const char **rawmsg, + char **msg) +{ + int r; + char hostname[HOST_NAME_MAX+1]; + struct addrinfo hints, *info; + char *result = NULL; + + *rawmsg = *msg = NULL; + r = gethostname(hostname, sizeof(hostname)); + if (r == -1) + return -1; + NUL_TERMINATE(hostname); + + if (STRPREFIX(hostname, "localhost") || strchr(hostname, '.')) { + /* in this case, gethostname returned localhost (meaning we can't + * do any further canonicalization), or it returned an FQDN (and + * we don't need to do any further canonicalization). Return the + * string as-is; it's up to callers to check whether "localhost" + * is allowed. + */ + ignore_value(VIR_STRDUP_QUIET(result, hostname)); + goto cleanup; + } + + /* otherwise, it's a shortened, non-localhost, hostname. Attempt to + * canonicalize the hostname by running it through getaddrinfo + */ + + 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) { + ignore_value(VIR_STRDUP_QUIET(result, hostname)); + goto cleanup; + } + + /* Tell static analyzers about getaddrinfo semantics. */ + sa_assert(info); + + if (info->ai_canonname == NULL || + STRPREFIX(info->ai_canonname, "localhost")) + /* in this case, we tried to canonicalize and we ended up back with + * localhost. Ignore the canonicalized name and just return the + * original hostname + */ + ignore_value(VIR_STRDUP_QUIET(result, hostname)); + else + /* Caller frees this string. */ + ignore_value(VIR_STRDUP_QUIET(result, info->ai_canonname)); + + freeaddrinfo(info); + + cleanup: + if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, result) < 0) { + VIR_FREE(result); + return -1; + } + *rawmsg = result; + return 0; +} + static void virLogSourceUpdate(virLogSourcePtr source) @@ -533,7 +601,7 @@ virLogVMessage(virLogSourcePtr source, const char *fmt, va_list vargs) { - static bool logVersionStderr = true; + static bool logInitMessageStderr = true; char *str = NULL; char *msg = NULL; char timestamp[VIR_TIME_STRING_BUFLEN]; @@ -583,16 +651,22 @@ virLogVMessage(virLogSourcePtr source, */ for (i = 0; i < virLogNbOutputs; i++) { if (priority >= virLogOutputs[i].priority) { - if (virLogOutputs[i].logVersion) { - const char *rawver; - char *ver = NULL; - if (virLogVersionString(&rawver, &ver) >= 0) + if (virLogOutputs[i].logInitMessage) { + const char *rawinitmsg; + char *initmsg = NULL; + if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) + virLogOutputs[i].f(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, 0, rawinitmsg, initmsg, + virLogOutputs[i].data); + VIR_FREE(initmsg); + if (virLogHostnameString(&rawinitmsg, &initmsg) >= 0) virLogOutputs[i].f(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawver, ver, + timestamp, NULL, 0, rawinitmsg, initmsg, virLogOutputs[i].data); - VIR_FREE(ver); - virLogOutputs[i].logVersion = false; + VIR_FREE(initmsg); + virLogOutputs[i].logInitMessage = false; } virLogOutputs[i].f(source, priority, filename, linenr, funcname, @@ -601,16 +675,22 @@ virLogVMessage(virLogSourcePtr source, } } if (virLogNbOutputs == 0) { - if (logVersionStderr) { - const char *rawver; - char *ver = NULL; - if (virLogVersionString(&rawver, &ver) >= 0) + if (logInitMessageStderr) { + const char *rawinitmsg; + char *initmsg = NULL; + if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) + virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, 0, rawinitmsg, initmsg, + (void *) STDERR_FILENO); + VIR_FREE(initmsg); + if (virLogHostnameString(&rawinitmsg, &initmsg) >= 0) virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawver, ver, + timestamp, NULL, 0, rawinitmsg, initmsg, (void *) STDERR_FILENO); - VIR_FREE(ver); - logVersionStderr = false; + VIR_FREE(initmsg); + logInitMessageStderr = false; } virLogOutputToFd(source, priority, filename, linenr, funcname, -- 2.5.0

2 1

[libvirt] [PATCH] rotatingfile: mark log files as close-on-exec
by Daniel P. Berrange 04 Dec '15

04 Dec '15

The log file descriptor associated with the virRotatingFile struct should be marked close-on-exec, as even when virtlogd re-exec's itself it expect to open the log file fresh. It does not need to preserve the logfile handles, only the network client FDs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virrotatingfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index a32759a..6654aff 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -108,7 +108,7 @@ virRotatingFileWriterEntryNew(const char *path, if (VIR_ALLOC(entry) < 0) return NULL; - if ((entry->fd = open(path, O_CREAT|O_APPEND|O_WRONLY, mode)) < 0) { + if ((entry->fd = open(path, O_CREAT|O_APPEND|O_WRONLY|O_CLOEXEC, mode)) < 0) { virReportSystemError(errno, _("Unable to open file: %s"), path); goto error; @@ -151,7 +151,7 @@ virRotatingFileReaderEntryNew(const char *path) if (VIR_ALLOC(entry) < 0) return NULL; - if ((entry->fd = open(path, O_RDONLY)) < 0) { + if ((entry->fd = open(path, O_RDONLY|O_CLOEXEC)) < 0) { if (errno != ENOENT) { virReportSystemError(errno, _("Unable to open file: %s"), path); -- 2.5.0

2 1