SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qemu-ga patch queue for soft-freeze

Browse Source 
* fix guest-get-vcpus reporting after vcpu unplug
 * coding style fix-ups
 * report a reason for disabled commands
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEzqzJ4VU066u4LT+gM1PJzvEItYQFAmBRc6kACgkQM1PJzvEI
 tYRTyAf/RAL9jEf6zFtztqpTKOUoptnBjtF2bb4A9WQ72/9sFzoufYoCSKeSEbuv
 9vEK1DW5JkgR5DETsk3qWCr4TK2wNf7rZde87iy5pOxPQqaUNwx5HFZqZnBMv3wl
 SIWRoa5fPucUOZQkYgjellRNlGVm0QJ1+hqmj+0Dwbw04KBti0Hbyl7YS23BskD0
 wafPensotjEswtbxG20yCW4WerI5XVnrPYURD8+lBMYYOxLgsIc+fSUZ+Ak+4gO+
 i3rgK7RamzoWJ/L9am8v7uImH1k74tO3g6iws79exT8wWK2o4/vqQYF2TMtTrUvq
 9ZBA1ehd6L0bDDRXFNsBOc27jADRIw==
 =d1L/
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2021-03-16-tag' into staging

qemu-ga patch queue for soft-freeze

* fix guest-get-vcpus reporting after vcpu unplug
* coding style fix-ups
* report a reason for disabled commands

# gpg: Signature made Wed 17 Mar 2021 03:12:41 GMT
# gpg:                using RSA key CEACC9E15534EBABB82D3FA03353C9CEF108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>" [full]
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>" [full]
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>" [full]
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584

* remotes/mdroth/tags/qga-pull-2021-03-16-tag:
  qga: return a more explicit error on why a command is disabled
  qga: Switch and case should be at the same indent
  qga: Open brace '{' following struct go on the same
  qga: Delete redundant spaces
  qga: Add spaces around operator
  qga: Correct loop count in qmp_guest_get_vcpus()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-03-18 11:27:11 +00:00
commit 7286d62d4e
8 changed files with 79 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/qapi/qmp/dispatch.h
View File

@ -36,6 +36,7 @@ typedef struct QmpCommand
QmpCommandOptions options; QmpCommandOptions options;
QTAILQ_ENTRY(QmpCommand) node; QTAILQ_ENTRY(QmpCommand) node;
bool enabled; bool enabled;
const char *disable_reason;
} QmpCommand; } QmpCommand;
typedef QTAILQ_HEAD(QmpCommandList, QmpCommand) QmpCommandList; typedef QTAILQ_HEAD(QmpCommandList, QmpCommand) QmpCommandList;
@ -44,7 +45,8 @@ void qmp_register_command(QmpCommandList *cmds, const char *name,
QmpCommandFunc *fn, QmpCommandOptions options); QmpCommandFunc *fn, QmpCommandOptions options);
const QmpCommand *qmp_find_command(const QmpCommandList *cmds, const QmpCommand *qmp_find_command(const QmpCommandList *cmds,
const char *name); const char *name);
void qmp_disable_command(QmpCommandList *cmds, const char *name); void qmp_disable_command(QmpCommandList *cmds, const char *name,
const char *err_msg);
void qmp_enable_command(QmpCommandList *cmds, const char *name); void qmp_enable_command(QmpCommandList *cmds, const char *name);
bool qmp_command_is_enabled(const QmpCommand *cmd); bool qmp_command_is_enabled(const QmpCommand *cmd);

6
qapi/qmp-dispatch.c
View File

