[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] x86/hvmloader: Don't override stddef.h
- To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Wed, 24 Aug 2022 11:59:14 +0100
- Authentication-results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Jan Beulich <JBeulich@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Wed, 24 Aug 2022 11:00:09 +0000
- Ironport-data: A9a23:CG5Xqav4KO1Vsg2efdvwCc1eF+fnVDReMUV32f8akzHdYApBsoF/q tZmKW3UPPuCZjTwfIx+aY+z8RkD7ZTRmt9mGgI6rHwxRXsb+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAgk/vOHtIQMcacUghpXwhoVSw9vhxqnu89k+ZAjMOwRgiAo rsemeWGULOe82MyYzl8B56r8ks15qyi4m9A5zTSWNgQ1LPgvyhNZH4gDfnZw0vQGuF8AuO8T uDf+7C1lkuxE8AFU47Nfh7TKyXmc5aKVeS8oiM+t5uK23CukhcawKcjXMfwXG8M49m/c3Kd/ /0W3XC4YV9B0qQhA43xWTEAe811FfUuFLMqvRFTGCFcpqHLWyKE/hlgMK05FYgdweNxPE9nz 8A/Di0vNTDf38Ks2ZvuH4GAhux7RCXqFIYWu3UmxjDFF/c2B5vERs0m5/cBgm123JoXW6+DO YxJMlKDbzyZC/FLEn4RBIgzg6GDgX7nficDgFmUubA28y7YywkZPL3Fb4qIIIDWG509ckCwl jLHxUn7BAkmHcHOzRnV1WOFgMbhtHauMG4VPOLhraM76LGJ/UQMDDUGWF39puO24maccd9CL 00f+gI1sLM/skesS7HVTxC+5XKJoBMYc95RCPEhrhGAzLLO5ASUDXRCSSROAOHKr+dvG2Zsj AXQ2Yq0W3o/69V5VE5x6J+RqAi3PxU7BFU+QgkZb1Alv4HDupga20enoslYLEKlsjHkMWiun WnQ9Xlu2+h7Yd0jjPviow2e6964jt2QF1NuuF2KNo6wxlkhDLNJcbBE/rQyARxoCI+CBmeMs 3Ef8yR1xLBfVMrd/MBhrQhkIV1I2xpmGGeF6bKXN8N9nwlBAlb6FWyq3BlwJV1yLuEPciLzb UnYtGt5vcENZSH1PP4tPdnhW6zGKJQM8vy0Ps04k/IUOsQhHON51HsGibGsM5DFzxF3zPBX1 WazesewF3cKYZlaIM6Nb75EidcWKtUWnzy7qWbTk0v6itJzpRe9Fd84Dbd5Rrpgt/zf/V+Nq o832gnj40w3bdASqxL/qeY7RW3m51BiXfgad+Q/mja/Hzdb
- Ironport-hdrordr: A9a23:J+u2rqy7b51f+juquuryKrPwFr1zdoMgy1knxilNoRw8SK2lfq eV7YwmPH7P+U8ssR4b6LO90cW7Lk80sKQFhbX5Xo3SOjUO2lHYTr2KhLGKq1aLdkHDH6xmpM BdmsBFeabN5DNB7foSjjPXLz9Z+qjjzJyV
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Since c/s 73b13705af7c ("firmware: provide a stand alone set of headers"),
we've had an implementation of offsetof() which isn't undefined behaviour.
Actually use it.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
---
tools/firmware/hvmloader/util.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
index 8d95eab28a65..ac7ff264e247 100644
--- a/tools/firmware/hvmloader/util.h
+++ b/tools/firmware/hvmloader/util.h
@@ -28,12 +28,6 @@ enum {
#define SEL_DATA32 0x0020
#define SEL_CODE64 0x0028
-#undef offsetof
-#define offsetof(t, m) ((unsigned long)&((t *)0)->m)
-
-#undef NULL
-#define NULL ((void*)0)
-
void __assert_failed(const char *assertion, const char *file, int line)
__attribute__((noreturn));
#define ASSERT(p) \
--
2.11.0
|
