File 0317-thread-pool-Drop-unnecessary-includ.patch of Package qemu.11147

Overview Repositories Revisions Requests Users Attributes Meta

File 0317-thread-pool-Drop-unnecessary-includ.patch of Package qemu.11147

From e94daedfd1863d61c67a01e8609f7560f3bce700 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 8 Sep 2014 18:51:01 +0200
Subject: [PATCH] thread-pool: Drop unnecessary includes

Dragging block_int.h into a header is *not* nice.  Fortunately, this
is the only offender.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit a31e69cf007dd2e7f6912b7839de1ebd1a41d091)
[BR: Fix and/or infrastructure for BSC#1020427 CVE-2016-9602]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 include/block/thread-pool.h | 6 +-----
 thread-pool.c               | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/block/thread-pool.h b/include/block/thread-pool.h
index 32afcdd1d6..472375227a 100644
--- a/include/block/thread-pool.h
+++ b/include/block/thread-pool.h
@@ -18,11 +18,7 @@
 #ifndef QEMU_THREAD_POOL_H
 #define QEMU_THREAD_POOL_H 1
 
-#include "qemu-common.h"
-#include "qemu/queue.h"
-#include "qemu/thread.h"
-#include "block/coroutine.h"
-#include "block/block_int.h"
+#include "block/block.h"
 
 typedef int ThreadPoolFunc(void *opaque);
 
diff --git a/thread-pool.c b/thread-pool.c
index fbdd3ffa3a..3fd4014fec 100644
--- a/thread-pool.c
+++ b/thread-pool.c
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "block/coroutine.h"
 #include "trace.h"
-#include "block/block_int.h"
 #include "qemu/event_notifier.h"
 #include "block/thread-pool.h"
 #include "qemu/main-loop.h"

Places

File 0317-thread-pool-Drop-unnecessary-includ.patch of Package qemu.11147

Places