aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu/0012-tpm-Use-EMSGSIZE-instead-of-EBADMSG-to-compile-on-Op.patch
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@xilinx.com>2018-01-17 13:39:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-18 12:49:06 +0000
commitd6d0d99569e0d8b62a61e27d389e7939af45bab9 (patch)
tree366e9d05cbf2142a850a8a46d3ffa5881309fab8 /meta/recipes-devtools/qemu/qemu/0012-tpm-Use-EMSGSIZE-instead-of-EBADMSG-to-compile-on-Op.patch
parent6abee5468e05333fbd9bd5ac8fc203a749ae3b3e (diff)
downloadopenembedded-core-contrib-d6d0d99569e0d8b62a61e27d389e7939af45bab9.tar.gz
qemu: Bump to version 2.11.0
Use the latest QEMU release 2.11. Remove all patches that are no longer required as they have been merged into the 2.11 releaese. One patch had to be updated to apply to the 2.11 tree. This also applies a linux user patch to avoid webkitgtk build hangs. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0012-tpm-Use-EMSGSIZE-instead-of-EBADMSG-to-compile-on-Op.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu/0012-tpm-Use-EMSGSIZE-instead-of-EBADMSG-to-compile-on-Op.patch67
1 files changed, 0 insertions, 67 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0012-tpm-Use-EMSGSIZE-instead-of-EBADMSG-to-compile-on-Op.patch b/meta/recipes-devtools/qemu/qemu/0012-tpm-Use-EMSGSIZE-instead-of-EBADMSG-to-compile-on-Op.patch
deleted file mode 100644
index 430fe1b1c4..0000000000
--- a/meta/recipes-devtools/qemu/qemu/0012-tpm-Use-EMSGSIZE-instead-of-EBADMSG-to-compile-on-Op.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c559d599c6880caf7aa0f0a60c6c023584e1b8ad Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Wed, 11 Oct 2017 08:52:43 -0400
-Subject: [PATCH 12/12] tpm: Use EMSGSIZE instead of EBADMSG to compile on
- OpenBSD
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-EBADMSG was only added to OpenBSD very recently. To make QEMU compilable
-on older OpenBSD versions use EMSGSIZE instead when a mismatch between
-number of received bytes and message size indicated in the header was
-found.
-
-Return -EMSGSIZE and convert all other errnos in the same functions to
-return the negative errno.
-
-Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-
-Upstream-Status: Backport [98979cdca44ba0e21055ee7736694aa5ebb54347]
----
- hw/tpm/tpm_util.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
-index fb929f6e92..73d77965fd 100644
---- a/hw/tpm/tpm_util.c
-+++ b/hw/tpm/tpm_util.c
-@@ -68,10 +68,10 @@ static int tpm_util_test(int fd,
-
- n = write(fd, request, requestlen);
- if (n < 0) {
-- return errno;
-+ return -errno;
- }
- if (n != requestlen) {
-- return EFAULT;
-+ return -EFAULT;
- }
-
- FD_ZERO(&readfds);
-@@ -80,18 +80,18 @@ static int tpm_util_test(int fd,
- /* wait for a second */
- n = select(fd + 1, &readfds, NULL, NULL, &tv);
- if (n != 1) {
-- return errno;
-+ return -errno;
- }
-
- n = read(fd, &buf, sizeof(buf));
- if (n < sizeof(struct tpm_resp_hdr)) {
-- return EFAULT;
-+ return -EFAULT;
- }
-
- resp = (struct tpm_resp_hdr *)buf;
- /* check the header */
- if (be32_to_cpu(resp->len) != n) {
-- return EBADMSG;
-+ return -EMSGSIZE;
- }
-
- *return_tag = be16_to_cpu(resp->tag);
---
-2.11.0
-