Skip to content

Fix C SDK build on Fedora39 #5436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Fix C SDK build on Fedora39 #5436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe78bd
CA_388624: fix(C SDK): fix build failure with recent GCC
edwintorok Feb 7, 2024
0008395
build: add sdk-build-c Makefile rule to test building C SDK locally
edwintorok Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ sdk:
sh ocaml/sdk-gen/windows-line-endings.sh $(XAPISDK)/csharp
sh ocaml/sdk-gen/windows-line-endings.sh $(XAPISDK)/powershell

.PHONY: sdk-build-c sdk sdksanity

sdk-build-c: sdk
cd _build/install/default/xapi/sdk/c && make -j $(JOBS)

# workaround for no .resx generation, just for compilation testing
sdksanity: sdk
sed -i 's/FriendlyErrorNames.ResourceManager/null/g' ./_build/install/default/xapi/sdk/csharp/src/Failure.cs
Expand Down
21 changes: 4 additions & 17 deletions ocaml/sdk-gen/c/autogen/src/xen_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,7 @@ set_api_version(xen_session *session)
void
xen_session_logout(xen_session *session)
{
abstract_value params[] =
{
};
xen_call_(session, "session.logout", params, 0, NULL, NULL);
xen_call_(session, "session.logout", NULL, 0, NULL, NULL);

if (session->error_description != NULL)
{
Expand All @@ -314,10 +311,7 @@ xen_session_logout(xen_session *session)
void
xen_session_local_logout(xen_session *session)
{
abstract_value params[] =
{
};
xen_call_(session, "session.local_logout", params, 0, NULL, NULL);
xen_call_(session, "session.local_logout", NULL, 0, NULL, NULL);

if (session->error_description != NULL)
{
Expand All @@ -336,29 +330,22 @@ xen_session_local_logout(xen_session *session)
bool
xen_session_get_all_subject_identifiers(xen_session *session, struct xen_string_set **result)
{
abstract_value params[] =
{
};

abstract_type result_type = abstract_type_string_set;

*result = NULL;
xen_call_(session, "session.get_all_subject_identifiers", params, 0, &result_type, result);
xen_call_(session, "session.get_all_subject_identifiers", NULL, 0, &result_type, result);
return session->ok;
}


bool
xen_session_get_all_subject_identifiers_async(xen_session *session, xen_task *result)
{
abstract_value params[] =
{
};

abstract_type result_type = abstract_type_string;

*result = NULL;
xen_call_(session, "Async.session.get_all_subject_identifiers", params, 0, &result_type, result);
xen_call_(session, "Async.session.get_all_subject_identifiers", NULL, 0, &result_type, result);
return session->ok;
}

Expand Down
4 changes: 3 additions & 1 deletion ocaml/sdk-gen/c/gen_c_binding.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,9 @@ and impl_message needed classname message =
sprintf
" xen_call_(session, \"%s.%s\", %s, %d, NULL, NULL);\n\
\ return session->ok;\n"
classname message.msg_name param_call param_count
classname message.msg_name
(if param_count = 0 then "NULL" else param_call)
param_count
in

let messageAsyncImpl = impl_message_async needed classname message in
Expand Down