matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix comments

Browse Source 
Signed-off-by: Ze Gan <ganze718@gmail.com>
This commit is contained in:
Ze Gan 2024-03-21 21:01:48 +08:00
parent 764d019fb7
commit dedfc63c3a
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/image_config/midplane-network/dummy-midplane.network
View File

@ -1,5 +1,6 @@
# The systemd-networkd requires that the bridge interface(bridge-midplane) has at least one member interface, otherwise the IP address will not be configured. # The systemd-networkd requires that the bridge interface(bridge-midplane) has at least one member interface, otherwise the IP address will not be configured.
# This dummy interface will be added into the bridge-midplane as a member to guarantee the IP address configuration correctly. # This dummy interface will be added into the bridge-midplane as a member to guarantee the IP address configuration correctly.
# Refer: https://github.com/systemd/systemd/issues/9252#issuecomment-771540028
[Match] [Match]
Name=dummy-midplane Name=dummy-midplane

14
src/systemd-sonic-generator/ssg-test.cc
View File

@ -185,16 +185,10 @@ class SsgFunctionTest : public SystemdSonicGeneratorFixture {
struct SsgMainConfig { struct SsgMainConfig {
int num_asics; int num_asics = 0;
bool is_smart_switch_npu; bool is_smart_switch_npu = false;
bool is_smart_switch_dpu; bool is_smart_switch_dpu = false;
int num_dpus; int num_dpus = 0;
SsgMainConfig() {
num_asics = 0;
is_smart_switch_npu = false;
is_smart_switch_dpu = false;
num_dpus = 0;
}
}; };

20
src/systemd-sonic-generator/systemd-sonic-generator.c
View File

@ -231,8 +231,11 @@ static bool is_multi_instance_service_for_dpu(const char *service_name) {
} }
const static char* multi_instance_services_for_dpu[] = {"database"}; const static char* multi_instance_services_for_dpu[] = {"database"};
char *saveptr;
char *tmp_service_name = strdup(service_name); char *tmp_service_name = strdup(service_name);
if (tmp_service_name == NULL) {
fprintf(stderr, "Error: Failed to allocate memory for tmp_service_name\n");
exit(EXIT_FAILURE);
}
for (size_t i = 0; i < sizeof(multi_instance_services_for_dpu) / for (size_t i = 0; i < sizeof(multi_instance_services_for_dpu) /
sizeof(multi_instance_services_for_dpu[0]); sizeof(multi_instance_services_for_dpu[0]);
@ -610,7 +613,7 @@ static int create_symlink(char* unit, char* target, char* install_dir, int insta
} }
if (is_devnull(dest_path)) { if (is_devnull(dest_path)) {
if (remove(dest_path) == -1) { if (remove(dest_path) != 0) {
fprintf(stderr, "Unable to remove existing symlink %s\n", dest_path); fprintf(stderr, "Unable to remove existing symlink %s\n", dest_path);
return -1; return -1;
} }
@ -730,6 +733,8 @@ const char* get_platform() {
} }
if (tmp_platform == NULL) { if (tmp_platform == NULL) {
set_invalid_pointer((void **)&platform); set_invalid_pointer((void **)&platform);
fclose(fp);
free(line);
return NULL; return NULL;
} }
strncpy(platform_buffer, tmp_platform, sizeof(platform_buffer) - 1); strncpy(platform_buffer, tmp_platform, sizeof(platform_buffer) - 1);
@ -832,6 +837,7 @@ const struct json_object* get_platform_info() {
} }
if (fread(platform_json, fsize, 1, fp) != 1) { if (fread(platform_json, fsize, 1, fp) != 1) {
fprintf(stdout, "Failed to read %s\n", platform_file_path); fprintf(stdout, "Failed to read %s\n", platform_file_path);
free(platform_json);
fclose(fp); fclose(fp);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -956,7 +962,7 @@ static int install_network_unit(const char* unit_name) {
} }
if (is_devnull(install_path)) { if (is_devnull(install_path)) {
if (remove(install_path) == -1) { if (remove(install_path) != 0) {
fprintf(stderr, "Unable to remove existing symlink %s\n", install_path); fprintf(stderr, "Unable to remove existing symlink %s\n", install_path);
return -1; return -1;
} }
@ -1011,12 +1017,14 @@ static int render_network_service_for_smart_switch() {
char *unit_content = malloc(len); char *unit_content = malloc(len);
if (unit_content == NULL) { if (unit_content == NULL) {
fprintf(stderr, "Failed to allocate memory for %s\n", unit_path); fprintf(stderr, "Failed to allocate memory for %s\n", unit_path);
fclose(fp);
exit(EXIT_FAILURE);
} }
if (fread(unit_content, file_size, 1, fp) != 1) { if (fread(unit_content, file_size, 1, fp) != 1) {
fprintf(stderr, "Failed to read %s\n", unit_path); fprintf(stderr, "Failed to read %s\n", unit_path);
free(unit_content); free(unit_content);
fclose(fp); fclose(fp);
return -1; exit(EXIT_FAILURE);
} }
fclose(fp); fclose(fp);
@ -1051,13 +1059,13 @@ static int render_network_service_for_smart_switch() {
if (fp == NULL) { if (fp == NULL) {
fprintf(stderr, "Failed to open %s\n", unit_path); fprintf(stderr, "Failed to open %s\n", unit_path);
free(unit_content); free(unit_content);
return -1; exit(EXIT_FAILURE);
} }
if (fwrite(unit_content, strlen(unit_content), 1, fp) != 1) { if (fwrite(unit_content, strlen(unit_content), 1, fp) != 1) {
fprintf(stderr, "Failed to write %s\n", unit_path); fprintf(stderr, "Failed to write %s\n", unit_path);
free(unit_content); free(unit_content);
fclose(fp); fclose(fp);
return -1; exit(EXIT_FAILURE);
} }
fclose(fp); fclose(fp);
free(unit_content); free(unit_content);