diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-09 12:04:31 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-09 12:17:58 +0000 |
commit | d7fcf5542a0a6ab8f821862a9cc050db36c8c2e9 (patch) | |
tree | 903af9a6ebff1a12405322e7e2a62e57f7f6425f /main/xen/xsa41c.patch | |
parent | 0ffb8fd99cbb3535ad5469c4bf17b624c2461dbc (diff) | |
download | aports-d7fcf5542a0a6ab8f821862a9cc050db36c8c2e9.tar.bz2 aports-d7fcf5542a0a6ab8f821862a9cc050db36c8c2e9.tar.xz |
main/xen: upgrade to 4.4.1 and remove xend
fixes #3228
Diffstat (limited to 'main/xen/xsa41c.patch')
-rw-r--r-- | main/xen/xsa41c.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/main/xen/xsa41c.patch b/main/xen/xsa41c.patch deleted file mode 100644 index d346937817..0000000000 --- a/main/xen/xsa41c.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2a1354d655d816feaad7dbdb8364f40a208439c1 Mon Sep 17 00:00:00 2001 -From: Ian Jackson <ian.jackson@eu.citrix.com> -Date: Thu, 17 Jan 2013 15:52:16 +0000 -Subject: [PATCH] e1000: fix compile warning introduced by security fix, and debugging - -e33f918c19e393900b95a2bb6b10668dfe96a8f2, the fix for XSA-41, -and its cherry picks in 4.2 and 4.1 introduced this compiler warning: - hw/e1000.c:641: warning: 'return' with a value, in function returning void - -In upstream qemu (where this change came from), e1000_receive returns -a value used by queueing machinery to decide whether to try -resubmitting the packet later. Returning "size" means that the packet -has been dealt with and should not be retried. - -In this old branch (aka qemu-xen-traditional), this machinery is -absent and e1000_receive returns void. Fix the return statement. - -Also add a debugging statement along the lines of the others in this -function. - -Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> ---- -diff --git a/tools/qemu-xen-traditional/hw/e1000.c b/tools/qemu-xen-traditional/hw/e1000.c -index 67d2651..c75bc5e 100644 ---- a/tools/qemu-xen-traditional/hw/e1000.c -+++ b/tools/qemu-xen-traditional/hw/e1000.c -@@ -638,7 +638,8 @@ e1000_receive(void *opaque, const uint8_t *buf, int size) - (size > MAXIMUM_ETHERNET_VLAN_SIZE - && !(s->mac_reg[RCTL] & E1000_RCTL_LPE))) - && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { -- return size; -+ DBGOUT(RX, "packet too large for applicable LPE/VLAN size\n"); -+ return; - } - - if (!receive_filter(s, buf, size)) --- -1.7.2.5 - |