[xen stable-4.20] tools/xl: fix channel configuration setting

[patchbot@xxxxxxx]

commit 70038e8c098ffa20b65e4e32faee9a138e176aa6
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Thu Mar 20 12:50:24 2025 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Mar 20 12:50:24 2025 +0100

    tools/xl: fix channel configuration setting
    
    Channels work differently than other device types: their devid should
    be -1 initially in order to distinguish them from the primary console
    which has the devid of 0.
    
    So when parsing the channel configuration, use
    ARRAY_EXTEND_INIT_NODEVID() in order to avoid overwriting the devid
    set by libxl_device_channel_init().
    
    Fixes: 3a6679634766 ("libxl: set channel devid when not provided by 
application")
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    master commit: e1ccced4afe465d6541c5825a0f8d1b8f5fa4253
    master date: 2025-03-05 16:37:37 +0100
---
 tools/xl/xl_parse.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 3d85be7dd4..089a88935a 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -2423,8 +2423,9 @@ void parse_config_data(const char *config_source,
             char *path = NULL;
             int len;
 
-            chn = ARRAY_EXTEND_INIT(d_config->channels, d_config->num_channels,
-                                   libxl_device_channel_init);
+            chn = ARRAY_EXTEND_INIT_NODEVID(d_config->channels,
+                                            d_config->num_channels,
+                                            libxl_device_channel_init);
 
             split_string_into_string_list(buf, ",", &pairs);
             len = libxl_string_list_length(&pairs);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.20