1 files changed, 0 insertions, 117 deletions
diff --git a/0047-tools-xenstore-add-helpers-to-free-struct-buffered_d.patch b/0047-tools-xenstore-add-helpers-to-free-struct-buffered_d.patch
deleted file mode 100644
index 96ba7bd..0000000
--- a/0047-tools-xenstore-add-helpers-to-free-struct-buffered_d.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From f8af1a27b00e373bfb5f5e61b14c51165a740fa4 Mon Sep 17 00:00:00 2001
-From: Juergen Gross <jgross@suse.com>
-Date: Tue, 13 Sep 2022 07:35:07 +0200
-Subject: [PATCH 47/87] tools/xenstore: add helpers to free struct
- buffered_data
-
-Add two helpers for freeing struct buffered_data: free_buffered_data()
-for freeing one instance and conn_free_buffered_data() for freeing all
-instances for a connection.
-
-This is avoiding duplicated code and will help later when more actions
-are needed when freeing a struct buffered_data.
-
-This is part of XSA-326.
-
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Reviewed-by: Julien Grall <jgrall@amazon.com>
-(cherry picked from commit ead062a68a9c201a95488e84750a70a107f7b317)
----
- tools/xenstore/xenstored_core.c   | 26 +++++++++++++++++---------
- tools/xenstore/xenstored_core.h   |  2 ++
- tools/xenstore/xenstored_domain.c |  7 +------
- 3 files changed, 20 insertions(+), 15 deletions(-)
-
-diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
-index 249ad5ec6fb1..527a1ebdeded 100644
---- a/tools/xenstore/xenstored_core.c
-+++ b/tools/xenstore/xenstored_core.c
-@@ -211,6 +211,21 @@ void reopen_log(void)
- 	}
- }
- 
-+static void free_buffered_data(struct buffered_data *out,
-+			       struct connection *conn)
-+{
-+	list_del(&out->list);
-+	talloc_free(out);
-+}
-+
-+void conn_free_buffered_data(struct connection *conn)
-+{
-+	struct buffered_data *out;
-+
-+	while ((out = list_top(&conn->out_list, struct buffered_data, list)))
-+		free_buffered_data(out, conn);
-+}
-+
- static bool write_messages(struct connection *conn)
- {
- 	int ret;
-@@ -254,8 +269,7 @@ static bool write_messages(struct connection *conn)
- 
- 	trace_io(conn, out, 1);
- 
--	list_del(&out->list);
--	talloc_free(out);
-+	free_buffered_data(out, conn);
- 
- 	return true;
- }
-@@ -1506,18 +1520,12 @@ static struct {
-  */
- void ignore_connection(struct connection *conn)
- {
--	struct buffered_data *out, *tmp;
--
- 	trace("CONN %p ignored\n", conn);
- 
- 	conn->is_ignored = true;
- 	conn_delete_all_watches(conn);
- 	conn_delete_all_transactions(conn);
--
--	list_for_each_entry_safe(out, tmp, &conn->out_list, list) {
--		list_del(&out->list);
--		talloc_free(out);
--	}
-+	conn_free_buffered_data(conn);
- 
- 	talloc_free(conn->in);
- 	conn->in = NULL;
-diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
-index 9af9af4390bd..e7ee87825c3b 100644
---- a/tools/xenstore/xenstored_core.h
-+++ b/tools/xenstore/xenstored_core.h
-@@ -276,6 +276,8 @@ int remember_string(struct hashtable *hash, const char *str);
- 
- void set_tdb_key(const char *name, TDB_DATA *key);
- 
-+void conn_free_buffered_data(struct connection *conn);
-+
- const char *dump_state_global(FILE *fp);
- const char *dump_state_buffered_data(FILE *fp, const struct connection *c,
- 				     struct xs_state_connection *sc);
-diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c
-index d03c7d93a9e7..93c4c1edcdd1 100644
---- a/tools/xenstore/xenstored_domain.c
-+++ b/tools/xenstore/xenstored_domain.c
-@@ -411,15 +411,10 @@ static struct domain *find_domain_by_domid(unsigned int domid)
- static void domain_conn_reset(struct domain *domain)
- {
- 	struct connection *conn = domain->conn;
--	struct buffered_data *out;
- 
- 	conn_delete_all_watches(conn);
- 	conn_delete_all_transactions(conn);
--
--	while ((out = list_top(&conn->out_list, struct buffered_data, list))) {
--		list_del(&out->list);
--		talloc_free(out);
--	}
-+	conn_free_buffered_data(conn);
- 
- 	talloc_free(conn->in);
- 
--- 
-2.37.4
-