forked from rpms/libvirt
RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/libvirt#4528832026024f462fbe0ce0d1e1e11e5bd84843
This commit is contained in:
parent
0ea401e939
commit
0565551f97
31
.abignore
Normal file
31
.abignore
Normal file
@ -0,0 +1,31 @@
|
||||
[suppress_function]
|
||||
symbol_version_regexp = LIBVIRT_PRIVATE.*
|
||||
soname_regexp = libvirt\\.so.*
|
||||
|
||||
[suppress_function]
|
||||
symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
|
||||
soname_regexp = libvirt-admin\\.so.*
|
||||
|
||||
[suppress_variable]
|
||||
symbol_version_regexp = LIBVIRT_PRIVATE.*
|
||||
soname_regexp = libvirt\\.so.*
|
||||
|
||||
[suppress_variable]
|
||||
symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
|
||||
soname_regexp = libvirt-admin\\.so.*
|
||||
|
||||
[suppress_function]
|
||||
symbol_version_regexp = .*
|
||||
soname_regexp = libvirt_storage_.*\\.so.*
|
||||
|
||||
[suppress_variable]
|
||||
symbol_version_regexp = .*
|
||||
soname_regexp = libvirt_storage_.*\\.so.*
|
||||
|
||||
[suppress_function]
|
||||
symbol_version_regexp = .*
|
||||
soname_regexp = libvirt_driver_.*\\.so.*
|
||||
|
||||
[suppress_variable]
|
||||
symbol_version_regexp = .*
|
||||
soname_regexp = libvirt_driver_.*\\.so.*
|
5
.gitignore
vendored
5
.gitignore
vendored
@ -0,0 +1,5 @@
|
||||
.build*.log
|
||||
*.rpm
|
||||
i686
|
||||
x86_64
|
||||
libvirt-*.tar.xz
|
@ -0,0 +1,90 @@
|
||||
From 48622bb5637587a1cc24f7fdc8ab32cd89798a9d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <48622bb5637587a1cc24f7fdc8ab32cd89798a9d.1601670767.git.crobinso@redhat.com>
|
||||
From: Pavel Hrdina <phrdina@redhat.com>
|
||||
Date: Fri, 2 Oct 2020 12:11:45 +0200
|
||||
Subject: [PATCH] tests: fix incorrect free of GVariant in our GLib mock
|
||||
functions
|
||||
|
||||
GLib implementation of g_dbus_connection_call_sync() calls
|
||||
g_variant_ref_sink() on the passed @parameters to make sure they have
|
||||
proper reference. If the original reference is floating the
|
||||
g_dbus_connection_call_sync() consumes it, but if it's normal reference
|
||||
it will just add another one.
|
||||
|
||||
Our mock functions were only freeing the @parameters which is incorrect
|
||||
and doesn't reflect how the real implementation works.
|
||||
|
||||
Reported-by: Cole Robinson <crobinso@redhat.com>
|
||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
---
|
||||
tests/networkxml2firewalltest.c | 4 +++-
|
||||
tests/virfirewalltest.c | 3 +++
|
||||
tests/virpolkittest.c | 3 +++
|
||||
tests/virsystemdtest.c | 4 +++-
|
||||
4 files changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
|
||||
index e0244f508e..3496445f0d 100644
|
||||
--- a/tests/networkxml2firewalltest.c
|
||||
+++ b/tests/networkxml2firewalltest.c
|
||||
@@ -60,8 +60,10 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync,
|
||||
GCancellable *, cancellable,
|
||||
GError **, error)
|
||||
{
|
||||
- if (parameters)
|
||||
+ if (parameters) {
|
||||
+ g_variant_ref_sink(parameters);
|
||||
g_variant_unref(parameters);
|
||||
+ }
|
||||
|
||||
VIR_MOCK_REAL_INIT(g_dbus_connection_call_sync);
|
||||
|
||||
diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
|
||||
index 607638e9d0..646b999d96 100644
|
||||
--- a/tests/virfirewalltest.c
|
||||
+++ b/tests/virfirewalltest.c
|
||||
@@ -79,6 +79,9 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync,
|
||||
GVariant *reply = NULL;
|
||||
g_autoptr(GVariant) params = parameters;
|
||||
|
||||
+ if (params)
|
||||
+ g_variant_ref_sink(params);
|
||||
+
|
||||
VIR_MOCK_REAL_INIT(g_dbus_connection_call_sync);
|
||||
|
||||
if (STREQ(bus_name, "org.freedesktop.DBus") &&
|
||||
diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c
|
||||
index 011d83a506..b7cbe28466 100644
|
||||
--- a/tests/virpolkittest.c
|
||||
+++ b/tests/virpolkittest.c
|
||||
@@ -52,6 +52,9 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync,
|
||||
GVariant *reply = NULL;
|
||||
g_autoptr(GVariant) params = parameters;
|
||||
|
||||
+ if (params)
|
||||
+ g_variant_ref_sink(params);
|
||||
+
|
||||
VIR_MOCK_REAL_INIT(g_dbus_connection_call_sync);
|
||||
|
||||
if (STREQ(bus_name, "org.freedesktop.PolicyKit1") &&
|
||||
diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
|
||||
index c1411d7c05..bd0ca51140 100644
|
||||
--- a/tests/virsystemdtest.c
|
||||
+++ b/tests/virsystemdtest.c
|
||||
@@ -54,8 +54,10 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync,
|
||||
{
|
||||
GVariant *reply = NULL;
|
||||
|
||||
- if (parameters)
|
||||
+ if (parameters) {
|
||||
+ g_variant_ref_sink(parameters);
|
||||
g_variant_unref(parameters);
|
||||
+ }
|
||||
|
||||
VIR_MOCK_REAL_INIT(g_dbus_connection_call_sync);
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
2096
libvirt.spec
Normal file
2096
libvirt.spec
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user