@ -157,8 +157,10 @@ QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request,
} }
if (!cmd->enabled) { if (!cmd->enabled) {
error_set(&err, ERROR_CLASS_COMMAND_NOT_FOUND, error_set(&err, ERROR_CLASS_COMMAND_NOT_FOUND,
"The command %s has been disabled for this instance", "Command %s has been disabled%s%s",
command); command,
cmd->disable_reason ? ": " : "",
cmd->disable_reason ?: "");
goto out; goto out;
} }
if (oob && !(cmd->options & QCO_ALLOW_OOB)) { if (oob && !(cmd->options & QCO_ALLOW_OOB)) {

10
qapi/qmp-registry.c
View File

@ -43,26 +43,28 @@ const QmpCommand *qmp_find_command(const QmpCommandList *cmds, const char *name)
} }
static void qmp_toggle_command(QmpCommandList *cmds, const char *name, static void qmp_toggle_command(QmpCommandList *cmds, const char *name,
bool enabled) bool enabled, const char *disable_reason)
{ {
QmpCommand *cmd; QmpCommand *cmd;
QTAILQ_FOREACH(cmd, cmds, node) { QTAILQ_FOREACH(cmd, cmds, node) {
if (strcmp(cmd->name, name) == 0) { if (strcmp(cmd->name, name) == 0) {
cmd->enabled = enabled; cmd->enabled = enabled;
cmd->disable_reason = disable_reason;
return; return;
} }
} }
} }
void qmp_disable_command(QmpCommandList *cmds, const char *name) void qmp_disable_command(QmpCommandList *cmds, const char *name,
const char *disable_reason)
{ {
qmp_toggle_command(cmds, name, false); qmp_toggle_command(cmds, name, false, disable_reason);
} }
void qmp_enable_command(QmpCommandList *cmds, const char *name) void qmp_enable_command(QmpCommandList *cmds, const char *name)
{ {
qmp_toggle_command(cmds, name, true); qmp_toggle_command(cmds, name, true, NULL);
} }
bool qmp_command_is_enabled(const QmpCommand *cmd) bool qmp_command_is_enabled(const QmpCommand *cmd)

7
qga/channel-win32.c
View File

