1
0
Fork 0

Merging upstream version 1.12.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-03-20 08:08:33 +01:00
parent 8d543389aa
commit a3d0cc5ebd
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
1005 changed files with 9469 additions and 1830 deletions

View file

@ -25,9 +25,9 @@
#include <dbus/dbus.h>
#define MCTP_DBUS_NAME "xyz.openbmc_project.MCTP"
#define MCTP_DBUS_PATH "/xyz/openbmc_project/mctp"
#define MCTP_DBUS_EP_IFACE "au.com.CodeConstruct.MCTP.Endpoint"
#define MCTP_DBUS_NAME "au.com.codeconstruct.MCTP1"
#define MCTP_DBUS_PATH "/au/com/codeconstruct/mctp1"
#define MCTP_DBUS_EP_IFACE "au.com.codeconstruct.MCTP.Endpoint1"
static int parse_mctp(const char *devstr, unsigned int *net, uint8_t *eid)
{
@ -87,7 +87,8 @@ int set_local_mtu(DBusConnection *bus, unsigned int net, uint8_t eid,
char *ep_path;
int rc;
rc = asprintf(&ep_path, "%s/%u/%hhu", MCTP_DBUS_PATH, net, eid);
rc = asprintf(&ep_path, "%s/networks/%u/endpoints/%hhu", MCTP_DBUS_PATH,
net, eid);
if (rc < 0) {
warn("Failed to create dbus path");
return -1;

View file

@ -50,8 +50,8 @@ static void save_telemetry(nvme_ctrl_t c)
return;
s = time(NULL);
ret = snprintf(buf, sizeof(buf), "/var/log/%s-telemetry-%ld",
nvme_ctrl_get_subsysnqn(c), s);
ret = snprintf(buf, sizeof(buf), "/var/log/%s-telemetry-%llu",
nvme_ctrl_get_subsysnqn(c), (unsigned long long)s);
if (ret < 0) {
free(log);
return;