From d032dae613dc006c91ad8581f203af1bd4bdbf9c Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Mon, 14 Oct 2019 10:06:36 +0100

Subject: [PATCH 11/21] s390-bios: ptr2u32 and u32toptr

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20191014100645.22862-9-thuth@redhat.com>

Patchwork-id: 91788

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH v2 08/17] s390-bios: ptr2u32 and u32toptr

Bugzilla: 1664376

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

From: "Jason J. Herne" <jjherne@linux.ibm.com>

Introduce inline functions to convert between pointers and unsigned 32-bit

ints. These are used to hide the ugliness required to  avoid compiler

warnings.

Signed-off-by: Jason J. Herne <jjherne@linux.ibm.com>

Acked-by: Cornelia Huck <cohuck@redhat.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Message-Id: <1554388475-18329-8-git-send-email-jjherne@linux.ibm.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

(cherry picked from commit 1fb3e5cde8dcd9b5917aea9a0b2918e16be8be1e)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 pc-bios/s390-ccw/helper.h | 31 +++++++++++++++++++++++++++++++

 1 file changed, 31 insertions(+)

 create mode 100644 pc-bios/s390-ccw/helper.h

diff --git a/pc-bios/s390-ccw/helper.h b/pc-bios/s390-ccw/helper.h

new file mode 100644

index 0000000..78d5bc7

--- /dev/null

+++ b/pc-bios/s390-ccw/helper.h

@@ -0,0 +1,31 @@

+/*

+ * Helper Functions

+ *

+ * Copyright (c) 2019 IBM Corp.

+ *

+ * Author(s): Jason J. Herne <jjherne@us.ibm.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or (at

+ * your option) any later version. See the COPYING file in the top-level

+ * directory.

+ */

+

+#ifndef S390_CCW_HELPER_H

+#define S390_CCW_HELPER_H

+

+#include "s390-ccw.h"

+

+/* Avoids compiler warnings when casting a pointer to a u32 */

+static inline uint32_t ptr2u32(void *ptr)

+{

+    IPL_assert((uint64_t)ptr <= 0xffffffff, "ptr2u32: ptr too large");

+    return (uint32_t)(uint64_t)ptr;

+}

+

+/* Avoids compiler warnings when casting a u32 to a pointer */

+static inline void *u32toptr(uint32_t n)

+{

+    return (void *)(uint64_t)n;

+}

+

+#endif

-- 

1.8.3.1