November 2015 - Devel - libvirt List Archives

[libvirt] [PATCH] virlogd: fix crash if log file exists and it's larger the maxlen
by Pavel Hrdina 30 Nov '15

30 Nov '15

If for some reason there is an existing log file, that is larger then max length of log file, we need to rollover that file immediately. Trying to figure out how much data we could write will resolve in overflow of unsigned variable 'towrite' and this leads to segfault. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virrotatingfile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 1260710..827b44b 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -443,7 +443,12 @@ virRotatingFileWriterAppend(virRotatingFileWriterPtr file, size_t towrite = len; bool forceRollover = false; - if ((file->entry->pos + towrite) > file->maxlen) { + if (file->entry->pos > file->maxlen) { + /* If existing file is for some reason larger then max length we + * won't write to this file anymore, but we rollover this file.*/ + forceRollover = true; + towrite = 0; + } else if ((file->entry->pos + towrite) > file->maxlen) { towrite = file->maxlen - file->entry->pos; /* -- 2.6.3

2 2

[libvirt] libprl_sdk.so.7 library dependancies
by Daniel P. Berrange 27 Nov '15

27 Nov '15

In debugging some recent problem I was rather surprised to find that libvirt.so was linked against Qt, X11 and GObject. It turns out that this is due to the VZ driver linking to libprl_sdk.so which pulls in all these libs: $ ldd /usr/lib64/libprl_sdk.so.7.0.26 linux-vdso.so.1 (0x00007fff443d3000) libz.so.1 => /usr/lib64/libz.so.1 (0x00007f4f8f415000) libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f4f8f210000) librt.so.1 => /usr/lib64/librt.so.1 (0x00007f4f8f008000) libQtXml.so.4 => /usr/lib64/libQtXml.so.4 (0x00007f4f8edc1000) libQtGui.so.4 => /usr/lib64/libQtGui.so.4 (0x00007f4f8e087000) libQtNetwork.so.4 => /usr/lib64/libQtNetwork.so.4 (0x00007f4f8dd33000) libQtCore.so.4 => /usr/lib64/libQtCore.so.4 (0x00007f4f8d82c000) libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f4f8d60e000) libXext.so.6 => /usr/lib64/libXext.so.6 (0x00007f4f8d3fc000) libX11.so.6 => /usr/lib64/libX11.so.6 (0x00007f4f8d0bc000) libstdc++.so.6 => /usr/lib64/libstdc++.so.6 (0x00007f4f8cd39000) libm.so.6 => /usr/lib64/libm.so.6 (0x00007f4f8ca37000) libgcc_s.so.1 => /usr/lib64/libgcc_s.so.1 (0x00007f4f8c820000) libc.so.6 => /usr/lib64/libc.so.6 (0x00007f4f8c45e000) /lib64/ld-linux-x86-64.so.2 (0x000055817de34000) libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f4f8c25c000) libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f4f8bf23000) libpng16.so.16 => /usr/lib64/libpng16.so.16 (0x00007f4f8bcef000) libfreetype.so.6 => /usr/lib64/libfreetype.so.6 (0x00007f4f8ba45000) libgobject-2.0.so.0 => /usr/lib64/libgobject-2.0.so.0 (0x00007f4f8b7f3000) libSM.so.6 => /usr/lib64/libSM.so.6 (0x00007f4f8b5e9000) libICE.so.6 => /usr/lib64/libICE.so.6 (0x00007f4f8b3cd000) libXi.so.6 => /usr/lib64/libXi.so.6 (0x00007f4f8b1bd000) libXrender.so.1 => /usr/lib64/libXrender.so.1 (0x00007f4f8afb1000) libXrandr.so.2 => /usr/lib64/libXrandr.so.2 (0x00007f4f8ada6000) libXfixes.so.3 => /usr/lib64/libXfixes.so.3 (0x00007f4f8aba0000) libXcursor.so.1 => /usr/lib64/libXcursor.so.1 (0x00007f4f8a994000) libXinerama.so.1 => /usr/lib64/libXinerama.so.1 (0x00007f4f8a791000) libfontconfig.so.1 => /usr/lib64/libfontconfig.so.1 (0x00007f4f8a54d000) libssl.so.10 => /usr/lib64/libssl.so.10 (0x00007f4f8a2d3000) libcrypto.so.10 => /usr/lib64/libcrypto.so.10 (0x00007f4f89e86000) libxcb.so.1 => /usr/lib64/libxcb.so.1 (0x00007f4f89c63000) libbz2.so.1 => /usr/lib64/libbz2.so.1 (0x00007f4f89a53000) libffi.so.6 => /usr/lib64/libffi.so.6 (0x00007f4f8984a000) libuuid.so.1 => /usr/lib64/libuuid.so.1 (0x00007f4f89645000) libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f4f8941a000) libgssapi_krb5.so.2 => /usr/lib64/libgssapi_krb5.so.2 (0x00007f4f891cc000) libkrb5.so.3 => /usr/lib64/libkrb5.so.3 (0x00007f4f88ee7000) libcom_err.so.2 => /usr/lib64/libcom_err.so.2 (0x00007f4f88ce2000) libk5crypto.so.3 => /usr/lib64/libk5crypto.so.3 (0x00007f4f88ab0000) libXau.so.6 => /usr/lib64/libXau.so.6 (0x00007f4f888ac000) libkrb5support.so.0 => /usr/lib64/libkrb5support.so.0 (0x00007f4f8869c000) libkeyutils.so.1 => /usr/lib64/libkeyutils.so.1 (0x00007f4f88498000) libresolv.so.2 => /usr/lib64/libresolv.so.2 (0x00007f4f8827d000) libselinux.so.1 => /usr/lib64/libselinux.so.1 (0x00007f4f88059000) libpcre.so.1 => /usr/lib64/libpcre.so.1 (0x00007f4f87de9000) This is bad for several reasons - libvirt should not pull in any GUI libraries at all, since virt hosts typically want to avoid any deps on this kind of packages in order to get a minimal hypervisor node install. Second, with libgobject in particular, this library abort()s when it hits out of memory conditions. This is absolutely against the policy of libvirt.so which is that we must feed all errors back to the caller and *never* abort a program using libvirt.so Since it is not in Fedora, I'm using libprlsdk.so from an RPM I built myself - libprlsdk-7.0.26-1.fc22.x86_64. So possibly this is just a mistake in the way I built the library ? If this long list of deps is normal / expected though, then we have a much bigger problem that I don't think we can solve in libvirt. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 5

[libvirt] [PATCH] systemd: Escape only needed characters for machined
by Martin Kletzander 27 Nov '15

27 Nov '15

My previous fix in commit e24eda48cfae84a9003456b68eaf753a26123639 was incomplete, or rather more complete than it needed to be. The problem is that even though machined requires non-ASCII characters to be escaped does not mean that it needs to follow the exact same rules as unit files and services, therefore rendering our escape function, namely virSystemdEscapeName(), as overkill. Well, that should not be a problem, because if we escape more than needed, it will not break anything. However, that is not the case with current release of systemd because even though it requires some characters to be escaped, *any* escaped character will cause the function to fail. Even though that will be fixed, we need to make sure that machines, which were able to start before the commit mentioned above, are still able to start now. So this patch changes virSystemdEscapeName() to operate as the aforementioned overkill merely based on its new parameter. If that parameter is false, which only occurs in the latest call to this function from virSystemdMakeMachineName(), it will not escape characters that would cause the machine being unable to be started. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1282846 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virsystemd.c | 15 ++++++++------- tests/virsystemdtest.c | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index abd883c73844..257efaab7829 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -39,7 +39,8 @@ VIR_LOG_INIT("util.systemd"); static void virSystemdEscapeName(virBufferPtr buf, - const char *name) + const char *name, + bool full_escape) { static const char hextable[16] = "0123456789abcdef"; @@ -57,7 +58,7 @@ static void virSystemdEscapeName(virBufferPtr buf, "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ ":-_.\\" - if (*name == '.') { + if (full_escape && *name == '.') { ESCAPE(*name); name++; } @@ -65,7 +66,7 @@ static void virSystemdEscapeName(virBufferPtr buf, while (*name) { if (*name == '/') virBufferAddChar(buf, '-'); - else if (*name == '-' || + else if ((full_escape && *name == '-') || *name == '\\' || !strchr(VALID_CHARS, *name)) ESCAPE(*name); @@ -85,9 +86,9 @@ char *virSystemdMakeScopeName(const char *name, virBuffer buf = VIR_BUFFER_INITIALIZER; virBufferAddLit(&buf, "machine-"); - virSystemdEscapeName(&buf, drivername); + virSystemdEscapeName(&buf, drivername, true); virBufferAddLit(&buf, "\\x2d"); - virSystemdEscapeName(&buf, name); + virSystemdEscapeName(&buf, name, true); virBufferAddLit(&buf, ".scope"); if (virBufferCheckError(&buf) < 0) @@ -104,7 +105,7 @@ char *virSystemdMakeSliceName(const char *partition) if (*partition == '/') partition++; - virSystemdEscapeName(&buf, partition); + virSystemdEscapeName(&buf, partition, true); virBufferAddLit(&buf, ".slice"); if (virBufferCheckError(&buf) < 0) @@ -130,7 +131,7 @@ char *virSystemdMakeMachineName(const char *name, virBufferAsprintf(&buf, "%s-%s-", username, drivername); } - virSystemdEscapeName(&buf, name); + virSystemdEscapeName(&buf, name, false); machinename = virBufferContentAndReset(&buf); cleanup: diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 06fec5495bc2..49d37c2032ec 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -517,9 +517,9 @@ mymain(void) } while (0) TEST_MACHINE("demo", "qemu-demo"); - TEST_MACHINE("demo-name", "qemu-demo\\x2dname"); + TEST_MACHINE("demo-name", "qemu-demo-name"); TEST_MACHINE("demo!name", "qemu-demo\\x21name"); - TEST_MACHINE(".demo", "qemu-\\x2edemo"); + TEST_MACHINE(".demo", "qemu-.demo"); TEST_MACHINE("bull\U0001f4a9", "qemu-bull\\xf0\\x9f\\x92\\xa9"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ -- 2.6.3

2 2

[libvirt] Plans for next releases
by Daniel Veillard 27 Nov '15

27 Nov '15

Seems I forgot to send that mail earlier. I think we should enter freeze now is we want to push on the next week (and I'm away travelling 3-7 unlikely to have much time on this. If I can freeze now I can try to push 1.3.0 on Wed 2nd, otherwise we would have to wait Tuesday 8. On the other hand usually Dec and Jan are relatively low traffic and I end up doing one release mid-january and the forlowing one end of Feb, so delaying 1.3.0 a little bit may not be a bad idea. Also make dist is broken right now :) make[2]: Entering directory '/home/veillard/libvirt/src' make[2]: *** No rule to make target 'logging/libvirt_logd.aug', needed by 'distdir'. Stop. make[2]: Leaving directory '/home/veillard/libvirt/src' Makefile:2100: recipe for target 'distdir' failed What about a freeze on Wed 3 with a release on Tuesday 8 for 1.3.0 then 1.3.1 mid january and 1.3.2 end of Feb ? thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] logging: remove reference to non-existent augeas files
by Daniel P. Berrange 27 Nov '15

27 Nov '15

The libvirt_logd.aug and test_libvirt_logd.aug.in files have never existed so shouldn't be in EXTRA_DIST. It was a copy+paste mistake when closing virtlogd from virtlockd Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a "make dist" build-fix src/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3c98c38..52552fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2464,9 +2464,7 @@ EXTRA_DIST += \ locking/lockd.conf \ locking/libvirt_lockd.aug \ locking/test_libvirt_lockd.aug.in \ - logging/virtlogd.sysconf \ - logging/libvirt_logd.aug \ - logging/test_libvirt_logd.aug.in + logging/virtlogd.sysconf install-sysconfig: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- 2.5.0

1 0

[libvirt] [PATCH v2] virtlogd: Fix build without DBus
by Martin Kletzander 27 Nov '15

27 Nov '15

The rule for virrotatingfiletest was defined in DBUS-only block even though the test does not use DBus at all. Also DBUS_CFLAGS and DBUS_LIBS are removed from the rules. The original error was: /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/../../../../lib64/Scrt1.o: In function `_start': (.text+0x20): undefined reference to `main' Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b449286f1fb3..e1e28eca93f1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1062,6 +1062,11 @@ virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \ ../src/libvirt.la virnetdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +virrotatingfiletest_SOURCES = \ + virrotatingfiletest.c testutils.h testutils.c +virrotatingfiletest_CFLAGS = $(AM_CFLAGS) +virrotatingfiletest_LDADD = $(LDADDS) + if WITH_LINUX virusbtest_SOURCES = \ virusbtest.c testutils.h testutils.c @@ -1101,11 +1106,6 @@ virpolkittest_SOURCES = \ virpolkittest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virpolkittest_LDADD = $(LDADDS) $(DBUS_LIBS) -virrotatingfiletest_SOURCES = \ - virrotatingfiletest.c testutils.h testutils.c -virrotatingfiletest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -virrotatingfiletest_LDADD = $(LDADDS) $(DBUS_LIBS) - virsystemdtest_SOURCES = \ virsystemdtest.c testutils.h testutils.c virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -- 2.6.3

2 1

[libvirt] [PATCH 00/34] Prepare for specific vcpu hot(un)plug - part 1
by Peter Krempa 27 Nov '15

27 Nov '15

This series is getting rather big. The target is to refactor the way libvirt stores info about vCPUs into a single structure (okay, two structures for the qemu driver. Part 1 is not yet completely there, well, not even halfway. Future work will involve fully allocating priv->vcpupids to the maxcpus size and moving around few other bits of data in cputune and other parts to the new structure. Yet another follow up work is then to add new APIs for vCPU hotplug, which will enable adding vCPUs sparsely (useful if you have NUMA). Since this refactor will result in tracking all vcpu-related data in one struct, the result will automagically fix a few bugs where we'd end up with invalid config after vcpu unplug or other operations. The changes can also be fetched at: git fetch git://pipo.sk/pipo/libvirt.git vcpu-refactor-part-1 Peter Krempa (34): hyperv: Allocate 'def' via virDomainDefNew openvz: Refactor extraction of vcpu count phyp: Refactor extraction of vcpu count xenapi: Refactor extraction of vcpu count conf: Use local copy of maxvcpus in virDomainVcpuParse conf: Drop useless check when parsing cpu scheduler info conf: Replace writes to def->maxvcpus with accessor conf: Extract update of vcpu count if maxvcpus is decreased conf: Add helper to check whether domain has offline vCPUs conf: Assume at least 1 maximum and current vCPU for every conf conf: Replace read access to def->maxvcpus with accessor conf: Replace writes to def->vcpus with accessor conf: Move vcpu count check into helper conf: Replace read accesses to def->vcpus with accessor conf: Turn def->maxvcpus into size_t qemu: domain: Add helper to access vm->privateData->agent qemu: Extract vCPU onlining/offlining via agent into a separate function qemu: qemuDomainSetVcpusAgent: re-check agent before calling it the again qemu: Split up vCPU hotplug and hotunplug qemu: cpu hotplug: Fix error handling logic qemu: monitor: Explain logic of qemuMonitorGetCPUInfo qemu: monitor: Remove weird return values from qemuMonitorSetCPU qemu: cpu hotplug: Move loops to qemuDomainSetVcpusFlags qemu: Refactor qemuDomainHotplugVcpus qemu: refactor qemuDomainHotunplugVcpus conf: turn def->vcpus into a structure conf: ABI: Split up and improve vcpu info ABI checking conf: Add helper to get pointer to a certain vCPU definition qemu: cgroup: Remove now unreachable check qemu: Drop checking vcpu threads in emulator bandwidth getter/setter qemu: Replace checking for vcpu<->pid mapping availability with a helper qemu: Add helper to retrieve vCPU pid qemu: driver: Refactor qemuDomainHelperGetVcpus qemu: cgroup: Don't use priv->ncpupids to iterate domain vCPUs src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 207 ++++++++++++++--- src/conf/domain_conf.h | 22 +- src/hyperv/hyperv_driver.c | 12 +- src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 6 +- src/libxl/libxl_driver.c | 38 +-- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_native.c | 5 - src/openvz/openvz_conf.c | 14 +- src/openvz/openvz_driver.c | 31 +-- src/phyp/phyp_driver.c | 15 +- src/qemu/qemu_cgroup.c | 42 ++-- src/qemu/qemu_command.c | 25 +- src/qemu/qemu_domain.c | 47 ++++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 538 ++++++++++++++++++++++--------------------- src/qemu/qemu_monitor.c | 9 + src/qemu/qemu_monitor_json.c | 4 - src/qemu/qemu_monitor_text.c | 22 +- src/qemu/qemu_process.c | 22 +- src/test/test_driver.c | 38 +-- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 19 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 34 +-- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 9 +- src/xen/xm_internal.c | 19 +- src/xenapi/xenapi_driver.c | 11 +- src/xenapi/xenapi_utils.c | 6 +- src/xenconfig/xen_common.c | 16 +- src/xenconfig/xen_sxpr.c | 26 ++- tests/openvzutilstest.c | 2 +- 35 files changed, 783 insertions(+), 478 deletions(-) -- 2.6.2

2 73

[libvirt] [PATCH] virtlogd: Fix build without DBus
by Martin Kletzander 27 Nov '15

27 Nov '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b449286f1fb3..e2fb3b7f3b67 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -172,7 +172,6 @@ test_programs = virshtest sockettest \ virkeycodetest \ virlockspacetest \ virlogtest \ - virrotatingfiletest \ virstringtest \ virportallocatortest \ sysinfotest \ @@ -210,6 +209,7 @@ endif WITH_LIBVIRTD if WITH_DBUS test_programs += virdbustest \ virsystemdtest \ + virrotatingfiletest \ $(NULL) if WITH_POLKIT1 test_programs += virpolkittest @@ -1112,7 +1112,9 @@ virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD = $(LDADDS) $(DBUS_LIBS) else ! WITH_DBUS -EXTRA_DIST += virdbustest.c virmockdbus.c virsystemdtest.c +EXTRA_DIST += \ + virdbustest.c virmockdbus.c \ + virsystemdtest.c virrotatingfiletest.c endif ! WITH_DBUS viruritest_SOURCES = \ -- 2.6.3

2 2

[libvirt] [PATCH] logging: avoid variables called 'daemon' due to function clash
by Daniel P. Berrange 27 Nov '15

27 Nov '15

With some versions of GLibC / GCC, a variable called 'daemon' will result in a warning about clashing with the function also named 'daemon'. Rename it to 'dmn' to avoid the clash. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a broken build fix. src/logging/log_daemon.c | 10 +++++----- src/logging/log_daemon.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 3fda9ca..6da5876 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -127,12 +127,12 @@ virLogDaemonFree(virLogDaemonPtr logd) static void virLogDaemonInhibitor(bool inhibit, void *opaque) { - virLogDaemonPtr daemon = opaque; + virLogDaemonPtr dmn = opaque; if (inhibit) - virNetDaemonAddShutdownInhibition(daemon->dmn); + virNetDaemonAddShutdownInhibition(dmn->dmn); else - virNetDaemonRemoveShutdownInhibition(daemon->dmn); + virNetDaemonRemoveShutdownInhibition(dmn->dmn); } static virLogDaemonPtr @@ -177,9 +177,9 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) virLogHandlerPtr -virLogDaemonGetHandler(virLogDaemonPtr daemon) +virLogDaemonGetHandler(virLogDaemonPtr dmn) { - return daemon->handler; + return dmn->handler; } diff --git a/src/logging/log_daemon.h b/src/logging/log_daemon.h index b076a4f..8d55bb2 100644 --- a/src/logging/log_daemon.h +++ b/src/logging/log_daemon.h @@ -40,6 +40,6 @@ struct _virLogDaemonClient { extern virLogDaemonPtr logDaemon; -virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr daemon); +virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr dmn); #endif /* __VIR_LOG_DAEMON_H__ */ -- 2.5.0

1 0

[libvirt] [PATCH] virtlogd: Rename variable shadowing global declaration
by Martin Kletzander 27 Nov '15

27 Nov '15

This time the winner is variable named 'daemon'. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/logging/log_daemon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 3fda9ca33c61..cc0559d7ff7b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -127,12 +127,12 @@ virLogDaemonFree(virLogDaemonPtr logd) static void virLogDaemonInhibitor(bool inhibit, void *opaque) { - virLogDaemonPtr daemon = opaque; + virLogDaemonPtr logdmn = opaque; if (inhibit) - virNetDaemonAddShutdownInhibition(daemon->dmn); + virNetDaemonAddShutdownInhibition(logdmn->dmn); else - virNetDaemonRemoveShutdownInhibition(daemon->dmn); + virNetDaemonRemoveShutdownInhibition(logdmn->dmn); } static virLogDaemonPtr @@ -177,9 +177,9 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) virLogHandlerPtr -virLogDaemonGetHandler(virLogDaemonPtr daemon) +virLogDaemonGetHandler(virLogDaemonPtr logdmn) { - return daemon->handler; + return logdmn->handler; } -- 2.6.3

2 1