@ -292,9 +292,9 @@ static gboolean ga_channel_open(GAChannel *c, GAChannelMethod method,
return false; return false;
} }
if (method == GA_CHANNEL_ISA_SERIAL){ if (method == GA_CHANNEL_ISA_SERIAL) {
snprintf(newpath, sizeof(newpath), "\\\\.\\%s", path); snprintf(newpath, sizeof(newpath), "\\\\.\\%s", path);
}else { } else {
g_strlcpy(newpath, path, sizeof(newpath)); g_strlcpy(newpath, path, sizeof(newpath));
} }
@ -307,7 +307,8 @@ static gboolean ga_channel_open(GAChannel *c, GAChannelMethod method,
return false; return false;
} }
if (method == GA_CHANNEL_ISA_SERIAL && !SetCommTimeouts(c->handle,&comTimeOut)) { if (method == GA_CHANNEL_ISA_SERIAL
&& !SetCommTimeouts(c->handle, &comTimeOut)) {
g_autofree gchar *emsg = g_win32_error_message(GetLastError()); g_autofree gchar *emsg = g_win32_error_message(GetLastError());
g_critical("error setting timeout for com port: %s", emsg); g_critical("error setting timeout for com port: %s", emsg);
CloseHandle(c->handle); CloseHandle(c->handle);

47
qga/commands-posix.c
View File

@ -110,7 +110,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
reopen_fd_to_null(2); reopen_fd_to_null(2);
execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
"hypervisor initiated shutdown", (char*)NULL, environ); "hypervisor initiated shutdown", (char *)NULL, environ);
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} else if (pid < 0) { } else if (pid < 0) {
error_setg_errno(errp, errno, "failed to create child process"); error_setg_errno(errp, errno, "failed to create child process");
@ -479,7 +479,7 @@ GuestFileRead *guest_file_read_unsafe(GuestFileHandle *gfh,
gfh->state = RW_STATE_NEW; gfh->state = RW_STATE_NEW;
} }
buf = g_malloc0(count+1); buf = g_malloc0(count + 1);
read_count = fread(buf, 1, count, fh); read_count = fread(buf, 1, count, fh);
if (ferror(fh)) { if (ferror(fh)) {
error_setg_errno(errp, errno, "failed to read file"); error_setg_errno(errp, errno, "failed to read file");
@ -2370,24 +2370,6 @@ error:
return NULL; return NULL;
} }
#define SYSCONF_EXACT(name, errp) sysconf_exact((name), #name, (errp))
static long sysconf_exact(int name, const char *name_str, Error **errp)
{
long ret;
errno = 0;
ret = sysconf(name);
if (ret == -1) {
if (errno == 0) {
error_setg(errp, "sysconf(%s): value indefinite", name_str);
} else {
error_setg_errno(errp, errno, "sysconf(%s)", name_str);
}
}
return ret;
}
/* Transfer online/offline status between @vcpu and the guest system. /* Transfer online/offline status between @vcpu and the guest system.
* *
* On input either @errp or *@errp must be NULL. * On input either @errp or *@errp must be NULL.
@ -2458,30 +2440,33 @@ static void transfer_vcpu(GuestLogicalProcessor *vcpu, bool sys2vcpu,
GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp) GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp)
{ {
int64_t current;
GuestLogicalProcessorList *head, **tail; GuestLogicalProcessorList *head, **tail;
long sc_max; const char *cpu_dir = "/sys/devices/system/cpu";
const gchar *line;
g_autoptr(GDir) cpu_gdir = NULL;
Error *local_err = NULL; Error *local_err = NULL;
current = 0;
head = NULL; head = NULL;
tail = &head; tail = &head;
sc_max = SYSCONF_EXACT(_SC_NPROCESSORS_CONF, &local_err); cpu_gdir = g_dir_open(cpu_dir, 0, NULL);
while (local_err == NULL && current < sc_max) { if (cpu_gdir == NULL) {
error_setg_errno(errp, errno, "failed to list entries: %s", cpu_dir);
return NULL;
}
while (local_err == NULL && (line = g_dir_read_name(cpu_gdir)) != NULL) {
GuestLogicalProcessor *vcpu; GuestLogicalProcessor *vcpu;
int64_t id = current++; int64_t id;
char *path = g_strdup_printf("/sys/devices/system/cpu/cpu%" PRId64 "/", if (sscanf(line, "cpu%" PRId64, &id)) {
id); g_autofree char *path = g_strdup_printf("/sys/devices/system/cpu/"
"cpu%" PRId64 "/", id);
if (g_file_test(path, G_FILE_TEST_EXISTS)) {
vcpu = g_malloc0(sizeof *vcpu); vcpu = g_malloc0(sizeof *vcpu);
vcpu->logical_id = id; vcpu->logical_id = id;
vcpu->has_can_offline = true; /* lolspeak ftw */ vcpu->has_can_offline = true; /* lolspeak ftw */
transfer_vcpu(vcpu, true, path, &local_err); transfer_vcpu(vcpu, true, path, &local_err);
QAPI_LIST_APPEND(tail, vcpu); QAPI_LIST_APPEND(tail, vcpu);
} }
g_free(path);
} }
if (local_err == NULL) { if (local_err == NULL) {

26
qga/commands-win32.c
View File

@ -110,15 +110,15 @@ static OpenFlags guest_file_open_modes[] = {
{"w", GENERIC_WRITE, CREATE_ALWAYS}, {"w", GENERIC_WRITE, CREATE_ALWAYS},
{"wb", GENERIC_WRITE, CREATE_ALWAYS}, {"wb", GENERIC_WRITE, CREATE_ALWAYS},
{"a", FILE_GENERIC_APPEND, OPEN_ALWAYS }, {"a", FILE_GENERIC_APPEND, OPEN_ALWAYS },
{"r+", GENERIC_WRITE|GENERIC_READ, OPEN_EXISTING}, {"r+", GENERIC_WRITE | GENERIC_READ, OPEN_EXISTING},
{"rb+", GENERIC_WRITE|GENERIC_READ, OPEN_EXISTING}, {"rb+", GENERIC_WRITE | GENERIC_READ, OPEN_EXISTING},
{"r+b", GENERIC_WRITE|GENERIC_READ, OPEN_EXISTING}, {"r+b", GENERIC_WRITE | GENERIC_READ, OPEN_EXISTING},
{"w+", GENERIC_WRITE|GENERIC_READ, CREATE_ALWAYS}, {"w+", GENERIC_WRITE | GENERIC_READ, CREATE_ALWAYS},
{"wb+", GENERIC_WRITE|GENERIC_READ, CREATE_ALWAYS}, {"wb+", GENERIC_WRITE | GENERIC_READ, CREATE_ALWAYS},
{"w+b", GENERIC_WRITE|GENERIC_READ, CREATE_ALWAYS}, {"w+b", GENERIC_WRITE | GENERIC_READ, CREATE_ALWAYS},
{"a+", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS }, {"a+", FILE_GENERIC_APPEND | GENERIC_READ, OPEN_ALWAYS },
{"ab+", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS }, {"ab+", FILE_GENERIC_APPEND | GENERIC_READ, OPEN_ALWAYS },
{"a+b", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS } {"a+b", FILE_GENERIC_APPEND | GENERIC_READ, OPEN_ALWAYS }
}; };
#define debug_error(msg) do { \ #define debug_error(msg) do { \
@ -280,7 +280,7 @@ static void acquire_privilege(const char *name, Error **errp)
Error *local_err = NULL; Error *local_err = NULL;
if (OpenProcessToken(GetCurrentProcess(), if (OpenProcessToken(GetCurrentProcess(),
TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &token)) TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token))
{ {
if (!LookupPrivilegeValue(NULL, name, &priv.Privileges[0].Luid)) { if (!LookupPrivilegeValue(NULL, name, &priv.Privileges[0].Luid)) {
error_setg(&local_err, QERR_QGA_COMMAND_FAILED, error_setg(&local_err, QERR_QGA_COMMAND_FAILED,
@ -1116,7 +1116,7 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
len = strlen(mnt_point); len = strlen(mnt_point);
mnt_point[len] = '\\'; mnt_point[len] = '\\';
mnt_point[len+1] = 0; mnt_point[len + 1] = 0;
if (!GetVolumeInformationByHandleW(hLocalDiskHandle, vol_info, if (!GetVolumeInformationByHandleW(hLocalDiskHandle, vol_info,
sizeof(vol_info), NULL, NULL, NULL, sizeof(vol_info), NULL, NULL, NULL,
@ -1323,7 +1323,7 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)
DWORD char_count = 0; DWORD char_count = 0;
char *path, *out; char *path, *out;
GError *gerr = NULL; GError *gerr = NULL;
gchar * argv[4]; gchar *argv[4];
GetVolumePathNamesForVolumeNameW(guid, NULL, 0, &char_count); GetVolumePathNamesForVolumeNameW(guid, NULL, 0, &char_count);
@ -2174,7 +2174,7 @@ static ga_win_10_0_server_t const WIN_10_0_SERVER_VERSION_MATRIX[3] = {
static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp) static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp)
{ {
typedef NTSTATUS(WINAPI * rtl_get_version_t)( typedef NTSTATUS(WINAPI *rtl_get_version_t)(
RTL_OSVERSIONINFOEXW *os_version_info_ex); RTL_OSVERSIONINFOEXW *os_version_info_ex);
info->dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); info->dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW);

4
qga/commands.c
View File

@ -22,9 +22,9 @@
#include "commands-common.h" #include "commands-common.h"
/* Maximum captured guest-exec out_data/err_data - 16MB */ /* Maximum captured guest-exec out_data/err_data - 16MB */
#define GUEST_EXEC_MAX_OUTPUT (16*1024*1024) #define GUEST_EXEC_MAX_OUTPUT (16 * 1024 * 1024)
/* Allocation and I/O buffer for reading guest-exec out_data/err_data - 4KB */ /* Allocation and I/O buffer for reading guest-exec out_data/err_data - 4KB */
#define GUEST_EXEC_IO_SIZE (4*1024) #define GUEST_EXEC_IO_SIZE (4 * 1024)
/* /*
* Maximum file size to read - 48MB * Maximum file size to read - 48MB
* *

63
qga/main.c
View File

@ -279,20 +279,20 @@ QEMU_HELP_BOTTOM "\n"
static const char *ga_log_level_str(GLogLevelFlags level) static const char *ga_log_level_str(GLogLevelFlags level)
{ {
switch (level & G_LOG_LEVEL_MASK) { switch (level & G_LOG_LEVEL_MASK) {
case G_LOG_LEVEL_ERROR: case G_LOG_LEVEL_ERROR:
return "error"; return "error";
case G_LOG_LEVEL_CRITICAL: case G_LOG_LEVEL_CRITICAL:
return "critical"; return "critical";
case G_LOG_LEVEL_WARNING: case G_LOG_LEVEL_WARNING:
return "warning"; return "warning";
case G_LOG_LEVEL_MESSAGE: case G_LOG_LEVEL_MESSAGE:
return "message"; return "message";
case G_LOG_LEVEL_INFO: case G_LOG_LEVEL_INFO:
return "info"; return "info";
case G_LOG_LEVEL_DEBUG: case G_LOG_LEVEL_DEBUG:
return "debug"; return "debug";
default: default:
return "user"; return "user";
} }
} }
@ -375,7 +375,7 @@ static void ga_disable_non_whitelisted(const QmpCommand *cmd, void *opaque)
} }
if (!whitelisted) { if (!whitelisted) {
g_debug("disabling command: %s", name); g_debug("disabling command: %s", name);
qmp_disable_command(&ga_commands, name); qmp_disable_command(&ga_commands, name, "the agent is in frozen state");
} }
} }
@ -586,7 +586,7 @@ end:
static gboolean channel_event_cb(GIOCondition condition, gpointer data) static gboolean channel_event_cb(GIOCondition condition, gpointer data)
{ {
GAState *s = data; GAState *s = data;
gchar buf[QGA_READ_COUNT_DEFAULT+1]; gchar buf[QGA_READ_COUNT_DEFAULT + 1];
gsize count; gsize count;
GIOStatus status = ga_channel_read(s->channel, buf, QGA_READ_COUNT_DEFAULT, &count); GIOStatus status = ga_channel_read(s->channel, buf, QGA_READ_COUNT_DEFAULT, &count);
switch (status) { switch (status) {
@ -610,7 +610,7 @@ static gboolean channel_event_cb(GIOCondition condition, gpointer data)
* host-side chardev. sleep a bit to mitigate this * host-side chardev. sleep a bit to mitigate this
*/ */
if (s->virtio) { if (s->virtio) {
usleep(100*1000); usleep(100 * 1000);
} }
return true; return true;
default: default:
@ -686,21 +686,20 @@ DWORD WINAPI service_ctrl_handler(DWORD ctrl, DWORD type, LPVOID data,
DWORD ret = NO_ERROR; DWORD ret = NO_ERROR;
GAService *service = &ga_state->service; GAService *service = &ga_state->service;
switch (ctrl) switch (ctrl) {
{ case SERVICE_CONTROL_STOP:
case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_SHUTDOWN:
case SERVICE_CONTROL_SHUTDOWN: quit_handler(SIGTERM);
quit_handler(SIGTERM); SetEvent(ga_state->wakeup_event);
SetEvent(ga_state->wakeup_event); service->status.dwCurrentState = SERVICE_STOP_PENDING;
service->status.dwCurrentState = SERVICE_STOP_PENDING; SetServiceStatus(service->status_handle, &service->status);
SetServiceStatus(service->status_handle, &service->status); break;
break; case SERVICE_CONTROL_DEVICEEVENT:
case SERVICE_CONTROL_DEVICEEVENT: handle_serial_device_events(type, data);
handle_serial_device_events(type, data); break;
break;
default: default:
ret = ERROR_CALL_NOT_IMPLEMENTED; ret = ERROR_CALL_NOT_IMPLEMENTED;
} }
return ret; return ret;
} }
@ -1329,7 +1328,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
s->blacklist = config->blacklist; s->blacklist = config->blacklist;
do { do {
g_debug("disabling command: %s", (char *)l->data); g_debug("disabling command: %s", (char *)l->data);
qmp_disable_command(&ga_commands, l->data); qmp_disable_command(&ga_commands, l->data, NULL);
l = g_list_next(l); l = g_list_next(l);
} while (l); } while (l);
} }