MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen-tools: add a patch to address failures on 32 bit systems with 64 bit time_t

Browse Source 
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Alexander Kanavin 2023-04-12 11:15:43 +02:00 committed by Bruce Ashfield
parent fff79433b6
commit bbc5057796
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
recipes-extended/xen/files/0001-tools-xenstore-xenstored_control.c-correctly-print-t.patch Normal file
View File

@ -0,0 +1,34 @@
From c7c43c4531fe1cd188f62d9905c3f5c7a29a6fb0 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Wed, 12 Apr 2023 10:30:18 +0200
Subject: [PATCH] tools/xenstore/xenstored_control.c: correctly print time_t
On 32 bit systems with 64 bit time_t (hello, Y2038 problem),
the following error occurs otherwise:
| xenstored_control.c: In function 'lu_reject_reason':
| xenstored_control.c:646:70: error: format '%ld' expects argument of type 'long int', but argument 5 has type 'time_t' {aka 'long long int'} [-Werror=format=]
Upstream-Status: Submitted [by email to xen-devel@lists.xenproject.org and maintainers as suggested by add_maintainers.pl script]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
tools/xenstore/xenstored_control.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c
index d1aaa00bf4..8d318c0399 100644
--- a/tools/xenstore/xenstored_control.c
+++ b/tools/xenstore/xenstored_control.c
@@ -643,10 +643,10 @@ static const char *lu_reject_reason(const void *ctx)
list_for_each_entry(conn, &connections, list) {
if (conn->ta_start_time &&
(now - conn->ta_start_time >= lu_status->timeout)) {
- ret = talloc_asprintf(ctx, "%s\nDomain %u: %ld s",
+ ret = talloc_asprintf(ctx, "%s\nDomain %u: %jd s",
ret ? : "Domains with long running transactions:",
conn->id,
- now - conn->ta_start_time);
+ (intmax_t)now - conn->ta_start_time);
}
}

1
recipes-extended/xen/xen-tools_4.16.bb
View File

@ -7,6 +7,7 @@ XEN_BRANCH ?= "stable-${XEN_REL}"
SRC_URI = " \ SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \ file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
file://0001-tools-xenstore-xenstored_control.c-correctly-print-t.patch \
" "
LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5" LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"

1
recipes-extended/xen/xen-tools_4.17.bb
View File

@ -7,6 +7,7 @@ XEN_BRANCH ?= "stable-${XEN_REL}"
SRC_URI = " \ SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \ file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
file://0001-tools-xenstore-xenstored_control.c-correctly-print-t.patch \
" "
LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9" LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

1
recipes-extended/xen/xen-tools_git.bb
View File

@ -7,6 +7,7 @@ XEN_BRANCH ?= "master"
SRC_URI = " \ SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \ file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
file://0001-tools-xenstore-xenstored_control.c-correctly-print-t.patch \
" "
LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9" LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"