qga: clean up command source locations and conditionals
cover qga: clean up command source locations and conditionals
This series is a side effect of other work I started, to attempt to make the QGA safe to use in confidential VMs by automatically restricting the permitted commands. Since this cleanup stands on its own, I'm sending it now.
The QGA codebase has a very complicated maze of #ifdefs to create stubs for the various commands that cannot be implemented on certain platforms. It then has further logic to dynamically disable the stub commands at runtime, except this is not consistently applied, so some commands remain enabled despite being merely stubs.
The resulting code is hard to follow, when trying to understand exactly what commands are available under what circumstances, and when changing impls it is easy to get the #ifdefs wrong, resulting in stubs getting missed on platforms without a real impl. In some cases, we have multiple stubs for the same command, due to the maze of #ifdefs.
The QAPI schema language has support for many years for expressing conditions against commands when declaring them. This results in the QAPI code generator omitting their implementation entirely at build time. This has mutliple benefits
* The unsupported commands are guaranteed to not exist at runtime
* No stubs need ever be defined in the code
* The generated QAPI reference manual documents the build conditions
This series is broadly split into three parts
* Moving tonnes of Linux only commands out of commands-posix.c into commands-linux.c to remove many #ifdefs.
* Adding 'if' conditions in the QAPI schema to reflect the build conditions, removing many more #ifdefs
* Sanitizing the logic for disabling/enabling commands at runtime to guarantee consistency
Daniel P. Berrangé (20):
qga: drop blocking of guest-get-memory-block-size command
qga: move linux vcpu command impls to commands-linux.c
qga: move linux suspend command impls to commands-linux.c
qga: move linux fs/disk command impls to commands-linux.c
qga: move linux disk/cpu stats command impls to commands-linux.c
qga: move linux memory block command impls to commands-linux.c
qga: move CONFIG_FSFREEZE/TRIM to be meson defined options
qga: conditionalize schema for commands unsupported on Windows
qga: conditionalize schema for commands unsupported on non-Linux POSIX
qga: conditionalize schema for commands requiring getifaddrs
qga: conditionalize schema for commands requiring linux/win32
qga: conditionalize schema for commands only supported on Windows
qga: conditionalize schema for commands requiring fsfreeze
qga: conditionalize schema for commands requiring fstrim
qga: conditionalize schema for commands requiring libudev
qga: conditionalize schema for commands requiring utmpx
qga: conditionalize schema for commands not supported on other UNIX
qga: add note about where to disable commands for a platform
qga: move declare of QGAConfig struct to top of file
qga: centralize logic for disabling/enabling commands
meson.build | 19 + qga/commands-bsd.c | 24 - qga/commands-common.h | 9 - qga/commands-linux.c | 1805 +++++++++++++++++++++++++++++++ qga/commands-posix.c | 2375 ++++------------------------------------- qga/commands-win32.c | 64 +- qga/main.c | 154 +-- qga/qapi-schema.json | 153 ++- 8 files changed, 2196 insertions(+), 2407 deletions(-)
Signature · 1 line
2.45.1
PATCH 1/20 qga: drop blocking of guest-get-memory-block-size command
This command has never existed in tree, since it was renamed to guest-get-memory-block-info before being merged.
--- qga/commands-posix.c | 2 +- qga/commands-win32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
qga/commands-posix.c +1 -1
@@ -3099,7 +3099,7 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)"guest-suspend-disk" ,"guest-suspend-ram" ,"guest-suspend-hybrid" ,"guest-get-vcpus" ,"guest-set-vcpus" ,"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-size" ,"guest-get-memory-block-info" , +"guest-get-memory-block-info" , NULL};char **p = (char **)list;
qga/commands-win32.c +1 -1
@@ -1995,7 +1995,7 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)"guest-suspend-hybrid" ,"guest-set-vcpus" ,"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-size" ,"guest-get-memory-block-info" , +"guest-get-memory-block-info" , NULL};char **p = (char **)list_unsupported;
Signature · 1 line
2.45.1
PATCH 7/20 qga: move CONFIG_FSFREEZE/TRIM to be meson defined options
In reply to Daniel P. BerrangéDefining these at the meson level allows them to be used a conditional tests in the QAPI schemas.
--- meson.build | 18 ++++++++++++++++++ qga/commands-common.h | 9 --------- 2 files changed, 18 insertions(+), 9 deletions(-)
meson.build +18 -0
@@ -2141,6 +2141,22 @@ have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \ .require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \ .allowed() +qga_fsfreeze = false +qga_fstrim = false +if host_os == 'windows' + qga_fsfreeze = true + qga_fstrim = true +elif host_os == 'linux' + if cc.has_header_symbol('linux/fs.h', 'FIFREEZE') + qga_fsfreeze = true + endif + if cc.has_header_symbol('linux/fs.h', 'FITRIM') + qga_fstrim = true + endif +elif host_os == 'freebsd' and cc.has_header_symbol('ufs/ffs/fs.h', 'UFSSUSPEND') + qga_fsfreeze = true +endif + if get_option('block_drv_ro_whitelist') == '' config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') else
@@ -2375,6 +2391,8 @@ config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg')) config_host_data.set('CONFIG_DEBUG_REMAP', get_option('debug_remap')) config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug')) config_host_data.set('CONFIG_REPLICATION', get_option('replication').allowed()) +config_host_data.set('CONFIG_FSFREEZE', qga_fsfreeze) +config_host_data.set('CONFIG_FSTRIM', qga_fstrim) # has_header config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h'))
qga/commands-common.h +0 -9
@@ -15,19 +15,10 @@#if defined(__linux__)#include <linux/fs.h> -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#ifdef FITRIM -#define CONFIG_FSTRIM -#endif #endif /* __linux__ */ #ifdef __FreeBSD__#include <ufs/ffs/fs.h> -#ifdef UFSSUSPEND -#define CONFIG_FSFREEZE -#endif #endif /* __FreeBSD__ */ #if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM )
Signature · 1 line
2.45.1
PATCH 3/20 qga: move linux suspend command impls to commands-linux.c
In reply to Daniel P. BerrangéThe qmp_guest_suspend_{disk,ram,hybrid} command impls in commands-posix.c are surrounded by '#ifdef __linux__' so should instead live in commands-linux.c
--- qga/commands-linux.c | 265 +++++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 265 ------------------------------------------- 2 files changed, 265 insertions(+), 265 deletions(-)
qga/commands-linux.c +265 -0
@@ -286,6 +286,271 @@ int qmp_guest_fsfreeze_do_thaw(Error **errp) }#endif /* CONFIG_FSFREEZE */ + +#define LINUX_SYS_STATE_FILE "/sys/power/state" +#define SUSPEND_SUPPORTED 0 +#define SUSPEND_NOT_SUPPORTED 1 + +typedef enum { +SUSPEND_MODE_DISK =0 , +SUSPEND_MODE_RAM =1 , +SUSPEND_MODE_HYBRID =2 , +}SuspendMode ; + +/* +* Executes a command in a child process using g_spawn_sync, +* returning an int >= 0 representing the exit status of the +* process. +* +* If the program wasn't found in path, returns -1. +* +* If a problem happened when creating the child process, +* returns -1 and errp is set. +*/ +static int run_process_child (const char *command[],Error **errp) +{ +int exit_status, spawn_flag; +GError *g_err =NULL ; +bool success; + + spawn_flag =G_SPAWN_SEARCH_PATH |G_SPAWN_STDOUT_TO_DEV_NULL | +G_SPAWN_STDERR_TO_DEV_NULL ; + + success =g_spawn_sync (NULL , (char **)command,NULL , spawn_flag, +NULL ,NULL ,NULL ,NULL , + &exit_status, &g_err); + +if (success) { +return WEXITSTATUS (exit_status); + } + +if (g_err && (g_err->code !=G_SPAWN_ERROR_NOENT )) { +error_setg (errp,"failed to create child process, error '%s'" , + g_err->message); + } + +g_error_free (g_err); +return -1 ; +} + +static bool systemd_supports_mode (SuspendMode mode,Error **errp) +{ +const char *systemctl_args[3 ] = {"systemd-hibernate" ,"systemd-suspend" , +"systemd-hybrid-sleep" }; +const char *cmd[4 ] = {"systemctl" ,"status" , systemctl_args[mode],NULL }; +int status; + + status =run_process_child (cmd, errp); + +/* +* systemctl status uses LSB return codes so we can expect +* status > 0 and be ok. To assert if the guest has support +* for the selected suspend mode, status should be < 4. 4 is +* the code for unknown service status, the return value when +* the service does not exist. A common value is status = 3 +* (program is not running). +*/ +if (status >0 && status <4 ) { +return true; + } + +return false; +} + +static void systemd_suspend (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +const char *systemctl_args[3 ] = {"hibernate" ,"suspend" ,"hybrid-sleep" }; +const char *cmd[3 ] = {"systemctl" , systemctl_args[mode],NULL }; +int status; + + status =run_process_child (cmd, &local_err); + +if (status ==0 ) { +return ; + } + +if ((status ==-1 ) && !local_err) { +error_setg (errp,"the helper program 'systemctl %s' was not found" , + systemctl_args[mode]); +return ; + } + +if (local_err) { +error_propagate (errp, local_err); + }else { +error_setg (errp,"the helper program 'systemctl %s' returned an " +"unexpected exit status code (%d)" , + systemctl_args[mode], status); + } +} + +static bool pmutils_supports_mode (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +const char *pmutils_args[3 ] = {"--hibernate" ,"--suspend" , +"--suspend-hybrid" }; +const char *cmd[3 ] = {"pm-is-supported" , pmutils_args[mode],NULL }; +int status; + + status =run_process_child (cmd, &local_err); + +if (status ==SUSPEND_SUPPORTED ) { +return true; + } + +if ((status ==-1 ) && !local_err) { +return false; + } + +if (local_err) { +error_propagate (errp, local_err); + }else { +error_setg (errp, +"the helper program '%s' returned an unexpected exit" +" status code (%d)" ,"pm-is-supported" , status); + } + +return false; +} + +static void pmutils_suspend (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +const char *pmutils_binaries[3 ] = {"pm-hibernate" ,"pm-suspend" , +"pm-suspend-hybrid" }; +const char *cmd[2 ] = {pmutils_binaries[mode],NULL }; +int status; + + status =run_process_child (cmd, &local_err); + +if (status ==0 ) { +return ; + } + +if ((status ==-1 ) && !local_err) { +error_setg (errp,"the helper program '%s' was not found" , + pmutils_binaries[mode]); +return ; + } + +if (local_err) { +error_propagate (errp, local_err); + }else { +error_setg (errp, +"the helper program '%s' returned an unexpected exit" +" status code (%d)" , pmutils_binaries[mode], status); + } +} + +static bool linux_sys_state_supports_mode (SuspendMode mode,Error **errp) +{ +const char *sysfile_strs[3 ] = {"disk" ,"mem" ,NULL }; +const char *sysfile_str = sysfile_strs[mode]; +char buf[32 ];/* hopefully big enough */ +int fd; +ssize_t ret; + +if (!sysfile_str) { +error_setg (errp,"unknown guest suspend mode" ); +return false; + } + + fd =open (LINUX_SYS_STATE_FILE ,O_RDONLY ); +if (fd <0 ) { +return false; + } + + ret =read (fd, buf,sizeof (buf) -1 ); +close (fd); +if (ret <=0 ) { +return false; + } + buf[ret] ='\0' ; + +if (strstr (buf, sysfile_str)) { +return true; + } +return false; +} + +static void linux_sys_state_suspend (SuspendMode mode,Error **errp) +{ +g_autoptr (GError) local_gerr =NULL ; +const char *sysfile_strs[3 ] = {"disk" ,"mem" ,NULL }; +const char *sysfile_str = sysfile_strs[mode]; + +if (!sysfile_str) { +error_setg (errp,"unknown guest suspend mode" ); +return ; + } + +if (!g_file_set_contents (LINUX_SYS_STATE_FILE , sysfile_str, +-1 , &local_gerr)) { +error_setg (errp,"suspend: cannot write to '%s': %s" , +LINUX_SYS_STATE_FILE , local_gerr->message); +return ; + } +} + +static void guest_suspend (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +bool mode_supported = false; + +if (systemd_supports_mode (mode, &local_err)) { + mode_supported = true; +systemd_suspend (mode, &local_err); + +if (!local_err) { +return ; + } + } + +error_free (local_err); + local_err =NULL ; + +if (pmutils_supports_mode (mode, &local_err)) { + mode_supported = true; +pmutils_suspend (mode, &local_err); + +if (!local_err) { +return ; + } + } + +error_free (local_err); + local_err =NULL ; + +if (linux_sys_state_supports_mode (mode, &local_err)) { + mode_supported = true; +linux_sys_state_suspend (mode, &local_err); + } + +if (!mode_supported) { +error_free (local_err); +error_setg (errp, +"the requested suspend mode is not supported by the guest" ); + }else { +error_propagate (errp, local_err); + } +} + +void qmp_guest_suspend_disk (Error **errp) +{ +guest_suspend (SUSPEND_MODE_DISK , errp); +} + +void qmp_guest_suspend_ram (Error **errp) +{ +guest_suspend (SUSPEND_MODE_RAM , errp); +} + +void qmp_guest_suspend_hybrid (Error **errp) +{ +guest_suspend (SUSPEND_MODE_HYBRID , errp); +} +/* Transfer online/offline status between @vcpu and the guest system. * * On input either @errp or *@errp must be NULL.
qga/commands-posix.c +0 -265
271 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 14/20 qga: conditionalize schema for commands requiring fstrim
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the filesystem trimming commands on POSIX platforms lacking required APIs.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-posix.c | 13 ------------- qga/qapi-schema.json | 9 ++++++--- 2 files changed, 6 insertions(+), 16 deletions(-)
qga/commands-posix.c +0 -13
@@ -1144,22 +1144,9 @@ error:#endif /* HAVE_GETIFADDRS */ -#if !defined(CONFIG_FSTRIM ) -GuestFilesystemTrimResponse * -qmp_guest_fstrim (bool has_minimum,int64_t minimum,Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} -#endif -/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) { -#if !defined(CONFIG_FSTRIM ) - blockedrpcs =g_list_append (blockedrpcs,g_strdup ("guest-fstrim" )); -#endif -return blockedrpcs; }
qga/qapi-schema.json +6 -3
@@ -509,7 +509,8 @@ ## { 'struct': 'GuestFilesystemTrimResult', 'data': {'path': 'str', - '*trimmed': 'int', '*minimum': 'int', '*error': 'str'} } + '*trimmed': 'int', '*minimum': 'int', '*error': 'str'}, + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSTRIM'] } } ## # @GuestFilesystemTrimResponse:
@@ -519,7 +520,8 @@ # Since: 2.4 ## { 'struct': 'GuestFilesystemTrimResponse', - 'data': {'paths': ['GuestFilesystemTrimResult']} } + 'data': {'paths': ['GuestFilesystemTrimResult']}, + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSTRIM'] } } ## # @guest-fstrim:
@@ -541,7 +543,8 @@ ## { 'command': 'guest-fstrim', 'data': { '*minimum': 'int' }, - 'returns': 'GuestFilesystemTrimResponse' } + 'returns': 'GuestFilesystemTrimResponse', + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSTRIM'] } } ## # @guest-suspend-disk:
Signature · 1 line
2.45.1
PATCH 10/20 qga: conditionalize schema for commands requiring getifaddrs
In reply to Daniel P. BerrangéRather than creating stubs for every comamnd that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the network interface command on POSIX platforms lacking getifaddrs().
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-posix.c | 13 ------------- qga/qapi-schema.json | 15 ++++++++++----- 2 files changed, 10 insertions(+), 18 deletions(-)
qga/commands-posix.c +0 -13
@@ -1142,14 +1142,6 @@ error: return NULL; } -#else - -GuestNetworkInterfaceList *qmp_guest_network_get_interfaces (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} -#endif /* HAVE_GETIFADDRS */ #if !defined(CONFIG_FSFREEZE )
@@ -1222,11 +1214,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) { -#if !defined(HAVE_GETIFADDRS ) - blockedrpcs =g_list_append (blockedrpcs, -g_strdup ("guest-network-get-interfaces" )); -#endif -#if !defined(CONFIG_FSFREEZE ) { const char *list[] = {
qga/qapi-schema.json +10 -5
@@ -653,7 +653,8 @@ # Since: 1.1 ## { 'enum': 'GuestIpAddressType', - 'data': [ 'ipv4', 'ipv6' ] } + 'data': [ 'ipv4', 'ipv6' ], + 'if': { 'any': ['CONFIG_WIN32', 'HAVE_GETIFADDRS'] } } ## # @GuestIpAddress:
@@ -669,7 +670,8 @@ { 'struct': 'GuestIpAddress', 'data': {'ip-address': 'str', 'ip-address-type': 'GuestIpAddressType', - 'prefix': 'int'} } + 'prefix': 'int'}, + 'if': { 'any': ['CONFIG_WIN32', 'HAVE_GETIFADDRS'] } } ## # @GuestNetworkInterfaceStat:
@@ -701,7 +703,8 @@ 'tx-packets': 'uint64', 'tx-errs': 'uint64', 'tx-dropped': 'uint64' - } } + }, + 'if': { 'any': ['CONFIG_WIN32', 'HAVE_GETIFADDRS'] } } ## # @GuestNetworkInterface:
@@ -721,7 +724,8 @@ 'data': {'name': 'str', '*hardware-address': 'str', '*ip-addresses': ['GuestIpAddress'], - '*statistics': 'GuestNetworkInterfaceStat' } } + '*statistics': 'GuestNetworkInterfaceStat' }, + 'if': { 'any': ['CONFIG_WIN32', 'HAVE_GETIFADDRS'] } } ## # @guest-network-get-interfaces:
@@ -733,7 +737,8 @@ # Since: 1.1 ## { 'command': 'guest-network-get-interfaces', - 'returns': ['GuestNetworkInterface'] } + 'returns': ['GuestNetworkInterface'], + 'if': { 'any': ['CONFIG_WIN32', 'HAVE_GETIFADDRS'] } } ## # @GuestLogicalProcessor:
Signature · 1 line
2.45.1
PATCH 18/20 qga: add note about where to disable commands for a platform
In reply to Daniel P. BerrangéAny command that is known to be unimplemented on a given build target must be disabled using a QAPI schema conditional. Only use dynamidc disabling for commands that require a runtime feature check.
--- qga/commands-posix.c | 8 +++++++- qga/commands-win32.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
qga/commands-posix.c +7 -1
@@ -1136,7 +1136,13 @@ error:#endif /* HAVE_GETIFADDRS */ -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on a given platform +* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {return blockedrpcs;
qga/commands-win32.c +7 -1
@@ -1958,7 +1958,13 @@ done:g_free (rawpasswddata); } -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on Wnidows +* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {if (!vss_init (true)) {
Signature · 1 line
2.45.1
PATCH 2/20 qga: move linux vcpu command impls to commands-linux.c
In reply to Daniel P. BerrangéThe qmp_guest_set_vcpus and qmp_guest_get_vcpus command impls in commands-posix.c are surrounded by '#ifdef __linux__' so should instead live in commands-linux.c
--- qga/commands-linux.c | 141 +++++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 139 ------------------------------------------ 2 files changed, 141 insertions(+), 139 deletions(-)
qga/commands-linux.c +141 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qga-qapi-commands.h" #include "commands-common.h" #include "cutils.h" #include <mntent.h>
@@ -284,3 +285,143 @@ int qmp_guest_fsfreeze_do_thaw(Error **errp)return i; }#endif /* CONFIG_FSFREEZE */ + +/* Transfer online/offline status between @vcpu and the guest system. +* +* On input either @errp or *@errp must be NULL. +* +* In system-to-@vcpu direction, the following @vcpu fields are accessed: +* - R: vcpu->logical_id +* - W: vcpu->online +* - W: vcpu->can_offline +* +* In @vcpu-to-system direction, the following @vcpu fields are accessed: +* - R: vcpu->logical_id +* - R: vcpu->online +* +* Written members remain unmodified on error. +*/ +static void transfer_vcpu (GuestLogicalProcessor *vcpu,bool sys2vcpu, +char *dirpath,Error **errp) +{ +int fd; +int res; +int dirfd; +static const char fn[] ="online" ; + + dirfd =open (dirpath,O_RDONLY |O_DIRECTORY ); +if (dirfd ==-1 ) { +error_setg_errno (errp, errno,"open(\"%s\")" , dirpath); +return ; + } + + fd =openat (dirfd, fn, sys2vcpu ?O_RDONLY :O_RDWR ); +if (fd ==-1 ) { +if (errno !=ENOENT ) { +error_setg_errno (errp, errno,"open(\"%s/%s\")" , dirpath, fn); + }else if (sys2vcpu) { + vcpu->online = true; + vcpu->can_offline = false; + }else if (!vcpu->online) { +error_setg (errp,"logical processor #%" PRId64" can't be " +"offlined" , vcpu->logical_id); + }/* otherwise pretend successful re-onlining */ + }else { +unsigned char status; + + res =pread (fd, &status,1 ,0 ); +if (res ==-1 ) { +error_setg_errno (errp, errno,"pread(\"%s/%s\")" , dirpath, fn); + }else if (res ==0 ) { +error_setg (errp,"pread(\"%s/%s\"): unexpected EOF" , dirpath, + fn); + }else if (sys2vcpu) { + vcpu->online = (status !='0' ); + vcpu->can_offline = true; + }else if (vcpu->online != (status !='0' )) { + status ='0' + vcpu->online; +if (pwrite (fd, &status,1 ,0 ) ==-1 ) { +error_setg_errno (errp, errno,"pwrite(\"%s/%s\")" , dirpath, + fn); + } + }/* otherwise pretend successful re-(on|off)-lining */ + + res =close (fd); +g_assert (res ==0 ); + } + + res =close (dirfd); +g_assert (res ==0 ); +} + +GuestLogicalProcessorList *qmp_guest_get_vcpus (Error **errp) +{ +GuestLogicalProcessorList *head, **tail; +const char *cpu_dir ="/sys/devices/system/cpu" ; +const gchar *line; +g_autoptr (GDir) cpu_gdir =NULL ; +Error *local_err =NULL ; + + head =NULL ; + tail = &head; + cpu_gdir =g_dir_open (cpu_dir,0 ,NULL ); + +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; +int64_t id; +if (sscanf (line,"cpu%" PRId64, &id)) { + g_autofree char *path = g_strdup_printf("/sys/devices/system/cpu/" +"cpu%" PRId64"/" , id); + vcpu =g_malloc0 (sizeof *vcpu); + vcpu->logical_id = id; + vcpu->has_can_offline = true;/* lolspeak ftw */ +transfer_vcpu (vcpu, true, path, &local_err); +QAPI_LIST_APPEND (tail, vcpu); + } + } + +if (local_err ==NULL ) { +/* there's no guest with zero VCPUs */ +g_assert (head !=NULL ); +return head; + } + +qapi_free_GuestLogicalProcessorList (head); +error_propagate (errp, local_err); +return NULL ; +} + +int64_t qmp_guest_set_vcpus (GuestLogicalProcessorList *vcpus,Error **errp) +{ +int64_t processed; +Error *local_err =NULL ; + + processed =0 ; +while (vcpus !=NULL ) { +char *path =g_strdup_printf ("/sys/devices/system/cpu/cpu%" PRId64"/" , + vcpus->value->logical_id); + +transfer_vcpu (vcpus->value, false, path, &local_err); +g_free (path); +if (local_err !=NULL ) { +break ; + } + ++processed; + vcpus = vcpus->next; + } + +if (local_err !=NULL ) { +if (processed ==0 ) { +error_propagate (errp, local_err); + }else { +error_free (local_err); + } + } + +return processed; +}
qga/commands-posix.c +0 -139
145 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 19/20 qga: move declare of QGAConfig struct to top of file
In reply to Daniel P. BerrangéIt is referenced byy QGAState already, and it is clearer to declare all data types at the top of the file, rather than have them mixed with code later.
--- qga/main.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
qga/main.c +22 -22
@@ -70,6 +70,28 @@ typedef struct GAPersistentState {typedef struct GAConfig GAConfig ; +struct GAConfig { +char *channel_path; +char *method; +char *log_filepath; +char *pid_filepath; +#ifdef CONFIG_FSFREEZE +char *fsfreeze_hook; +#endif +char *state_dir; +#ifdef _WIN32 +const char *service; +#endif +gchar *bliststr;/* blockedrpcs may point to this string */ +gchar *aliststr;/* allowedrpcs may point to this string */ +GList *blockedrpcs; +GList *allowedrpcs; +int daemonize; +GLogLevelFlags log_level; +int dumpconf; +bool retry_path; +}; +struct GAState {JSONMessageParser parser;GMainLoop *main_loop;
@@ -996,28 +1018,6 @@ static GList *split_list(const gchar *str, const gchar *delim)return list; } -struct GAConfig { -char *channel_path; -char *method; -char *log_filepath; -char *pid_filepath; -#ifdef CONFIG_FSFREEZE -char *fsfreeze_hook; -#endif -char *state_dir; -#ifdef _WIN32 -const char *service; -#endif -gchar *bliststr;/* blockedrpcs may point to this string */ -gchar *aliststr;/* allowedrpcs may point to this string */ -GList *blockedrpcs; -GList *allowedrpcs; -int daemonize; -GLogLevelFlags log_level; -int dumpconf; -bool retry_path; -}; -static void config_load (GAConfig *config) {GError *gerr =NULL ;
Signature · 1 line
2.45.1
PATCH 16/20 qga: conditionalize schema for commands requiring utmpx
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the get-users command on POSIX platforms lacking required APIs.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-posix.c | 10 +--------- qga/qapi-schema.json | 6 ++++-- 2 files changed, 5 insertions(+), 11 deletions(-)
qga/commands-posix.c +1 -9
@@ -1212,15 +1212,7 @@ GuestUserList *qmp_guest_get_users(Error **errp) return head; } -#else - -GuestUserList *qmp_guest_get_users (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -#endif +#endif /* HAVE_UTMPX */ /* Replace escaped special characters with their real values. The replacement * is done in place -- returned value is in the original string.
qga/qapi-schema.json +4 -2
@@ -1413,7 +1413,8 @@ # Since: 2.10 ## { 'struct': 'GuestUser', - 'data': { 'user': 'str', 'login-time': 'number', '*domain': 'str' } } + 'data': { 'user': 'str', 'login-time': 'number', '*domain': 'str' }, + 'if': { 'any': ['CONFIG_WIN32', 'HAVE_UTMPX' ] } } ## # @guest-get-users:
@@ -1425,7 +1426,8 @@ # Since: 2.10 ## { 'command': 'guest-get-users', - 'returns': ['GuestUser'] } + 'returns': ['GuestUser'], + 'if': { 'any': ['CONFIG_WIN32', 'HAVE_UTMPX' ] } } ## # @GuestTimezone:
Signature · 1 line
2.45.1
PATCH 15/20 qga: conditionalize schema for commands requiring libudev
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the schema to fully exclude generation of the filesystem trimming commands on POSIX platforms lacking required APIs.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-linux.c | 8 -------- qga/qapi-schema.json | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-)
qga/commands-linux.c +0 -8
@@ -1049,14 +1049,6 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp) return ret; } -#else - -GuestDiskInfoList *qmp_guest_get_disks (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} -#endif /* Return a list of the disk device(s)' info which @mount lies on */
qga/qapi-schema.json +4 -4
@@ -985,7 +985,7 @@ 'media-errors-hi': 'uint64', 'number-of-error-log-entries-lo': 'uint64', 'number-of-error-log-entries-hi': 'uint64' }, - 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LINUX' ] } } + 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LIBUDEV' ] } } ## # @GuestDiskSmart:
@@ -1000,7 +1000,7 @@ 'base': { 'type': 'GuestDiskBusType' }, 'discriminator': 'type', 'data': { 'nvme': 'GuestNVMeSmart' }, - 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LINUX' ] } } + 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LIBUDEV' ] } } ## # @GuestDiskInfo:
@@ -1026,7 +1026,7 @@ 'data': {'name': 'str', 'partition': 'bool', '*dependencies': ['str'], '*address': 'GuestDiskAddress', '*alias': 'str', '*smart': 'GuestDiskSmart'}, - 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LINUX' ] } } + 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LIBUDEV' ] } } ## # @guest-get-disks:
@@ -1040,7 +1040,7 @@ ## { 'command': 'guest-get-disks', 'returns': ['GuestDiskInfo'], - 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LINUX' ] } } + 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LIBUDEV' ] } } ## # @GuestFilesystemInfo:
Signature · 1 line
2.45.1
PATCH 11/20 qga: conditionalize schema for commands requiring linux/win32
In reply to Daniel P. BerrangéSome commands were blocked based on CONFIG_FSFREEZE, but their impl had nothing todo with CONFIG_FSFREEZE, and were instead either Linux-only, or Win+Linux-only.
Rather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the stats and fsinfo commands on platforms that can't support them.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-bsd.c | 24 ----------------------- qga/commands-posix.c | 30 ++--------------------------- qga/qapi-schema.json | 45 +++++++++++++++++++++++++++----------------- 3 files changed, 30 insertions(+), 69 deletions(-)
qga/commands-bsd.c +0 -24
@@ -149,30 +149,6 @@ int qmp_guest_fsfreeze_do_thaw(Error **errp) }return ret; } - -GuestFilesystemInfoList *qmp_guest_get_fsinfo (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestDiskInfoList *qmp_guest_get_disks (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestDiskStatsInfoList *qmp_guest_get_diskstats (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestCpuStatsList *qmp_guest_get_cpustats (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -}#endif /* CONFIG_FSFREEZE */ #ifdef HAVE_GETIFADDRS
qga/commands-posix.c +2 -28
@@ -1146,12 +1146,6 @@ error:#if !defined(CONFIG_FSFREEZE ) -GuestFilesystemInfoList *qmp_guest_get_fsinfo (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} -GuestFsfreezeStatus qmp_guest_fsfreeze_status (Error **errp) {error_setg (errp,QERR_UNSUPPORTED );
@@ -1181,25 +1175,6 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp) return 0; } - -GuestDiskInfoList *qmp_guest_get_disks (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestDiskStatsInfoList *qmp_guest_get_diskstats (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestCpuStatsList *qmp_guest_get_cpustats (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} -#endif /* CONFIG_FSFREEZE */ #if !defined(CONFIG_FSTRIM )
@@ -1217,10 +1192,9 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)#if !defined(CONFIG_FSFREEZE ) {const char *list[] = { -"guest-get-fsinfo" ,"guest-fsfreeze-status" , +"guest-fsfreeze-status" ,"guest-fsfreeze-freeze" ,"guest-fsfreeze-freeze-list" , -"guest-fsfreeze-thaw" ,"guest-get-fsinfo" , -"guest-get-disks" ,NULL }; +"guest-fsfreeze-thaw" ,NULL };char **p = (char **)list;while (*p) {
qga/qapi-schema.json +28 -17
145 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 20/20 qga: centralize logic for disabling/enabling commands
In reply to Daniel P. BerrangéIt is confusing having many different pieces of code enabling and disabling commands, and it is not clear that they all have the same semantics, especially wrt prioritization of the block/allow lists.
Centralizing the code in a single method "ga_apply_command_filters" will provide a strong guarantee of consistency and clarify the intended behaviour.
--- qga/main.c | 110 ++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 55 deletions(-)
qga/main.c +55 -55
@@ -419,60 +419,79 @@ static gint ga_strcmp(gconstpointer str1, gconstpointer str2)return strcmp (str1, str2); } -/* disable commands that aren't safe for fsfreeze */ -static void ga_disable_not_allowed_freeze (const QmpCommand *cmd,void *opaque) +static bool ga_command_is_allowed (const QmpCommand *cmd,GAState *state) { -bool allowed = false;int i =0 ; +GAConfig *config = state->config;const char *name =qmp_command_name (cmd); +/* Fallback policy is allow everything */ +bool allowed = true; -while (ga_freeze_allowlist[i] !=NULL ) { -if (strcmp (name, ga_freeze_allowlist[i]) ==0 ) { +if (config->allowedrpcs) { +/* +* If an allow-list is given, this changes the fallback +* policy to deny everything +*/ + allowed = false; + +if (g_list_find_custom (config->allowedrpcs, name, ga_strcmp) !=NULL ) { allowed = true; } - i++; - } -if (!allowed) { -g_debug ("disabling command: %s" , name); -qmp_disable_command (&ga_commands, name,"the agent is in frozen state" ); } -} - -/* [re-]enable all commands, except those explicitly blocked by user */ -static void ga_enable_non_blocked (const QmpCommand *cmd,void *opaque) -{ -GAState *s = opaque; -GList *blockedrpcs = s->blockedrpcs; -GList *allowedrpcs = s->allowedrpcs; -const char *name =qmp_command_name (cmd); -if (g_list_find_custom (blockedrpcs, name, ga_strcmp) ==NULL ) { -if (qmp_command_is_enabled (cmd)) { -return ; +/* +* If both allowedrpcs and blockedrpcs are set, the blocked +* list will take priority +*/ +if (config->blockedrpcs) { +if (g_list_find_custom (config->blockedrpcs, name, ga_strcmp) !=NULL ) { + allowed = false; } + } -if (allowedrpcs && -g_list_find_custom (allowedrpcs, name, ga_strcmp) ==NULL ) { -return ; - } +/* +* If frozen, this filtering must take priority over +* absolutely everything +*/ +if (state->frozen) { + allowed = false; -g_debug ("enabling command: %s" , name); -qmp_enable_command (&ga_commands, name); +while (ga_freeze_allowlist[i] !=NULL ) { +if (strcmp (name, ga_freeze_allowlist[i]) ==0 ) { + allowed = true; + } + i++; + } } + +return allowed; } -/* disable commands that aren't allowed */ -static void ga_disable_not_allowed (const QmpCommand *cmd,void *opaque) +static void ga_apply_command_filters_iter (const QmpCommand *cmd,void *opaque) { -GList *allowedrpcs = opaque; +GAState *state = opaque; +bool want =ga_command_is_allowed (cmd, state); +bool have =qmp_command_is_enabled (cmd);const char *name =qmp_command_name (cmd); -if (g_list_find_custom (allowedrpcs, name, ga_strcmp) ==NULL ) { +if (want == have) { +return ; + } + +if (qmp_command_is_enabled (cmd)) {g_debug ("disabling command: %s" , name);qmp_disable_command (&ga_commands, name,"the command is not allowed" ); + }else { +g_debug ("enabling command: %s" , name); +qmp_enable_command (&ga_commands, name); } } +static void ga_apply_command_filters (GAState *state) +{ +qmp_for_each_command (&ga_commands, ga_apply_command_filters_iter, state); +} +static bool ga_create_file (const char *path) {int fd =open (path,O_CREAT |O_WRONLY ,S_IWUSR |S_IRUSR );
@@ -505,15 +524,14 @@ void ga_set_frozen(GAState *s)if (ga_is_frozen (s)) {return ; } -/* disable all forbidden (for frozen state) commands */ -qmp_for_each_command (&ga_commands, ga_disable_not_allowed_freeze,NULL );g_warning ("disabling logging due to filesystem freeze" ); -ga_disable_logging (s); s->frozen = true;if (!ga_create_file (s->state_filepath_isfrozen)) {g_warning ("unable to create %s, fsfreeze may not function properly" , s->state_filepath_isfrozen); } +ga_apply_command_filters (s); +ga_disable_logging (s); }void ga_unset_frozen (GAState *s)
@@ -545,12 +563,12 @@ void ga_unset_frozen(GAState *s) }/* enable all disabled, non-blocked and allowed commands */ -qmp_for_each_command (&ga_commands, ga_enable_non_blocked, s); s->frozen = false;if (!ga_delete_file (s->state_filepath_isfrozen)) {g_warning ("unable to delete %s, fsfreeze may not function properly" , s->state_filepath_isfrozen); } +ga_apply_command_filters (s); }#ifdef CONFIG_FSFREEZE
@@ -1414,7 +1432,6 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation) s->deferred_options.log_filepath = config->log_filepath; }ga_disable_logging (s); -qmp_for_each_command (&ga_commands, ga_disable_not_allowed_freeze,NULL ); }else {if (config->daemonize) {become_daemon (config->pid_filepath);
@@ -1438,25 +1455,8 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)return NULL ; } -if (config->allowedrpcs) { -qmp_for_each_command (&ga_commands, ga_disable_not_allowed, config->allowedrpcs); - s->allowedrpcs = config->allowedrpcs; - } +ga_apply_command_filters (s); -/* -* Some commands can be blocked due to system limitation. -* Initialize blockedrpcs list even if allowedrpcs specified. -*/ - config->blockedrpcs =ga_command_init_blockedrpcs (config->blockedrpcs); -if (config->blockedrpcs) { -GList *l = config->blockedrpcs; - s->blockedrpcs = config->blockedrpcs; -do { -g_debug ("disabling command: %s" , (char *)l->data); -qmp_disable_command (&ga_commands, l->data,NULL ); - l =g_list_next (l); - }while (l); - } s->command_state =ga_command_state_new ();ga_command_state_init (s, s->command_state);ga_command_state_init_all (s->command_state);
Signature · 1 line
2.45.1
PATCH 17/20 qga: conditionalize schema for commands not supported on other UNIX
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on other UNIX.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- meson.build | 1 + qga/commands-posix.c | 8 -------- qga/qapi-schema.json | 3 ++- 3 files changed, 3 insertions(+), 9 deletions(-)
meson.build +1 -0
@@ -2233,6 +2233,7 @@ config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BDRV_WHITELIST_TOOLS', get_option('block_drv_whitelist_in_tools')) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_BSD', host_os in bsd_oses) +config_host_data.set('CONFIG_FREEBSD', host_os == 'freebsd') config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_DARWIN', host_os == 'darwin')
qga/commands-posix.c +0 -8
@@ -877,14 +877,6 @@ void qmp_guest_set_user_password(const char *username, return; } } -#else /* __linux__ || __FreeBSD__ */ -void qmp_guest_set_user_password (const char *username, -const char *password, -bool crypted, -Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -}#endif /* __linux__ || __FreeBSD__ */ #ifdef HAVE_GETIFADDRS
qga/qapi-schema.json +2 -1
@@ -1108,7 +1108,8 @@ # Since: 2.3 ## { 'command': 'guest-set-user-password', - 'data': { 'username': 'str', 'password': 'str', 'crypted': 'bool' } } + 'data': { 'username': 'str', 'password': 'str', 'crypted': 'bool' }, + 'if': { 'any': [ 'CONFIG_WIN32', 'CONFIG_LINUX', 'CONFIG_FREEBSD'] } } ## # @GuestMemoryBlock:
Signature · 1 line
2.45.1
PATCH 4/20 qga: move linux fs/disk command impls to commands-linux.c
In reply to Daniel P. BerrangéThe qmp_guest_{fstrim, get_fsinfo, get_disks} command impls in commands-posix.c are surrounded by '#ifdef __linux__' so should instead live in commands-linux.c
--- qga/commands-linux.c | 904 ++++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 909 ------------------------------------------- 2 files changed, 904 insertions(+), 909 deletions(-)
qga/commands-linux.c +904 -0
@@ -14,10 +14,21 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qga-qapi-commands.h" +#include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "commands-common.h" #include "cutils.h" #include <mntent.h> #include <sys/ioctl.h> +#include <mntent.h> +#include <linux/nvme_ioctl.h> +#include "block/nvme.h" + +#ifdef CONFIG_LIBUDEV +#include <libudev.h> +#endif + +#include <sys/statvfs.h> #if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) static int dev_major_minor(const char *devpath,
@@ -286,6 +297,899 @@ int qmp_guest_fsfreeze_do_thaw(Error **errp) }#endif /* CONFIG_FSFREEZE */ +#if defined(CONFIG_FSFREEZE ) + +static char *get_pci_driver (char const *syspath,int pathlen,Error **errp) +{ +char *path; +char *dpath; +char *driver =NULL ; +char buf[PATH_MAX ]; +ssize_t len; + + path =g_strndup (syspath, pathlen); + dpath =g_strdup_printf ("%s/driver" , path); + len =readlink (dpath, buf,sizeof (buf) -1 ); +if (len !=-1 ) { + buf[len] =0 ; + driver =g_path_get_basename (buf); + } +g_free (dpath); +g_free (path); +return driver; +} + +static int compare_uint (const void *_a,const void *_b) +{ +unsigned int a = *(unsigned int *)_a; +unsigned int b = *(unsigned int *)_b; + +return a < b ?-1 : a > b ?1 :0 ; +} + +/* Walk the specified sysfs and build a sorted list of host or ata numbers */ +static int build_hosts (char const *syspath,char const *host,bool ata, +unsigned int *hosts,int hosts_max,Error **errp) +{ +char *path; +DIR *dir; +struct dirent *entry; +int i =0 ; + + path =g_strndup (syspath, host - syspath); + dir =opendir (path); +if (!dir) { +error_setg_errno (errp, errno,"opendir(\"%s\")" , path); +g_free (path); +return -1 ; + } + +while (i < hosts_max) { + entry =readdir (dir); +if (!entry) { +break ; + } +if (ata &&sscanf (entry->d_name,"ata%d" , hosts + i) ==1 ) { + ++i; + }else if (!ata &&sscanf (entry->d_name,"host%d" , hosts + i) ==1 ) { + ++i; + } + } + +qsort (hosts, i,sizeof (hosts[0 ]), compare_uint); + +g_free (path); +closedir (dir); +return i; +} + +/* +* Store disk device info for devices on the PCI bus. +* Returns true if information has been stored, or false for failure. +*/ +static bool build_guest_fsinfo_for_pci_dev (char const *syspath, +GuestDiskAddress *disk, +Error **errp) +{ +unsigned int pci[4 ], host, hosts[8 ], tgt[3 ]; +int i, nhosts =0 , pcilen; +GuestPCIAddress *pciaddr = disk->pci_controller; +bool has_ata = false, has_host = false, has_tgt = false; +char *p, *q, *driver =NULL ; +bool ret = false; + + p =strstr (syspath,"/devices/pci" ); +if (!p ||sscanf (p +12 ,"%*x:%*x/%x:%x:%x.%x%n" , + pci, pci +1 , pci +2 , pci +3 , &pcilen) <4 ) { +g_debug ("only pci device is supported: sysfs path '%s'" , syspath); +return false; + } + + p +=12 + pcilen; +while (true) { + driver =get_pci_driver (syspath, p - syspath, errp); +if (driver && (g_str_equal (driver,"ata_piix" ) || +g_str_equal (driver,"sym53c8xx" ) || +g_str_equal (driver,"virtio-pci" ) || +g_str_equal (driver,"ahci" ) || +g_str_equal (driver,"nvme" ) || +g_str_equal (driver,"xhci_hcd" ) || +g_str_equal (driver,"ehci-pci" ))) { +break ; + } + +g_free (driver); +if (sscanf (p,"/%x:%x:%x.%x%n" , + pci, pci +1 , pci +2 , pci +3 , &pcilen) ==4 ) { + p += pcilen; +continue ; + } + +g_debug ("unsupported driver or sysfs path '%s'" , syspath); +return false; + } + + p =strstr (syspath,"/target" ); +if (p &&sscanf (p +7 ,"%*u:%*u:%*u/%*u:%u:%u:%u" , + tgt, tgt +1 , tgt +2 ) ==3 ) { + has_tgt = true; + } + + p =strstr (syspath,"/ata" ); +if (p) { + q = p +4 ; + has_ata = true; + }else { + p =strstr (syspath,"/host" ); + q = p +5 ; + } +if (p &&sscanf (q,"%u" , &host) ==1 ) { + has_host = true; + nhosts =build_hosts (syspath, p, has_ata, hosts, +ARRAY_SIZE (hosts), errp); +if (nhosts <0 ) { + goto cleanup; + } + } + + pciaddr->domain = pci[0 ]; + pciaddr->bus = pci[1 ]; + pciaddr->slot = pci[2 ]; + pciaddr->function = pci[3 ]; + +if (strcmp (driver,"ata_piix" ) ==0 ) { +/* a host per ide bus, target*:0:<unit>:0 */ +if (!has_host || !has_tgt) { +g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } +for (i =0 ; i < nhosts; i++) { +if (host == hosts[i]) { + disk->bus_type =GUEST_DISK_BUS_TYPE_IDE ; + disk->bus = i; + disk->unit = tgt[1 ]; +break ; + } + } +if (i >= nhosts) { +g_debug ("no host for '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } + }else if (strcmp (driver,"sym53c8xx" ) ==0 ) { +/* scsi(LSI Logic): target*:0:<unit>:0 */ +if (!has_tgt) { +g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } + disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; + disk->unit = tgt[1 ]; + }else if (strcmp (driver,"virtio-pci" ) ==0 ) { +if (has_tgt) { +/* virtio-scsi: target*:0:0:<unit> */ + disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; + disk->unit = tgt[2 ]; + }else { +/* virtio-blk: 1 disk per 1 device */ + disk->bus_type =GUEST_DISK_BUS_TYPE_VIRTIO ; + } + }else if (strcmp (driver,"ahci" ) ==0 ) { +/* ahci: 1 host per 1 unit */ +if (!has_host || !has_tgt) { +g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } +for (i =0 ; i < nhosts; i++) { +if (host == hosts[i]) { + disk->unit = i; + disk->bus_type =GUEST_DISK_BUS_TYPE_SATA ; +break ; + } + } +if (i >= nhosts) { +g_debug ("no host for '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } + }else if (strcmp (driver,"nvme" ) ==0 ) { + disk->bus_type =GUEST_DISK_BUS_TYPE_NVME ; + }else if (strcmp (driver,"ehci-pci" ) ==0 ||strcmp (driver,"xhci_hcd" ) ==0 ) { + disk->bus_type =GUEST_DISK_BUS_TYPE_USB ; + }else { +g_debug ("unknown driver '%s' (sysfs path '%s')" , driver, syspath); + goto cleanup; + } + + ret = true; + +cleanup: +g_free (driver); +return ret; +} + +/* +* Store disk device info for non-PCI virtio devices (for example s390x +* channel I/O devices). Returns true if information has been stored, or +* false for failure. +*/ +static bool build_guest_fsinfo_for_nonpci_virtio (char const *syspath, +GuestDiskAddress *disk, +Error **errp) +{ +unsigned int tgt[3 ]; +char *p; + +if (!strstr (syspath,"/virtio" ) || !strstr (syspath,"/block" )) { +g_debug ("Unsupported virtio device '%s'" , syspath); +return false; + } + + p =strstr (syspath,"/target" ); +if (p &&sscanf (p +7 ,"%*u:%*u:%*u/%*u:%u:%u:%u" , + &tgt[0 ], &tgt[1 ], &tgt[2 ]) ==3 ) { +/* virtio-scsi: target*:0:<target>:<unit> */ + disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; + disk->bus = tgt[0 ]; + disk->target = tgt[1 ]; + disk->unit = tgt[2 ]; + }else { +/* virtio-blk: 1 disk per 1 device */ + disk->bus_type =GUEST_DISK_BUS_TYPE_VIRTIO ; + } + +return true; +} + +/* +* Store disk device info for CCW devices (s390x channel I/O devices). +* Returns true if information has been stored, or false for failure. +*/ +static bool build_guest_fsinfo_for_ccw_dev (char const *syspath, +GuestDiskAddress *disk, +Error **errp) +{ +unsigned int cssid, ssid, subchno, devno; +char *p; + + p =strstr (syspath,"/devices/css" ); +if (!p ||sscanf (p +12 ,"%*x/%x.%x.%x/%*x.%*x.%x/" , + &cssid, &ssid, &subchno, &devno) <4 ) { +g_debug ("could not parse ccw device sysfs path: %s" , syspath); +return false; + } + + disk->ccw_address =g_new0 (GuestCCWAddress,1 ); + disk->ccw_address->cssid = cssid; + disk->ccw_address->ssid = ssid; + disk->ccw_address->subchno = subchno; + disk->ccw_address->devno = devno; + +if (strstr (p,"/virtio" )) { +build_guest_fsinfo_for_nonpci_virtio (syspath, disk, errp); + } + +return true; +} + +/* Store disk device info specified by @sysfs into @fs */ +static void build_guest_fsinfo_for_real_device (char const *syspath, +GuestFilesystemInfo *fs, +Error **errp) +{ +GuestDiskAddress *disk; +GuestPCIAddress *pciaddr; +bool has_hwinf; +#ifdef CONFIG_LIBUDEV +struct udev *udev =NULL ; +struct udev_device *udevice =NULL ; +#endif + + pciaddr =g_new0 (GuestPCIAddress,1 ); + pciaddr->domain =-1 ;/* -1 means field is invalid */ + pciaddr->bus =-1 ; + pciaddr->slot =-1 ; + pciaddr->function =-1 ; + + disk =g_new0 (GuestDiskAddress,1 ); + disk->pci_controller = pciaddr; + disk->bus_type =GUEST_DISK_BUS_TYPE_UNKNOWN ; + +#ifdef CONFIG_LIBUDEV + udev =udev_new (); + udevice =udev_device_new_from_syspath (udev, syspath); +if (udev ==NULL || udevice ==NULL ) { +g_debug ("failed to query udev" ); + }else { +const char *devnode, *serial; + devnode =udev_device_get_devnode (udevice); +if (devnode !=NULL ) { + disk->dev =g_strdup (devnode); + } + serial =udev_device_get_property_value (udevice,"ID_SERIAL" ); +if (serial !=NULL && *serial !=0 ) { + disk->serial =g_strdup (serial); + } + } + +udev_unref (udev); +udev_device_unref (udevice); +#endif + +if (strstr (syspath,"/devices/pci" )) { + has_hwinf =build_guest_fsinfo_for_pci_dev (syspath, disk, errp); + }else if (strstr (syspath,"/devices/css" )) { + has_hwinf =build_guest_fsinfo_for_ccw_dev (syspath, disk, errp); + }else if (strstr (syspath,"/virtio" )) { + has_hwinf =build_guest_fsinfo_for_nonpci_virtio (syspath, disk, errp); + }else { +g_debug ("Unsupported device type for '%s'" , syspath); + has_hwinf = false; + } + +if (has_hwinf || disk->dev || disk->serial) { +QAPI_LIST_PREPEND (fs->disk, disk); + }else { +qapi_free_GuestDiskAddress (disk); + } +} + +static void build_guest_fsinfo_for_device (char const *devpath, +GuestFilesystemInfo *fs, +Error **errp); + +/* Store a list of slave devices of virtual volume specified by @syspath into +* @fs */ +static void build_guest_fsinfo_for_virtual_device (char const *syspath, +GuestFilesystemInfo *fs, +Error **errp) +{ +Error *err =NULL ; +DIR *dir; +char *dirpath; +struct dirent *entry; + + dirpath =g_strdup_printf ("%s/slaves" , syspath); + dir =opendir (dirpath); +if (!dir) { +if (errno !=ENOENT ) { +error_setg_errno (errp, errno,"opendir(\"%s\")" , dirpath); + } +g_free (dirpath); +return ; + } + +for (;;) { + errno =0 ; + entry =readdir (dir); +if (entry ==NULL ) { +if (errno) { +error_setg_errno (errp, errno,"readdir(\"%s\")" , dirpath); + } +break ; + } + +if (entry->d_type ==DT_LNK ) { +char *path; + +g_debug (" slave device '%s'" , entry->d_name); + path =g_strdup_printf ("%s/slaves/%s" , syspath, entry->d_name); +build_guest_fsinfo_for_device (path, fs, &err); +g_free (path); + +if (err) { +error_propagate (errp, err); +break ; + } + } + } + +g_free (dirpath); +closedir (dir); +} + +static bool is_disk_virtual (const char *devpath,Error **errp) +{ + g_autofree char *syspath = realpath(devpath, NULL); + +if (!syspath) { +error_setg_errno (errp, errno,"realpath(\"%s\")" , devpath); +return false; + } +return strstr (syspath,"/devices/virtual/block/" ) !=NULL ; +} + +/* Dispatch to functions for virtual/real device */ +static void build_guest_fsinfo_for_device (char const *devpath, +GuestFilesystemInfo *fs, +Error **errp) +{ +ERRP_GUARD (); + g_autofree char *syspath = NULL; +bool is_virtual = false; + + syspath =realpath (devpath,NULL ); +if (!syspath) { +if (errno !=ENOENT ) { +error_setg_errno (errp, errno,"realpath(\"%s\")" , devpath); +return ; + } + +/* ENOENT: This devpath may not exist because of container config */ +if (!fs->name) { + fs->name =g_path_get_basename (devpath); + } +return ; + } + +if (!fs->name) { + fs->name =g_path_get_basename (syspath); + } + +g_debug (" parse sysfs path '%s'" , syspath); + is_virtual =is_disk_virtual (syspath, errp); +if (*errp !=NULL ) { +return ; + } +if (is_virtual) { +build_guest_fsinfo_for_virtual_device (syspath, fs, errp); + }else { +build_guest_fsinfo_for_real_device (syspath, fs, errp); + } +} + +#ifdef CONFIG_LIBUDEV + +/* +* Wrapper around build_guest_fsinfo_for_device() for getting just +* the disk address. +*/ +static GuestDiskAddress *get_disk_address (const char *syspath,Error **errp) +{ +g_autoptr (GuestFilesystemInfo) fs =NULL ; + + fs =g_new0 (GuestFilesystemInfo,1 ); +build_guest_fsinfo_for_device (syspath, fs, errp); +if (fs->disk !=NULL ) { +return g_steal_pointer (&fs->disk->value); + } +return NULL ; +} + +static char *get_alias_for_syspath (const char *syspath) +{ +struct udev *udev =NULL ; +struct udev_device *udevice =NULL ; +char *ret =NULL ; + + udev =udev_new (); +if (udev ==NULL ) { +g_debug ("failed to query udev" ); + goto out; + } + udevice =udev_device_new_from_syspath (udev, syspath); +if (udevice ==NULL ) { +g_debug ("failed to query udev for path: %s" , syspath); + goto out; + }else { +const char *alias =udev_device_get_property_value ( + udevice,"DM_NAME" ); +/* +* NULL means there was an error and empty string means there is no +* alias. In case of no alias we return NULL instead of empty string. +*/ +if (alias ==NULL ) { +g_debug ("failed to query udev for device alias for: %s" , + syspath); + }else if (*alias !=0 ) { + ret =g_strdup (alias); + } + } + +out: +udev_unref (udev); +udev_device_unref (udevice); +return ret; +} + +static char *get_device_for_syspath (const char *syspath) +{ +struct udev *udev =NULL ; +struct udev_device *udevice =NULL ; +char *ret =NULL ; + + udev =udev_new (); +if (udev ==NULL ) { +g_debug ("failed to query udev" ); + goto out; + } + udevice =udev_device_new_from_syspath (udev, syspath); +if (udevice ==NULL ) { +g_debug ("failed to query udev for path: %s" , syspath); + goto out; + }else { + ret =g_strdup (udev_device_get_devnode (udevice)); + } + +out: +udev_unref (udev); +udev_device_unref (udevice); +return ret; +} + +static void get_disk_deps (const char *disk_dir,GuestDiskInfo *disk) +{ + g_autofree char *deps_dir = NULL; +const gchar *dep; +GDir *dp_deps =NULL ; + +/* List dependent disks */ + deps_dir =g_strdup_printf ("%s/slaves" , disk_dir); +g_debug (" listing entries in: %s" , deps_dir); + dp_deps =g_dir_open (deps_dir,0 ,NULL ); +if (dp_deps ==NULL ) { +g_debug ("failed to list entries in %s" , deps_dir); +return ; + } + disk->has_dependencies = true; +while ((dep =g_dir_read_name (dp_deps)) !=NULL ) { + g_autofree char *dep_dir = NULL; +char *dev_name; + +/* Add dependent disks */ + dep_dir =g_strdup_printf ("%s/%s" , deps_dir, dep); + dev_name =get_device_for_syspath (dep_dir); +if (dev_name !=NULL ) { +g_debug (" adding dependent device: %s" , dev_name); +QAPI_LIST_PREPEND (disk->dependencies, dev_name); + } + } +g_dir_close (dp_deps); +} + +/* +* Detect partitions subdirectory, name is "<disk_name><number>" or +* "<disk_name>p<number>" +* +* @disk_name -- last component of /sys path (e.g. sda) +* @disk_dir -- sys path of the disk (e.g. /sys/block/sda) +* @disk_dev -- device node of the disk (e.g. /dev/sda) +*/ +static GuestDiskInfoList *get_disk_partitions ( +GuestDiskInfoList *list, +const char *disk_name,const char *disk_dir, +const char *disk_dev) +{ +GuestDiskInfoList *ret = list; +struct dirent *de_disk; +DIR *dp_disk =NULL ; +size_t len =strlen (disk_name); + + dp_disk =opendir (disk_dir); +while ((de_disk =readdir (dp_disk)) !=NULL ) { + g_autofree char *partition_dir = NULL; +char *dev_name; +GuestDiskInfo *partition; + +if (!(de_disk->d_type &DT_DIR )) { +continue ; + } + +if (!(strncmp (disk_name, de_disk->d_name, len) ==0 && + ((*(de_disk->d_name + len) =='p' && +isdigit (*(de_disk->d_name + len +1 ))) || +isdigit (*(de_disk->d_name + len))))) { +continue ; + } + + partition_dir =g_strdup_printf ("%s/%s" , + disk_dir, de_disk->d_name); + dev_name =get_device_for_syspath (partition_dir); +if (dev_name ==NULL ) { +g_debug ("Failed to get device name for syspath: %s" , + disk_dir); +continue ; + } + partition =g_new0 (GuestDiskInfo,1 ); + partition->name = dev_name; + partition->partition = true; + partition->has_dependencies = true; +/* Add parent disk as dependent for easier tracking of hierarchy */ +QAPI_LIST_PREPEND (partition->dependencies,g_strdup (disk_dev)); + +QAPI_LIST_PREPEND (ret, partition); + } +closedir (dp_disk); + +return ret; +} + +static void get_nvme_smart (GuestDiskInfo *disk) +{ +int fd; +GuestNVMeSmart *smart; +NvmeSmartLog log = {0 }; +struct nvme_admin_cmd cmd = { + .opcode =NVME_ADM_CMD_GET_LOG_PAGE , + .nsid =NVME_NSID_BROADCAST , + .addr = (uintptr_t )&log, + .data_len =sizeof (log), + .cdw10 =NVME_LOG_SMART_INFO | (1 <<15 )/* RAE bit */ + | (((sizeof (log) >>2 ) -1 ) <<16 ) + }; + + fd =qga_open_cloexec (disk->name,O_RDONLY ,0 ); +if (fd ==-1 ) { +g_debug ("Failed to open device: %s: %s" , disk->name,g_strerror (errno)); +return ; + } + +if (ioctl (fd,NVME_IOCTL_ADMIN_CMD , &cmd)) { +g_debug ("Failed to get smart: %s: %s" , disk->name,g_strerror (errno)); +close (fd); +return ; + } + + disk->smart =g_new0 (GuestDiskSmart,1 ); + disk->smart->type =GUEST_DISK_BUS_TYPE_NVME ; + + smart = &disk->smart->u.nvme; + smart->critical_warning = log.critical_warning; + smart->temperature =lduw_le_p (&log.temperature);/* unaligned field */ + smart->available_spare = log.available_spare; + smart->available_spare_threshold = log.available_spare_threshold; + smart->percentage_used = log.percentage_used; + smart->data_units_read_lo =le64_to_cpu (log.data_units_read[0 ]); + smart->data_units_read_hi =le64_to_cpu (log.data_units_read[1 ]); + smart->data_units_written_lo =le64_to_cpu (log.data_units_written[0 ]); + smart->data_units_written_hi =le64_to_cpu (log.data_units_written[1 ]); + smart->host_read_commands_lo =le64_to_cpu (log.host_read_commands[0 ]); + smart->host_read_commands_hi =le64_to_cpu (log.host_read_commands[1 ]); + smart->host_write_commands_lo =le64_to_cpu (log.host_write_commands[0 ]); + smart->host_write_commands_hi =le64_to_cpu (log.host_write_commands[1 ]); + smart->controller_busy_time_lo =le64_to_cpu (log.controller_busy_time[0 ]); + smart->controller_busy_time_hi =le64_to_cpu (log.controller_busy_time[1 ]); + smart->power_cycles_lo =le64_to_cpu (log.power_cycles[0 ]); + smart->power_cycles_hi =le64_to_cpu (log.power_cycles[1 ]); + smart->power_on_hours_lo =le64_to_cpu (log.power_on_hours[0 ]); + smart->power_on_hours_hi =le64_to_cpu (log.power_on_hours[1 ]); + smart->unsafe_shutdowns_lo =le64_to_cpu (log.unsafe_shutdowns[0 ]); + smart->unsafe_shutdowns_hi =le64_to_cpu (log.unsafe_shutdowns[1 ]); + smart->media_errors_lo =le64_to_cpu (log.media_errors[0 ]); + smart->media_errors_hi =le64_to_cpu (log.media_errors[1 ]); + smart->number_of_error_log_entries_lo = +le64_to_cpu (log.number_of_error_log_entries[0 ]); + smart->number_of_error_log_entries_hi = +le64_to_cpu (log.number_of_error_log_entries[1 ]); + +close (fd); +} + +static void get_disk_smart (GuestDiskInfo *disk) +{ +if (disk->address + && (disk->address->bus_type ==GUEST_DISK_BUS_TYPE_NVME )) { +get_nvme_smart (disk); + } +} + +GuestDiskInfoList *qmp_guest_get_disks (Error **errp) +{ +GuestDiskInfoList *ret =NULL ; +GuestDiskInfo *disk; +DIR *dp =NULL ; +struct dirent *de =NULL ; + +g_debug ("listing /sys/block directory" ); + dp =opendir ("/sys/block" ); +if (dp ==NULL ) { +error_setg_errno (errp, errno,"Can't open directory \"/sys/block\"" ); +return NULL ; + } +while ((de =readdir (dp)) !=NULL ) { + g_autofree char *disk_dir = NULL, *line = NULL, + *size_path =NULL ; +char *dev_name; +Error *local_err =NULL ; +if (de->d_type !=DT_LNK ) { +g_debug (" skipping entry: %s" , de->d_name); +continue ; + } + +/* Check size and skip zero-sized disks */ +g_debug (" checking disk size" ); + size_path =g_strdup_printf ("/sys/block/%s/size" , de->d_name); +if (!g_file_get_contents (size_path, &line,NULL ,NULL )) { +g_debug (" failed to read disk size" ); +continue ; + } +if (g_strcmp0 (line,"0\n" ) ==0 ) { +g_debug (" skipping zero-sized disk" ); +continue ; + } + +g_debug (" adding %s" , de->d_name); + disk_dir =g_strdup_printf ("/sys/block/%s" , de->d_name); + dev_name =get_device_for_syspath (disk_dir); +if (dev_name ==NULL ) { +g_debug ("Failed to get device name for syspath: %s" , + disk_dir); +continue ; + } + disk =g_new0 (GuestDiskInfo,1 ); + disk->name = dev_name; + disk->partition = false; + disk->alias =get_alias_for_syspath (disk_dir); +QAPI_LIST_PREPEND (ret, disk); + +/* Get address for non-virtual devices */ +bool is_virtual =is_disk_virtual (disk_dir, &local_err); +if (local_err !=NULL ) { +g_debug (" failed to check disk path, ignoring error: %s" , +error_get_pretty (local_err)); +error_free (local_err); + local_err =NULL ; +/* Don't try to get the address */ + is_virtual = true; + } +if (!is_virtual) { + disk->address =get_disk_address (disk_dir, &local_err); +if (local_err !=NULL ) { +g_debug (" failed to get device info, ignoring error: %s" , +error_get_pretty (local_err)); +error_free (local_err); + local_err =NULL ; + } + } + +get_disk_deps (disk_dir, disk); +get_disk_smart (disk); + ret =get_disk_partitions (ret, de->d_name, disk_dir, dev_name); + } + +closedir (dp); + +return ret; +} + +#else + +GuestDiskInfoList *qmp_guest_get_disks (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +#endif + +/* Return a list of the disk device(s)' info which @mount lies on */ +static GuestFilesystemInfo *build_guest_fsinfo (struct FsMount *mount, +Error **errp) +{ +GuestFilesystemInfo *fs =g_malloc0 (sizeof (*fs)); +struct statvfs buf; +unsigned long used, nonroot_total, fr_size; +char *devpath =g_strdup_printf ("/sys/dev/block/%u:%u" , + mount->devmajor, mount->devminor); + + fs->mountpoint =g_strdup (mount->dirname); + fs->type =g_strdup (mount->devtype); +build_guest_fsinfo_for_device (devpath, fs, errp); + +if (statvfs (fs->mountpoint, &buf) ==0 ) { + fr_size = buf.f_frsize; + used = buf.f_blocks - buf.f_bfree; + nonroot_total = used + buf.f_bavail; + fs->used_bytes = used * fr_size; + fs->total_bytes = nonroot_total * fr_size; + fs->total_bytes_privileged = buf.f_blocks * fr_size; + + fs->has_total_bytes = true; + fs->has_total_bytes_privileged = true; + fs->has_used_bytes = true; + } + +g_free (devpath); + +return fs; +} + +GuestFilesystemInfoList *qmp_guest_get_fsinfo (Error **errp) +{ +FsMountList mounts; +struct FsMount *mount; +GuestFilesystemInfoList *ret =NULL ; +Error *local_err =NULL ; + +QTAILQ_INIT (&mounts); +if (!build_fs_mount_list (&mounts, &local_err)) { +error_propagate (errp, local_err); +return NULL ; + } + + QTAILQ_FOREACH(mount, &mounts, next) { +g_debug ("Building guest fsinfo for '%s'" , mount->dirname); + +QAPI_LIST_PREPEND (ret,build_guest_fsinfo (mount, &local_err)); +if (local_err) { +error_propagate (errp, local_err); +qapi_free_GuestFilesystemInfoList (ret); + ret =NULL ; +break ; + } + } + +free_fs_mount_list (&mounts); +return ret; +} +#endif /* CONFIG_FSFREEZE */ + +#if defined(CONFIG_FSTRIM ) +/* +* Walk list of mounted file systems in the guest, and trim them. +*/ +GuestFilesystemTrimResponse * +qmp_guest_fstrim (bool has_minimum,int64_t minimum,Error **errp) +{ +GuestFilesystemTrimResponse *response; +GuestFilesystemTrimResult *result; +int ret =0 ; +FsMountList mounts; +struct FsMount *mount; +int fd; +struct fstrim_range r; + +slog ("guest-fstrim called" ); + +QTAILQ_INIT (&mounts); +if (!build_fs_mount_list (&mounts, errp)) { +return NULL ; + } + + response =g_malloc0 (sizeof (*response)); + + QTAILQ_FOREACH(mount, &mounts, next) { + result =g_malloc0 (sizeof (*result)); + result->path =g_strdup (mount->dirname); + +QAPI_LIST_PREPEND (response->paths, result); + + fd =qga_open_cloexec (mount->dirname,O_RDONLY ,0 ); +if (fd ==-1 ) { + result->error =g_strdup_printf ("failed to open: %s" , +strerror (errno)); +continue ; + } + +/* We try to cull filesystems we know won't work in advance, but other +* filesystems may not implement fstrim for less obvious reasons. +* These will report EOPNOTSUPP; while in some other cases ENOTTY +* will be reported (e.g. CD-ROMs). +* Any other error means an unexpected error. +*/ + r.start =0 ; + r.len =-1 ; + r.minlen = has_minimum ? minimum :0 ; + ret =ioctl (fd,FITRIM , &r); +if (ret ==-1 ) { +if (errno ==ENOTTY || errno ==EOPNOTSUPP ) { + result->error =g_strdup ("trim not supported" ); + }else { + result->error =g_strdup_printf ("failed to trim: %s" , +strerror (errno)); + } +close (fd); +continue ; + } + + result->has_minimum = true; + result->minimum = r.minlen; + result->has_trimmed = true; + result->trimmed = r.len; +close (fd); + } + +free_fs_mount_list (&mounts); +return response; +} +#endif /* CONFIG_FSTRIM */ #define LINUX_SYS_STATE_FILE "/sys/power/state"#define SUSPEND_SUPPORTED 0
qga/commands-posix.c +0 -909
927 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 12/20 qga: conditionalize schema for commands only supported on Windows
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on non-Windows.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-posix.c | 9 --------- qga/qapi-schema.json | 15 ++++++++++----- 2 files changed, 10 insertions(+), 14 deletions(-)
qga/commands-posix.c +0 -9
@@ -1207,8 +1207,6 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) blockedrpcs =g_list_append (blockedrpcs,g_strdup ("guest-fstrim" ));#endif - blockedrpcs =g_list_append (blockedrpcs,g_strdup ("guest-get-devices" )); -return blockedrpcs; }
@@ -1419,13 +1417,6 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp)return info; } -GuestDeviceInfoList *qmp_guest_get_devices (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); - -return NULL ; -} -#ifndef HOST_NAME_MAX # ifdef _POSIX_HOST_NAME_MAX# define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
qga/qapi-schema.json +10 -5
@@ -1527,7 +1527,8 @@ # @pci: PCI device ## { 'enum': 'GuestDeviceType', - 'data': [ 'pci' ] } + 'data': [ 'pci' ], + 'if': 'CONFIG_WIN32' } ## # @GuestDeviceIdPCI:
@@ -1539,7 +1540,8 @@ # Since: 5.2 ## { 'struct': 'GuestDeviceIdPCI', - 'data': { 'vendor-id': 'uint16', 'device-id': 'uint16' } } + 'data': { 'vendor-id': 'uint16', 'device-id': 'uint16' }, + 'if': 'CONFIG_WIN32' } ## # @GuestDeviceId:
@@ -1553,7 +1555,8 @@ { 'union': 'GuestDeviceId', 'base': { 'type': 'GuestDeviceType' }, 'discriminator': 'type', - 'data': { 'pci': 'GuestDeviceIdPCI' } } + 'data': { 'pci': 'GuestDeviceIdPCI' }, + 'if': 'CONFIG_WIN32' } ## # @GuestDeviceInfo:
@@ -1574,7 +1577,8 @@ '*driver-date': 'int', '*driver-version': 'str', '*id': 'GuestDeviceId' - } } + }, + 'if': 'CONFIG_WIN32' } ## # @guest-get-devices:
@@ -1586,7 +1590,8 @@ # Since: 5.2 ## { 'command': 'guest-get-devices', - 'returns': ['GuestDeviceInfo'] } + 'returns': ['GuestDeviceInfo'], + 'if': 'CONFIG_WIN32' } ## # @GuestAuthorizedKeys:
Signature · 1 line
2.45.1
PATCH 5/20 qga: move linux disk/cpu stats command impls to commands-linux.c
In reply to Daniel P. BerrangéThe qmp_guest_{diskstats,cpustats} command impls in commands-posix.c are surrounded by '#ifdef __linux__' so should instead live in commands-linux.c
This also removes a "#ifdef CONFIG_LINUX" that was nested inside a "#ifdef __linux__".
--- qga/commands-linux.c | 195 ++++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 199 ------------------------------------------- 2 files changed, 195 insertions(+), 199 deletions(-)
qga/commands-linux.c +195 -0
@@ -1594,3 +1594,198 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)return processed; } + +#define MAX_NAME_LEN 128 +static GuestDiskStatsInfoList *guest_get_diskstats (Error **errp) +{ +GuestDiskStatsInfoList *head =NULL , **tail = &head; +const char *diskstats ="/proc/diskstats" ; +FILE *fp; +size_t n; +char *line =NULL ; + + fp =fopen (diskstats,"r" ); +if (fp ==NULL ) { +error_setg_errno (errp, errno,"open(\"%s\")" , diskstats); +return NULL ; + } + +while (getline (&line, &n, fp) !=-1 ) { + g_autofree GuestDiskStatsInfo *diskstatinfo = NULL; + g_autofree GuestDiskStats *diskstat = NULL; +char dev_name[MAX_NAME_LEN ]; +unsigned int ios_pgr, tot_ticks, rq_ticks, wr_ticks, dc_ticks, fl_ticks; +unsigned long rd_ios, rd_merges_or_rd_sec, rd_ticks_or_wr_sec, wr_ios; +unsigned long wr_merges, rd_sec_or_wr_ios, wr_sec; +unsigned long dc_ios, dc_merges, dc_sec, fl_ios; +unsigned int major, minor; +int i; + + i =sscanf (line,"%u %u %s %lu %lu %lu" +"%lu %lu %lu %lu %u %u %u %u" +"%lu %lu %lu %u %lu %u" , + &major, &minor, dev_name, + &rd_ios, &rd_merges_or_rd_sec, &rd_sec_or_wr_ios, + &rd_ticks_or_wr_sec, &wr_ios, &wr_merges, &wr_sec, + &wr_ticks, &ios_pgr, &tot_ticks, &rq_ticks, + &dc_ios, &dc_merges, &dc_sec, &dc_ticks, + &fl_ios, &fl_ticks); + +if (i <7 ) { +continue ; + } + + diskstatinfo =g_new0 (GuestDiskStatsInfo,1 ); + diskstatinfo->name =g_strdup (dev_name); + diskstatinfo->major = major; + diskstatinfo->minor = minor; + + diskstat =g_new0 (GuestDiskStats,1 ); +if (i ==7 ) { + diskstat->has_read_ios = true; + diskstat->read_ios = rd_ios; + diskstat->has_read_sectors = true; + diskstat->read_sectors = rd_merges_or_rd_sec; + diskstat->has_write_ios = true; + diskstat->write_ios = rd_sec_or_wr_ios; + diskstat->has_write_sectors = true; + diskstat->write_sectors = rd_ticks_or_wr_sec; + } +if (i >=14 ) { + diskstat->has_read_ios = true; + diskstat->read_ios = rd_ios; + diskstat->has_read_sectors = true; + diskstat->read_sectors = rd_sec_or_wr_ios; + diskstat->has_read_merges = true; + diskstat->read_merges = rd_merges_or_rd_sec; + diskstat->has_read_ticks = true; + diskstat->read_ticks = rd_ticks_or_wr_sec; + diskstat->has_write_ios = true; + diskstat->write_ios = wr_ios; + diskstat->has_write_sectors = true; + diskstat->write_sectors = wr_sec; + diskstat->has_write_merges = true; + diskstat->write_merges = wr_merges; + diskstat->has_write_ticks = true; + diskstat->write_ticks = wr_ticks; + diskstat->has_ios_pgr = true; + diskstat->ios_pgr = ios_pgr; + diskstat->has_total_ticks = true; + diskstat->total_ticks = tot_ticks; + diskstat->has_weight_ticks = true; + diskstat->weight_ticks = rq_ticks; + } +if (i >=18 ) { + diskstat->has_discard_ios = true; + diskstat->discard_ios = dc_ios; + diskstat->has_discard_merges = true; + diskstat->discard_merges = dc_merges; + diskstat->has_discard_sectors = true; + diskstat->discard_sectors = dc_sec; + diskstat->has_discard_ticks = true; + diskstat->discard_ticks = dc_ticks; + } +if (i >=20 ) { + diskstat->has_flush_ios = true; + diskstat->flush_ios = fl_ios; + diskstat->has_flush_ticks = true; + diskstat->flush_ticks = fl_ticks; + } + + diskstatinfo->stats =g_steal_pointer (&diskstat); +QAPI_LIST_APPEND (tail, diskstatinfo); + diskstatinfo =NULL ; + } +free (line); +fclose (fp); +return head; +} + +GuestDiskStatsInfoList *qmp_guest_get_diskstats (Error **errp) +{ +return guest_get_diskstats (errp); +} + +GuestCpuStatsList *qmp_guest_get_cpustats (Error **errp) +{ +GuestCpuStatsList *head =NULL , **tail = &head; +const char *cpustats ="/proc/stat" ; +int clk_tck =sysconf (_SC_CLK_TCK); +FILE *fp; +size_t n; +char *line =NULL ; + + fp =fopen (cpustats,"r" ); +if (fp ==NULL ) { +error_setg_errno (errp, errno,"open(\"%s\")" , cpustats); +return NULL ; + } + +while (getline (&line, &n, fp) !=-1 ) { +GuestCpuStats *cpustat =NULL ; +GuestLinuxCpuStats *linuxcpustat; +int i; +unsigned long user, system, idle, iowait, irq, softirq, steal, guest; +unsigned long nice, guest_nice; +char name[64 ]; + + i =sscanf (line,"%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu" , + name, &user, &nice, &system, &idle, &iowait, &irq, &softirq, + &steal, &guest, &guest_nice); + +/* drop "cpu 1 2 3 ...", get "cpuX 1 2 3 ..." only */ +if ((i ==EOF ) ||strncmp (name,"cpu" ,3 ) || (name[3 ] =='\0' )) { +continue ; + } + +if (i <5 ) { +slog ("Parsing cpu stat from %s failed, see \"man proc\"" , cpustats); +break ; + } + + cpustat =g_new0 (GuestCpuStats,1 ); + cpustat->type =GUEST_CPU_STATS_TYPE_LINUX ; + + linuxcpustat = &cpustat->u.q_linux; + linuxcpustat->cpu =atoi (&name[3 ]); + linuxcpustat->user = user *1000 / clk_tck; + linuxcpustat->nice = nice *1000 / clk_tck; + linuxcpustat->system = system *1000 / clk_tck; + linuxcpustat->idle = idle *1000 / clk_tck; + +if (i >5 ) { + linuxcpustat->has_iowait = true; + linuxcpustat->iowait = iowait *1000 / clk_tck; + } + +if (i >6 ) { + linuxcpustat->has_irq = true; + linuxcpustat->irq = irq *1000 / clk_tck; + linuxcpustat->has_softirq = true; + linuxcpustat->softirq = softirq *1000 / clk_tck; + } + +if (i >8 ) { + linuxcpustat->has_steal = true; + linuxcpustat->steal = steal *1000 / clk_tck; + } + +if (i >9 ) { + linuxcpustat->has_guest = true; + linuxcpustat->guest = guest *1000 / clk_tck; + } + +if (i >10 ) { + linuxcpustat->has_guest = true; + linuxcpustat->guest = guest *1000 / clk_tck; + linuxcpustat->has_guestnice = true; + linuxcpustat->guestnice = guest_nice *1000 / clk_tck; + } + +QAPI_LIST_APPEND (tail, cpustat); + } + +free (line); +fclose (fp); +return head; +}
qga/commands-posix.c +0 -199
205 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 6/20 qga: move linux memory block command impls to commands-linux.c
In reply to Daniel P. BerrangéThe qmp_guest_{set,get}_{memory_blocks,block_info} command impls in commands-posix.c are surrounded by '#ifdef __linux__' so should instead live in commands-linux.c
This also removes a "#ifdef CONFIG_LINUX" that was nested inside a "#ifdef __linux__".
--- qga/commands-linux.c | 308 ++++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 311 +------------------------------------------ 2 files changed, 309 insertions(+), 310 deletions(-)
qga/commands-linux.c +308 -0
@@ -1595,6 +1595,314 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)return processed; } + +static void ga_read_sysfs_file (int dirfd,const char *pathname,char *buf, +int size,Error **errp) +{ +int fd; +int res; + + errno =0 ; + fd =openat (dirfd, pathname,O_RDONLY ); +if (fd ==-1 ) { +error_setg_errno (errp, errno,"open sysfs file \"%s\"" , pathname); +return ; + } + + res =pread (fd, buf, size,0 ); +if (res ==-1 ) { +error_setg_errno (errp, errno,"pread sysfs file \"%s\"" , pathname); + }else if (res ==0 ) { +error_setg (errp,"pread sysfs file \"%s\": unexpected EOF" , pathname); + } +close (fd); +} + +static void ga_write_sysfs_file (int dirfd,const char *pathname, +const char *buf,int size,Error **errp) +{ +int fd; + + errno =0 ; + fd =openat (dirfd, pathname,O_WRONLY ); +if (fd ==-1 ) { +error_setg_errno (errp, errno,"open sysfs file \"%s\"" , pathname); +return ; + } + +if (pwrite (fd, buf, size,0 ) ==-1 ) { +error_setg_errno (errp, errno,"pwrite sysfs file \"%s\"" , pathname); + } + +close (fd); +} + +/* Transfer online/offline status between @mem_blk and the guest system. +* +* On input either @errp or *@errp must be NULL. +* +* In system-to-@mem_blk direction, the following @mem_blk fields are accessed: +* - R: mem_blk->phys_index +* - W: mem_blk->online +* - W: mem_blk->can_offline +* +* In @mem_blk-to-system direction, the following @mem_blk fields are accessed: +* - R: mem_blk->phys_index +* - R: mem_blk->online +*- R: mem_blk->can_offline +* Written members remain unmodified on error. +*/ +static void transfer_memory_block (GuestMemoryBlock *mem_blk,bool sys2memblk, +GuestMemoryBlockResponse *result, +Error **errp) +{ +char *dirpath; +int dirfd; +char *status; +Error *local_err =NULL ; + +if (!sys2memblk) { +DIR *dp; + +if (!result) { +error_setg (errp,"Internal error, 'result' should not be NULL" ); +return ; + } + errno =0 ; + dp =opendir ("/sys/devices/system/memory/" ); +/* if there is no 'memory' directory in sysfs, +* we think this VM does not support online/offline memory block, +* any other solution? +*/ +if (!dp) { +if (errno ==ENOENT ) { + result->response = +GUEST_MEMORY_BLOCK_RESPONSE_TYPE_OPERATION_NOT_SUPPORTED ; + } + goto out1; + } +closedir (dp); + } + + dirpath =g_strdup_printf ("/sys/devices/system/memory/memory%" PRId64"/" , + mem_blk->phys_index); + dirfd =open (dirpath,O_RDONLY |O_DIRECTORY ); +if (dirfd ==-1 ) { +if (sys2memblk) { +error_setg_errno (errp, errno,"open(\"%s\")" , dirpath); + }else { +if (errno ==ENOENT ) { + result->response =GUEST_MEMORY_BLOCK_RESPONSE_TYPE_NOT_FOUND ; + }else { + result->response = +GUEST_MEMORY_BLOCK_RESPONSE_TYPE_OPERATION_FAILED ; + } + } +g_free (dirpath); + goto out1; + } +g_free (dirpath); + + status =g_malloc0 (10 ); +ga_read_sysfs_file (dirfd,"state" , status,10 , &local_err); +if (local_err) { +/* treat with sysfs file that not exist in old kernel */ +if (errno ==ENOENT ) { +error_free (local_err); +if (sys2memblk) { + mem_blk->online = true; + mem_blk->can_offline = false; + }else if (!mem_blk->online) { + result->response = +GUEST_MEMORY_BLOCK_RESPONSE_TYPE_OPERATION_NOT_SUPPORTED ; + } + }else { +if (sys2memblk) { +error_propagate (errp, local_err); + }else { +error_free (local_err); + result->response = +GUEST_MEMORY_BLOCK_RESPONSE_TYPE_OPERATION_FAILED ; + } + } + goto out2; + } + +if (sys2memblk) { +char removable ='0' ; + + mem_blk->online = (strncmp (status,"online" ,6 ) ==0 ); + +ga_read_sysfs_file (dirfd,"removable" , &removable,1 , &local_err); +if (local_err) { +/* if no 'removable' file, it doesn't support offline mem blk */ +if (errno ==ENOENT ) { +error_free (local_err); + mem_blk->can_offline = false; + }else { +error_propagate (errp, local_err); + } + }else { + mem_blk->can_offline = (removable !='0' ); + } + }else { +if (mem_blk->online != (strncmp (status,"online" ,6 ) ==0 )) { +const char *new_state = mem_blk->online ?"online" :"offline" ; + +ga_write_sysfs_file (dirfd,"state" , new_state,strlen (new_state), + &local_err); +if (local_err) { +error_free (local_err); + result->response = +GUEST_MEMORY_BLOCK_RESPONSE_TYPE_OPERATION_FAILED ; + goto out2; + } + + result->response =GUEST_MEMORY_BLOCK_RESPONSE_TYPE_SUCCESS ; + result->has_error_code = false; + }/* otherwise pretend successful re-(on|off)-lining */ + } +g_free (status); +close (dirfd); +return ; + +out2: +g_free (status); +close (dirfd); +out1: +if (!sys2memblk) { + result->has_error_code = true; + result->error_code = errno; + } +} + +GuestMemoryBlockList *qmp_guest_get_memory_blocks (Error **errp) +{ +GuestMemoryBlockList *head, **tail; +Error *local_err =NULL ; +struct dirent *de; +DIR *dp; + + head =NULL ; + tail = &head; + + dp =opendir ("/sys/devices/system/memory/" ); +if (!dp) { +/* it's ok if this happens to be a system that doesn't expose +* memory blocks via sysfs, but otherwise we should report +* an error +*/ +if (errno !=ENOENT ) { +error_setg_errno (errp, errno,"Can't open directory" +"\"/sys/devices/system/memory/\"" ); + } +return NULL ; + } + +/* Note: the phys_index of memory block may be discontinuous, +* this is because a memblk is the unit of the Sparse Memory design, which +* allows discontinuous memory ranges (ex. NUMA), so here we should +* traverse the memory block directory. +*/ +while ((de =readdir (dp)) !=NULL ) { +GuestMemoryBlock *mem_blk; + +if ((strncmp (de->d_name,"memory" ,6 ) !=0 ) || + !(de->d_type &DT_DIR )) { +continue ; + } + + mem_blk =g_malloc0 (sizeof *mem_blk); +/* The d_name is "memoryXXX", phys_index is block id, same as XXX */ + mem_blk->phys_index =strtoul (&de->d_name[6 ],NULL ,10 ); + mem_blk->has_can_offline = true;/* lolspeak ftw */ +transfer_memory_block (mem_blk, true,NULL , &local_err); +if (local_err) { +break ; + } + +QAPI_LIST_APPEND (tail, mem_blk); + } + +closedir (dp); +if (local_err ==NULL ) { +/* there's no guest with zero memory blocks */ +if (head ==NULL ) { +error_setg (errp,"guest reported zero memory blocks!" ); + } +return head; + } + +qapi_free_GuestMemoryBlockList (head); +error_propagate (errp, local_err); +return NULL ; +} + +GuestMemoryBlockResponseList * +qmp_guest_set_memory_blocks (GuestMemoryBlockList *mem_blks,Error **errp) +{ +GuestMemoryBlockResponseList *head, **tail; +Error *local_err =NULL ; + + head =NULL ; + tail = &head; + +while (mem_blks !=NULL ) { +GuestMemoryBlockResponse *result; +GuestMemoryBlock *current_mem_blk = mem_blks->value; + + result =g_malloc0 (sizeof (*result)); + result->phys_index = current_mem_blk->phys_index; +transfer_memory_block (current_mem_blk, false, result, &local_err); +if (local_err) {/* should never happen */ + goto err; + } + +QAPI_LIST_APPEND (tail, result); + mem_blks = mem_blks->next; + } + +return head; +err: +qapi_free_GuestMemoryBlockResponseList (head); +error_propagate (errp, local_err); +return NULL ; +} + +GuestMemoryBlockInfo *qmp_guest_get_memory_block_info (Error **errp) +{ +Error *local_err =NULL ; +char *dirpath; +int dirfd; +char *buf; +GuestMemoryBlockInfo *info; + + dirpath =g_strdup_printf ("/sys/devices/system/memory/" ); + dirfd =open (dirpath,O_RDONLY |O_DIRECTORY ); +if (dirfd ==-1 ) { +error_setg_errno (errp, errno,"open(\"%s\")" , dirpath); +g_free (dirpath); +return NULL ; + } +g_free (dirpath); + + buf =g_malloc0 (20 ); +ga_read_sysfs_file (dirfd,"block_size_bytes" , buf,20 , &local_err); +close (dirfd); +if (local_err) { +g_free (buf); +error_propagate (errp, local_err); +return NULL ; + } + + info =g_new0 (GuestMemoryBlockInfo,1 ); + info->size =strtol (buf,NULL ,16 );/* the unit is bytes */ + +g_free (buf); + +return info; +} +#define MAX_NAME_LEN 128static GuestDiskStatsInfoList *guest_get_diskstats (Error **errp) {
qga/commands-posix.c +1 -310
317 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 8/20 qga: conditionalize schema for commands unsupported on Windows
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on Windows.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This fixes inconsistency where some commands are implemented as stubs, yet not added to the blockedrpc list.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-win32.c | 56 +------------------------------------------- qga/qapi-schema.json | 45 +++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 70 deletions(-)
qga/commands-win32.c +1 -55
@@ -1494,11 +1494,6 @@ out: } } -void qmp_guest_suspend_hybrid (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -} -static IP_ADAPTER_ADDRESSES *guest_get_adapters_addresses (Error **errp) {IP_ADAPTER_ADDRESSES *adptr_addrs =NULL ;
@@ -1862,12 +1857,6 @@ GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp)return NULL ; } -int64_t qmp_guest_set_vcpus (GuestLogicalProcessorList *vcpus,Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return -1 ; -} -static gchar *get_net_error_message (gint error) {
@@ -1969,46 +1958,15 @@ done:g_free (rawpasswddata); } -GuestMemoryBlockList *qmp_guest_get_memory_blocks (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestMemoryBlockResponseList * -qmp_guest_set_memory_blocks (GuestMemoryBlockList *mem_blks,Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestMemoryBlockInfo *qmp_guest_get_memory_block_info (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} -/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) { -const char *list_unsupported[] = { -"guest-suspend-hybrid" , -"guest-set-vcpus" , -"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-info" , -NULL }; -char **p = (char **)list_unsupported; - -while (*p) { - blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } -if (!vss_init (true)) {g_debug ("vss_init failed, vss commands are going to be disabled" );const char *list[] = {"guest-get-fsinfo" ,"guest-fsfreeze-status" ,"guest-fsfreeze-freeze" ,"guest-fsfreeze-thaw" ,NULL }; - p = (char **)list; +char **p = (char **)list;while (*p) { blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++));
@@ -2505,15 +2463,3 @@ char *qga_get_host_name(Error **errp)return g_utf16_to_utf8 (tmp, size,NULL ,NULL ,NULL ); } - -GuestDiskStatsInfoList *qmp_guest_get_diskstats (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestCpuStatsList *qmp_guest_get_cpustats (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -}
qga/qapi-schema.json +30 -15
133 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 9/20 qga: conditionalize schema for commands unsupported on non-Linux POSIX
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on non-Linux POSIX platforms
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-posix.c | 66 -------------------------------------------- qga/qapi-schema.json | 30 +++++++++++--------- 2 files changed, 17 insertions(+), 79 deletions(-)
qga/commands-posix.c +0 -66
@@ -887,56 +887,6 @@ void qmp_guest_set_user_password(const char *username, }#endif /* __linux__ || __FreeBSD__ */ -#ifndef __linux__ - -void qmp_guest_suspend_disk (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -} - -void qmp_guest_suspend_ram (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -} - -void qmp_guest_suspend_hybrid (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -} - -GuestLogicalProcessorList *qmp_guest_get_vcpus (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -int64_t qmp_guest_set_vcpus (GuestLogicalProcessorList *vcpus,Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return -1 ; -} - -GuestMemoryBlockList *qmp_guest_get_memory_blocks (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestMemoryBlockResponseList * -qmp_guest_set_memory_blocks (GuestMemoryBlockList *mem_blks,Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestMemoryBlockInfo *qmp_guest_get_memory_block_info (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -#endif -#ifdef HAVE_GETIFADDRS static GuestNetworkInterface * guest_find_interface(GuestNetworkInterfaceList *head,
@@ -1272,22 +1222,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) { -#if !defined(__linux__) - { -const char *list[] = { -"guest-suspend-disk" ,"guest-suspend-ram" , -"guest-suspend-hybrid" ,"guest-get-vcpus" ,"guest-set-vcpus" , -"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-info" , -NULL }; -char **p = (char **)list; - -while (*p) { - blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } - } -#endif -#if !defined(HAVE_GETIFADDRS ) blockedrpcs =g_list_append (blockedrpcs,g_strdup ("guest-network-get-interfaces" ));
qga/qapi-schema.json +17 -13
@@ -565,7 +565,8 @@ # # Since: 1.1 ## -{ 'command': 'guest-suspend-disk', 'success-response': false } +{ 'command': 'guest-suspend-disk', 'success-response': false, + 'if': { 'any': ['CONFIG_LINUX', 'CONFIG_WIN32'] } } ## # @guest-suspend-ram:
@@ -601,7 +602,8 @@ # # Since: 1.1 ## -{ 'command': 'guest-suspend-ram', 'success-response': false } +{ 'command': 'guest-suspend-ram', 'success-response': false, + 'if': { 'any': ['CONFIG_LINUX', 'CONFIG_WIN32'] } } ## # @guest-suspend-hybrid:
@@ -637,7 +639,7 @@ # Since: 1.1 ## { 'command': 'guest-suspend-hybrid', 'success-response': false, - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @GuestIpAddressType:
@@ -750,7 +752,8 @@ { 'struct': 'GuestLogicalProcessor', 'data': {'logical-id': 'int', 'online': 'bool', - '*can-offline': 'bool'} } + '*can-offline': 'bool'}, + 'if': { 'any': ['CONFIG_LINUX', 'CONFIG_WIN32'] } } ## # @guest-get-vcpus:
@@ -765,7 +768,8 @@ # Since: 1.5 ## { 'command': 'guest-get-vcpus', - 'returns': ['GuestLogicalProcessor'] } + 'returns': ['GuestLogicalProcessor'], + 'if': { 'any': ['CONFIG_LINUX', 'CONFIG_WIN32'] } } ## # @guest-set-vcpus:
@@ -808,7 +812,7 @@ { 'command': 'guest-set-vcpus', 'data': {'vcpus': ['GuestLogicalProcessor'] }, 'returns': 'int', - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @GuestDiskBusType:
@@ -1102,7 +1106,7 @@ 'data': {'phys-index': 'uint64', 'online': 'bool', '*can-offline': 'bool'}, - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @guest-get-memory-blocks:
@@ -1119,7 +1123,7 @@ ## { 'command': 'guest-get-memory-blocks', 'returns': ['GuestMemoryBlock'], - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @GuestMemoryBlockResponseType:
@@ -1143,7 +1147,7 @@ { 'enum': 'GuestMemoryBlockResponseType', 'data': ['success', 'not-found', 'operation-not-supported', 'operation-failed'], - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @GuestMemoryBlockResponse:
@@ -1162,7 +1166,7 @@ 'data': { 'phys-index': 'uint64', 'response': 'GuestMemoryBlockResponseType', '*error-code': 'int' }, - 'if': 'CONFIG_POSIX'} + 'if': 'CONFIG_LINUX'} ## # @guest-set-memory-blocks:
@@ -1194,7 +1198,7 @@ { 'command': 'guest-set-memory-blocks', 'data': {'mem-blks': ['GuestMemoryBlock'] }, 'returns': ['GuestMemoryBlockResponse'], - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @GuestMemoryBlockInfo:
@@ -1207,7 +1211,7 @@ ## { 'struct': 'GuestMemoryBlockInfo', 'data': {'size': 'uint64'}, - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @guest-get-memory-block-info:
@@ -1220,7 +1224,7 @@ ## { 'command': 'guest-get-memory-block-info', 'returns': 'GuestMemoryBlockInfo', - 'if': 'CONFIG_POSIX' } + 'if': 'CONFIG_LINUX' } ## # @GuestExecStatus:
Signature · 1 line
2.45.1
PATCH 13/20 qga: conditionalize schema for commands requiring fsfreeze
In reply to Daniel P. BerrangéRather than creating stubs for every command that just return QERR_UNSUPPORTED, use 'if' conditions in the schema to fully exclude generation of the filesystem freezing commands on POSIX platforms lacking the required APIs.
The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
--- qga/commands-posix.c | 47 -------------------------------------------- qga/qapi-schema.json | 15 +++++++++----- 2 files changed, 10 insertions(+), 52 deletions(-)
qga/commands-posix.c +0 -47
@@ -1144,39 +1144,6 @@ error:#endif /* HAVE_GETIFADDRS */ -#if !defined(CONFIG_FSFREEZE ) - -GuestFsfreezeStatus qmp_guest_fsfreeze_status (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); - -return 0 ; -} - -int64_t qmp_guest_fsfreeze_freeze (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); - -return 0 ; -} - -int64_t qmp_guest_fsfreeze_freeze_list (bool has_mountpoints, -strList *mountpoints, -Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); - -return 0 ; -} - -int64_t qmp_guest_fsfreeze_thaw (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); - -return 0 ; -} -#endif /* CONFIG_FSFREEZE */ -#if !defined(CONFIG_FSTRIM )GuestFilesystemTrimResponse *qmp_guest_fstrim (bool has_minimum,int64_t minimum,Error **errp)
@@ -1189,20 +1156,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) { -#if !defined(CONFIG_FSFREEZE ) - { -const char *list[] = { -"guest-fsfreeze-status" , -"guest-fsfreeze-freeze" ,"guest-fsfreeze-freeze-list" , -"guest-fsfreeze-thaw" ,NULL }; -char **p = (char **)list; - -while (*p) { - blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } - } -#endif -#if !defined(CONFIG_FSTRIM ) blockedrpcs =g_list_append (blockedrpcs,g_strdup ("guest-fstrim" ));#endif
qga/qapi-schema.json +10 -5
@@ -412,7 +412,8 @@ # Since: 0.15.0 ## { 'enum': 'GuestFsfreezeStatus', - 'data': [ 'thawed', 'frozen' ] } + 'data': [ 'thawed', 'frozen' ], + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSFREEZE'] } } ## # @guest-fsfreeze-status:
@@ -428,7 +429,8 @@ # Since: 0.15.0 ## { 'command': 'guest-fsfreeze-status', - 'returns': 'GuestFsfreezeStatus' } + 'returns': 'GuestFsfreezeStatus', + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSFREEZE'] } } ## # @guest-fsfreeze-freeze:
@@ -450,7 +452,8 @@ # Since: 0.15.0 ## { 'command': 'guest-fsfreeze-freeze', - 'returns': 'int' } + 'returns': 'int', + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSFREEZE'] } } ## # @guest-fsfreeze-freeze-list:
@@ -470,7 +473,8 @@ ## { 'command': 'guest-fsfreeze-freeze-list', 'data': { '*mountpoints': ['str'] }, - 'returns': 'int' } + 'returns': 'int', + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSFREEZE'] } } ## # @guest-fsfreeze-thaw:
@@ -487,7 +491,8 @@ # Since: 0.15.0 ## { 'command': 'guest-fsfreeze-thaw', - 'returns': 'int' } + 'returns': 'int', + 'if': { 'any': ['CONFIG_WIN32', 'CONFIG_FSFREEZE'] } } ## # @GuestFilesystemTrimResult:
Signature · 1 line
2.45.1
Re: [PATCH 07/20] qga: move CONFIG_FSFREEZE/TRIM to be meson defined options
In reply to Daniel P. BerrangéHi
Quoted 15 lines · Daniel P. Berrangé
Defining these at the meson level allows them to be used a conditional tests in the QAPI schemas.
Signed-off-by Daniel P. Berrangé <[email protected]>--- meson.build | 18 ++++++++++++++++++ qga/commands-common.h | 9 --------- 2 files changed, 18 insertions(+), 9 deletions(-)meson.build +0
-0@@ -2141,6 +2141,22 @@ have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \
meson.build have_virtfs_proxy_helper = · line 2151
Quoted 10 lines
meson.build +5
-0.require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \ .allowed() +qga_fsfreeze = false +qga_fstrim = false +if host_os == 'windows' + qga_fsfreeze = true + qga_fstrim = true
The hook code in qga/main.c compiles for win32, but it is not used. Did you intentionally enabled that?
+elif host_os == 'linux'
Quoted 55 lines
meson.build +7
-0+ if cc.has_header_symbol('linux/fs.h', 'FIFREEZE') + qga_fsfreeze = true + endif + if cc.has_header_symbol('linux/fs.h', 'FITRIM') + qga_fstrim = true + endif +elif host_os == 'freebsd' and cc.has_header_symbol('ufs/ffs/fs.h','UFSSUSPEND')
meson.build +5
-0+ qga_fsfreeze = true +endif + if get_option('block_drv_ro_whitelist') == '' config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') else@@ -2375,6 +2391,8 @@ config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg')) config_host_data.set('CONFIG_DEBUG_REMAP', get_option('debug_remap')) config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug')) config_host_data.set('CONFIG_REPLICATION', get_option('replication').allowed()) +config_host_data.set('CONFIG_FSFREEZE', qga_fsfreeze) +config_host_data.set('CONFIG_FSTRIM', qga_fstrim)# has_header config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h'))qga/commands-common.h +0
-10@@ -15,19 +15,10 @@#if defined(__linux__)#include <linux/fs.h> -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#ifdef FITRIM -#define CONFIG_FSTRIM -#endif #endif /* __linux__ */ #ifdef __FreeBSD__#include <ufs/ffs/fs.h> -#ifdef UFSSUSPEND -#define CONFIG_FSFREEZE -#endif #endif /* __FreeBSD__ */ #if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) --2.45.1
Signature · 1 line
Marc-André Lureau
Re: [PATCH 07/20] qga: move CONFIG_FSFREEZE/TRIM to be meson defined options
Quoted 24 lines · Marc-André Lureau
Hi
Quoted 19 lines · Daniel P. Berrangé
Defining these at the meson level allows them to be used a conditional tests in the QAPI schemas.
Signed-off-by Daniel P. Berrangé <[email protected]>--- meson.build | 18 ++++++++++++++++++ qga/commands-common.h | 9 --------- 2 files changed, 18 insertions(+), 9 deletions(-)meson.build +0
-0@@ -2141,6 +2141,22 @@ have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \ .require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \ .allowed()
Quoted 9 lines
meson.build have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \
Quoted 6 lines
meson.build +5
-0+qga_fsfreeze = false +qga_fstrim = false +if host_os == 'windows' + qga_fsfreeze = true + qga_fstrim = trueThe hook code in
qga/main.ccompiles for win32, but it is not used. Did you intentionally enabled that?
Oh whoops, yes, that is an oversight. I was initially thinking that CONFIG_FSFREEZE was used in commands-win32.c, since it has a freeze impl, but I forgot I later learnt it was unconditional. So we don't need to set these for meson vars for windows.
Quoted 51 lines
+elif
host_os== 'linux'Quoted 49 lines
meson.build +7
-0+ if cc.has_header_symbol('linux/fs.h', 'FIFREEZE') + qga_fsfreeze = true + endif + if cc.has_header_symbol('linux/fs.h', 'FITRIM') + qga_fstrim = true + endif +elif host_os == 'freebsd' and cc.has_header_symbol('ufs/ffs/fs.h','UFSSUSPEND')
meson.build +5
-0+ qga_fsfreeze = true +endif + if get_option('block_drv_ro_whitelist') == '' config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') else@@ -2375,6 +2391,8 @@ config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg')) config_host_data.set('CONFIG_DEBUG_REMAP', get_option('debug_remap')) config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug')) config_host_data.set('CONFIG_REPLICATION', get_option('replication').allowed()) +config_host_data.set('CONFIG_FSFREEZE', qga_fsfreeze) +config_host_data.set('CONFIG_FSTRIM', qga_fstrim)# has_header config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h'))qga/commands-common.h +0
-9@@ -15,19 +15,10 @@#if defined(__linux__)#include <linux/fs.h> -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#ifdef FITRIM -#define CONFIG_FSTRIM -#endif #endif /* __linux__ */ #ifdef __FreeBSD__#include <ufs/ffs/fs.h> -#ifdef UFSSUSPEND -#define CONFIG_FSFREEZE -#endif #endif /* __FreeBSD__ */
Quoted 9 lines
Quoted 6 lines
qga/commands-common.h +0
-1#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) --2.45.1
Signature · 1 line
Marc-André Lureau
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 19/20] qga: move declare of QGAConfig struct to top of file
In reply to Daniel P. BerrangéQuoted 2 lines · Daniel P. Berrangé
It is referenced byy QGAState already, and it is clearer to declare all
minor "byy" typo
Quoted 76 lines
data types at the top of the file, rather than have them mixed with code later.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/main.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)qga/main.c +22
-22@@ -70,6 +70,28 @@ typedef struct GAPersistentState {typedef struct GAConfig GAConfig ; +struct GAConfig { +char *channel_path; +char *method; +char *log_filepath; +char *pid_filepath; +#ifdef CONFIG_FSFREEZE +char *fsfreeze_hook; +#endif +char *state_dir; +#ifdef _WIN32 +const char *service; +#endif +gchar *bliststr;/* blockedrpcs may point to this string */ +gchar *aliststr;/* allowedrpcs may point to this string */ +GList *blockedrpcs; +GList *allowedrpcs; +int daemonize; +GLogLevelFlags log_level; +int dumpconf; +bool retry_path; +}; +struct GAState {JSONMessageParser parser;GMainLoop *main_loop;@@ -996,28 +1018,6 @@ static GList *split_list(const gchar *str, const gchar *delim)return list; } -struct GAConfig { -char *channel_path; -char *method; -char *log_filepath; -char *pid_filepath; -#ifdef CONFIG_FSFREEZE -char *fsfreeze_hook; -#endif -char *state_dir; -#ifdef _WIN32 -const char *service; -#endif -gchar *bliststr;/* blockedrpcs may point to this string */ -gchar *aliststr;/* allowedrpcs may point to this string */ -GList *blockedrpcs; -GList *allowedrpcs; -int daemonize; -GLogLevelFlags log_level; -int dumpconf; -bool retry_path; -}; -static void config_load (GAConfig *config) {GError *gerr = NULL;--
2.45.1
Signature · 1 line
Marc-André Lureau
Re: [PATCH 20/20] qga: centralize logic for disabling/enabling commands
In reply to Daniel P. BerrangéHi
Quoted 10 lines · Daniel P. Berrangé
It is confusing having many different pieces of code enabling and disabling commands, and it is not clear that they all have the same semantics, especially wrt prioritization of the block/allow lists.
Centralizing the code in a single method "
ga_apply_command_filters" will provide a strong guarantee of consistency and clarify the intended behaviour.Signed-off-by Daniel P. Berrangé <[email protected]>
The clean up is very much welcome and looks correct, but it crashes:
Thread 1 "qemu-ga" received signal SIGSEGV, Segmentation fault. 0x000055555557db4f in ga_command_is_allowed (cmd=0x555555632800, state=0x555555633710) at ../qga/main.c:430
430 if (config->allowedrpcs) {
(gdb) bt
#0 0x000055555557db4f in ga_command_is_allowed (cmd=0x555555632800, state=0x555555633710) at ../qga/main.c:430
#1 ga_apply_command_filters_iter (cmd=0x555555632800, opaque=0x555555633710) at ../qga/main.c:473
#2 0x000055555559ef81 in qmp_for_each_command (cmds=cmds@entry=0x55555562c2b0 <ga_commands>, fn=fn@entry=0x55555557db30 <ga_apply_command_filters_iter>, opaque=opaque@entry=0x555555633710)
at ../qapi/qmp-registry.c:93
#3 0x0000555555571436 in ga_apply_command_filters (state=0x555555633710) at ../qga/main.c:492
#4 initialize_agent (config=0x555555632760, socket_activation=0) at ../qga/main.c:1452
#5 main (argc=<optimized out>, argv=<optimized out>) at ../qga/main.c:1646 (gdb) p state.config
$1 = (GAConfig *) 0x0
(meson test fails too)
I wonder why s->config is set so late in initialize_agent(). Moving it earlier seems to solve the issue, but reviewing all code paths is tedious..
---
Quoted 207 lines
qga/main.c | 110 ++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 55 deletions(-)qga/main.c +43
-32@@ -419,60 +419,79 @@ static gint ga_strcmp(gconstpointer str1, gconstpointer str2)return strcmp (str1, str2); } -/* disable commands that aren't safe for fsfreeze */ -static void ga_disable_not_allowed_freeze (const QmpCommand *cmd,void *opaque) +static bool ga_command_is_allowed (const QmpCommand *cmd,GAState *state) { -bool allowed = false;int i =0 ; +GAConfig *config = state->config;const char *name =qmp_command_name (cmd); +/* Fallback policy is allow everything */ +bool allowed = true; -while (ga_freeze_allowlist[i] !=NULL ) { -if (strcmp (name, ga_freeze_allowlist[i]) ==0 ) { +if (config->allowedrpcs) { +/* +* If an allow-list is given, this changes the fallback +* policy to deny everything +*/ + allowed = false; + +if (g_list_find_custom (config->allowedrpcs, name, ga_strcmp) !=NULL ) { allowed = true; } - i++; - } -if (!allowed) { -g_debug ("disabling command: %s" , name); -qmp_disable_command (&ga_commands, name,"the agent is in frozen state"); } -} - -/* [re-]enable all commands, except those explicitly blocked by user */ -static void ga_enable_non_blocked (const QmpCommand *cmd,void *opaque) -{ -GAState *s = opaque; -GList *blockedrpcs = s->blockedrpcs; -GList *allowedrpcs = s->allowedrpcs; -const char *name =qmp_command_name (cmd); -if (g_list_find_custom (blockedrpcs, name, ga_strcmp) ==NULL ) { -if (qmp_command_is_enabled (cmd)) { -return ; +/* +* If both allowedrpcs and blockedrpcs are set, the blocked +* list will take priority +*/ +if (config->blockedrpcs) { +if (g_list_find_custom (config->blockedrpcs, name, ga_strcmp) !=NULL ) { + allowed = false; } + } -if (allowedrpcs && -g_list_find_custom (allowedrpcs, name, ga_strcmp) ==NULL ) { -return ; - } +/* +* If frozen, this filtering must take priority over +* absolutely everything +*/ +if (state->frozen) { + allowed = false; -g_debug ("enabling command: %s" , name); -qmp_enable_command (&ga_commands, name); +while (ga_freeze_allowlist[i] !=NULL ) { +if (strcmp (name, ga_freeze_allowlist[i]) ==0 ) { + allowed = true; + } + i++; + } } + +return allowed; } -/* disable commands that aren't allowed */ -static void ga_disable_not_allowed (const QmpCommand *cmd,void *opaque) +static void ga_apply_command_filters_iter (const QmpCommand *cmd,void *opaque) { -GList *allowedrpcs = opaque; +GAState *state = opaque; +bool want =ga_command_is_allowed (cmd, state); +bool have =qmp_command_is_enabled (cmd);const char *name =qmp_command_name (cmd); -if (g_list_find_custom (allowedrpcs, name, ga_strcmp) ==NULL ) { +if (want == have) { +return ; + } + +if (qmp_command_is_enabled (cmd)) {g_debug ("disabling command: %s" , name); qmp_disable_command(&ga_commands, name, "the command is notallowed");
qga/main.c +6
-0+ }else { +g_debug ("enabling command: %s" , name); +qmp_enable_command (&ga_commands, name); } } +static void ga_apply_command_filters (GAState *state) +{ + qmp_for_each_command(&ga_commands, ga_apply_command_filters_iter,state);
qga/main.c +4
-3+} +static bool ga_create_file (const char *path) {int fd =open (path,O_CREAT |O_WRONLY ,S_IWUSR |S_IRUSR );@@ -505,15 +524,14 @@ void ga_set_frozen(GAState *s)if (ga_is_frozen (s)) {return ; } -/* disable all forbidden (for frozen state) commands */ -qmp_for_each_command (&ga_commands, ga_disable_not_allowed_freeze, NULL);g_warning ("disabling logging due to filesystem freeze" ); -ga_disable_logging (s); s->frozen = true;if (!ga_create_file (s->state_filepath_isfrozen)) {g_warning ("unable to create %s, fsfreeze may not function properly", s->state_filepath_isfrozen); } +ga_apply_command_filters (s); +ga_disable_logging (s); }void
ga_unset_frozen(GAState *s)qga/main.c +1
-1@@ -545,12 +563,12 @@ void ga_unset_frozen(GAState *s) }/* enable all disabled, non-blocked and allowed commands */ -qmp_for_each_command (&ga_commands, ga_enable_non_blocked, s); s->frozen = false;if (!ga_delete_file (s->state_filepath_isfrozen)) {g_warning ("unable to delete %s, fsfreeze may not function properly", s->state_filepath_isfrozen); } +ga_apply_command_filters (s); }#ifdef
CONFIG_FSFREEZEqga/main.c +0
-1@@ -1414,7 +1432,6 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation) s->deferred_options.log_filepath = config->log_filepath; }ga_disable_logging (s); -qmp_for_each_command (&ga_commands, ga_disable_not_allowed_freeze, NULL); }else {if (config->daemonize) { become_daemon(config->pid_filepath);qga/main.c +1
-18@@ -1438,25 +1455,8 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)return NULL ; } -if (config->allowedrpcs) { -qmp_for_each_command (&ga_commands, ga_disable_not_allowed, config->allowedrpcs); - s->allowedrpcs = config->allowedrpcs; - } +ga_apply_command_filters (s); -/* -* Some commands can be blocked due to system limitation. -* Initialize blockedrpcs list even if allowedrpcs specified. -*/ - config->blockedrpcs =ga_command_init_blockedrpcs (config->blockedrpcs); -if (config->blockedrpcs) { -GList *l = config->blockedrpcs; - s->blockedrpcs = config->blockedrpcs; -do { -g_debug ("disabling command: %s" , (char *)l->data); -qmp_disable_command (&ga_commands, l->data,NULL ); - l =g_list_next (l); - }while (l); - }s->command_state = ga_command_state_new(); ga_command_state_init(s, s->command_state); ga_command_state_init_all(s->command_state);--
2.45.1
Signature · 1 line
Marc-André Lureau
Re: [PATCH 20/20] qga: centralize logic for disabling/enabling commands
Hi
Quoted 39 lines · Marc-André Lureau
Hi
Quoted 10 lines · Daniel P. Berrangé
It is confusing having many different pieces of code enabling and disabling commands, and it is not clear that they all have the same semantics, especially wrt prioritization of the block/allow lists.
Centralizing the code in a single method "
ga_apply_command_filters" will provide a strong guarantee of consistency and clarify the intended behaviour.Signed-off-by Daniel P. Berrangé <[email protected]>The clean up is very much welcome and looks correct, but it crashes:
Thread 1 "qemu-ga" received signal SIGSEGV, Segmentation fault.
0x000055555557db4finga_command_is_allowed(cmd=0x555555632800, state=0x555555633710) at../qga/main.c:430
430 if (config->allowedrpcs) {
(gdb) bt
#00x000055555557db4finga_command_is_allowed(cmd=0x555555632800, state=0x555555633710) at../qga/main.c:430
#1ga_apply_command_filters_iter(cmd=0x555555632800, opaque=0x555555633710) at../qga/main.c:473
#20x000055555559ef81inqmp_for_each_command(cmds=cmds@entry=0x55555562c2b0 <ga_commands>, fn=fn@entry=0x55555557db30 <ga_apply_command_filters_iter>, opaque=opaque@entry=0x555555633710)at ../qapi/qmp-registry.c:93#3
0x0000555555571436inga_apply_command_filters(state=0x555555633710) at../qga/main.c:492
#4initialize_agent(config=0x555555632760, socket_activation=0) at../qga/main.c:1452
#5 main (argc=<optimized out>, argv=<optimized out>) at../qga/main.c:1646(gdb) p state.config
$1 = (GAConfig *)0x0
Quoted 5 lines
(meson test fails too)
I wonder why
s->configis set so late ininitialize_agent(). Moving it earlier seems to solve the issue, but reviewing all code paths is tedious..
Actually, there seems to be few ->config users, and they don't check if it's NULL. So I guess it's ok to move it earlier.
Signature · 1 line
Marc-André Lureau
Re: [PATCH 20/20] qga: centralize logic for disabling/enabling commands
In reply to Marc-André LureauQuoted 39 lines · Marc-André Lureau
Hi
Quoted 10 lines · Daniel P. Berrangé
It is confusing having many different pieces of code enabling and disabling commands, and it is not clear that they all have the same semantics, especially wrt prioritization of the block/allow lists.
Centralizing the code in a single method "
ga_apply_command_filters" will provide a strong guarantee of consistency and clarify the intended behaviour.Signed-off-by Daniel P. Berrangé <[email protected]>The clean up is very much welcome and looks correct, but it crashes:
Thread 1 "qemu-ga" received signal SIGSEGV, Segmentation fault.
0x000055555557db4finga_command_is_allowed(cmd=0x555555632800, state=0x555555633710) at../qga/main.c:430
430 if (config->allowedrpcs) {
(gdb) bt
#00x000055555557db4finga_command_is_allowed(cmd=0x555555632800, state=0x555555633710) at../qga/main.c:430
#1ga_apply_command_filters_iter(cmd=0x555555632800, opaque=0x555555633710) at../qga/main.c:473
#20x000055555559ef81inqmp_for_each_command(cmds=cmds@entry=0x55555562c2b0 <ga_commands>, fn=fn@entry=0x55555557db30 <ga_apply_command_filters_iter>, opaque=opaque@entry=0x555555633710)at ../qapi/qmp-registry.c:93#3
0x0000555555571436inga_apply_command_filters(state=0x555555633710) at../qga/main.c:492
#4initialize_agent(config=0x555555632760, socket_activation=0) at../qga/main.c:1452
#5 main (argc=<optimized out>, argv=<optimized out>) at../qga/main.c:1646(gdb) p state.config
$1 = (GAConfig *)0x0
Quoted 4 lines
(meson test fails too)
I wonder why
s->configis set so late ininitialize_agent(). Moving it earlier seems to solve the issue, but reviewing all code paths is tedious..
The ga_apply_command_filters() call can just be moved later, since the only constraint is that is called /before/ we call g_main_loop_run() to start processing I/O
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 01/20] qga: drop blocking of guest-get-memory-block-size command
In reply to Daniel P. BerrangéQuoted 5 lines · Daniel P. Berrangé
This command has never existed in tree, since it was renamed to guest-get-memory-block-info before being merged.
Signed-off-by Daniel P. Berrangé <[email protected]>---
Quoted 34 lines
qga/commands-posix.c| 2 +-qga/commands-win32.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)qga/commands-posix.c +1
-1@@ -3099,7 +3099,7 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)"guest-suspend-disk" ,"guest-suspend-ram" ,"guest-suspend-hybrid" ,"guest-get-vcpus" ,"guest-set-vcpus" ,"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-size" ,"guest-get-memory-block-info" , +"guest-get-memory-block-info" , NULL};char **p = (char **)list;qga/commands-win32.c +1
-1@@ -1995,7 +1995,7 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)"guest-suspend-hybrid" ,"guest-set-vcpus" ,"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-size" ,"guest-get-memory-block-info" , +"guest-get-memory-block-info" , NULL};char **p = (char **)list_unsupported;Signature · 1 line
2.45.1
Re: [PATCH 02/20] qga: move linux vcpu command impls to commands-linux.c
In reply to Daniel P. BerrangéQuoted 6 lines · Daniel P. Berrangé
The
qmp_guest_set_vcpusandqmp_guest_get_vcpuscommand impls incommands-posix.care surrounded by '#ifdef__linux__' so should instead live incommands-linux.cSigned-off-by Daniel P. Berrangé <[email protected]>---
Quoted 314 lines
qga/commands-linux.c| 141 +++++++++++++++++++++++++++++++++++++++++++qga/commands-posix.c| 139 ------------------------------------------2 files changed, 141 insertions(+), 139 deletions(-)qga/commands-linux.c +141
-0@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qga-qapi-commands.h" #include "commands-common.h" #include "cutils.h" #include <mntent.h> @@ -284,3 +285,143 @@ int qmp_guest_fsfreeze_do_thaw(Error **errp)return i; }#endif /* CONFIG_FSFREEZE */ + +/* Transfer online/offline status between @vcpu and the guest system. +* +* On input either @errp or *@errp must be NULL. +* +* In system-to-@vcpu direction, the following @vcpu fields are accessed: +* - R: vcpu->logical_id +* - W: vcpu->online +* - W: vcpu->can_offline +* +* In @vcpu-to-system direction, the following @vcpu fields are accessed: +* - R: vcpu->logical_id +* - R: vcpu->online +* +* Written members remain unmodified on error. +*/ +static void transfer_vcpu (GuestLogicalProcessor *vcpu,bool sys2vcpu, +char *dirpath,Error **errp) +{ +int fd; +int res; +int dirfd; +static const char fn[] ="online" ; + + dirfd =open (dirpath,O_RDONLY |O_DIRECTORY ); +if (dirfd ==-1 ) { +error_setg_errno (errp, errno,"open(\"%s\")" , dirpath); +return ; + } + + fd =openat (dirfd, fn, sys2vcpu ?O_RDONLY :O_RDWR ); +if (fd ==-1 ) { +if (errno !=ENOENT ) { +error_setg_errno (errp, errno,"open(\"%s/%s\")" , dirpath, fn); + }else if (sys2vcpu) { + vcpu->online = true; + vcpu->can_offline = false; + }else if (!vcpu->online) { +error_setg (errp,"logical processor #%" PRId64" can't be " +"offlined" , vcpu->logical_id); + }/* otherwise pretend successful re-onlining */ + }else { +unsigned char status; + + res =pread (fd, &status,1 ,0 ); +if (res ==-1 ) { +error_setg_errno (errp, errno,"pread(\"%s/%s\")" , dirpath, fn); + }else if (res ==0 ) { +error_setg (errp,"pread(\"%s/%s\"): unexpected EOF" , dirpath, + fn); + }else if (sys2vcpu) { + vcpu->online = (status !='0' ); + vcpu->can_offline = true; + }else if (vcpu->online != (status !='0' )) { + status ='0' + vcpu->online; +if (pwrite (fd, &status,1 ,0 ) ==-1 ) { +error_setg_errno (errp, errno,"pwrite(\"%s/%s\")" , dirpath, + fn); + } + }/* otherwise pretend successful re-(on|off)-lining */ + + res =close (fd); +g_assert (res ==0 ); + } + + res =close (dirfd); +g_assert (res ==0 ); +} + +GuestLogicalProcessorList *qmp_guest_get_vcpus (Error **errp) +{ +GuestLogicalProcessorList *head, **tail; +const char *cpu_dir ="/sys/devices/system/cpu" ; +const gchar *line; +g_autoptr (GDir) cpu_gdir =NULL ; +Error *local_err =NULL ; + + head =NULL ; + tail = &head; + cpu_gdir =g_dir_open (cpu_dir,0 ,NULL ); + +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; +int64_t id; +if (sscanf (line,"cpu%" PRId64, &id)) { + g_autofree char *path = g_strdup_printf("/sys/devices/system/cpu/" +"cpu%" PRId64"/" , id); + vcpu =g_malloc0 (sizeof *vcpu); + vcpu->logical_id = id; + vcpu->has_can_offline = true;/* lolspeak ftw */ +transfer_vcpu (vcpu, true, path, &local_err); +QAPI_LIST_APPEND (tail, vcpu); + } + } + +if (local_err ==NULL ) { +/* there's no guest with zero VCPUs */ +g_assert (head !=NULL ); +return head; + } + +qapi_free_GuestLogicalProcessorList (head); +error_propagate (errp, local_err); +return NULL ; +} + +int64_t qmp_guest_set_vcpus (GuestLogicalProcessorList *vcpus,Error **errp) +{ +int64_t processed; +Error *local_err =NULL ; + + processed =0 ; +while (vcpus !=NULL ) { +char *path =g_strdup_printf ("/sys/devices/system/cpu/cpu%" PRId64"/" , + vcpus->value->logical_id); + +transfer_vcpu (vcpus->value, false, path, &local_err); +g_free (path); +if (local_err !=NULL ) { +break ; + } + ++processed; + vcpus = vcpus->next; + } + +if (local_err !=NULL ) { +if (processed ==0 ) { +error_propagate (errp, local_err); + }else { +error_free (local_err); + } + } + +return processed; +}qga/commands-posix.c +0
-139@@ -2003,145 +2003,6 @@ void qmp_guest_suspend_hybrid(Error **errp) guest_suspend(SUSPEND_MODE_HYBRID, errp); } -/* Transfer online/offline status between @vcpu and the guest system. -* -* On input either @errp or *@errp must be NULL. -* -* In system-to-@vcpu direction, the following @vcpu fields are accessed: -* - R: vcpu->logical_id -* - W: vcpu->online -* - W: vcpu->can_offline -* -* In @vcpu-to-system direction, the following @vcpu fields are accessed: -* - R: vcpu->logical_id -* - R: vcpu->online -* -* Written members remain unmodified on error. -*/ -static void transfer_vcpu (GuestLogicalProcessor *vcpu,bool sys2vcpu, -char *dirpath,Error **errp) -{ -int fd; -int res; -int dirfd; -static const char fn[] ="online" ; - - dirfd =open (dirpath,O_RDONLY |O_DIRECTORY ); -if (dirfd ==-1 ) { -error_setg_errno (errp, errno,"open(\"%s\")" , dirpath); -return ; - } - - fd =openat (dirfd, fn, sys2vcpu ?O_RDONLY :O_RDWR ); -if (fd ==-1 ) { -if (errno !=ENOENT ) { -error_setg_errno (errp, errno,"open(\"%s/%s\")" , dirpath, fn); - }else if (sys2vcpu) { - vcpu->online = true; - vcpu->can_offline = false; - }else if (!vcpu->online) { -error_setg (errp,"logical processor #%" PRId64" can't be " -"offlined" , vcpu->logical_id); - }/* otherwise pretend successful re-onlining */ - }else { -unsigned char status; - - res =pread (fd, &status,1 ,0 ); -if (res ==-1 ) { -error_setg_errno (errp, errno,"pread(\"%s/%s\")" , dirpath, fn); - }else if (res ==0 ) { -error_setg (errp,"pread(\"%s/%s\"): unexpected EOF" , dirpath, - fn); - }else if (sys2vcpu) { - vcpu->online = (status !='0' ); - vcpu->can_offline = true; - }else if (vcpu->online != (status !='0' )) { - status ='0' + vcpu->online; -if (pwrite (fd, &status,1 ,0 ) ==-1 ) { -error_setg_errno (errp, errno,"pwrite(\"%s/%s\")" , dirpath, - fn); - } - }/* otherwise pretend successful re-(on|off)-lining */ - - res =close (fd); -g_assert (res ==0 ); - } - - res =close (dirfd); -g_assert (res ==0 ); -} - -GuestLogicalProcessorList *qmp_guest_get_vcpus (Error **errp) -{ -GuestLogicalProcessorList *head, **tail; -const char *cpu_dir ="/sys/devices/system/cpu" ; -const gchar *line; -g_autoptr (GDir) cpu_gdir =NULL ; -Error *local_err =NULL ; - - head =NULL ; - tail = &head; - cpu_gdir =g_dir_open (cpu_dir,0 ,NULL ); - -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; -int64_t id; -if (sscanf (line,"cpu%" PRId64, &id)) { - g_autofree char *path = g_strdup_printf("/sys/devices/system/cpu/" -"cpu%" PRId64"/" , id); - vcpu =g_malloc0 (sizeof *vcpu); - vcpu->logical_id = id; - vcpu->has_can_offline = true;/* lolspeak ftw */ -transfer_vcpu (vcpu, true, path, &local_err); -QAPI_LIST_APPEND (tail, vcpu); - } - } - -if (local_err ==NULL ) { -/* there's no guest with zero VCPUs */ -g_assert (head !=NULL ); -return head; - } - -qapi_free_GuestLogicalProcessorList (head); -error_propagate (errp, local_err); -return NULL ; -} - -int64_t qmp_guest_set_vcpus (GuestLogicalProcessorList *vcpus,Error **errp) -{ -int64_t processed; -Error *local_err =NULL ; - - processed =0 ; -while (vcpus !=NULL ) { -char *path =g_strdup_printf ("/sys/devices/system/cpu/cpu%" PRId64"/" , - vcpus->value->logical_id); - -transfer_vcpu (vcpus->value, false, path, &local_err); -g_free (path); -if (local_err !=NULL ) { -break ; - } - ++processed; - vcpus = vcpus->next; - } - -if (local_err !=NULL ) { -if (processed ==0 ) { -error_propagate (errp, local_err); - }else { -error_free (local_err); - } - } - -return processed; -}#endif /* __linux__ */ #if defined(__linux__) || defined(__FreeBSD__)Signature · 1 line
2.45.1
Re: [PATCH 03/20] qga: move linux suspend command impls to commands-linux.c
In reply to Daniel P. BerrangéQuoted 6 lines · Daniel P. Berrangé
The qmp_guest_suspend_{disk,ram,hybrid} command impls in
commands-posix.care surrounded by '#ifdef__linux__' so should instead live incommands-linux.cSigned-off-by Daniel P. Berrangé <[email protected]>---
Quoted 258 lines
qga/commands-linux.c| 265 +++++++++++++++++++++++++++++++++++++++++++qga/commands-posix.c| 265 -------------------------------------------2 files changed, 265 insertions(+), 265 deletions(-)qga/commands-linux.c +246
-0@@ -286,6 +286,271 @@ int qmp_guest_fsfreeze_do_thaw(Error **errp) }#endif /* CONFIG_FSFREEZE */ + +#define LINUX_SYS_STATE_FILE "/sys/power/state" +#define SUSPEND_SUPPORTED 0 +#define SUSPEND_NOT_SUPPORTED 1 + +typedef enum { +SUSPEND_MODE_DISK =0 , +SUSPEND_MODE_RAM =1 , +SUSPEND_MODE_HYBRID =2 , +}SuspendMode ; + +/* +* Executes a command in a child process using g_spawn_sync, +* returning an int >= 0 representing the exit status of the +* process. +* +* If the program wasn't found in path, returns -1. +* +* If a problem happened when creating the child process, +* returns -1 and errp is set. +*/ +static int run_process_child (const char *command[],Error **errp) +{ +int exit_status, spawn_flag; +GError *g_err =NULL ; +bool success; + + spawn_flag =G_SPAWN_SEARCH_PATH |G_SPAWN_STDOUT_TO_DEV_NULL | +G_SPAWN_STDERR_TO_DEV_NULL ; + + success =g_spawn_sync (NULL , (char **)command,NULL , spawn_flag, +NULL ,NULL ,NULL ,NULL , + &exit_status, &g_err); + +if (success) { +return WEXITSTATUS (exit_status); + } + +if (g_err && (g_err->code !=G_SPAWN_ERROR_NOENT )) { +error_setg (errp,"failed to create child process, error '%s'" , + g_err->message); + } + +g_error_free (g_err); +return -1 ; +} + +static bool systemd_supports_mode (SuspendMode mode,Error **errp) +{ +const char *systemctl_args[3 ] = {"systemd-hibernate" ,"systemd-suspend" , +"systemd-hybrid-sleep" }; +const char *cmd[4 ] = {"systemctl" ,"status" , systemctl_args[mode],NULL }; +int status; + + status =run_process_child (cmd, errp); + +/* +* systemctl status uses LSB return codes so we can expect +* status > 0 and be ok. To assert if the guest has support +* for the selected suspend mode, status should be < 4. 4 is +* the code for unknown service status, the return value when +* the service does not exist. A common value is status = 3 +* (program is not running). +*/ +if (status >0 && status <4 ) { +return true; + } + +return false; +} + +static void systemd_suspend (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +const char *systemctl_args[3 ] = {"hibernate" ,"suspend" ,"hybrid-sleep" }; +const char *cmd[3 ] = {"systemctl" , systemctl_args[mode],NULL }; +int status; + + status =run_process_child (cmd, &local_err); + +if (status ==0 ) { +return ; + } + +if ((status ==-1 ) && !local_err) { +error_setg (errp,"the helper program 'systemctl %s' was not found" , + systemctl_args[mode]); +return ; + } + +if (local_err) { +error_propagate (errp, local_err); + }else { +error_setg (errp,"the helper program 'systemctl %s' returned an " +"unexpected exit status code (%d)" , + systemctl_args[mode], status); + } +} + +static bool pmutils_supports_mode (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +const char *pmutils_args[3 ] = {"--hibernate" ,"--suspend" , +"--suspend-hybrid" }; +const char *cmd[3 ] = {"pm-is-supported" , pmutils_args[mode],NULL }; +int status; + + status =run_process_child (cmd, &local_err); + +if (status ==SUSPEND_SUPPORTED ) { +return true; + } + +if ((status ==-1 ) && !local_err) { +return false; + } + +if (local_err) { +error_propagate (errp, local_err); + }else { +error_setg (errp, +"the helper program '%s' returned an unexpected exit" +" status code (%d)" ,"pm-is-supported" , status); + } + +return false; +} + +static void pmutils_suspend (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +const char *pmutils_binaries[3 ] = {"pm-hibernate" ,"pm-suspend" , +"pm-suspend-hybrid" }; +const char *cmd[2 ] = {pmutils_binaries[mode],NULL }; +int status; + + status =run_process_child (cmd, &local_err); + +if (status ==0 ) { +return ; + } + +if ((status ==-1 ) && !local_err) { +error_setg (errp,"the helper program '%s' was not found" , + pmutils_binaries[mode]); +return ; + } + +if (local_err) { +error_propagate (errp, local_err); + }else { +error_setg (errp, +"the helper program '%s' returned an unexpected exit" +" status code (%d)" , pmutils_binaries[mode], status); + } +} + +static bool linux_sys_state_supports_mode (SuspendMode mode,Error **errp) +{ +const char *sysfile_strs[3 ] = {"disk" ,"mem" ,NULL }; +const char *sysfile_str = sysfile_strs[mode]; +char buf[32 ];/* hopefully big enough */ +int fd; +ssize_t ret; + +if (!sysfile_str) { +error_setg (errp,"unknown guest suspend mode" ); +return false; + } + + fd =open (LINUX_SYS_STATE_FILE ,O_RDONLY ); +if (fd <0 ) { +return false; + } + + ret =read (fd, buf,sizeof (buf) -1 ); +close (fd); +if (ret <=0 ) { +return false; + } + buf[ret] ='\0' ; + +if (strstr (buf, sysfile_str)) { +return true; + } +return false; +} + +static void linux_sys_state_suspend (SuspendMode mode,Error **errp) +{ +g_autoptr (GError) local_gerr =NULL ; +const char *sysfile_strs[3 ] = {"disk" ,"mem" ,NULL }; +const char *sysfile_str = sysfile_strs[mode]; + +if (!sysfile_str) { +error_setg (errp,"unknown guest suspend mode" ); +return ; + } + +if (!g_file_set_contents (LINUX_SYS_STATE_FILE , sysfile_str, +-1 , &local_gerr)) { +error_setg (errp,"suspend: cannot write to '%s': %s" , +LINUX_SYS_STATE_FILE , local_gerr->message); +return ; + } +} + +static void guest_suspend (SuspendMode mode,Error **errp) +{ +Error *local_err =NULL ; +bool mode_supported = false; + +if (systemd_supports_mode (mode, &local_err)) { + mode_supported = true; +systemd_suspend (mode, &local_err); + +if (!local_err) { +return ; + } + } + +error_free (local_err); + local_err =NULL ; + +if (pmutils_supports_mode (mode, &local_err)) { + mode_supported = true; +pmutils_suspend (mode, &local_err); + +if (!local_err) { +return ; + } + } + +error_free (local_err); + local_err =NULL ; + +if (linux_sys_state_supports_mode (mode, &local_err)) { + mode_supported = true; +linux_sys_state_suspend (mode, &local_err); + } + +if (!mode_supported) { +error_free (local_err); +error_setg (errp, +"the requested suspend mode is not supported by the guest" ); + }else {
qga/commands-linux.c int qmp_guest_fsfreeze_do_thaw(Error **errp) · line 544
Quoted 10 lines
qga/commands-linux.c +10
-0+error_propagate (errp, local_err); + } +} + +void qmp_guest_suspend_disk (Error **errp) +{ +guest_suspend (SUSPEND_MODE_DISK , errp); +} + +void qmp_guest_suspend_ram (Error **errp)
+{
Quoted 291 lines
qga/commands-linux.c +8
-0+guest_suspend (SUSPEND_MODE_RAM , errp); +} + +void qmp_guest_suspend_hybrid (Error **errp) +{ +guest_suspend (SUSPEND_MODE_HYBRID , errp); +} +/* Transfer online/offline status between @vcpu and the guest system. * * On input either @errp or *@errp must be NULL. qga/commands-posix.c +0
-265@@ -1738,271 +1738,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp) }#endif /* CONFIG_FSTRIM */ - -#define LINUX_SYS_STATE_FILE "/sys/power/state" -#define SUSPEND_SUPPORTED 0 -#define SUSPEND_NOT_SUPPORTED 1 - -typedef enum { -SUSPEND_MODE_DISK =0 , -SUSPEND_MODE_RAM =1 , -SUSPEND_MODE_HYBRID =2 , -}SuspendMode ; - -/* -* Executes a command in a child process using g_spawn_sync, -* returning an int >= 0 representing the exit status of the -* process. -* -* If the program wasn't found in path, returns -1. -* -* If a problem happened when creating the child process, -* returns -1 and errp is set. -*/ -static int run_process_child (const char *command[],Error **errp) -{ -int exit_status, spawn_flag; -GError *g_err =NULL ; -bool success; - - spawn_flag =G_SPAWN_SEARCH_PATH |G_SPAWN_STDOUT_TO_DEV_NULL | -G_SPAWN_STDERR_TO_DEV_NULL ; - - success =g_spawn_sync (NULL , (char **)command,NULL , spawn_flag, -NULL ,NULL ,NULL ,NULL , - &exit_status, &g_err); - -if (success) { -return WEXITSTATUS (exit_status); - } - -if (g_err && (g_err->code !=G_SPAWN_ERROR_NOENT )) { -error_setg (errp,"failed to create child process, error '%s'" , - g_err->message); - } - -g_error_free (g_err); -return -1 ; -} - -static bool systemd_supports_mode (SuspendMode mode,Error **errp) -{ -const char *systemctl_args[3 ] = {"systemd-hibernate" ,"systemd-suspend" , -"systemd-hybrid-sleep" }; -const char *cmd[4 ] = {"systemctl" ,"status" , systemctl_args[mode],NULL }; -int status; - - status =run_process_child (cmd, errp); - -/* -* systemctl status uses LSB return codes so we can expect -* status > 0 and be ok. To assert if the guest has support -* for the selected suspend mode, status should be < 4. 4 is -* the code for unknown service status, the return value when -* the service does not exist. A common value is status = 3 -* (program is not running). -*/ -if (status >0 && status <4 ) { -return true; - } - -return false; -} - -static void systemd_suspend (SuspendMode mode,Error **errp) -{ -Error *local_err =NULL ; -const char *systemctl_args[3 ] = {"hibernate" ,"suspend" ,"hybrid-sleep" }; -const char *cmd[3 ] = {"systemctl" , systemctl_args[mode],NULL }; -int status; - - status =run_process_child (cmd, &local_err); - -if (status ==0 ) { -return ; - } - -if ((status ==-1 ) && !local_err) { -error_setg (errp,"the helper program 'systemctl %s' was not found" , - systemctl_args[mode]); -return ; - } - -if (local_err) { -error_propagate (errp, local_err); - }else { -error_setg (errp,"the helper program 'systemctl %s' returned an " -"unexpected exit status code (%d)" , - systemctl_args[mode], status); - } -} - -static bool pmutils_supports_mode (SuspendMode mode,Error **errp) -{ -Error *local_err =NULL ; -const char *pmutils_args[3 ] = {"--hibernate" ,"--suspend" , -"--suspend-hybrid" }; -const char *cmd[3 ] = {"pm-is-supported" , pmutils_args[mode],NULL }; -int status; - - status =run_process_child (cmd, &local_err); - -if (status ==SUSPEND_SUPPORTED ) { -return true; - } - -if ((status ==-1 ) && !local_err) { -return false; - } - -if (local_err) { -error_propagate (errp, local_err); - }else { -error_setg (errp, -"the helper program '%s' returned an unexpected exit" -" status code (%d)" ,"pm-is-supported" , status); - } - -return false; -} - -static void pmutils_suspend (SuspendMode mode,Error **errp) -{ -Error *local_err =NULL ; -const char *pmutils_binaries[3 ] = {"pm-hibernate" ,"pm-suspend" , -"pm-suspend-hybrid" }; -const char *cmd[2 ] = {pmutils_binaries[mode],NULL }; -int status; - - status =run_process_child (cmd, &local_err); - -if (status ==0 ) { -return ; - } - -if ((status ==-1 ) && !local_err) { -error_setg (errp,"the helper program '%s' was not found" , - pmutils_binaries[mode]); -return ; - } - -if (local_err) { -error_propagate (errp, local_err); - }else { -error_setg (errp, -"the helper program '%s' returned an unexpected exit" -" status code (%d)" , pmutils_binaries[mode], status); - } -} - -static bool linux_sys_state_supports_mode (SuspendMode mode,Error **errp) -{ -const char *sysfile_strs[3 ] = {"disk" ,"mem" ,NULL }; -const char *sysfile_str = sysfile_strs[mode]; -char buf[32 ];/* hopefully big enough */ -int fd; -ssize_t ret; - -if (!sysfile_str) { -error_setg (errp,"unknown guest suspend mode" ); -return false; - } - - fd =open (LINUX_SYS_STATE_FILE ,O_RDONLY ); -if (fd <0 ) { -return false; - } - - ret =read (fd, buf,sizeof (buf) -1 ); -close (fd); -if (ret <=0 ) { -return false; - } - buf[ret] ='\0' ; - -if (strstr (buf, sysfile_str)) { -return true; - } -return false; -} - -static void linux_sys_state_suspend (SuspendMode mode,Error **errp) -{ -g_autoptr (GError) local_gerr =NULL ; -const char *sysfile_strs[3 ] = {"disk" ,"mem" ,NULL }; -const char *sysfile_str = sysfile_strs[mode]; - -if (!sysfile_str) { -error_setg (errp,"unknown guest suspend mode" ); -return ; - } - -if (!g_file_set_contents (LINUX_SYS_STATE_FILE , sysfile_str, --1 , &local_gerr)) { -error_setg (errp,"suspend: cannot write to '%s': %s" , -LINUX_SYS_STATE_FILE , local_gerr->message); -return ; - } -} - -static void guest_suspend (SuspendMode mode,Error **errp) -{ -Error *local_err =NULL ; -bool mode_supported = false; - -if (systemd_supports_mode (mode, &local_err)) { - mode_supported = true; -systemd_suspend (mode, &local_err); - -if (!local_err) { -return ; - } - } - -error_free (local_err); - local_err =NULL ; - -if (pmutils_supports_mode (mode, &local_err)) { - mode_supported = true; -pmutils_suspend (mode, &local_err); - -if (!local_err) { -return ; - } - } - -error_free (local_err); - local_err =NULL ; - -if (linux_sys_state_supports_mode (mode, &local_err)) { - mode_supported = true; -linux_sys_state_suspend (mode, &local_err); - } - -if (!mode_supported) { -error_free (local_err); -error_setg (errp, -"the requested suspend mode is not supported by the guest" ); - }else { -error_propagate (errp, local_err); - } -} - -void qmp_guest_suspend_disk (Error **errp) -{ -guest_suspend (SUSPEND_MODE_DISK , errp); -} - -void qmp_guest_suspend_ram (Error **errp) -{ -guest_suspend (SUSPEND_MODE_RAM , errp); -} - -void qmp_guest_suspend_hybrid (Error **errp) -{ -guest_suspend (SUSPEND_MODE_HYBRID , errp); -} -#endif /* __linux__ */ #if defined(__linux__) || defined(__FreeBSD__)Signature · 1 line
2.45.1
Re: [PATCH 04/20] qga: move linux fs/disk command impls to commands-linux.c
In reply to Daniel P. BerrangéQuoted 6 lines · Daniel P. Berrangé
The qmp_guest_{fstrim,
get_fsinfo,get_disks} command impls incommands-posix.care surrounded by '#ifdef__linux__' so should instead live incommands-linux.cSigned-off-by Daniel P. Berrangé <[email protected]>---
Quoted 1,867 lines
qga/commands-linux.c| 904 ++++++++++++++++++++++++++++++++++++++++++qga/commands-posix.c| 909 -------------------------------------------2 files changed, 904 insertions(+), 909 deletions(-)qga/commands-linux.c +904
-0@@ -14,10 +14,21 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qga-qapi-commands.h" +#include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "commands-common.h" #include "cutils.h" #include <mntent.h> #include <sys/ioctl.h> +#include <mntent.h> +#include <linux/nvme_ioctl.h> +#include "block/nvme.h" + +#ifdef CONFIG_LIBUDEV +#include <libudev.h> +#endif + +#include <sys/statvfs.h> #if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) static int dev_major_minor(const char *devpath,@@ -286,6 +297,899 @@ int qmp_guest_fsfreeze_do_thaw(Error **errp) }#endif /* CONFIG_FSFREEZE */ +#if defined(CONFIG_FSFREEZE ) + +static char *get_pci_driver (char const *syspath,int pathlen,Error **errp) +{ +char *path; +char *dpath; +char *driver =NULL ; +char buf[PATH_MAX ]; +ssize_t len; + + path =g_strndup (syspath, pathlen); + dpath =g_strdup_printf ("%s/driver" , path); + len =readlink (dpath, buf,sizeof (buf) -1 ); +if (len !=-1 ) { + buf[len] =0 ; + driver =g_path_get_basename (buf); + } +g_free (dpath); +g_free (path); +return driver; +} + +static int compare_uint (const void *_a,const void *_b) +{ +unsigned int a = *(unsigned int *)_a; +unsigned int b = *(unsigned int *)_b; + +return a < b ?-1 : a > b ?1 :0 ; +} + +/* Walk the specified sysfs and build a sorted list of host or ata numbers */ +static int build_hosts (char const *syspath,char const *host,bool ata, +unsigned int *hosts,int hosts_max,Error **errp) +{ +char *path; +DIR *dir; +struct dirent *entry; +int i =0 ; + + path =g_strndup (syspath, host - syspath); + dir =opendir (path); +if (!dir) { +error_setg_errno (errp, errno,"opendir(\"%s\")" , path); +g_free (path); +return -1 ; + } + +while (i < hosts_max) { + entry =readdir (dir); +if (!entry) { +break ; + } +if (ata &&sscanf (entry->d_name,"ata%d" , hosts + i) ==1 ) { + ++i; + }else if (!ata &&sscanf (entry->d_name,"host%d" , hosts + i) ==1 ) { + ++i; + } + } + +qsort (hosts, i,sizeof (hosts[0 ]), compare_uint); + +g_free (path); +closedir (dir); +return i; +} + +/* +* Store disk device info for devices on the PCI bus. +* Returns true if information has been stored, or false for failure. +*/ +static bool build_guest_fsinfo_for_pci_dev (char const *syspath, +GuestDiskAddress *disk, +Error **errp) +{ +unsigned int pci[4 ], host, hosts[8 ], tgt[3 ]; +int i, nhosts =0 , pcilen; +GuestPCIAddress *pciaddr = disk->pci_controller; +bool has_ata = false, has_host = false, has_tgt = false; +char *p, *q, *driver =NULL ; +bool ret = false; + + p =strstr (syspath,"/devices/pci" ); +if (!p ||sscanf (p +12 ,"%*x:%*x/%x:%x:%x.%x%n" , + pci, pci +1 , pci +2 , pci +3 , &pcilen) <4 ) { +g_debug ("only pci device is supported: sysfs path '%s'" , syspath); +return false; + } + + p +=12 + pcilen; +while (true) { + driver =get_pci_driver (syspath, p - syspath, errp); +if (driver && (g_str_equal (driver,"ata_piix" ) || +g_str_equal (driver,"sym53c8xx" ) || +g_str_equal (driver,"virtio-pci" ) || +g_str_equal (driver,"ahci" ) || +g_str_equal (driver,"nvme" ) || +g_str_equal (driver,"xhci_hcd" ) || +g_str_equal (driver,"ehci-pci" ))) { +break ; + } + +g_free (driver); +if (sscanf (p,"/%x:%x:%x.%x%n" , + pci, pci +1 , pci +2 , pci +3 , &pcilen) ==4 ) { + p += pcilen; +continue ; + } + +g_debug ("unsupported driver or sysfs path '%s'" , syspath); +return false; + } + + p =strstr (syspath,"/target" ); +if (p &&sscanf (p +7 ,"%*u:%*u:%*u/%*u:%u:%u:%u" , + tgt, tgt +1 , tgt +2 ) ==3 ) { + has_tgt = true; + } + + p =strstr (syspath,"/ata" ); +if (p) { + q = p +4 ; + has_ata = true; + }else { + p =strstr (syspath,"/host" ); + q = p +5 ; + } +if (p &&sscanf (q,"%u" , &host) ==1 ) { + has_host = true; + nhosts =build_hosts (syspath, p, has_ata, hosts, +ARRAY_SIZE (hosts), errp); +if (nhosts <0 ) { + goto cleanup; + } + } + + pciaddr->domain = pci[0 ]; + pciaddr->bus = pci[1 ]; + pciaddr->slot = pci[2 ]; + pciaddr->function = pci[3 ]; + +if (strcmp (driver,"ata_piix" ) ==0 ) { +/* a host per ide bus, target*:0:<unit>:0 */ +if (!has_host || !has_tgt) { +g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } +for (i =0 ; i < nhosts; i++) { +if (host == hosts[i]) { + disk->bus_type =GUEST_DISK_BUS_TYPE_IDE ; + disk->bus = i; + disk->unit = tgt[1 ]; +break ; + } + } +if (i >= nhosts) { +g_debug ("no host for '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } + }else if (strcmp (driver,"sym53c8xx" ) ==0 ) { +/* scsi(LSI Logic): target*:0:<unit>:0 */ +if (!has_tgt) { +g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } + disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; + disk->unit = tgt[1 ]; + }else if (strcmp (driver,"virtio-pci" ) ==0 ) { +if (has_tgt) { +/* virtio-scsi: target*:0:0:<unit> */ + disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; + disk->unit = tgt[2 ]; + }else { +/* virtio-blk: 1 disk per 1 device */ + disk->bus_type =GUEST_DISK_BUS_TYPE_VIRTIO ; + } + }else if (strcmp (driver,"ahci" ) ==0 ) { +/* ahci: 1 host per 1 unit */ +if (!has_host || !has_tgt) { +g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } +for (i =0 ; i < nhosts; i++) { +if (host == hosts[i]) { + disk->unit = i; + disk->bus_type =GUEST_DISK_BUS_TYPE_SATA ; +break ; + } + } +if (i >= nhosts) { +g_debug ("no host for '%s' (driver '%s')" , syspath, driver); + goto cleanup; + } + }else if (strcmp (driver,"nvme" ) ==0 ) { + disk->bus_type =GUEST_DISK_BUS_TYPE_NVME ; + }else if (strcmp (driver,"ehci-pci" ) ==0 ||strcmp (driver,"xhci_hcd" ) ==0 ) { + disk->bus_type =GUEST_DISK_BUS_TYPE_USB ; + }else { +g_debug ("unknown driver '%s' (sysfs path '%s')" , driver, syspath); + goto cleanup; + } + + ret = true; + +cleanup: +g_free (driver); +return ret; +} + +/* +* Store disk device info for non-PCI virtio devices (for example s390x +* channel I/O devices). Returns true if information has been stored, or +* false for failure. +*/ +static bool build_guest_fsinfo_for_nonpci_virtio (char const *syspath, +GuestDiskAddress *disk, +Error **errp) +{ +unsigned int tgt[3 ]; +char *p; + +if (!strstr (syspath,"/virtio" ) || !strstr (syspath,"/block" )) { +g_debug ("Unsupported virtio device '%s'" , syspath); +return false; + } + + p =strstr (syspath,"/target" ); +if (p &&sscanf (p +7 ,"%*u:%*u:%*u/%*u:%u:%u:%u" , + &tgt[0 ], &tgt[1 ], &tgt[2 ]) ==3 ) { +/* virtio-scsi: target*:0:<target>:<unit> */ + disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; + disk->bus = tgt[0 ]; + disk->target = tgt[1 ]; + disk->unit = tgt[2 ]; + }else { +/* virtio-blk: 1 disk per 1 device */ + disk->bus_type =GUEST_DISK_BUS_TYPE_VIRTIO ; + } + +return true; +} + +/* +* Store disk device info for CCW devices (s390x channel I/O devices). +* Returns true if information has been stored, or false for failure. +*/ +static bool build_guest_fsinfo_for_ccw_dev (char const *syspath, +GuestDiskAddress *disk, +Error **errp) +{ +unsigned int cssid, ssid, subchno, devno; +char *p; + + p =strstr (syspath,"/devices/css" ); +if (!p ||sscanf (p +12 ,"%*x/%x.%x.%x/%*x.%*x.%x/" , + &cssid, &ssid, &subchno, &devno) <4 ) { +g_debug ("could not parse ccw device sysfs path: %s" , syspath); +return false; + } + + disk->ccw_address =g_new0 (GuestCCWAddress,1 ); + disk->ccw_address->cssid = cssid; + disk->ccw_address->ssid = ssid; + disk->ccw_address->subchno = subchno; + disk->ccw_address->devno = devno; + +if (strstr (p,"/virtio" )) { +build_guest_fsinfo_for_nonpci_virtio (syspath, disk, errp); + } + +return true; +} + +/* Store disk device info specified by @sysfs into @fs */ +static void build_guest_fsinfo_for_real_device (char const *syspath, +GuestFilesystemInfo *fs, +Error **errp) +{ +GuestDiskAddress *disk; +GuestPCIAddress *pciaddr; +bool has_hwinf; +#ifdef CONFIG_LIBUDEV +struct udev *udev =NULL ; +struct udev_device *udevice =NULL ; +#endif + + pciaddr =g_new0 (GuestPCIAddress,1 ); + pciaddr->domain =-1 ;/* -1 means field is invalid */ + pciaddr->bus =-1 ; + pciaddr->slot =-1 ; + pciaddr->function =-1 ; + + disk =g_new0 (GuestDiskAddress,1 ); + disk->pci_controller = pciaddr; + disk->bus_type =GUEST_DISK_BUS_TYPE_UNKNOWN ; + +#ifdef CONFIG_LIBUDEV + udev =udev_new (); + udevice =udev_device_new_from_syspath (udev, syspath); +if (udev ==NULL || udevice ==NULL ) { +g_debug ("failed to query udev" ); + }else { +const char *devnode, *serial; + devnode =udev_device_get_devnode (udevice); +if (devnode !=NULL ) { + disk->dev =g_strdup (devnode); + } + serial =udev_device_get_property_value (udevice,"ID_SERIAL" ); +if (serial !=NULL && *serial !=0 ) { + disk->serial =g_strdup (serial); + } + } + +udev_unref (udev); +udev_device_unref (udevice); +#endif + +if (strstr (syspath,"/devices/pci" )) { + has_hwinf =build_guest_fsinfo_for_pci_dev (syspath, disk, errp); + }else if (strstr (syspath,"/devices/css" )) { + has_hwinf =build_guest_fsinfo_for_ccw_dev (syspath, disk, errp); + }else if (strstr (syspath,"/virtio" )) { + has_hwinf =build_guest_fsinfo_for_nonpci_virtio (syspath, disk, errp); + }else { +g_debug ("Unsupported device type for '%s'" , syspath); + has_hwinf = false; + } + +if (has_hwinf || disk->dev || disk->serial) { +QAPI_LIST_PREPEND (fs->disk, disk); + }else { +qapi_free_GuestDiskAddress (disk); + } +} + +static void build_guest_fsinfo_for_device (char const *devpath, +GuestFilesystemInfo *fs, +Error **errp); + +/* Store a list of slave devices of virtual volume specified by @syspath into +* @fs */ +static void build_guest_fsinfo_for_virtual_device (char const *syspath, +GuestFilesystemInfo *fs, +Error **errp) +{ +Error *err =NULL ; +DIR *dir; +char *dirpath; +struct dirent *entry; + + dirpath =g_strdup_printf ("%s/slaves" , syspath); + dir =opendir (dirpath); +if (!dir) { +if (errno !=ENOENT ) { +error_setg_errno (errp, errno,"opendir(\"%s\")" , dirpath); + } +g_free (dirpath); +return ; + } + +for (;;) { + errno =0 ; + entry =readdir (dir); +if (entry ==NULL ) { +if (errno) { +error_setg_errno (errp, errno,"readdir(\"%s\")" , dirpath); + } +break ; + } + +if (entry->d_type ==DT_LNK ) { +char *path; + +g_debug (" slave device '%s'" , entry->d_name); + path =g_strdup_printf ("%s/slaves/%s" , syspath, entry->d_name); +build_guest_fsinfo_for_device (path, fs, &err); +g_free (path); + +if (err) { +error_propagate (errp, err); +break ; + } + } + } + +g_free (dirpath); +closedir (dir); +} + +static bool is_disk_virtual (const char *devpath,Error **errp) +{ + g_autofree char *syspath = realpath(devpath, NULL); + +if (!syspath) { +error_setg_errno (errp, errno,"realpath(\"%s\")" , devpath); +return false; + } +return strstr (syspath,"/devices/virtual/block/" ) !=NULL ; +} + +/* Dispatch to functions for virtual/real device */ +static void build_guest_fsinfo_for_device (char const *devpath, +GuestFilesystemInfo *fs, +Error **errp) +{ +ERRP_GUARD (); + g_autofree char *syspath = NULL; +bool is_virtual = false; + + syspath =realpath (devpath,NULL ); +if (!syspath) { +if (errno !=ENOENT ) { +error_setg_errno (errp, errno,"realpath(\"%s\")" , devpath); +return ; + } + +/* ENOENT: This devpath may not exist because of container config */ +if (!fs->name) { + fs->name =g_path_get_basename (devpath); + } +return ; + } + +if (!fs->name) { + fs->name =g_path_get_basename (syspath); + } + +g_debug (" parse sysfs path '%s'" , syspath); + is_virtual =is_disk_virtual (syspath, errp); +if (*errp !=NULL ) { +return ; + } +if (is_virtual) { +build_guest_fsinfo_for_virtual_device (syspath, fs, errp); + }else { +build_guest_fsinfo_for_real_device (syspath, fs, errp); + } +} + +#ifdef CONFIG_LIBUDEV + +/* +* Wrapper around build_guest_fsinfo_for_device() for getting just +* the disk address. +*/ +static GuestDiskAddress *get_disk_address (const char *syspath,Error **errp) +{ +g_autoptr (GuestFilesystemInfo) fs =NULL ; + + fs =g_new0 (GuestFilesystemInfo,1 ); +build_guest_fsinfo_for_device (syspath, fs, errp); +if (fs->disk !=NULL ) { +return g_steal_pointer (&fs->disk->value); + } +return NULL ; +} + +static char *get_alias_for_syspath (const char *syspath) +{ +struct udev *udev =NULL ; +struct udev_device *udevice =NULL ; +char *ret =NULL ; + + udev =udev_new (); +if (udev ==NULL ) { +g_debug ("failed to query udev" ); + goto out; + } + udevice =udev_device_new_from_syspath (udev, syspath); +if (udevice ==NULL ) { +g_debug ("failed to query udev for path: %s" , syspath); + goto out; + }else { +const char *alias =udev_device_get_property_value ( + udevice,"DM_NAME" ); +/* +* NULL means there was an error and empty string means there is no +* alias. In case of no alias we return NULL instead of empty string. +*/ +if (alias ==NULL ) { +g_debug ("failed to query udev for device alias for: %s" , + syspath); + }else if (*alias !=0 ) { + ret =g_strdup (alias); + } + } + +out: +udev_unref (udev); +udev_device_unref (udevice); +return ret; +} + +static char *get_device_for_syspath (const char *syspath) +{ +struct udev *udev =NULL ; +struct udev_device *udevice =NULL ; +char *ret =NULL ; + + udev =udev_new (); +if (udev ==NULL ) { +g_debug ("failed to query udev" ); + goto out; + } + udevice =udev_device_new_from_syspath (udev, syspath); +if (udevice ==NULL ) { +g_debug ("failed to query udev for path: %s" , syspath); + goto out; + }else { + ret =g_strdup (udev_device_get_devnode (udevice)); + } + +out: +udev_unref (udev); +udev_device_unref (udevice); +return ret; +} + +static void get_disk_deps (const char *disk_dir,GuestDiskInfo *disk) +{ + g_autofree char *deps_dir = NULL; +const gchar *dep; +GDir *dp_deps =NULL ; + +/* List dependent disks */ + deps_dir =g_strdup_printf ("%s/slaves" , disk_dir); +g_debug (" listing entries in: %s" , deps_dir); + dp_deps =g_dir_open (deps_dir,0 ,NULL ); +if (dp_deps ==NULL ) { +g_debug ("failed to list entries in %s" , deps_dir); +return ; + } + disk->has_dependencies = true; +while ((dep =g_dir_read_name (dp_deps)) !=NULL ) { + g_autofree char *dep_dir = NULL; +char *dev_name; + +/* Add dependent disks */ + dep_dir =g_strdup_printf ("%s/%s" , deps_dir, dep); + dev_name =get_device_for_syspath (dep_dir); +if (dev_name !=NULL ) { +g_debug (" adding dependent device: %s" , dev_name); +QAPI_LIST_PREPEND (disk->dependencies, dev_name); + } + } +g_dir_close (dp_deps); +} + +/* +* Detect partitions subdirectory, name is "<disk_name><number>" or +* "<disk_name>p<number>" +* +* @disk_name -- last component of /sys path (e.g. sda) +* @disk_dir -- sys path of the disk (e.g. /sys/block/sda) +* @disk_dev -- device node of the disk (e.g. /dev/sda) +*/ +static GuestDiskInfoList *get_disk_partitions ( +GuestDiskInfoList *list, +const char *disk_name,const char *disk_dir, +const char *disk_dev) +{ +GuestDiskInfoList *ret = list; +struct dirent *de_disk; +DIR *dp_disk =NULL ; +size_t len =strlen (disk_name); + + dp_disk =opendir (disk_dir); +while ((de_disk =readdir (dp_disk)) !=NULL ) { + g_autofree char *partition_dir = NULL; +char *dev_name; +GuestDiskInfo *partition; + +if (!(de_disk->d_type &DT_DIR )) { +continue ; + } + +if (!(strncmp (disk_name, de_disk->d_name, len) ==0 && + ((*(de_disk->d_name + len) =='p' && +isdigit (*(de_disk->d_name + len +1 ))) || +isdigit (*(de_disk->d_name + len))))) { +continue ; + } + + partition_dir =g_strdup_printf ("%s/%s" , + disk_dir, de_disk->d_name); + dev_name =get_device_for_syspath (partition_dir); +if (dev_name ==NULL ) { +g_debug ("Failed to get device name for syspath: %s" , + disk_dir); +continue ; + } + partition =g_new0 (GuestDiskInfo,1 ); + partition->name = dev_name; + partition->partition = true; + partition->has_dependencies = true; +/* Add parent disk as dependent for easier tracking of hierarchy */ +QAPI_LIST_PREPEND (partition->dependencies,g_strdup (disk_dev)); + +QAPI_LIST_PREPEND (ret, partition); + } +closedir (dp_disk); + +return ret; +} + +static void get_nvme_smart (GuestDiskInfo *disk) +{ +int fd; +GuestNVMeSmart *smart; +NvmeSmartLog log = {0 }; +struct nvme_admin_cmd cmd = { + .opcode =NVME_ADM_CMD_GET_LOG_PAGE , + .nsid =NVME_NSID_BROADCAST , + .addr = (uintptr_t )&log, + .data_len =sizeof (log), + .cdw10 =NVME_LOG_SMART_INFO | (1 <<15 )/* RAE bit */ + | (((sizeof (log) >>2 ) -1 ) <<16 ) + }; + + fd =qga_open_cloexec (disk->name,O_RDONLY ,0 ); +if (fd ==-1 ) { +g_debug ("Failed to open device: %s: %s" , disk->name,g_strerror (errno)); +return ; + } + +if (ioctl (fd,NVME_IOCTL_ADMIN_CMD , &cmd)) { +g_debug ("Failed to get smart: %s: %s" , disk->name,g_strerror (errno)); +close (fd); +return ; + } + + disk->smart =g_new0 (GuestDiskSmart,1 ); + disk->smart->type =GUEST_DISK_BUS_TYPE_NVME ; + + smart = &disk->smart->u.nvme; + smart->critical_warning = log.critical_warning; + smart->temperature =lduw_le_p (&log.temperature);/* unaligned field */ + smart->available_spare = log.available_spare; + smart->available_spare_threshold = log.available_spare_threshold; + smart->percentage_used = log.percentage_used; + smart->data_units_read_lo =le64_to_cpu (log.data_units_read[0 ]); + smart->data_units_read_hi =le64_to_cpu (log.data_units_read[1 ]); + smart->data_units_written_lo =le64_to_cpu (log.data_units_written[0 ]); + smart->data_units_written_hi =le64_to_cpu (log.data_units_written[1 ]); + smart->host_read_commands_lo =le64_to_cpu (log.host_read_commands[0 ]); + smart->host_read_commands_hi =le64_to_cpu (log.host_read_commands[1 ]); + smart->host_write_commands_lo =le64_to_cpu (log.host_write_commands[0 ]); + smart->host_write_commands_hi =le64_to_cpu (log.host_write_commands[1 ]); + smart->controller_busy_time_lo =le64_to_cpu (log.controller_busy_time[0 ]); + smart->controller_busy_time_hi =le64_to_cpu (log.controller_busy_time[1 ]); + smart->power_cycles_lo =le64_to_cpu (log.power_cycles[0 ]); + smart->power_cycles_hi =le64_to_cpu (log.power_cycles[1 ]); + smart->power_on_hours_lo =le64_to_cpu (log.power_on_hours[0 ]); + smart->power_on_hours_hi =le64_to_cpu (log.power_on_hours[1 ]); + smart->unsafe_shutdowns_lo =le64_to_cpu (log.unsafe_shutdowns[0 ]); + smart->unsafe_shutdowns_hi =le64_to_cpu (log.unsafe_shutdowns[1 ]); + smart->media_errors_lo =le64_to_cpu (log.media_errors[0 ]); + smart->media_errors_hi =le64_to_cpu (log.media_errors[1 ]); + smart->number_of_error_log_entries_lo = +le64_to_cpu (log.number_of_error_log_entries[0 ]); + smart->number_of_error_log_entries_hi = +le64_to_cpu (log.number_of_error_log_entries[1 ]); + +close (fd); +} + +static void get_disk_smart (GuestDiskInfo *disk) +{ +if (disk->address + && (disk->address->bus_type ==GUEST_DISK_BUS_TYPE_NVME )) { +get_nvme_smart (disk); + } +} + +GuestDiskInfoList *qmp_guest_get_disks (Error **errp) +{ +GuestDiskInfoList *ret =NULL ; +GuestDiskInfo *disk; +DIR *dp =NULL ; +struct dirent *de =NULL ; + +g_debug ("listing /sys/block directory" ); + dp =opendir ("/sys/block" ); +if (dp ==NULL ) { +error_setg_errno (errp, errno,"Can't open directory \"/sys/block\"" ); +return NULL ; + } +while ((de =readdir (dp)) !=NULL ) { + g_autofree char *disk_dir = NULL, *line = NULL, + *size_path =NULL ; +char *dev_name; +Error *local_err =NULL ; +if (de->d_type !=DT_LNK ) { +g_debug (" skipping entry: %s" , de->d_name); +continue ; + } + +/* Check size and skip zero-sized disks */ +g_debug (" checking disk size" ); + size_path =g_strdup_printf ("/sys/block/%s/size" , de->d_name); +if (!g_file_get_contents (size_path, &line,NULL ,NULL )) { +g_debug (" failed to read disk size" ); +continue ; + } +if (g_strcmp0 (line,"0\n" ) ==0 ) { +g_debug (" skipping zero-sized disk" ); +continue ; + } + +g_debug (" adding %s" , de->d_name); + disk_dir =g_strdup_printf ("/sys/block/%s" , de->d_name); + dev_name =get_device_for_syspath (disk_dir); +if (dev_name ==NULL ) { +g_debug ("Failed to get device name for syspath: %s" , + disk_dir); +continue ; + } + disk =g_new0 (GuestDiskInfo,1 ); + disk->name = dev_name; + disk->partition = false; + disk->alias =get_alias_for_syspath (disk_dir); +QAPI_LIST_PREPEND (ret, disk); + +/* Get address for non-virtual devices */ +bool is_virtual =is_disk_virtual (disk_dir, &local_err); +if (local_err !=NULL ) { +g_debug (" failed to check disk path, ignoring error: %s" , +error_get_pretty (local_err)); +error_free (local_err); + local_err =NULL ; +/* Don't try to get the address */ + is_virtual = true; + } +if (!is_virtual) { + disk->address =get_disk_address (disk_dir, &local_err); +if (local_err !=NULL ) { +g_debug (" failed to get device info, ignoring error: %s" , +error_get_pretty (local_err)); +error_free (local_err); + local_err =NULL ; + } + } + +get_disk_deps (disk_dir, disk); +get_disk_smart (disk); + ret =get_disk_partitions (ret, de->d_name, disk_dir, dev_name); + } + +closedir (dp); + +return ret; +} + +#else + +GuestDiskInfoList *qmp_guest_get_disks (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +#endif + +/* Return a list of the disk device(s)' info which @mount lies on */ +static GuestFilesystemInfo *build_guest_fsinfo (struct FsMount *mount, +Error **errp) +{ +GuestFilesystemInfo *fs =g_malloc0 (sizeof (*fs)); +struct statvfs buf; +unsigned long used, nonroot_total, fr_size; +char *devpath =g_strdup_printf ("/sys/dev/block/%u:%u" , + mount->devmajor, mount->devminor); + + fs->mountpoint =g_strdup (mount->dirname); + fs->type =g_strdup (mount->devtype); +build_guest_fsinfo_for_device (devpath, fs, errp); + +if (statvfs (fs->mountpoint, &buf) ==0 ) { + fr_size = buf.f_frsize; + used = buf.f_blocks - buf.f_bfree; + nonroot_total = used + buf.f_bavail; + fs->used_bytes = used * fr_size; + fs->total_bytes = nonroot_total * fr_size; + fs->total_bytes_privileged = buf.f_blocks * fr_size; + + fs->has_total_bytes = true; + fs->has_total_bytes_privileged = true; + fs->has_used_bytes = true; + } + +g_free (devpath); + +return fs; +} + +GuestFilesystemInfoList *qmp_guest_get_fsinfo (Error **errp) +{ +FsMountList mounts; +struct FsMount *mount; +GuestFilesystemInfoList *ret =NULL ; +Error *local_err =NULL ; + +QTAILQ_INIT (&mounts); +if (!build_fs_mount_list (&mounts, &local_err)) { +error_propagate (errp, local_err); +return NULL ; + } + + QTAILQ_FOREACH(mount, &mounts, next) { +g_debug ("Building guest fsinfo for '%s'" , mount->dirname); + +QAPI_LIST_PREPEND (ret,build_guest_fsinfo (mount, &local_err)); +if (local_err) { +error_propagate (errp, local_err); +qapi_free_GuestFilesystemInfoList (ret); + ret =NULL ; +break ; + } + } + +free_fs_mount_list (&mounts); +return ret; +} +#endif /* CONFIG_FSFREEZE */ + +#if defined(CONFIG_FSTRIM ) +/* +* Walk list of mounted file systems in the guest, and trim them. +*/ +GuestFilesystemTrimResponse * +qmp_guest_fstrim (bool has_minimum,int64_t minimum,Error **errp) +{ +GuestFilesystemTrimResponse *response; +GuestFilesystemTrimResult *result; +int ret =0 ; +FsMountList mounts; +struct FsMount *mount; +int fd; +struct fstrim_range r; + +slog ("guest-fstrim called" ); + +QTAILQ_INIT (&mounts); +if (!build_fs_mount_list (&mounts, errp)) { +return NULL ; + } + + response =g_malloc0 (sizeof (*response)); + + QTAILQ_FOREACH(mount, &mounts, next) { + result =g_malloc0 (sizeof (*result)); + result->path =g_strdup (mount->dirname); + +QAPI_LIST_PREPEND (response->paths, result); + + fd =qga_open_cloexec (mount->dirname,O_RDONLY ,0 ); +if (fd ==-1 ) { + result->error =g_strdup_printf ("failed to open: %s" , +strerror (errno)); +continue ; + } + +/* We try to cull filesystems we know won't work in advance, but other +* filesystems may not implement fstrim for less obvious reasons. +* These will report EOPNOTSUPP; while in some other cases ENOTTY +* will be reported (e.g. CD-ROMs). +* Any other error means an unexpected error. +*/ + r.start =0 ; + r.len =-1 ; + r.minlen = has_minimum ? minimum :0 ; + ret =ioctl (fd,FITRIM , &r); +if (ret ==-1 ) { +if (errno ==ENOTTY || errno ==EOPNOTSUPP ) { + result->error =g_strdup ("trim not supported" ); + }else { + result->error =g_strdup_printf ("failed to trim: %s" , +strerror (errno)); + } +close (fd); +continue ; + } + + result->has_minimum = true; + result->minimum = r.minlen; + result->has_trimmed = true; + result->trimmed = r.len; +close (fd); + } + +free_fs_mount_list (&mounts); +return response; +} +#endif /* CONFIG_FSTRIM */ #define LINUX_SYS_STATE_FILE "/sys/power/state"#define SUSPEND_SUPPORTED 0qga/commands-posix.c +0
-909@@ -24,23 +24,12 @@#include "qemu/base64.h" #include "qemu/cutils.h" #include "commands-common.h" -#include "block/nvme.h" #include "cutils.h" #ifdef HAVE_UTMPX #include <utmpx.h> #endif -#if defined(__linux__) -#include <mntent.h> -#include <sys/statvfs.h> -#include <linux/nvme_ioctl.h> - -#ifdef CONFIG_LIBUDEV -#include <libudev.h> -#endif -#endif -#ifdef HAVE_GETIFADDRS #include <arpa/inet.h> #include <sys/socket.h> @@ -842,904 +831,6 @@ static void guest_fsfreeze_cleanup(void) }#endif -/* linux-specific implementations. avoid this if at all possible. */ -#if defined(__linux__) -#if defined(CONFIG_FSFREEZE ) - -static char *get_pci_driver (char const *syspath,int pathlen,Error **errp) -{ -char *path; -char *dpath; -char *driver =NULL ; -char buf[PATH_MAX ]; -ssize_t len; - - path =g_strndup (syspath, pathlen); - dpath =g_strdup_printf ("%s/driver" , path); - len =readlink (dpath, buf,sizeof (buf) -1 ); -if (len !=-1 ) { - buf[len] =0 ; - driver =g_path_get_basename (buf); - } -g_free (dpath); -g_free (path); -return driver; -} - -static int compare_uint (const void *_a,const void *_b) -{ -unsigned int a = *(unsigned int *)_a; -unsigned int b = *(unsigned int *)_b; - -return a < b ?-1 : a > b ?1 :0 ; -} - -/* Walk the specified sysfs and build a sorted list of host or ata numbers */ -static int build_hosts (char const *syspath,char const *host,bool ata, -unsigned int *hosts,int hosts_max,Error **errp) -{ -char *path; -DIR *dir; -struct dirent *entry; -int i =0 ; - - path =g_strndup (syspath, host - syspath); - dir =opendir (path); -if (!dir) { -error_setg_errno (errp, errno,"opendir(\"%s\")" , path); -g_free (path); -return -1 ; - } - -while (i < hosts_max) { - entry =readdir (dir); -if (!entry) { -break ; - } -if (ata &&sscanf (entry->d_name,"ata%d" , hosts + i) ==1 ) { - ++i; - }else if (!ata &&sscanf (entry->d_name,"host%d" , hosts + i) ==1 ) { - ++i; - } - } - -qsort (hosts, i,sizeof (hosts[0 ]), compare_uint); - -g_free (path); -closedir (dir); -return i; -} - -/* -* Store disk device info for devices on the PCI bus. -* Returns true if information has been stored, or false for failure. -*/ -static bool build_guest_fsinfo_for_pci_dev (char const *syspath, -GuestDiskAddress *disk, -Error **errp) -{ -unsigned int pci[4 ], host, hosts[8 ], tgt[3 ]; -int i, nhosts =0 , pcilen; -GuestPCIAddress *pciaddr = disk->pci_controller; -bool has_ata = false, has_host = false, has_tgt = false; -char *p, *q, *driver =NULL ; -bool ret = false; - - p =strstr (syspath,"/devices/pci" ); -if (!p ||sscanf (p +12 ,"%*x:%*x/%x:%x:%x.%x%n" , - pci, pci +1 , pci +2 , pci +3 , &pcilen) <4 ) { -g_debug ("only pci device is supported: sysfs path '%s'" , syspath); -return false; - } - - p +=12 + pcilen; -while (true) { - driver =get_pci_driver (syspath, p - syspath, errp); -if (driver && (g_str_equal (driver,"ata_piix" ) || -g_str_equal (driver,"sym53c8xx" ) || -g_str_equal (driver,"virtio-pci" ) || -g_str_equal (driver,"ahci" ) || -g_str_equal (driver,"nvme" ) || -g_str_equal (driver,"xhci_hcd" ) || -g_str_equal (driver,"ehci-pci" ))) { -break ; - } - -g_free (driver); -if (sscanf (p,"/%x:%x:%x.%x%n" , - pci, pci +1 , pci +2 , pci +3 , &pcilen) ==4 ) { - p += pcilen; -continue ; - } - -g_debug ("unsupported driver or sysfs path '%s'" , syspath); -return false; - } - - p =strstr (syspath,"/target" ); -if (p &&sscanf (p +7 ,"%*u:%*u:%*u/%*u:%u:%u:%u" , - tgt, tgt +1 , tgt +2 ) ==3 ) { - has_tgt = true; - } - - p =strstr (syspath,"/ata" ); -if (p) { - q = p +4 ; - has_ata = true; - }else { - p =strstr (syspath,"/host" ); - q = p +5 ; - } -if (p &&sscanf (q,"%u" , &host) ==1 ) { - has_host = true; - nhosts =build_hosts (syspath, p, has_ata, hosts, -ARRAY_SIZE (hosts), errp); -if (nhosts <0 ) { - goto cleanup; - } - } - - pciaddr->domain = pci[0 ]; - pciaddr->bus = pci[1 ]; - pciaddr->slot = pci[2 ]; - pciaddr->function = pci[3 ]; - -if (strcmp (driver,"ata_piix" ) ==0 ) { -/* a host per ide bus, target*:0:<unit>:0 */ -if (!has_host || !has_tgt) { -g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); - goto cleanup; - } -for (i =0 ; i < nhosts; i++) { -if (host == hosts[i]) { - disk->bus_type =GUEST_DISK_BUS_TYPE_IDE ; - disk->bus = i; - disk->unit = tgt[1 ]; -break ; - } - } -if (i >= nhosts) { -g_debug ("no host for '%s' (driver '%s')" , syspath, driver); - goto cleanup; - } - }else if (strcmp (driver,"sym53c8xx" ) ==0 ) { -/* scsi(LSI Logic): target*:0:<unit>:0 */ -if (!has_tgt) { -g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); - goto cleanup; - } - disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; - disk->unit = tgt[1 ]; - }else if (strcmp (driver,"virtio-pci" ) ==0 ) { -if (has_tgt) { -/* virtio-scsi: target*:0:0:<unit> */ - disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; - disk->unit = tgt[2 ]; - }else { -/* virtio-blk: 1 disk per 1 device */ - disk->bus_type =GUEST_DISK_BUS_TYPE_VIRTIO ; - } - }else if (strcmp (driver,"ahci" ) ==0 ) { -/* ahci: 1 host per 1 unit */ -if (!has_host || !has_tgt) { -g_debug ("invalid sysfs path '%s' (driver '%s')" , syspath, driver); - goto cleanup; - } -for (i =0 ; i < nhosts; i++) { -if (host == hosts[i]) { - disk->unit = i; - disk->bus_type =GUEST_DISK_BUS_TYPE_SATA ; -break ; - } - } -if (i >= nhosts) { -g_debug ("no host for '%s' (driver '%s')" , syspath, driver); - goto cleanup; - } - }else if (strcmp (driver,"nvme" ) ==0 ) { - disk->bus_type =GUEST_DISK_BUS_TYPE_NVME ; - }else if (strcmp (driver,"ehci-pci" ) ==0 ||strcmp (driver,"xhci_hcd" ) ==0 ) { - disk->bus_type =GUEST_DISK_BUS_TYPE_USB ; - }else { -g_debug ("unknown driver '%s' (sysfs path '%s')" , driver, syspath); - goto cleanup; - } - - ret = true; - -cleanup: -g_free (driver); -return ret; -} - -/* -* Store disk device info for non-PCI virtio devices (for example s390x -* channel I/O devices). Returns true if information has been stored, or -* false for failure. -*/ -static bool build_guest_fsinfo_for_nonpci_virtio (char const *syspath, -GuestDiskAddress *disk, -Error **errp) -{ -unsigned int tgt[3 ]; -char *p; - -if (!strstr (syspath,"/virtio" ) || !strstr (syspath,"/block" )) { -g_debug ("Unsupported virtio device '%s'" , syspath); -return false; - } - - p =strstr (syspath,"/target" ); -if (p &&sscanf (p +7 ,"%*u:%*u:%*u/%*u:%u:%u:%u" , - &tgt[0 ], &tgt[1 ], &tgt[2 ]) ==3 ) { -/* virtio-scsi: target*:0:<target>:<unit> */ - disk->bus_type =GUEST_DISK_BUS_TYPE_SCSI ; - disk->bus = tgt[0 ]; - disk->target = tgt[1 ]; - disk->unit = tgt[2 ]; - }else { -/* virtio-blk: 1 disk per 1 device */ - disk->bus_type =GUEST_DISK_BUS_TYPE_VIRTIO ; - } - -return true; -} - -/* -* Store disk device info for CCW devices (s390x channel I/O devices). -* Returns true if information has been stored, or false for failure. -*/ -static bool build_guest_fsinfo_for_ccw_dev (char const *syspath, -GuestDiskAddress *disk, -Error **errp) -{ -unsigned int cssid, ssid, subchno, devno; -char *p; - - p =strstr (syspath,"/devices/css" ); -if (!p ||sscanf (p +12 ,"%*x/%x.%x.%x/%*x.%*x.%x/" , - &cssid, &ssid, &subchno, &devno) <4 ) { -g_debug ("could not parse ccw device sysfs path: %s" , syspath); -return false; - } - - disk->ccw_address =g_new0 (GuestCCWAddress,1 ); - disk->ccw_address->cssid = cssid; - disk->ccw_address->ssid = ssid; - disk->ccw_address->subchno = subchno; - disk->ccw_address->devno = devno; - -if (strstr (p,"/virtio" )) { -build_guest_fsinfo_for_nonpci_virtio (syspath, disk, errp); - } - -return true; -} - -/* Store disk device info specified by @sysfs into @fs */ -static void build_guest_fsinfo_for_real_device (char const *syspath, -GuestFilesystemInfo *fs, -Error **errp) -{ -GuestDiskAddress *disk; -GuestPCIAddress *pciaddr; -bool has_hwinf; -#ifdef CONFIG_LIBUDEV -struct udev *udev =NULL ; -struct udev_device *udevice =NULL ; -#endif - - pciaddr =g_new0 (GuestPCIAddress,1 ); - pciaddr->domain =-1 ;/* -1 means field is invalid */ - pciaddr->bus =-1 ; - pciaddr->slot =-1 ; - pciaddr->function =-1 ; - - disk =g_new0 (GuestDiskAddress,1 ); - disk->pci_controller = pciaddr; - disk->bus_type =GUEST_DISK_BUS_TYPE_UNKNOWN ; - -#ifdef CONFIG_LIBUDEV - udev =udev_new (); - udevice =udev_device_new_from_syspath (udev, syspath); -if (udev ==NULL || udevice ==NULL ) { -g_debug ("failed to query udev" ); - }else { -const char *devnode, *serial; - devnode =udev_device_get_devnode (udevice); -if (devnode !=NULL ) { - disk->dev =g_strdup (devnode); - } - serial =udev_device_get_property_value (udevice,"ID_SERIAL" ); -if (serial !=NULL && *serial !=0 ) { - disk->serial =g_strdup (serial); - } - } - -udev_unref (udev); -udev_device_unref (udevice); -#endif - -if (strstr (syspath,"/devices/pci" )) { - has_hwinf =build_guest_fsinfo_for_pci_dev (syspath, disk, errp); - }else if (strstr (syspath,"/devices/css" )) { - has_hwinf =build_guest_fsinfo_for_ccw_dev (syspath, disk, errp); - }else if (strstr (syspath,"/virtio" )) { - has_hwinf =build_guest_fsinfo_for_nonpci_virtio (syspath, disk, errp); - }else { -g_debug ("Unsupported device type for '%s'" , syspath); - has_hwinf = false; - } - -if (has_hwinf || disk->dev || disk->serial) { -QAPI_LIST_PREPEND (fs->disk, disk); - }else { -qapi_free_GuestDiskAddress (disk); - } -} - -static void build_guest_fsinfo_for_device (char const *devpath, -GuestFilesystemInfo *fs, -Error **errp); - -/* Store a list of slave devices of virtual volume specified by @syspath into -* @fs */ -static void build_guest_fsinfo_for_virtual_device (char const *syspath, -GuestFilesystemInfo *fs, -Error **errp) -{ -Error *err =NULL ; -DIR *dir; -char *dirpath; -struct dirent *entry; - - dirpath =g_strdup_printf ("%s/slaves" , syspath); - dir =opendir (dirpath); -if (!dir) { -if (errno !=ENOENT ) { -error_setg_errno (errp, errno,"opendir(\"%s\")" , dirpath); - } -g_free (dirpath); -return ; - } - -for (;;) { - errno =0 ; - entry =readdir (dir); -if (entry ==NULL ) { -if (errno) { -error_setg_errno (errp, errno,"readdir(\"%s\")" , dirpath); - } -break ; - } - -if (entry->d_type ==DT_LNK ) { -char *path; - -g_debug (" slave device '%s'" , entry->d_name); - path =g_strdup_printf ("%s/slaves/%s" , syspath, entry->d_name); -build_guest_fsinfo_for_device (path, fs, &err); -g_free (path); - -if (err) { -error_propagate (errp, err); -break ; - } - } - } - -g_free (dirpath); -closedir (dir); -} - -static bool is_disk_virtual (const char *devpath,Error **errp) -{ - g_autofree char *syspath = realpath(devpath, NULL); - -if (!syspath) { -error_setg_errno (errp, errno,"realpath(\"%s\")" , devpath); -return false; - } -return strstr (syspath,"/devices/virtual/block/" ) !=NULL ; -} - -/* Dispatch to functions for virtual/real device */ -static void build_guest_fsinfo_for_device (char const *devpath, -GuestFilesystemInfo *fs, -Error **errp) -{ -ERRP_GUARD (); - g_autofree char *syspath = NULL; -bool is_virtual = false; - - syspath =realpath (devpath,NULL ); -if (!syspath) { -if (errno !=ENOENT ) { -error_setg_errno (errp, errno,"realpath(\"%s\")" , devpath); -return ; - } - -/* ENOENT: This devpath may not exist because of container config */ -if (!fs->name) { - fs->name =g_path_get_basename (devpath); - } -return ; - } - -if (!fs->name) { - fs->name =g_path_get_basename (syspath); - } - -g_debug (" parse sysfs path '%s'" , syspath); - is_virtual =is_disk_virtual (syspath, errp); -if (*errp !=NULL ) { -return ; - } -if (is_virtual) { -build_guest_fsinfo_for_virtual_device (syspath, fs, errp); - }else { -build_guest_fsinfo_for_real_device (syspath, fs, errp); - } -} - -#ifdef CONFIG_LIBUDEV - -/* -* Wrapper around build_guest_fsinfo_for_device() for getting just -* the disk address. -*/ -static GuestDiskAddress *get_disk_address (const char *syspath,Error **errp) -{ -g_autoptr (GuestFilesystemInfo) fs =NULL ; - - fs =g_new0 (GuestFilesystemInfo,1 ); -build_guest_fsinfo_for_device (syspath, fs, errp); -if (fs->disk !=NULL ) { -return g_steal_pointer (&fs->disk->value); - } -return NULL ; -} - -static char *get_alias_for_syspath (const char *syspath) -{ -struct udev *udev =NULL ; -struct udev_device *udevice =NULL ; -char *ret =NULL ; - - udev =udev_new (); -if (udev ==NULL ) { -g_debug ("failed to query udev" ); - goto out; - } - udevice =udev_device_new_from_syspath (udev, syspath); -if (udevice ==NULL ) { -g_debug ("failed to query udev for path: %s" , syspath); - goto out; - }else { -const char *alias =udev_device_get_property_value ( - udevice,"DM_NAME" ); -/* -* NULL means there was an error and empty string means there is no -* alias. In case of no alias we return NULL instead of empty string. -*/ -if (alias ==NULL ) { -g_debug ("failed to query udev for device alias for: %s" , - syspath); - }else if (*alias !=0 ) { - ret =g_strdup (alias); - } - } - -out: -udev_unref (udev); -udev_device_unref (udevice); -return ret; -} - -static char *get_device_for_syspath (const char *syspath) -{ -struct udev *udev =NULL ; -struct udev_device *udevice =NULL ; -char *ret =NULL ; - - udev =udev_new (); -if (udev ==NULL ) { -g_debug ("failed to query udev" ); - goto out; - } - udevice =udev_device_new_from_syspath (udev, syspath); -if (udevice ==NULL ) { -g_debug ("failed to query udev for path: %s" , syspath); - goto out; - }else { - ret =g_strdup (udev_device_get_devnode (udevice)); - } - -out: -udev_unref (udev); -udev_device_unref (udevice); -return ret; -} - -static void get_disk_deps (const char *disk_dir,GuestDiskInfo *disk) -{ - g_autofree char *deps_dir = NULL; -const gchar *dep; -GDir *dp_deps =NULL ; - -/* List dependent disks */ - deps_dir =g_strdup_printf ("%s/slaves" , disk_dir); -g_debug (" listing entries in: %s" , deps_dir); - dp_deps =g_dir_open (deps_dir,0 ,NULL ); -if (dp_deps ==NULL ) { -g_debug ("failed to list entries in %s" , deps_dir); -return ; - } - disk->has_dependencies = true; -while ((dep =g_dir_read_name (dp_deps)) !=NULL ) { - g_autofree char *dep_dir = NULL; -char *dev_name; - -/* Add dependent disks */ - dep_dir =g_strdup_printf ("%s/%s" , deps_dir, dep); - dev_name =get_device_for_syspath (dep_dir); -if (dev_name !=NULL ) { -g_debug (" adding dependent device: %s" , dev_name); -QAPI_LIST_PREPEND (disk->dependencies, dev_name); - } - } -g_dir_close (dp_deps); -} - -/* -* Detect partitions subdirectory, name is "<disk_name><number>" or -* "<disk_name>p<number>" -* -* @disk_name -- last component of /sys path (e.g. sda) -* @disk_dir -- sys path of the disk (e.g. /sys/block/sda) -* @disk_dev -- device node of the disk (e.g. /dev/sda) -*/ -static GuestDiskInfoList *get_disk_partitions ( -GuestDiskInfoList *list, -const char *disk_name,const char *disk_dir, -const char *disk_dev) -{ -GuestDiskInfoList *ret = list; -struct dirent *de_disk; -DIR *dp_disk =NULL ; -size_t len =strlen (disk_name); - - dp_disk =opendir (disk_dir); -while ((de_disk =readdir (dp_disk)) !=NULL ) { - g_autofree char *partition_dir = NULL; -char *dev_name; -GuestDiskInfo *partition; - -if (!(de_disk->d_type &DT_DIR )) { -continue ; - } - -if (!(strncmp (disk_name, de_disk->d_name, len) ==0 && - ((*(de_disk->d_name + len) =='p' && -isdigit (*(de_disk->d_name + len +1 ))) || -isdigit (*(de_disk->d_name + len))))) { -continue ; - } - - partition_dir =g_strdup_printf ("%s/%s" , - disk_dir, de_disk->d_name); - dev_name =get_device_for_syspath (partition_dir); -if (dev_name ==NULL ) { -g_debug ("Failed to get device name for syspath: %s" , - disk_dir); -continue ; - } - partition =g_new0 (GuestDiskInfo,1 ); - partition->name = dev_name; - partition->partition = true; - partition->has_dependencies = true; -/* Add parent disk as dependent for easier tracking of hierarchy */ -QAPI_LIST_PREPEND (partition->dependencies,g_strdup (disk_dev)); - -QAPI_LIST_PREPEND (ret, partition); - } -closedir (dp_disk); - -return ret; -} - -static void get_nvme_smart (GuestDiskInfo *disk) -{ -int fd; -GuestNVMeSmart *smart; -NvmeSmartLog log = {0 }; -struct nvme_admin_cmd cmd = { - .opcode =NVME_ADM_CMD_GET_LOG_PAGE , - .nsid =NVME_NSID_BROADCAST , - .addr = (uintptr_t )&log, - .data_len =sizeof (log), - .cdw10 =NVME_LOG_SMART_INFO | (1 <<15 )/* RAE bit */ - | (((sizeof (log) >>2 ) -1 ) <<16 ) - }; - - fd =qga_open_cloexec (disk->name,O_RDONLY ,0 ); -if (fd ==-1 ) { -g_debug ("Failed to open device: %s: %s" , disk->name,g_strerror (errno)); -return ; - } - -if (ioctl (fd,NVME_IOCTL_ADMIN_CMD , &cmd)) { -g_debug ("Failed to get smart: %s: %s" , disk->name,g_strerror (errno)); -close (fd); -return ; - } - - disk->smart =g_new0 (GuestDiskSmart,1 ); - disk->smart->type =GUEST_DISK_BUS_TYPE_NVME ; - - smart = &disk->smart->u.nvme; - smart->critical_warning = log.critical_warning; - smart->temperature =lduw_le_p (&log.temperature);/* unaligned field */ - smart->available_spare = log.available_spare; - smart->available_spare_threshold = log.available_spare_threshold; - smart->percentage_used = log.percentage_used; - smart->data_units_read_lo =le64_to_cpu (log.data_units_read[0 ]); - smart->data_units_read_hi =le64_to_cpu (log.data_units_read[1 ]); - smart->data_units_written_lo =le64_to_cpu (log.data_units_written[0 ]); - smart->data_units_written_hi =le64_to_cpu (log.data_units_written[1 ]); - smart->host_read_commands_lo =le64_to_cpu (log.host_read_commands[0 ]); - smart->host_read_commands_hi =le64_to_cpu (log.host_read_commands[1 ]); - smart->host_write_commands_lo =le64_to_cpu (log.host_write_commands[0 ]); - smart->host_write_commands_hi =le64_to_cpu (log.host_write_commands[1 ]); - smart->controller_busy_time_lo =le64_to_cpu (log.controller_busy_time[0 ]); - smart->controller_busy_time_hi =le64_to_cpu (log.controller_busy_time[1 ]); - smart->power_cycles_lo =le64_to_cpu (log.power_cycles[0 ]); - smart->power_cycles_hi =le64_to_cpu (log.power_cycles[1 ]); - smart->power_on_hours_lo =le64_to_cpu (log.power_on_hours[0 ]); - smart->power_on_hours_hi =le64_to_cpu (log.power_on_hours[1 ]); - smart->unsafe_shutdowns_lo =le64_to_cpu (log.unsafe_shutdowns[0 ]); - smart->unsafe_shutdowns_hi =le64_to_cpu (log.unsafe_shutdowns[1 ]); - smart->media_errors_lo =le64_to_cpu (log.media_errors[0 ]); - smart->media_errors_hi =le64_to_cpu (log.media_errors[1 ]); - smart->number_of_error_log_entries_lo = -le64_to_cpu (log.number_of_error_log_entries[0 ]); - smart->number_of_error_log_entries_hi = -le64_to_cpu (log.number_of_error_log_entries[1 ]); - -close (fd); -} - -static void get_disk_smart (GuestDiskInfo *disk) -{ -if (disk->address - && (disk->address->bus_type ==GUEST_DISK_BUS_TYPE_NVME )) { -get_nvme_smart (disk); - } -} - -GuestDiskInfoList *qmp_guest_get_disks (Error **errp) -{ -GuestDiskInfoList *ret =NULL ; -GuestDiskInfo *disk; -DIR *dp =NULL ; -struct dirent *de =NULL ; - -g_debug ("listing /sys/block directory" ); - dp =opendir ("/sys/block" ); -if (dp ==NULL ) { -error_setg_errno (errp, errno,"Can't open directory \"/sys/block\"" ); -return NULL ; - } -while ((de =readdir (dp)) !=NULL ) { - g_autofree char *disk_dir = NULL, *line = NULL, - *size_path =NULL ; -char *dev_name; -Error *local_err =NULL ; -if (de->d_type !=DT_LNK ) { -g_debug (" skipping entry: %s" , de->d_name); -continue ; - } - -/* Check size and skip zero-sized disks */ -g_debug (" checking disk size" ); - size_path =g_strdup_printf ("/sys/block/%s/size" , de->d_name); -if (!g_file_get_contents (size_path, &line,NULL ,NULL )) { -g_debug (" failed to read disk size" ); -continue ; - } -if (g_strcmp0 (line,"0\n" ) ==0 ) { -g_debug (" skipping zero-sized disk" ); -continue ; - } - -g_debug (" adding %s" , de->d_name); - disk_dir =g_strdup_printf ("/sys/block/%s" , de->d_name); - dev_name =get_device_for_syspath (disk_dir); -if (dev_name ==NULL ) { -g_debug ("Failed to get device name for syspath: %s" , - disk_dir); -continue ; - } - disk =g_new0 (GuestDiskInfo,1 ); - disk->name = dev_name; - disk->partition = false; - disk->alias =get_alias_for_syspath (disk_dir); -QAPI_LIST_PREPEND (ret, disk); - -/* Get address for non-virtual devices */ -bool is_virtual =is_disk_virtual (disk_dir, &local_err); -if (local_err !=NULL ) { -g_debug (" failed to check disk path, ignoring error: %s" , -error_get_pretty (local_err)); -error_free (local_err); - local_err =NULL ; -/* Don't try to get the address */ - is_virtual = true; - } -if (!is_virtual) { - disk->address =get_disk_address (disk_dir, &local_err); -if (local_err !=NULL ) { -g_debug (" failed to get device info, ignoring error: %s" , -error_get_pretty (local_err)); -error_free (local_err); - local_err =NULL ; - } - } - -get_disk_deps (disk_dir, disk); -get_disk_smart (disk); - ret =get_disk_partitions (ret, de->d_name, disk_dir, dev_name); - } - -closedir (dp); - -return ret; -} - -#else - -GuestDiskInfoList *qmp_guest_get_disks (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -#endif - -/* Return a list of the disk device(s)' info which @mount lies on */ -static GuestFilesystemInfo *build_guest_fsinfo (struct FsMount *mount, -Error **errp) -{ -GuestFilesystemInfo *fs =g_malloc0 (sizeof (*fs)); -struct statvfs buf; -unsigned long used, nonroot_total, fr_size; -char *devpath =g_strdup_printf ("/sys/dev/block/%u:%u" , - mount->devmajor, mount->devminor); - - fs->mountpoint =g_strdup (mount->dirname); - fs->type =g_strdup (mount->devtype); -build_guest_fsinfo_for_device (devpath, fs, errp); - -if (statvfs (fs->mountpoint, &buf) ==0 ) { - fr_size = buf.f_frsize; - used = buf.f_blocks - buf.f_bfree; - nonroot_total = used + buf.f_bavail; - fs->used_bytes = used * fr_size; - fs->total_bytes = nonroot_total * fr_size; - fs->total_bytes_privileged = buf.f_blocks * fr_size; - - fs->has_total_bytes = true; - fs->has_total_bytes_privileged = true; - fs->has_used_bytes = true; - } - -g_free (devpath); - -return fs; -} - -GuestFilesystemInfoList *qmp_guest_get_fsinfo (Error **errp) -{ -FsMountList mounts; -struct FsMount *mount; -GuestFilesystemInfoList *ret =NULL ; -Error *local_err =NULL ; - -QTAILQ_INIT (&mounts); -if (!build_fs_mount_list (&mounts, &local_err)) { -error_propagate (errp, local_err); -return NULL ; - } - - QTAILQ_FOREACH(mount, &mounts, next) { -g_debug ("Building guest fsinfo for '%s'" , mount->dirname); - -QAPI_LIST_PREPEND (ret,build_guest_fsinfo (mount, &local_err)); -if (local_err) { -error_propagate (errp, local_err); -qapi_free_GuestFilesystemInfoList (ret); - ret =NULL ; -break ; - } - } - -free_fs_mount_list (&mounts); -return ret; -} -#endif /* CONFIG_FSFREEZE */ - -#if defined(CONFIG_FSTRIM ) -/* -* Walk list of mounted file systems in the guest, and trim them. -*/ -GuestFilesystemTrimResponse * -qmp_guest_fstrim (bool has_minimum,int64_t minimum,Error **errp) -{ -GuestFilesystemTrimResponse *response; -GuestFilesystemTrimResult *result; -int ret =0 ; -FsMountList mounts; -struct FsMount *mount; -int fd; -struct fstrim_range r; - -slog ("guest-fstrim called" ); - -QTAILQ_INIT (&mounts); -if (!build_fs_mount_list (&mounts, errp)) { -return NULL ; - } - - response =g_malloc0 (sizeof (*response)); - - QTAILQ_FOREACH(mount, &mounts, next) { - result =g_malloc0 (sizeof (*result)); - result->path =g_strdup (mount->dirname); - -QAPI_LIST_PREPEND (response->paths, result); - - fd =qga_open_cloexec (mount->dirname,O_RDONLY ,0 ); -if (fd ==-1 ) { - result->error =g_strdup_printf ("failed to open: %s" , -strerror (errno)); -continue ; - } - -/* We try to cull filesystems we know won't work in advance, but other -* filesystems may not implement fstrim for less obvious reasons. -* These will report EOPNOTSUPP; while in some other cases ENOTTY -* will be reported (e.g. CD-ROMs). -* Any other error means an unexpected error. -*/ - r.start =0 ; - r.len =-1 ; - r.minlen = has_minimum ? minimum :0 ; - ret =ioctl (fd,FITRIM , &r); -if (ret ==-1 ) { -if (errno ==ENOTTY || errno ==EOPNOTSUPP ) { - result->error =g_strdup ("trim not supported" ); - }else { - result->error =g_strdup_printf ("failed to trim: %s" , -strerror (errno)); - } -close (fd); -continue ; - } - - result->has_minimum = true; - result->minimum = r.minlen; - result->has_trimmed = true; - result->trimmed = r.len; -close (fd); - } - -free_fs_mount_list (&mounts); -return response; -} -#endif /* CONFIG_FSTRIM */ - -#endif /* __linux__ */ -#if defined(__linux__) || defined(__FreeBSD__) void qmp_guest_set_user_password(const char *username, const char *password,Signature · 1 line
2.45.1
Re: [PATCH 18/20] qga: add note about where to disable commands for a platform
In reply to Daniel P. BerrangéQuoted 2 lines · Daniel P. Berrangé
Any command that is known to be unimplemented on a given build target must be disabled using a QAPI schema conditional. Only use dynamidc
Suggest "should be disabled", for consistency with the comment below.
s/dynamidc/dynamic/
Quoted 32 lines
disabling for commands that require a runtime feature check.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-posix.c | 8 +++++++- qga/commands-win32.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)qga/commands-posix.c +7
-1@@ -1136,7 +1136,13 @@ error:#endif /* HAVE_GETIFADDRS */ -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on a given platform +* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {return blockedrpcs;qga/commands-win32.c +0
-0
qga/commands-win32.c done: · line 1965
Quoted 9 lines
qga/commands-win32.c +5
-1@@ -1958,7 +1958,13 @@ done:g_free (rawpasswddata); } -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on Wnidows
s/Wnidows/Windows/
qga/commands-win32.c done: · line 1970
Quoted 5 lines
qga/commands-win32.c +2
-0+* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {if (!vss_init (true)) {
Both functions will be unused after PATCH 20. Remove them there, and drop this patch?
Re: [PATCH 18/20] qga: add note about where to disable commands for a platform
Quoted 53 lines · Markus Armbruster
Quoted 2 lines · Daniel P. Berrangé
Any command that is known to be unimplemented on a given build target must be disabled using a QAPI schema conditional. Only use dynamidc
Suggest "should be disabled", for consistency with the comment below.
s/dynamidc/dynamic/
Quoted 32 lines
disabling for commands that require a runtime feature check.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-posix.c | 8 +++++++- qga/commands-win32.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)qga/commands-posix.c +7
-1@@ -1136,7 +1136,13 @@ error:#endif /* HAVE_GETIFADDRS */ -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on a given platform +* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {return blockedrpcs;qga/commands-win32.c +0
-0qga/commands-win32.c done: · line 1965
Quoted 9 lines
qga/commands-win32.c +5
-1@@ -1958,7 +1958,13 @@ done:g_free (rawpasswddata); } -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on Wnidows s/Wnidows/Windows/
Quoted 8 lines
qga/commands-win32.c done: · line 1970
Quoted 5 lines
qga/commands-win32.c +2
-0+* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {if (!vss_init (true)) {Both functions will be unused after PATCH 20. Remove them there, and drop this patch?
Hmm, they shouldn't be unused. I've made a mistake in Patch 20.
We still need to run these methods, since the Windows impl has todo a runtime check to determine whether snapshot APIs are supported by the system or not - that's the vss_init() call just seen in the diff context here.
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 08/20] qga: conditionalize schema for commands unsupported on Windows
In reply to Daniel P. BerrangéQuoted 6 lines · Daniel P. Berrangé
Rather than creating stubs for every command that just return
QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on Windows.The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
The commit message should mention that the value of "error" in the error response changes from
{"class": "GenericError, "desc": "this feature or command is not currently supported"}to
{"class": "CommandNotFound", "desc": "The command FOO has not been found"}Quoted 2 lines
This fixes inconsistency where some commands are implemented as stubs, yet not added to the blockedrpc list.
Example?
Quoted 2 lines
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
Yes!
Quoted 70 lines
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-win32.c | 56 +------------------------------------------- qga/qapi-schema.json | 45 +++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 70 deletions(-)qga/commands-win32.c +0
-39@@ -1494,11 +1494,6 @@ out: } } -void qmp_guest_suspend_hybrid (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -} -static IP_ADAPTER_ADDRESSES *guest_get_adapters_addresses (Error **errp) {IP_ADAPTER_ADDRESSES *adptr_addrs =NULL ;@@ -1862,12 +1857,6 @@ GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp)return NULL ; } -int64_t qmp_guest_set_vcpus (GuestLogicalProcessorList *vcpus,Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return -1 ; -} -static gchar *get_net_error_message (gint error) {@@ -1969,46 +1958,15 @@ done:g_free (rawpasswddata); } -GuestMemoryBlockList *qmp_guest_get_memory_blocks (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestMemoryBlockResponseList * -qmp_guest_set_memory_blocks (GuestMemoryBlockList *mem_blks,Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestMemoryBlockInfo *qmp_guest_get_memory_block_info (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} -/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) { -const char *list_unsupported[] = { -"guest-suspend-hybrid" , -"guest-set-vcpus" , -"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-info" , -NULL }; -char **p = (char **)list_unsupported; - -while (*p) {
qga/commands-win32.c done: · line 1969
Quoted 10 lines
qga/commands-win32.c +1
-4- blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } -if (!vss_init (true)) {g_debug ("vss_init failed, vss commands are going to be disabled" );const char *list[] = {"guest-get-fsinfo" ,"guest-fsfreeze-status" ,"guest-fsfreeze-freeze" ,"guest-fsfreeze-thaw" ,NULL }; - p = (char **)list; +char **p = (char **)list;
Can you make @p const and drop the cast?
Quoted 9 lines
qga/commands-win32.c +0
-2while (*p) { blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++));@@ -2505,15 +2463,3 @@ char *qga_get_host_name(Error **errp)return g_utf16_to_utf8 (tmp, size,NULL ,NULL ,NULL ); } - -GuestDiskStatsInfoList *qmp_guest_get_diskstats (Error **errp)
qga/commands-win32.c char *qga_get_host_name(Error **errp) · line 2519
Quoted 10 lines
qga/commands-win32.c +0
-10-{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -} - -GuestCpuStatsList *qmp_guest_get_cpustats (Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -return NULL ; -}
Reducing use of QERR_UNSUPPORTED is lovely.
[Schema patch snipped; it looks good to me...]
Re: [PATCH 08/20] qga: conditionalize schema for commands unsupported on Windows
In reply to Daniel P. BerrangéQuoted 23 lines · Daniel P. Berrangé
Rather than creating stubs for every command that just return
QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on Windows.The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This fixes inconsistency where some commands are implemented as stubs, yet not added to the blockedrpc list.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-win32.c | 56 +------------------------------------------- qga/qapi-schema.json | 45 +++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 70 deletions(-)qga/commands-win32.c +0
-0
[...]
Quoted 15 lines
/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) {
qga/commands-win32.c +0
-12-const char *list_unsupported[] = { -"guest-suspend-hybrid" , -"guest-set-vcpus" , -"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-info" , -NULL }; -char **p = (char **)list_unsupported; - -while (*p) { - blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } -
qga/commands-win32.c done: · line 1972
Quoted 10 lines
qga/commands-win32.c +1
-1if (!vss_init (true)) {g_debug ("vss_init failed, vss commands are going to be disabled" );const char *list[] = {"guest-get-fsinfo" ,"guest-fsfreeze-status" ,"guest-fsfreeze-freeze" ,"guest-fsfreeze-thaw" ,NULL }; - p = (char **)list; +char **p = (char **)list;while (*p) { blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++));
}
}
return blockedrpcs;}
Four commands get disabled when vss_init() fails, i.e. when qga-vss.dll can't be loaded and initialized.
Three of the four commands do this first:
if (!vss_initialized()) {
error_setg(errp, QERR_UNSUPPORTED);
return 0;
}The execption is qmp_guest_get_fsinfo().
vss_initialized() returns true between successful vss_init() and vss_deinit().
Aside: we call vss_init() in three places. Two of them init, call something, then deinit. Weird. Moving on.
If these commands are meant to be only available when the DLL is, then having them check vss_initialized() is useless.
Conversely, if the check isn't useless, then the "make it available only" business is.
Opportunity for further cleanup?
[...]
Re: [PATCH 08/20] qga: conditionalize schema for commands unsupported on Windows
Quoted 77 lines · Markus Armbruster
Quoted 23 lines · Daniel P. Berrangé
Rather than creating stubs for every command that just return
QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on Windows.The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This fixes inconsistency where some commands are implemented as stubs, yet not added to the blockedrpc list.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-win32.c | 56 +------------------------------------------- qga/qapi-schema.json | 45 +++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 70 deletions(-)qga/commands-win32.c +0
-0[...]
Quoted 15 lines
/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) {
qga/commands-win32.c +0
-12-const char *list_unsupported[] = { -"guest-suspend-hybrid" , -"guest-set-vcpus" , -"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-info" , -NULL }; -char **p = (char **)list_unsupported; - -while (*p) { - blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } -qga/commands-win32.c done: · line 1972
Quoted 10 lines
qga/commands-win32.c +1
-1if (!vss_init (true)) {g_debug ("vss_init failed, vss commands are going to be disabled" );const char *list[] = {"guest-get-fsinfo" ,"guest-fsfreeze-status" ,"guest-fsfreeze-freeze" ,"guest-fsfreeze-thaw" ,NULL }; - p = (char **)list; +char **p = (char **)list;while (*p) { blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++));} } return blockedrpcs;}
Four commands get disabled when
vss_init()fails, i.e. when qga-vss.dll can't be loaded and initialized.Three of the four commands do this first:
if (!vss_initialized()) { error_setg(errp, QERR_UNSUPPORTED); return 0; }The execption is
qmp_guest_get_fsinfo().
vss_initialized()returns true between successfulvss_init()andvss_deinit().Aside: we call
vss_init()in three places. Two of them init, call something, then deinit. Weird. Moving on.
Quoted 7 lines
If these commands are meant to be only available when the DLL is, then having them check
vss_initialized()is useless.Conversely, if the check isn't useless, then the "make it available only" business is.
Opportunity for further cleanup?
If we eliminate the "make it available" check in ga_command_init_blockedrpcs, that would be a nice cleanup IMHO, as these few commands are the only special case where that's needed now.
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 08/20] qga: conditionalize schema for commands unsupported on Windows
In reply to Markus ArmbrusterQuoted 9 lines · Markus Armbruster
Quoted 6 lines · Daniel P. Berrangé
Rather than creating stubs for every command that just return
QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on Windows.The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
Quoted 8 lines
The commit message should mention that the value of "error" in the error response changes from
{"class": "GenericError, "desc": "this feature or command is not currently supported"}to
{"class": "CommandNotFound", "desc": "The command FOO has not been found"}
Actually it doesn't change like this, because the runtime disablement means the stub never runs. So the actual differenceis this:
{"class": "CommandNotFound", "desc": "Command FOO has been disabled"}to
{"class": "CommandNotFound", "desc": "The command FOO has not been found"}still better, because it more accurately describes the sitution where a command is not implemented on a platform configuration.
I'll add this to the commit msg.
Quoted 5 lines
Quoted 3 lines
This fixes inconsistency where some commands are implemented as stubs, yet not added to the blockedrpc list.
Example?
guest-get-cpustats & guest-get-diskstats. These two do actally have their error message change in the way you describe. I'll document this too.
Quoted 6 lines
Quoted 3 lines
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
Yes!
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 08/20] qga: conditionalize schema for commands unsupported on Windows
In reply to Markus ArmbrusterQuoted 69 lines · Markus Armbruster
Quoted 23 lines · Daniel P. Berrangé
Rather than creating stubs for every command that just return
QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on Windows.The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This fixes inconsistency where some commands are implemented as stubs, yet not added to the blockedrpc list.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-win32.c | 56 +------------------------------------------- qga/qapi-schema.json | 45 +++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 70 deletions(-)qga/commands-win32.c +0
-0[...]
Quoted 15 lines
/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) {
qga/commands-win32.c +0
-12-const char *list_unsupported[] = { -"guest-suspend-hybrid" , -"guest-set-vcpus" , -"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-info" , -NULL }; -char **p = (char **)list_unsupported; - -while (*p) { - blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } -qga/commands-win32.c done: · line 1972
Quoted 10 lines
qga/commands-win32.c +1
-1if (!vss_init (true)) {g_debug ("vss_init failed, vss commands are going to be disabled" );const char *list[] = {"guest-get-fsinfo" ,"guest-fsfreeze-status" ,"guest-fsfreeze-freeze" ,"guest-fsfreeze-thaw" ,NULL }; - p = (char **)list; +char **p = (char **)list;while (*p) { blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++));} } return blockedrpcs;}
Four commands get disabled when
vss_init()fails, i.e. when qga-vss.dll can't be loaded and initialized.Three of the four commands do this first:
if (!vss_initialized()) { error_setg(errp, QERR_UNSUPPORTED); return 0; }
Quoted 7 lines
The execption is
qmp_guest_get_fsinfo().
vss_initialized()returns true between successfulvss_init()andvss_deinit().Aside: we call
vss_init()in three places. Two of them init, call something, then deinit. Weird. Moving on.
The two odd balls are a special case for the Windows only --service argument, which installs a Windows system service for VSS. In that case, the QGA immediately exits after (un)installing the service. So the vss_init+vss_deinit pairly makes sense there.
Quoted 2 lines
If these commands are meant to be only available when the DLL is, then having them check
vss_initialized()is useless.
The DLL should always exist unless the install is broken, but versions of Windows prior to win2k3 don't support the required APIs, so vss_init could fail.
Quoted 2 lines
Conversely, if the check isn't useless, then the "make it available only" business is.
The 'make it available only" business is bad practice, as it does not allow a caller to distinguish between the admin manually disabling these commands, vs the commands being unavailable due to the OS not supporting the feature. This distinction is important to preserve to benefit those triaging bugs about why this might fail.
I'm going to get rid of the runtime blocking in ga_command_init_blockedrpcs, and also replace QERR_UNSUPPORTED with a more targetted error message to clearly articulate why the commands are failing.
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 18/20] qga: add note about where to disable commands for a platform
In reply to Daniel P. BerrangéQuoted 63 lines · Daniel P. Berrangé
Quoted 53 lines · Markus Armbruster
Quoted 2 lines · Daniel P. Berrangé
Any command that is known to be unimplemented on a given build target must be disabled using a QAPI schema conditional. Only use dynamidc
Suggest "should be disabled", for consistency with the comment below.
s/dynamidc/dynamic/
Quoted 32 lines
disabling for commands that require a runtime feature check.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-posix.c | 8 +++++++- qga/commands-win32.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)qga/commands-posix.c +7
-1@@ -1136,7 +1136,13 @@ error:#endif /* HAVE_GETIFADDRS */ -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on a given platform +* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {return blockedrpcs;qga/commands-win32.c +0
-0qga/commands-win32.c done: · line 1965
Quoted 9 lines
qga/commands-win32.c +5
-1@@ -1958,7 +1958,13 @@ done:g_free (rawpasswddata); } -/* add unsupported commands to the list of blocked RPCs */ +/* +* Add commands that cannot be supported based on the results of +* dynamic check of the running OS installation. +* +* Commands that cannot be supported at all on Wnidows s/Wnidows/Windows/
Quoted 8 lines
qga/commands-win32.c done: · line 1970
Quoted 5 lines
qga/commands-win32.c +2
-0+* should be disabled with a condition in the QAPI schema. +*/ GList *ga_command_init_blockedrpcs (GList *blockedrpcs) {if (!vss_init (true)) {Both functions will be unused after PATCH 20. Remove them there, and drop this patch?
Quoted 6 lines
Hmm, they shouldn't be unused. I've made a mistake in Patch 20.
We still need to run these methods, since the Windows impl has todo a runtime check to determine whether snapshot APIs are supported by the system or not - that's the
vss_init()call just seen in the diff context here.
Based on our discussion about vss_init() handling, these methods will indeed end up unused, so I will delete them entirely in the last patch which removes their only usage.
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 08/20] qga: conditionalize schema for commands unsupported on Windows
In reply to Daniel P. BerrangéQuoted 84 lines · Daniel P. Berrangé
Quoted 37 lines · Markus Armbruster
Quoted 23 lines · Daniel P. Berrangé
Rather than creating stubs for every command that just return
QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to fully exclude generation of the commands on Windows.The command will be rejected at QMP dispatch time instead, avoiding reimplementing rejection by blocking the stub commands.
This fixes inconsistency where some commands are implemented as stubs, yet not added to the blockedrpc list.
This has the additional benefit that the QGA protocol reference now documents what conditions enable use of the command.
Signed-off-by Daniel P. Berrangé <[email protected]>--- qga/commands-win32.c | 56 +------------------------------------------- qga/qapi-schema.json | 45 +++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 70 deletions(-)qga/commands-win32.c +0
-0[...]
Quoted 9 lines
/* add unsupported commands to the list of blocked RPCs */ GList *ga_command_init_blockedrpcs(GList *blockedrpcs) {
qga/commands-win32.c +0
-6-const char *list_unsupported[] = { -"guest-suspend-hybrid" , -"guest-set-vcpus" , -"guest-get-memory-blocks" ,"guest-set-memory-blocks" , -"guest-get-memory-block-info" , -NULL };Quoted 8 lines
qga/commands-win32.c done:
Quoted 8 lines
qga/commands-win32.c +0
-6-char **p = (char **)list_unsupported; - -while (*p) { - blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++)); - } -if (!vss_init (true)) { g_debug("vss_init failed, vss commands are going to bedisabled");
Quoted 24 lines
qga/commands-win32.c done: · line 1972
Quoted 8 lines
const char *list[] = { "guest-get-fsinfo", "guest-fsfreeze-status", "guest-fsfreeze-freeze", "guest-fsfreeze-thaw", NULL};qga/commands-win32.c +1
-1- p = (char **)list; +char **p = (char **)list;while (*p) { blockedrpcs =g_list_append (blockedrpcs,g_strdup (*p++));} } return blockedrpcs;}
Four commands get disabled when
vss_init()fails, i.e. when qga-vss.dll can't be loaded and initialized.Three of the four commands do this first:
if (!vss_initialized()) { error_setg(errp, QERR_UNSUPPORTED); return 0; }Quoted 7 lines
The execption is
qmp_guest_get_fsinfo().
vss_initialized()returns true between successfulvss_init()andvss_deinit().Aside: we call
vss_init()in three places. Two of them init, call something, then deinit. Weird. Moving on.The two odd balls are a special case for the Windows only --service argument, which installs a Windows system service for VSS. In that case, the QGA immediately exits after (un)installing the service. So the vss_init+vss_deinit pairly makes sense there.
Quoted 7 lines
Quoted 2 lines
If these commands are meant to be only available when the DLL is, then having them check
vss_initialized()is useless.The DLL should always exist unless the install is broken, but versions of Windows prior to win2k3 don't support the required APIs, so
vss_initcould fail.
If Windows VSS is disabled vss_init could fail too. Also, one person reported
an error that VSS failed to initialize after the first boot. I can't reproduce this
so I have not details but we should check in runtime that QGA-VSS is initialized
before trying to freeze fs, in case to be more sure where is error.
Quoted 26 lines
Quoted 3 lines
Conversely, if the check isn't useless, then the "make it available only" business is.
The 'make it available only" business is bad practice, as it does not allow a caller to distinguish between the admin manually disabling these commands, vs the commands being unavailable due to the OS not supporting the feature. This distinction is important to preserve to benefit those triaging bugs about why this might fail.
I'm going to get rid of the runtime blocking in
ga_command_init_blockedrpcs,
and also replaceQERR_UNSUPPORTEDwith a more targetted error message to clearly articulate why the commands are failing.With regards,
Daniel
--
|: https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-
https://fstop138.berrange.com :|
|: https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|