10:39 a.m.
New rules are added in fixup_name in gendispatch.pl to keep the name
FSFreeze and FSThaw. This adds a new ACL permission 'fs_freeze',
which is also applied to VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag.
Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com>
---
src/access/viraccessperm.c | 2 +-
src/access/viraccessperm.h | 6 ++++++
src/remote/remote_driver.c | 2 ++
src/remote/remote_protocol.x | 30 ++++++++++++++++++++++++++++--
src/remote_protocol-structs | 18 ++++++++++++++++++
src/rpc/gendispatch.pl | 2 ++
6 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/src/access/viraccessperm.c b/src/access/viraccessperm.c
index d517c66..462f46c 100644
--- a/src/access/viraccessperm.c
+++ b/src/access/viraccessperm.c
@@ -39,7 +39,7 @@ VIR_ENUM_IMPL(virAccessPermDomain,
"start", "stop", "reset",
"save", "delete",
"migrate", "snapshot", "suspend",
"hibernate", "core_dump", "pm_control",
- "init_control", "inject_nmi", "send_input",
"send_signal", "fs_trim",
+ "init_control", "inject_nmi", "send_input",
"send_signal", "fs_trim", "fs_freeze",
"block_read", "block_write", "mem_read",
"open_graphics", "open_device",
"screenshot",
"open_namespace");
diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
index 6d14f05..ac48d70 100644
--- a/src/access/viraccessperm.h
+++ b/src/access/viraccessperm.h
@@ -242,6 +242,12 @@ typedef enum {
*/
VIR_ACCESS_PERM_DOMAIN_FS_TRIM, /* Issue TRIM to guest filesystems */
+ /**
+ * @desc: Freeze and thaw domain filesystems
+ * @message: Freezing and thawing domain filesystems require authorization
+ */
+ VIR_ACCESS_PERM_DOMAIN_FS_FREEZE, /* Freeze and thaw guest filesystems */
+
/* Peeking at guest */
/**
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ed7dde6..8b39a90 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7800,6 +7800,8 @@ static virDriver remote_driver = {
.domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */
.domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */
.connectGetCPUModelNames = remoteConnectGetCPUModelNames, /* 1.1.3 */
+ .domainFSFreeze = remoteDomainFSFreeze, /* 1.2.4 */
+ .domainFSThaw = remoteDomainFSThaw, /* 1.2.4 */
};
static virNetworkDriver network_driver = {
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 6c445cc..13fa69b 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -235,6 +235,9 @@ const REMOTE_DOMAIN_JOB_STATS_MAX = 64;
/* Upper limit on number of CPU models */
const REMOTE_CONNECT_CPU_MODELS_MAX = 8192;
+/* Upper limit on number of disks to frozen */
+const REMOTE_DOMAIN_FSFREEZE_DISKS_MAX = 256;
+
/* UUID. VIR_UUID_BUFLEN definition comes from libvirt.h */
typedef opaque remote_uuid[VIR_UUID_BUFLEN];
@@ -2959,6 +2962,17 @@ struct remote_network_event_lifecycle_msg {
int detail;
};
+struct remote_domain_fsfreeze_args {
+ remote_nonnull_domain dom;
+ remote_nonnull_string disks<REMOTE_DOMAIN_FSFREEZE_DISKS_MAX>; /* (const char
**) */
+ unsigned int flags;
+};
+
+struct remote_domain_fsthaw_args {
+ remote_nonnull_domain dom;
+ remote_nonnull_string disks<REMOTE_DOMAIN_FSFREEZE_DISKS_MAX>; /* (const char
**) */
+ unsigned int flags;
+};
/*----- Protocol. -----*/
@@ -4289,7 +4303,7 @@ enum remote_procedure {
/**
* @generate: both
* @acl: domain:snapshot
- * @acl: domain:write:VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE
+ * @acl: domain:fs_freeze:VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE
*/
REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML = 185,
@@ -5275,5 +5289,17 @@ enum remote_procedure {
* @generate: both
* @acl: domain:core_dump
*/
- REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334
+ REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334,
+
+ /**
+ * @generate: both
+ * @acl: domain:fs_freeze
+ */
+ REMOTE_PROC_DOMAIN_FSFREEZE = 335,
+
+ /**
+ * @generate: both
+ * @acl: domain:fs_freeze
+ */
+ REMOTE_PROC_DOMAIN_FSTHAW = 336
};
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 456d0da..439ff87 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2427,6 +2427,22 @@ struct remote_network_event_lifecycle_msg {
int event;
int detail;
};
+struct remote_domain_fsfreeze_args {
+ remote_nonnull_domain dom;
+ struct {
+ u_int disks_len;
+ remote_nonnull_string * disks_val;
+ } disks;
+ u_int flags;
+};
+struct remote_domain_fsthaw_args {
+ remote_nonnull_domain dom;
+ struct {
+ u_int disks_len;
+ remote_nonnull_string * disks_val;
+ } disks;
+ u_int flags;
+};
enum remote_procedure {
REMOTE_PROC_CONNECT_OPEN = 1,
REMOTE_PROC_CONNECT_CLOSE = 2,
@@ -2762,4 +2778,6 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_EVENT_CALLBACK_PMSUSPEND_DISK = 332,
REMOTE_PROC_DOMAIN_EVENT_CALLBACK_DEVICE_REMOVED = 333,
REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334,
+ REMOTE_PROC_DOMAIN_FSFREEZE = 335,
+ REMOTE_PROC_DOMAIN_FSTHAW = 336,
};
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index b76bbac..9cd620e 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -64,6 +64,8 @@ sub fixup_name {
$name =~ s/Nmi$/NMI/;
$name =~ s/Pm/PM/;
$name =~ s/Fstrim$/FSTrim/;
+ $name =~ s/Fsfreeze$/FSFreeze/;
+ $name =~ s/Fsthaw$/FSThaw/;
$name =~ s/Scsi/SCSI/;
$name =~ s/Wwn$/WWN/;