diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/rng_remove_the_unused_request_cancellation_code.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/rng_remove_the_unused_request_cancellation_code.patch | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/rng_remove_the_unused_request_cancellation_code.patch b/meta/recipes-devtools/qemu/qemu/rng_remove_the_unused_request_cancellation_code.patch deleted file mode 100644 index 51296bcac8..0000000000 --- a/meta/recipes-devtools/qemu/qemu/rng_remove_the_unused_request_cancellation_code.patch +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | From 3c52ddcdc548e7fbe65112d8a7bdc9cd105b4750 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ladi Prosek <lprosek@redhat.com> | ||
3 | Date: Thu, 3 Mar 2016 09:37:15 +0100 | ||
4 | Subject: [PATCH] rng: remove the unused request cancellation code | ||
5 | |||
6 | rng_backend_cancel_requests had no callers and none of the code | ||
7 | deleted in this commit ever ran. | ||
8 | |||
9 | Signed-off-by: Ladi Prosek <lprosek@redhat.com> | ||
10 | Reviewed-by: Amit Shah <amit.shah@redhat.com> | ||
11 | Message-Id: <1456994238-9585-2-git-send-email-lprosek@redhat.com> | ||
12 | Signed-off-by: Amit Shah <amit.shah@redhat.com> | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | in support of CVE-2016-2858 | ||
16 | |||
17 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
18 | |||
19 | --- | ||
20 | backends/rng-egd.c | 12 ------------ | ||
21 | backends/rng.c | 9 --------- | ||
22 | include/sysemu/rng.h | 11 ----------- | ||
23 | 3 files changed, 32 deletions(-) | ||
24 | |||
25 | Index: qemu-2.5.0/backends/rng-egd.c | ||
26 | =================================================================== | ||
27 | --- qemu-2.5.0.orig/backends/rng-egd.c | ||
28 | +++ qemu-2.5.0/backends/rng-egd.c | ||
29 | @@ -114,17 +114,6 @@ static void rng_egd_free_requests(RngEgd | ||
30 | s->parent.requests = NULL; | ||
31 | } | ||
32 | |||
33 | -static void rng_egd_cancel_requests(RngBackend *b) | ||
34 | -{ | ||
35 | - RngEgd *s = RNG_EGD(b); | ||
36 | - | ||
37 | - /* We simply delete the list of pending requests. If there is data in the | ||
38 | - * queue waiting to be read, this is okay, because there will always be | ||
39 | - * more data than we requested originally | ||
40 | - */ | ||
41 | - rng_egd_free_requests(s); | ||
42 | -} | ||
43 | - | ||
44 | static void rng_egd_opened(RngBackend *b, Error **errp) | ||
45 | { | ||
46 | RngEgd *s = RNG_EGD(b); | ||
47 | @@ -202,7 +191,6 @@ static void rng_egd_class_init(ObjectCla | ||
48 | RngBackendClass *rbc = RNG_BACKEND_CLASS(klass); | ||
49 | |||
50 | rbc->request_entropy = rng_egd_request_entropy; | ||
51 | - rbc->cancel_requests = rng_egd_cancel_requests; | ||
52 | rbc->opened = rng_egd_opened; | ||
53 | } | ||
54 | |||
55 | Index: qemu-2.5.0/backends/rng.c | ||
56 | =================================================================== | ||
57 | --- qemu-2.5.0.orig/backends/rng.c | ||
58 | +++ qemu-2.5.0/backends/rng.c | ||
59 | @@ -25,15 +25,6 @@ void rng_backend_request_entropy(RngBack | ||
60 | } | ||
61 | } | ||
62 | |||
63 | -void rng_backend_cancel_requests(RngBackend *s) | ||
64 | -{ | ||
65 | - RngBackendClass *k = RNG_BACKEND_GET_CLASS(s); | ||
66 | - | ||
67 | - if (k->cancel_requests) { | ||
68 | - k->cancel_requests(s); | ||
69 | - } | ||
70 | -} | ||
71 | - | ||
72 | static bool rng_backend_prop_get_opened(Object *obj, Error **errp) | ||
73 | { | ||
74 | RngBackend *s = RNG_BACKEND(obj); | ||
75 | Index: qemu-2.5.0/include/sysemu/rng.h | ||
76 | =================================================================== | ||
77 | --- qemu-2.5.0.orig/include/sysemu/rng.h | ||
78 | +++ qemu-2.5.0/include/sysemu/rng.h | ||
79 | @@ -48,7 +48,6 @@ struct RngBackendClass | ||
80 | |||
81 | void (*request_entropy)(RngBackend *s, size_t size, | ||
82 | EntropyReceiveFunc *receive_entropy, void *opaque); | ||
83 | - void (*cancel_requests)(RngBackend *s); | ||
84 | |||
85 | void (*opened)(RngBackend *s, Error **errp); | ||
86 | }; | ||
87 | @@ -80,14 +79,4 @@ struct RngBackend | ||
88 | void rng_backend_request_entropy(RngBackend *s, size_t size, | ||
89 | EntropyReceiveFunc *receive_entropy, | ||
90 | void *opaque); | ||
91 | - | ||
92 | -/** | ||
93 | - * rng_backend_cancel_requests: | ||
94 | - * @s: the backend to cancel all pending requests in | ||
95 | - * | ||
96 | - * Cancels all pending requests submitted by @rng_backend_request_entropy. This | ||
97 | - * should be used by a device during reset or in preparation for live migration | ||
98 | - * to stop tracking any request. | ||
99 | - */ | ||
100 | -void rng_backend_cancel_requests(RngBackend *s); | ||
101 | #endif | ||