|
 |
43fe83 |
From 2e8315d0699d051ad77d9c8f667bad7669ead44b Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <2e8315d0699d051ad77d9c8f667bad7669ead44b.1375465853.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
43fe83 |
Date: Fri, 2 Aug 2013 12:15:15 +0100
|
|
|
43fe83 |
Subject: [PATCH] Ensure LXC/QEMU APIs set the filename for errors
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=991348
|
|
|
43fe83 |
|
|
|
43fe83 |
The virLibConnError macros in libvirt-lxc.c and
|
|
|
43fe83 |
libvirt-qemu.c were passing NULL for the filename.
|
|
|
43fe83 |
This causes a crash if the logging code is configured
|
|
|
43fe83 |
to use journald.
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
43fe83 |
(cherry picked from commit cb3868f701bda3e3f71f9161b4a7f19106600fa6)
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/libvirt-lxc.c | 6 +++---
|
|
|
43fe83 |
src/libvirt-qemu.c | 6 +++---
|
|
|
43fe83 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
|
|
|
43fe83 |
index da69dce..c8cdcea 100644
|
|
|
43fe83 |
--- a/src/libvirt-lxc.c
|
|
|
43fe83 |
+++ b/src/libvirt-lxc.c
|
|
|
43fe83 |
@@ -35,12 +35,12 @@
|
|
|
43fe83 |
|
|
|
43fe83 |
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
43fe83 |
|
|
|
43fe83 |
-#define virLibConnError(conn, error, info) \
|
|
|
43fe83 |
- virReportErrorHelper(VIR_FROM_NONE, error, NULL, __FUNCTION__, \
|
|
|
43fe83 |
+#define virLibConnError(conn, error, info) \
|
|
|
43fe83 |
+ virReportErrorHelper(VIR_FROM_NONE, error, __FILE__, __FUNCTION__, \
|
|
|
43fe83 |
__LINE__, info)
|
|
|
43fe83 |
|
|
|
43fe83 |
#define virLibDomainError(domain, error, info) \
|
|
|
43fe83 |
- virReportErrorHelper(VIR_FROM_DOM, error, NULL, __FUNCTION__, \
|
|
|
43fe83 |
+ virReportErrorHelper(VIR_FROM_DOM, error, __FILE__, __FUNCTION__, \
|
|
|
43fe83 |
__LINE__, info)
|
|
|
43fe83 |
|
|
|
43fe83 |
/**
|
|
|
43fe83 |
diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
|
|
|
43fe83 |
index 2a1432b..83fb3b3 100644
|
|
|
43fe83 |
--- a/src/libvirt-qemu.c
|
|
|
43fe83 |
+++ b/src/libvirt-qemu.c
|
|
|
43fe83 |
@@ -29,12 +29,12 @@
|
|
|
43fe83 |
|
|
|
43fe83 |
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
43fe83 |
|
|
|
43fe83 |
-#define virLibConnError(conn, error, info) \
|
|
|
43fe83 |
- virReportErrorHelper(VIR_FROM_NONE, error, NULL, __FUNCTION__, \
|
|
|
43fe83 |
+#define virLibConnError(conn, error, info) \
|
|
|
43fe83 |
+ virReportErrorHelper(VIR_FROM_NONE, error, __FILE__, __FUNCTION__, \
|
|
|
43fe83 |
__LINE__, info)
|
|
|
43fe83 |
|
|
|
43fe83 |
#define virLibDomainError(domain, error, info) \
|
|
|
43fe83 |
- virReportErrorHelper(VIR_FROM_DOM, error, NULL, __FUNCTION__, \
|
|
|
43fe83 |
+ virReportErrorHelper(VIR_FROM_DOM, error, __FILE__, __FUNCTION__, \
|
|
|
43fe83 |
__LINE__, info)
|
|
|
43fe83 |
|
|
|
43fe83 |
/**
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|