External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ch_monitor: Update virCHMonitorGet to handle accept a response

Browse Source 
The virCHMonitorGet function needed to be able to return data from the
hypervisor. This functionality is needed in order for the driver to
support PTY enablement and getting details about the VM state.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: William Douglas <william.douglas@intel.com>
This commit is contained in:
William Douglas 2021-09-08 11:01:17 -07:00 committed by Daniel P. Berrangé
parent f84286c0b3
commit e727cc8041
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/ch/ch_monitor.c
View File

@ -54,7 +54,7 @@ VIR_ONCE_GLOBAL_INIT(virCHMonitor);
int virCHMonitorShutdownVMM(virCHMonitor *mon); int virCHMonitorShutdownVMM(virCHMonitor *mon);
int virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint); int virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint);
int virCHMonitorGet(virCHMonitor *mon, const char *endpoint); int virCHMonitorGet(virCHMonitor *mon, const char *endpoint, virJSONValue **response);
static int static int
virCHMonitorBuildCPUJson(virJSONValue *content, virDomainDef *vmdef) virCHMonitorBuildCPUJson(virJSONValue *content, virDomainDef *vmdef)
@ -612,12 +612,36 @@ virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint)
return ret; return ret;
} }
struct curl_data {
char *content;
size_t size;
};
static size_t
curl_callback(void *contents, size_t size, size_t nmemb, void *userp)
{
size_t content_size = size * nmemb;
struct curl_data *data = userp;
if (content_size == 0)
return content_size;
data->content = g_realloc(data->content, data->size + content_size);
memcpy(&(data->content[data->size]), contents, content_size);
data->size += content_size;
return content_size;
}
int int
virCHMonitorGet(virCHMonitor *mon, const char *endpoint) virCHMonitorGet(virCHMonitor *mon, const char *endpoint, virJSONValue **response)
{ {
g_autofree char *url = NULL; g_autofree char *url = NULL;
int responseCode = 0; int responseCode = 0;
int ret = -1; int ret = -1;
struct curl_slist *headers = NULL;
struct curl_data data = {0};
url = g_strdup_printf("%s/%s", URL_ROOT, endpoint); url = g_strdup_printf("%s/%s", URL_ROOT, endpoint);
@ -629,12 +653,33 @@ virCHMonitorGet(virCHMonitor *mon, const char *endpoint)
curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socketpath); curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socketpath);
curl_easy_setopt(mon->handle, CURLOPT_URL, url); curl_easy_setopt(mon->handle, CURLOPT_URL, url);
if (response) {
headers = curl_slist_append(headers, "Accept: application/json");
headers = curl_slist_append(headers, "Content-Type: application/json");
curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, headers);
curl_easy_setopt(mon->handle, CURLOPT_WRITEFUNCTION, curl_callback);
curl_easy_setopt(mon->handle, CURLOPT_WRITEDATA, (void *)&data);
}
responseCode = virCHMonitorCurlPerform(mon->handle); responseCode = virCHMonitorCurlPerform(mon->handle);
virObjectUnlock(mon); virObjectUnlock(mon);
if (responseCode == 200 || responseCode == 204) if (responseCode == 200 || responseCode == 204) {
if (response) {
data.content = g_realloc(data.content, data.size + 1);
data.content[data.size] = 0;
*response = virJSONValueFromString(data.content);
if (!*response)
goto cleanup;
}
ret = 0; ret = 0;
}
cleanup:
g_free(data.content);
/* reset the libcurl handle to avoid leaking a stack pointer to data */
curl_easy_reset(mon->handle);
return ret; return ret;
} }