diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2019-09-16 05:58:10 -0400 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2019-10-04 17:31:55 +0200 |
| commit | 667b33dd3be1068ffb92783e189cbc1b41c9ac28 (patch) | |
| tree | b5916e88c9137d74085514679d972c69795533f4 /libdm | |
| parent | ebc9274be07299e1defd332685a2dff2c5b43cdf (diff) | |
| download | lvm2-667b33dd3be1068ffb92783e189cbc1b41c9ac28.tar.gz | |
dm: introduce DM_GET_TARGET_VERSION
Adds support for the DM_GET_TARGET_VERSION to dmsetup.
It introduces a new comman "target-version" that will accept list
of targets and print their version.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Diffstat (limited to 'libdm')
| -rw-r--r-- | libdm/dm-tools/dmsetup.c | 28 | ||||
| -rw-r--r-- | libdm/ioctl/libdm-iface.c | 3 | ||||
| -rw-r--r-- | libdm/libdevmapper.h | 4 | ||||
| -rw-r--r-- | libdm/misc/dm-ioctl.h | 2 |
4 files changed, 36 insertions, 1 deletions
diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c index 7267d0da9..7d60d2f1b 100644 --- a/libdm/dm-tools/dmsetup.c +++ b/libdm/dm-tools/dmsetup.c @@ -2589,6 +2589,33 @@ out: return r; } +/* Show target names and their version numbers */ +static int _target_version(CMD_ARGS) +{ + int r = 0; + struct dm_task *dmt; + struct dm_versions *target; + + if (!(dmt = dm_task_create(DM_GET_TARGET_VERSION))) + return_0; + + if (!dm_task_set_name(dmt, argv[0])) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + target = dm_task_get_versions(dmt); + printf("%-16s v%d.%d.%d\n", target->name, target->version[0], + target->version[1], target->version[2]); + + r = 1; + +out: + dm_task_destroy(dmt); + return r; +} + static int _info(CMD_ARGS) { int r = 0; @@ -6241,6 +6268,7 @@ static struct command _dmsetup_commands[] = { {"udevcomplete", "<cookie>", 1, 1, 0, 0, _udevcomplete}, {"udevcomplete_all", "[<age_in_minutes>]", 0, 1, 0, 0, _udevcomplete_all}, {"udevcookies", "", 0, 0, 0, 0, _udevcookies}, + {"target-version", "[<target>...]", 1, -1, 1, 0, _target_version}, {"targets", "", 0, 0, 0, 0, _targets}, {"version", "", 0, 0, 0, 0, _version}, {"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, 0, 0, _setgeometry}, diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index b195c115f..dd46b674a 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -118,6 +118,9 @@ static struct cmd_data _cmd_data_v4[] = { #ifdef DM_DEV_ARM_POLL {"armpoll", DM_DEV_ARM_POLL, {4, 36, 0}}, #endif +#ifdef DM_GET_TARGET_VERSION + {"target-version", DM_GET_TARGET_VERSION, {4, 41, 0}}, +#endif }; /* *INDENT-ON* */ diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index e885f52ae..81c67dcf2 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -121,7 +121,9 @@ enum { DM_DEVICE_SET_GEOMETRY, - DM_DEVICE_ARM_POLL + DM_DEVICE_ARM_POLL, + + DM_GET_TARGET_VERSION }; /* diff --git a/libdm/misc/dm-ioctl.h b/libdm/misc/dm-ioctl.h index 79f574cd9..52a7a93d1 100644 --- a/libdm/misc/dm-ioctl.h +++ b/libdm/misc/dm-ioctl.h @@ -244,6 +244,7 @@ enum { DM_TARGET_MSG_CMD, DM_DEV_SET_GEOMETRY_CMD, DM_DEV_ARM_POLL_CMD, + DM_GET_TARGET_VERSION_CMD, }; #define DM_IOCTL 0xfd @@ -269,6 +270,7 @@ enum { #define DM_TARGET_MSG _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl) #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) +#define DM_GET_TARGET_VERSION _IOWR(DM_IOCTL, DM_GET_TARGET_VERSION_CMD, struct dm_ioctl) #define DM_VERSION_MAJOR 4 #define DM_VERSION_MINOR 36 |