diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2025-09-02 12:07:04 +0200 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2025-09-02 12:07:05 +0200 |
| commit | 8415b0619f65bff12f10c774659df92d3f61daca (patch) | |
| tree | cc2e9f64b472ad29f2185b781d5a7b632e674ba1 /qga/main.c | |
| parent | 0a028b5e1dd2f02ba3d1f2a7825ce40b6eb559ec (diff) | |
| parent | 28c5d27dd4dc4100a96ff4c9e5871dd23c6b02ec (diff) | |
| download | focaccia-qemu-8415b0619f65bff12f10c774659df92d3f61daca.tar.gz focaccia-qemu-8415b0619f65bff12f10c774659df92d3f61daca.zip | |
Merge tag 'qga-pull-2025-08-29-v2' of https://github.com/kostyanf14/qemu into staging
qga-pull-2025-08-29-v2 # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEwsLBCepDxjwUI+uE711egWG6hOcFAmi1foEACgkQ711egWG6 # hOf0wA/+JhdZQUYWsdADK30KdAByRGF4ujz6n2c3smaYNxZh9M0fjmwy9TVjA3P9 # f2fLf1/ltgKwd8MVxR8UAE143Oq7mt2Qe+p37ftkMRtBnIyF7KVzlco3d+lH76PL # 4zW8rCbYnhYonGD1mwTAgxHnmrEv91ZqgBH46o+A8vFUUog+QgtHj5y5YIPTTxOi # BK+mkhG7F5nCjjl8MTFyiASRdHeYLV0cYhV+baX/sbnFU92ewojQhUFQwbxlwNH+ # yl5/+K8vlHf1OEMljCGtWabZwm5voj/hUi2apcdJtHycx3J4LOa9XpWknOZrUiJe # ZR7ad1FAmLnoDO3MqRQvQpUDyGDwC4rBhyhcxImGljbxPlRaOV8NRjeOZYuDvb9Z # Gv75dmAwNkLDTvCteMIsyTlavpVemu6sePmbOnFQmfRebl9Qcn5eSDoyoQX3QOp7 # SUZStaY6fLZCFnHOM97Yd5JFn5UuAlw/ZVGQjK5EYnAZX+7s0CbYmx5OSNusMPzt # IW2Z3ydok0KkdbQ0Yhpm2j2nzvQr2gsuquaddcqjZg7i9F30CYbBAGWp91MSpJgx # xS5aURvB1psktFNuA0WtpDkMN8sNnjNMIreh4StXf/tYg5pYi8yHYlRYkeTrxhLl # HHaWfb2nAlZaQPjx6CXFvUKv0W2kAn+12WFzVMcM2IrQ/ESyUyE= # =y5F8 # -----END PGP SIGNATURE----- # gpg: Signature made Mon 01 Sep 2025 01:07:45 PM CEST # gpg: using RSA key C2C2C109EA43C63C1423EB84EF5D5E8161BA84E7 # gpg: Good signature from "Kostiantyn Kostiuk (Upstream PR sign) <kkostiuk@redhat.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: C2C2 C109 EA43 C63C 1423 EB84 EF5D 5E81 61BA 84E7 * tag 'qga-pull-2025-08-29-v2' of https://github.com/kostyanf14/qemu: qga: Fix truncated output handling in guest-exec status reporting qga/installer: Remove QGA VSS if QGA installation failed qga-vss: Write hex value of error in log qga: ignore channel_init() fail if 'retry_path' is set qga: Fix channel initialization check in run_agent_once qga-vss: Remove unused dependencies qga-vss: Replace asserts with condition and report error qga: fix potentially not initialized nr_volumes in qga_vss_fsfreeze() qga: Fix ubsan warning Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'qga/main.c')
| -rw-r--r-- | qga/main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qga/main.c b/qga/main.c index 6c02f3ec38..dd1c216f9a 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1512,8 +1512,12 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation) if (!channel_init(s, s->config->method, s->config->channel_path, s->socket_activation ? FIRST_SOCKET_ACTIVATION_FD : -1)) { - g_critical("failed to initialize guest agent channel"); - return NULL; + if (s->config->retry_path) { + g_info("failed to initialize guest agent channel, will retry"); + } else { + g_critical("failed to initialize guest agent channel"); + return NULL; + } } if (config->daemonize) { @@ -1563,7 +1567,7 @@ static void cleanup_agent(GAState *s) static int run_agent_once(GAState *s) { if (!s->channel && - channel_init(s, s->config->method, s->config->channel_path, + !channel_init(s, s->config->method, s->config->channel_path, s->socket_activation ? FIRST_SOCKET_ACTIVATION_FD : -1)) { g_critical("failed to initialize guest agent channel"); return EXIT_FAILURE; |