Compare commits
No commits in common. 'c8' and 'c9' have entirely different histories.
@ -1,48 +0,0 @@
|
|||||||
From 1e2d32c6ee12b45823ba3cda0054a4bd843896fc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Olaf Hering <olaf@aepfle.de>
|
|
||||||
Date: Tue, 5 Jun 2018 13:37:55 -0700
|
|
||||||
Subject: [PATCH] tools: hv: update lsvmbus to be compatible with python3
|
|
||||||
|
|
||||||
Python3 changed the way how 'print' works.
|
|
||||||
Adjust the code to a syntax that is understood by python2 and python3.
|
|
||||||
|
|
||||||
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
||||||
Acked-by: Dexuan Cui <decui@microsoft.com>
|
|
||||||
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
||||||
---
|
|
||||||
tools/hv/lsvmbus | 12 ++++++------
|
|
||||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tools/hv/lsvmbus b/tools/hv/lsvmbus
|
|
||||||
index 353e56768df8..55e7374bade0 100644
|
|
||||||
--- a/tools/hv/lsvmbus
|
|
||||||
+++ b/tools/hv/lsvmbus
|
|
||||||
@@ -17,7 +17,7 @@ if options.verbose is not None:
|
|
||||||
|
|
||||||
vmbus_sys_path = '/sys/bus/vmbus/devices'
|
|
||||||
if not os.path.isdir(vmbus_sys_path):
|
|
||||||
- print "%s doesn't exist: exiting..." % vmbus_sys_path
|
|
||||||
+ print("%s doesn't exist: exiting..." % vmbus_sys_path)
|
|
||||||
exit(-1)
|
|
||||||
|
|
||||||
vmbus_dev_dict = {
|
|
||||||
@@ -93,11 +93,11 @@ format2 = '%2s: Class_ID = %s - %s\n\tDevice_ID = %s\n\tSysfs path: %s\n%s'
|
|
||||||
|
|
||||||
for d in vmbus_dev_list:
|
|
||||||
if verbose == 0:
|
|
||||||
- print ('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc)
|
|
||||||
+ print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
|
|
||||||
elif verbose == 1:
|
|
||||||
- print ('VMBUS ID ' + format1) % \
|
|
||||||
- (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
|
|
||||||
+ print (('VMBUS ID ' + format1) % \
|
|
||||||
+ (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
|
|
||||||
else:
|
|
||||||
- print ('VMBUS ID ' + format2) % \
|
|
||||||
+ print (('VMBUS ID ' + format2) % \
|
|
||||||
(d.vmbus_id, d.class_id, d.dev_desc, \
|
|
||||||
- d.device_id, d.sysfs_path, d.chn_vp_mapping)
|
|
||||||
+ d.device_id, d.sysfs_path, d.chn_vp_mapping))
|
|
||||||
--
|
|
||||||
2.14.4
|
|
||||||
|
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
From 88be69d62a01b9ac233de7f68118c948623c6f0a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
Date: Thu, 14 Nov 2019 09:45:44 +0100
|
||||||
|
Subject: Do not set NM_CONTROLLED=no
|
||||||
|
|
||||||
|
---
|
||||||
|
hv_set_ifconfig.sh | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
|
||||||
|
index 7ed9f85..18b27cc 100644
|
||||||
|
--- a/hv_set_ifconfig.sh
|
||||||
|
+++ b/hv_set_ifconfig.sh
|
||||||
|
@@ -51,7 +51,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
echo "IPV6INIT=yes" >> $1
|
||||||
|
-echo "NM_CONTROLLED=no" >> $1
|
||||||
|
echo "PEERDNS=yes" >> $1
|
||||||
|
echo "ONBOOT=yes" >> $1
|
||||||
|
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- hv_set_ifconfig.sh.orig 2018-06-11 15:57:50.000000000 +0200
|
|
||||||
+++ hv_set_ifconfig.sh 2018-09-03 09:34:57.470114502 +0200
|
|
||||||
@@ -51,7 +51,6 @@
|
|
||||||
|
|
||||||
|
|
||||||
echo "IPV6INIT=yes" >> $1
|
|
||||||
-echo "NM_CONTROLLED=no" >> $1
|
|
||||||
echo "PEERDNS=yes" >> $1
|
|
||||||
echo "ONBOOT=yes" >> $1
|
|
||||||
|
|
||||||
@ -0,0 +1,345 @@
|
|||||||
|
From f20c2a3298ceae7536c06bd08a5c571ebfa8cce4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
Date: Thu, 6 May 2021 12:50:43 +0200
|
||||||
|
Subject: Update C files and scripts to kernel version 5.7-rc1
|
||||||
|
|
||||||
|
(cherry-picked from RHEL 8.4.0 commit b0a20fac0e74b0b3eecc20ffe74006e7877da352)
|
||||||
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
---
|
||||||
|
hv_fcopy_daemon.c | 37 +++++++++++++++++++++++++++++++-----
|
||||||
|
hv_get_dhcp_info.sh | 2 +-
|
||||||
|
hv_kvp_daemon.c | 35 ++++++++++++++++++++--------------
|
||||||
|
hv_set_ifconfig.sh | 2 +-
|
||||||
|
hv_vss_daemon.c | 46 ++++++++++++++++++++++++++++++++++-----------
|
||||||
|
5 files changed, 90 insertions(+), 32 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/hv_fcopy_daemon.c b/hv_fcopy_daemon.c
|
||||||
|
index aea2d91..16d629b 100644
|
||||||
|
--- a/hv_fcopy_daemon.c
|
||||||
|
+++ b/hv_fcopy_daemon.c
|
||||||
|
@@ -80,6 +80,8 @@ static int hv_start_fcopy(struct hv_start_fcopy *smsg)
|
||||||
|
|
||||||
|
error = 0;
|
||||||
|
done:
|
||||||
|
+ if (error)
|
||||||
|
+ target_fname[0] = '\0';
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -108,15 +110,29 @@ static int hv_copy_data(struct hv_do_fcopy *cpmsg)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * Reset target_fname to "" in the two below functions for hibernation: if
|
||||||
|
+ * the fcopy operation is aborted by hibernation, the daemon should remove the
|
||||||
|
+ * partially-copied file; to achieve this, the hv_utils driver always fakes a
|
||||||
|
+ * CANCEL_FCOPY message upon suspend, and later when the VM resumes back,
|
||||||
|
+ * the daemon calls hv_copy_cancel() to remove the file; if a file is copied
|
||||||
|
+ * successfully before suspend, hv_copy_finished() must reset target_fname to
|
||||||
|
+ * avoid that the file can be incorrectly removed upon resume, since the faked
|
||||||
|
+ * CANCEL_FCOPY message is spurious in this case.
|
||||||
|
+ */
|
||||||
|
static int hv_copy_finished(void)
|
||||||
|
{
|
||||||
|
close(target_fd);
|
||||||
|
+ target_fname[0] = '\0';
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
static int hv_copy_cancel(void)
|
||||||
|
{
|
||||||
|
close(target_fd);
|
||||||
|
- unlink(target_fname);
|
||||||
|
+ if (strlen(target_fname) > 0) {
|
||||||
|
+ unlink(target_fname);
|
||||||
|
+ target_fname[0] = '\0';
|
||||||
|
+ }
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
}
|
||||||
|
@@ -131,7 +147,7 @@ void print_usage(char *argv[])
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
- int fcopy_fd;
|
||||||
|
+ int fcopy_fd = -1;
|
||||||
|
int error;
|
||||||
|
int daemonize = 1, long_index = 0, opt;
|
||||||
|
int version = FCOPY_CURRENT_VERSION;
|
||||||
|
@@ -141,7 +157,7 @@ int main(int argc, char *argv[])
|
||||||
|
struct hv_do_fcopy copy;
|
||||||
|
__u32 kernel_modver;
|
||||||
|
} buffer = { };
|
||||||
|
- int in_handshake = 1;
|
||||||
|
+ int in_handshake;
|
||||||
|
|
||||||
|
static struct option long_options[] = {
|
||||||
|
{"help", no_argument, 0, 'h' },
|
||||||
|
@@ -170,6 +186,12 @@ int main(int argc, char *argv[])
|
||||||
|
openlog("HV_FCOPY", 0, LOG_USER);
|
||||||
|
syslog(LOG_INFO, "starting; pid is:%d", getpid());
|
||||||
|
|
||||||
|
+reopen_fcopy_fd:
|
||||||
|
+ if (fcopy_fd != -1)
|
||||||
|
+ close(fcopy_fd);
|
||||||
|
+ /* Remove any possible partially-copied file on error */
|
||||||
|
+ hv_copy_cancel();
|
||||||
|
+ in_handshake = 1;
|
||||||
|
fcopy_fd = open("/dev/vmbus/hv_fcopy", O_RDWR);
|
||||||
|
|
||||||
|
if (fcopy_fd < 0) {
|
||||||
|
@@ -196,7 +218,7 @@ int main(int argc, char *argv[])
|
||||||
|
len = pread(fcopy_fd, &buffer, sizeof(buffer), 0);
|
||||||
|
if (len < 0) {
|
||||||
|
syslog(LOG_ERR, "pread failed: %s", strerror(errno));
|
||||||
|
- exit(EXIT_FAILURE);
|
||||||
|
+ goto reopen_fcopy_fd;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (in_handshake) {
|
||||||
|
@@ -231,9 +253,14 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /*
|
||||||
|
+ * pwrite() may return an error due to the faked CANCEL_FCOPY
|
||||||
|
+ * message upon hibernation. Ignore the error by resetting the
|
||||||
|
+ * dev file, i.e. closing and re-opening it.
|
||||||
|
+ */
|
||||||
|
if (pwrite(fcopy_fd, &error, sizeof(int), 0) != sizeof(int)) {
|
||||||
|
syslog(LOG_ERR, "pwrite failed: %s", strerror(errno));
|
||||||
|
- exit(EXIT_FAILURE);
|
||||||
|
+ goto reopen_fcopy_fd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/hv_get_dhcp_info.sh b/hv_get_dhcp_info.sh
|
||||||
|
index c38686c..2f2a3c7 100644
|
||||||
|
--- a/hv_get_dhcp_info.sh
|
||||||
|
+++ b/hv_get_dhcp_info.sh
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
# the script prints the string "Disabled" to stdout.
|
||||||
|
#
|
||||||
|
# Each Distro is expected to implement this script in a distro specific
|
||||||
|
-# fashion. For instance on Distros that ship with Network Manager enabled,
|
||||||
|
+# fashion. For instance, on Distros that ship with Network Manager enabled,
|
||||||
|
# this script can be based on the Network Manager APIs for retrieving DHCP
|
||||||
|
# information.
|
||||||
|
|
||||||
|
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
||||||
|
index e9ef4ca..0e5f14a 100644
|
||||||
|
--- a/hv_kvp_daemon.c
|
||||||
|
+++ b/hv_kvp_daemon.c
|
||||||
|
@@ -76,7 +76,7 @@ enum {
|
||||||
|
DNS
|
||||||
|
};
|
||||||
|
|
||||||
|
-static int in_hand_shake = 1;
|
||||||
|
+static int in_hand_shake;
|
||||||
|
|
||||||
|
static char *os_name = "";
|
||||||
|
static char *os_major = "";
|
||||||
|
@@ -1360,7 +1360,7 @@ void print_usage(char *argv[])
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
- int kvp_fd, len;
|
||||||
|
+ int kvp_fd = -1, len;
|
||||||
|
int error;
|
||||||
|
struct pollfd pfd;
|
||||||
|
char *p;
|
||||||
|
@@ -1400,14 +1400,6 @@ int main(int argc, char *argv[])
|
||||||
|
openlog("KVP", 0, LOG_USER);
|
||||||
|
syslog(LOG_INFO, "KVP starting; pid is:%d", getpid());
|
||||||
|
|
||||||
|
- kvp_fd = open("/dev/vmbus/hv_kvp", O_RDWR | O_CLOEXEC);
|
||||||
|
-
|
||||||
|
- if (kvp_fd < 0) {
|
||||||
|
- syslog(LOG_ERR, "open /dev/vmbus/hv_kvp failed; error: %d %s",
|
||||||
|
- errno, strerror(errno));
|
||||||
|
- exit(EXIT_FAILURE);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
/*
|
||||||
|
* Retrieve OS release information.
|
||||||
|
*/
|
||||||
|
@@ -1423,6 +1415,18 @@ int main(int argc, char *argv[])
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
+reopen_kvp_fd:
|
||||||
|
+ if (kvp_fd != -1)
|
||||||
|
+ close(kvp_fd);
|
||||||
|
+ in_hand_shake = 1;
|
||||||
|
+ kvp_fd = open("/dev/vmbus/hv_kvp", O_RDWR | O_CLOEXEC);
|
||||||
|
+
|
||||||
|
+ if (kvp_fd < 0) {
|
||||||
|
+ syslog(LOG_ERR, "open /dev/vmbus/hv_kvp failed; error: %d %s",
|
||||||
|
+ errno, strerror(errno));
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Register ourselves with the kernel.
|
||||||
|
*/
|
||||||
|
@@ -1457,8 +1461,7 @@ int main(int argc, char *argv[])
|
||||||
|
syslog(LOG_ERR, "read failed; error:%d %s",
|
||||||
|
errno, strerror(errno));
|
||||||
|
|
||||||
|
- close(kvp_fd);
|
||||||
|
- return EXIT_FAILURE;
|
||||||
|
+ goto reopen_kvp_fd;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -1617,13 +1620,17 @@ int main(int argc, char *argv[])
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* Send the value back to the kernel. */
|
||||||
|
+ /*
|
||||||
|
+ * Send the value back to the kernel. Note: the write() may
|
||||||
|
+ * return an error due to hibernation; we can ignore the error
|
||||||
|
+ * by resetting the dev file, i.e. closing and re-opening it.
|
||||||
|
+ */
|
||||||
|
kvp_done:
|
||||||
|
len = write(kvp_fd, hv_msg, sizeof(struct hv_kvp_msg));
|
||||||
|
if (len != sizeof(struct hv_kvp_msg)) {
|
||||||
|
syslog(LOG_ERR, "write failed; error: %d %s", errno,
|
||||||
|
strerror(errno));
|
||||||
|
- exit(EXIT_FAILURE);
|
||||||
|
+ goto reopen_kvp_fd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
|
||||||
|
index 18b27cc..3dd064c 100644
|
||||||
|
--- a/hv_set_ifconfig.sh
|
||||||
|
+++ b/hv_set_ifconfig.sh
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
# be used to configure the interface.
|
||||||
|
#
|
||||||
|
# Each Distro is expected to implement this script in a distro specific
|
||||||
|
-# fashion. For instance on Distros that ship with Network Manager enabled,
|
||||||
|
+# fashion. For instance, on Distros that ship with Network Manager enabled,
|
||||||
|
# this script can be based on the Network Manager APIs for configuring the
|
||||||
|
# interface.
|
||||||
|
#
|
||||||
|
diff --git a/hv_vss_daemon.c b/hv_vss_daemon.c
|
||||||
|
index 92902a8..29a1e48 100644
|
||||||
|
--- a/hv_vss_daemon.c
|
||||||
|
+++ b/hv_vss_daemon.c
|
||||||
|
@@ -28,6 +28,8 @@
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <dirent.h>
|
||||||
|
|
||||||
|
+static bool fs_frozen;
|
||||||
|
+
|
||||||
|
/* Don't use syslog() in the function since that can cause write to disk */
|
||||||
|
static int vss_do_freeze(char *dir, unsigned int cmd)
|
||||||
|
{
|
||||||
|
@@ -155,16 +157,22 @@ static int vss_operate(int operation)
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
error |= vss_do_freeze(ent->mnt_dir, cmd);
|
||||||
|
- if (error && operation == VSS_OP_FREEZE)
|
||||||
|
- goto err;
|
||||||
|
+ if (operation == VSS_OP_FREEZE) {
|
||||||
|
+ if (error)
|
||||||
|
+ goto err;
|
||||||
|
+ fs_frozen = true;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
endmntent(mounts);
|
||||||
|
|
||||||
|
if (root_seen) {
|
||||||
|
error |= vss_do_freeze("/", cmd);
|
||||||
|
- if (error && operation == VSS_OP_FREEZE)
|
||||||
|
- goto err;
|
||||||
|
+ if (operation == VSS_OP_FREEZE) {
|
||||||
|
+ if (error)
|
||||||
|
+ goto err;
|
||||||
|
+ fs_frozen = true;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
goto out;
|
||||||
|
@@ -175,6 +183,7 @@ err:
|
||||||
|
endmntent(mounts);
|
||||||
|
}
|
||||||
|
vss_operate(VSS_OP_THAW);
|
||||||
|
+ fs_frozen = false;
|
||||||
|
/* Call syslog after we thaw all filesystems */
|
||||||
|
if (ent)
|
||||||
|
syslog(LOG_ERR, "FREEZE of %s failed; error:%d %s",
|
||||||
|
@@ -196,13 +205,13 @@ void print_usage(char *argv[])
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
- int vss_fd, len;
|
||||||
|
+ int vss_fd = -1, len;
|
||||||
|
int error;
|
||||||
|
struct pollfd pfd;
|
||||||
|
int op;
|
||||||
|
struct hv_vss_msg vss_msg[1];
|
||||||
|
int daemonize = 1, long_index = 0, opt;
|
||||||
|
- int in_handshake = 1;
|
||||||
|
+ int in_handshake;
|
||||||
|
__u32 kernel_modver;
|
||||||
|
|
||||||
|
static struct option long_options[] = {
|
||||||
|
@@ -232,6 +241,18 @@ int main(int argc, char *argv[])
|
||||||
|
openlog("Hyper-V VSS", 0, LOG_USER);
|
||||||
|
syslog(LOG_INFO, "VSS starting; pid is:%d", getpid());
|
||||||
|
|
||||||
|
+reopen_vss_fd:
|
||||||
|
+ if (vss_fd != -1)
|
||||||
|
+ close(vss_fd);
|
||||||
|
+ if (fs_frozen) {
|
||||||
|
+ if (vss_operate(VSS_OP_THAW) || fs_frozen) {
|
||||||
|
+ syslog(LOG_ERR, "failed to thaw file system: err=%d",
|
||||||
|
+ errno);
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ in_handshake = 1;
|
||||||
|
vss_fd = open("/dev/vmbus/hv_vss", O_RDWR);
|
||||||
|
if (vss_fd < 0) {
|
||||||
|
syslog(LOG_ERR, "open /dev/vmbus/hv_vss failed; error: %d %s",
|
||||||
|
@@ -247,8 +268,7 @@ int main(int argc, char *argv[])
|
||||||
|
if (len < 0) {
|
||||||
|
syslog(LOG_ERR, "registration to kernel failed; error: %d %s",
|
||||||
|
errno, strerror(errno));
|
||||||
|
- close(vss_fd);
|
||||||
|
- exit(EXIT_FAILURE);
|
||||||
|
+ goto reopen_vss_fd;
|
||||||
|
}
|
||||||
|
|
||||||
|
pfd.fd = vss_fd;
|
||||||
|
@@ -312,14 +332,18 @@ int main(int argc, char *argv[])
|
||||||
|
default:
|
||||||
|
syslog(LOG_ERR, "Illegal op:%d\n", op);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * The write() may return an error due to the faked VSS_OP_THAW
|
||||||
|
+ * message upon hibernation. Ignore the error by resetting the
|
||||||
|
+ * dev file, i.e. closing and re-opening it.
|
||||||
|
+ */
|
||||||
|
vss_msg->error = error;
|
||||||
|
len = write(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
|
||||||
|
if (len != sizeof(struct hv_vss_msg)) {
|
||||||
|
syslog(LOG_ERR, "write failed; error: %d %s", errno,
|
||||||
|
strerror(errno));
|
||||||
|
-
|
||||||
|
- if (op == VSS_OP_FREEZE)
|
||||||
|
- vss_operate(VSS_OP_THAW);
|
||||||
|
+ goto reopen_vss_fd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
From 2b218c6e29ff031862c0976deb9810dfb2d79ab2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
Date: Thu, 14 Nov 2019 12:21:46 +0100
|
|
||||||
Subject: [PATCH] Set IgnoreOnIsolate=1 in systemd units
|
|
||||||
|
|
||||||
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
Message-id: <20191114122146.17009-1-vkuznets@redhat.com>
|
|
||||||
Patchwork-id: 92251
|
|
||||||
O-Subject: [RHEL8.2 hyperv-daemons PATCH] Set IgnoreOnIsolate=1 in systemd units
|
|
||||||
Bugzilla: 1769920
|
|
||||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
|
|
||||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1769920
|
|
||||||
Branch: rhel-8.2.0
|
|
||||||
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=24699501
|
|
||||||
Upstream: RHEL-only (upstream doesn't ship systemd units)
|
|
||||||
|
|
||||||
Hyper-V daemons' units are udev activated: when the appropriate device
|
|
||||||
appears systemd unit is started and normal targets (e.g. multi-user.target)
|
|
||||||
don't depend on these units. With systemd it is possible to try to isolate
|
|
||||||
the target (somewhat similar to switching runlevel), this is supposed to
|
|
||||||
shut everything which the target doesn't depend on (like units started
|
|
||||||
manually) off. It seems that the general users' expectation is that
|
|
||||||
hyperv-daemons units survive the procedure.
|
|
||||||
|
|
||||||
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
---
|
|
||||||
hypervfcopyd.service | 1 +
|
|
||||||
hypervkvpd.service | 1 +
|
|
||||||
hypervvssd.service | 1 +
|
|
||||||
3 files changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/hypervfcopyd.service b/hypervfcopyd.service
|
|
||||||
index fa4a0a3..dd14a97 100644
|
|
||||||
--- a/hypervfcopyd.service
|
|
||||||
+++ b/hypervfcopyd.service
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
[Unit]
|
|
||||||
Description=Hyper-V FCOPY daemon
|
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
|
|
||||||
+IgnoreOnIsolate=1
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/sbin/hypervfcopyd -n
|
|
||||||
diff --git a/hypervkvpd.service b/hypervkvpd.service
|
|
||||||
index d8bfdf3..36ee11c 100644
|
|
||||||
--- a/hypervkvpd.service
|
|
||||||
+++ b/hypervkvpd.service
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
Description=Hyper-V KVP daemon
|
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
|
|
||||||
After=network.target
|
|
||||||
+IgnoreOnIsolate=1
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
diff --git a/hypervvssd.service b/hypervvssd.service
|
|
||||||
index 9751cb3..1e5ff43 100644
|
|
||||||
--- a/hypervvssd.service
|
|
||||||
+++ b/hypervvssd.service
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
[Unit]
|
|
||||||
Description=Hyper-V VSS daemon
|
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
|
|
||||||
+IgnoreOnIsolate=1
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/sbin/hypervvssd -n
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
From 33725de60efa5e867ed73d2404d316785d0e4bb5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
Date: Wed, 20 Jul 2022 11:48:40 +0200
|
|
||||||
Subject: [PATCH 1/2] hypervkvpd.service: ordering fixes
|
|
||||||
|
|
||||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
|
||||||
RH-MergeRequest: 3: hypervkvpd.service: ordering fixes
|
|
||||||
RH-Commit: [1/2] f5bec088f7cf4afd641a2d7184a4e29cd1734bf4
|
|
||||||
RH-Bugzilla: 2115761
|
|
||||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
|
|
||||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115761
|
|
||||||
|
|
||||||
From 8dcff588c8eb1ab3119c6b0acead03189814b955 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chris Patterson <cpatterson@microsoft.com>
|
|
||||||
Date: Jul 01 2022 14:36:25 +0000
|
|
||||||
Subject: hypervkvpd.service: ordering fixes
|
|
||||||
|
|
||||||
- Only start kvpd under Hyper-V.
|
|
||||||
|
|
||||||
- Minimize dependencies for kvpd by removing the unnecessary
|
|
||||||
network.target requirement, but add kvp device and mount
|
|
||||||
requirements.
|
|
||||||
|
|
||||||
Start before cloud-init-local.service which relies on kvpd
|
|
||||||
for Azure.
|
|
||||||
|
|
||||||
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
|
|
||||||
|
|
||||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
---
|
|
||||||
hypervkvpd.service | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/hypervkvpd.service b/hypervkvpd.service
|
|
||||||
index 36ee11c..40dff13 100644
|
|
||||||
--- a/hypervkvpd.service
|
|
||||||
+++ b/hypervkvpd.service
|
|
||||||
@@ -1,7 +1,10 @@
|
|
||||||
[Unit]
|
|
||||||
Description=Hyper-V KVP daemon
|
|
||||||
+ConditionVirtualization=microsoft
|
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
|
|
||||||
-After=network.target
|
|
||||||
+After=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
|
|
||||||
+RequiresMountsFor=/var/lib/hyperv
|
|
||||||
+Before=cloud-init-local.service
|
|
||||||
IgnoreOnIsolate=1
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
From 3eb64f25afdf65d9999d155d8c89327cf9d27036 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
Date: Mon, 15 Aug 2022 17:38:37 +0200
|
|
||||||
Subject: [PATCH 2/2] redhat: Add ConditionalVirtualization to the rest of
|
|
||||||
systemd units
|
|
||||||
|
|
||||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
|
||||||
RH-MergeRequest: 3: hypervkvpd.service: ordering fixes
|
|
||||||
RH-Commit: [2/2] 6638ac3cfcff63e664d6ba86772a4bdfe45d2084
|
|
||||||
RH-Bugzilla: 2115761
|
|
||||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
|
|
||||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115761
|
|
||||||
|
|
||||||
Add ConditionalVirtualization to the rest of systemd units to make sure
|
|
||||||
they're started when running in Azure/Hyper-V.
|
|
||||||
|
|
||||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
---
|
|
||||||
hypervfcopyd.service | 1 +
|
|
||||||
hypervvssd.service | 1 +
|
|
||||||
2 files changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/hypervfcopyd.service b/hypervfcopyd.service
|
|
||||||
index dd14a97..aab4b6b 100644
|
|
||||||
--- a/hypervfcopyd.service
|
|
||||||
+++ b/hypervfcopyd.service
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
[Unit]
|
|
||||||
Description=Hyper-V FCOPY daemon
|
|
||||||
+ConditionVirtualization=microsoft
|
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
|
|
||||||
IgnoreOnIsolate=1
|
|
||||||
|
|
||||||
diff --git a/hypervvssd.service b/hypervvssd.service
|
|
||||||
index 1e5ff43..6a0fad0 100644
|
|
||||||
--- a/hypervvssd.service
|
|
||||||
+++ b/hypervvssd.service
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
[Unit]
|
|
||||||
Description=Hyper-V VSS daemon
|
|
||||||
+ConditionVirtualization=microsoft
|
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
|
|
||||||
IgnoreOnIsolate=1
|
|
||||||
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -0,0 +1,47 @@
|
|||||||
|
From 18888d66ca55ebefbf36dc74ab25c3958d56789b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
Date: Thu, 17 Nov 2022 18:56:20 +0100
|
||||||
|
Subject: [PATCH 2/3] tools: hv: Remove an extraneous "the"
|
||||||
|
|
||||||
|
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||||
|
RH-MergeRequest: 5: Update hyperv-daemons for RHEL-9.2
|
||||||
|
RH-Bugzilla: 2139457
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
RH-Commit: [1/2] 53bf20c6a219a20e7a2ae3986a9b2ed43ac4faac
|
||||||
|
|
||||||
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139457
|
||||||
|
|
||||||
|
commit f15f39fabed2248311607445ddfa6dba63abebb9
|
||||||
|
Author: Jason Wang <wangborong@cdjrlc.com>
|
||||||
|
Date: Thu Aug 11 21:34:33 2022 +0800
|
||||||
|
|
||||||
|
tools: hv: Remove an extraneous "the"
|
||||||
|
|
||||||
|
There are two "the" in the text. Remove one.
|
||||||
|
|
||||||
|
Signed-off-by: Jason Wang <wangborong@cdjrlc.com>
|
||||||
|
Link: https://lore.kernel.org/r/20220811133433.10175-1-wangborong@cdjrlc.com
|
||||||
|
Signed-off-by: Wei Liu <wei.liu@kernel.org>
|
||||||
|
|
||||||
|
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
---
|
||||||
|
hv_kvp_daemon.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
||||||
|
index c06c94d..5f98bee 100644
|
||||||
|
--- a/hv_kvp_daemon.c
|
||||||
|
+++ b/hv_kvp_daemon.c
|
||||||
|
@@ -44,7 +44,7 @@
|
||||||
|
|
||||||
|
/*
|
||||||
|
* KVP protocol: The user mode component first registers with the
|
||||||
|
- * the kernel component. Subsequently, the kernel component requests, data
|
||||||
|
+ * kernel component. Subsequently, the kernel component requests, data
|
||||||
|
* for the specified keys. In response to this message the user mode component
|
||||||
|
* fills in the value corresponding to the specified key. We overload the
|
||||||
|
* sequence field in the cn_msg header to define our KVP message types.
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
From 07081e4a9622c042dec1e3c7ffd47722a6dc0337 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
Date: Thu, 17 Nov 2022 18:58:31 +0100
|
||||||
|
Subject: [PATCH 3/3] tools: hv: kvp: remove unnecessary (void*) conversions
|
||||||
|
|
||||||
|
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||||
|
RH-MergeRequest: 5: Update hyperv-daemons for RHEL-9.2
|
||||||
|
RH-Bugzilla: 2139457
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
RH-Commit: [2/2] d3fe2884e899eab164e8b42398db72618b05ec71
|
||||||
|
|
||||||
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139457
|
||||||
|
|
||||||
|
commit 2258954234db7530e9d86bb32cd6ad54485ff926
|
||||||
|
Author: Zhou jie <zhoujie@nfschina.com>
|
||||||
|
Date: Tue Aug 23 11:45:52 2022 +0800
|
||||||
|
|
||||||
|
tools: hv: kvp: remove unnecessary (void*) conversions
|
||||||
|
|
||||||
|
Remove unnecessary void* type casting.
|
||||||
|
|
||||||
|
Signed-off-by: Zhou jie <zhoujie@nfschina.com>
|
||||||
|
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
|
||||||
|
Link: https://lore.kernel.org/r/20220823034552.8596-1-zhoujie@nfschina.com
|
||||||
|
Signed-off-by: Wei Liu <wei.liu@kernel.org>
|
||||||
|
|
||||||
|
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
---
|
||||||
|
hv_kvp_daemon.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
||||||
|
index 5f98bee..2ad9af3 100644
|
||||||
|
--- a/hv_kvp_daemon.c
|
||||||
|
+++ b/hv_kvp_daemon.c
|
||||||
|
@@ -772,11 +772,11 @@ static int kvp_process_ip_address(void *addrp,
|
||||||
|
const char *str;
|
||||||
|
|
||||||
|
if (family == AF_INET) {
|
||||||
|
- addr = (struct sockaddr_in *)addrp;
|
||||||
|
+ addr = addrp;
|
||||||
|
str = inet_ntop(family, &addr->sin_addr, tmp, 50);
|
||||||
|
addr_length = INET_ADDRSTRLEN;
|
||||||
|
} else {
|
||||||
|
- addr6 = (struct sockaddr_in6 *)addrp;
|
||||||
|
+ addr6 = addrp;
|
||||||
|
str = inet_ntop(family, &addr6->sin6_addr.s6_addr, tmp, 50);
|
||||||
|
addr_length = INET6_ADDRSTRLEN;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
From 21261cb75d523dd3ac815524e66f53694c1a3c2a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Wed, 5 Jul 2023 18:44:34 +0530
|
||||||
|
Subject: [PATCH] vmbus_testing: fix wrong python syntax for integer value
|
||||||
|
comparison
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 6: vmbus_testing: fix wrong python syntax for interger value comparison
|
||||||
|
RH-Bugzilla: 2218931
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
RH-Commit: [1/1] 2887e0ad51a16a499ebdeac29f3086c8be481e0c (anisinha/centos-hyperv-daemons)
|
||||||
|
|
||||||
|
It is incorrect in python to compare integer values using the "is" keyword. The
|
||||||
|
"is" keyword in python is used to compare references to two objects, not their
|
||||||
|
values. Newer version of python3 (version 3.8) throws a warning when such
|
||||||
|
incorrect comparison is made. For value comparison, "==" should be used.
|
||||||
|
|
||||||
|
Fix this in the code and suppress the following warning:
|
||||||
|
|
||||||
|
/usr/sbin/vmbus_testing:167: SyntaxWarning: "is" with a literal. Did you mean "=="?
|
||||||
|
|
||||||
|
RHBZ: 2218931
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
---
|
||||||
|
vmbus_testing | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/vmbus_testing b/vmbus_testing
|
||||||
|
index e721290..4467979 100755
|
||||||
|
--- a/vmbus_testing
|
||||||
|
+++ b/vmbus_testing
|
||||||
|
@@ -164,7 +164,7 @@ def recursive_file_lookup(path, file_map):
|
||||||
|
def get_all_devices_test_status(file_map):
|
||||||
|
|
||||||
|
for device in file_map:
|
||||||
|
- if (get_test_state(locate_state(device, file_map)) is 1):
|
||||||
|
+ if (get_test_state(locate_state(device, file_map)) == 1):
|
||||||
|
print("Testing = ON for: {}"
|
||||||
|
.format(device.split("/")[5]))
|
||||||
|
else:
|
||||||
|
@@ -203,7 +203,7 @@ def write_test_files(path, value):
|
||||||
|
def set_test_state(state_path, state_value, quiet):
|
||||||
|
|
||||||
|
write_test_files(state_path, state_value)
|
||||||
|
- if (get_test_state(state_path) is 1):
|
||||||
|
+ if (get_test_state(state_path) == 1):
|
||||||
|
if (not quiet):
|
||||||
|
print("Testing = ON for device: {}"
|
||||||
|
.format(state_path.split("/")[5]))
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
||||||
@ -1,685 +0,0 @@
|
|||||||
From b0a20fac0e74b0b3eecc20ffe74006e7877da352 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
Date: Wed, 15 Apr 2020 12:00:14 +0200
|
|
||||||
Subject: [PATCH 1/2] Update C files and scripts to kernel version 5.7-rc1
|
|
||||||
|
|
||||||
RH-Author: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
Message-id: <20200414183955.194006-2-mgamal@redhat.com>
|
|
||||||
Patchwork-id: 94689
|
|
||||||
O-Subject: [RHEL8.3 virt hyperv-daemons PATCH v5 1/2] Update C files and scripts to kernel version 5.7-rc1
|
|
||||||
Bugzilla: 1816750
|
|
||||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
|
|
||||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
---
|
|
||||||
hv_fcopy_daemon.c | 38 ++++++++++++--
|
|
||||||
hv_get_dhcp_info.sh | 2 +-
|
|
||||||
hv_kvp_daemon.c | 63 ++++++++++++++---------
|
|
||||||
hv_set_ifconfig.sh | 2 +-
|
|
||||||
hv_vss_daemon.c | 118 ++++++++++++++++++++++++++++++++++++++------
|
|
||||||
lsvmbus | 75 +++++++++++++++-------------
|
|
||||||
6 files changed, 220 insertions(+), 78 deletions(-)
|
|
||||||
|
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
---
|
|
||||||
hv_fcopy_daemon.c | 38 ++++++++++++++---
|
|
||||||
hv_get_dhcp_info.sh | 2 +-
|
|
||||||
hv_kvp_daemon.c | 63 ++++++++++++++++++----------
|
|
||||||
hv_set_ifconfig.sh | 2 +-
|
|
||||||
hv_vss_daemon.c | 118 +++++++++++++++++++++++++++++++++++++++++++++-------
|
|
||||||
lsvmbus | 75 ++++++++++++++++++---------------
|
|
||||||
6 files changed, 220 insertions(+), 78 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/hv_fcopy_daemon.c b/hv_fcopy_daemon.c
|
|
||||||
index d78aed8..f40ddaf 100644
|
|
||||||
--- a/hv_fcopy_daemon.c
|
|
||||||
+++ b/hv_fcopy_daemon.c
|
|
||||||
@@ -89,6 +89,8 @@ static int hv_start_fcopy(struct hv_start_fcopy *smsg)
|
|
||||||
|
|
||||||
error = 0;
|
|
||||||
done:
|
|
||||||
+ if (error)
|
|
||||||
+ target_fname[0] = '\0';
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -117,15 +119,29 @@ static int hv_copy_data(struct hv_do_fcopy *cpmsg)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * Reset target_fname to "" in the two below functions for hibernation: if
|
|
||||||
+ * the fcopy operation is aborted by hibernation, the daemon should remove the
|
|
||||||
+ * partially-copied file; to achieve this, the hv_utils driver always fakes a
|
|
||||||
+ * CANCEL_FCOPY message upon suspend, and later when the VM resumes back,
|
|
||||||
+ * the daemon calls hv_copy_cancel() to remove the file; if a file is copied
|
|
||||||
+ * successfully before suspend, hv_copy_finished() must reset target_fname to
|
|
||||||
+ * avoid that the file can be incorrectly removed upon resume, since the faked
|
|
||||||
+ * CANCEL_FCOPY message is spurious in this case.
|
|
||||||
+ */
|
|
||||||
static int hv_copy_finished(void)
|
|
||||||
{
|
|
||||||
close(target_fd);
|
|
||||||
+ target_fname[0] = '\0';
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
static int hv_copy_cancel(void)
|
|
||||||
{
|
|
||||||
close(target_fd);
|
|
||||||
- unlink(target_fname);
|
|
||||||
+ if (strlen(target_fname) > 0) {
|
|
||||||
+ unlink(target_fname);
|
|
||||||
+ target_fname[0] = '\0';
|
|
||||||
+ }
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -140,7 +156,7 @@ void print_usage(char *argv[])
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
- int fcopy_fd;
|
|
||||||
+ int fcopy_fd = -1;
|
|
||||||
int error;
|
|
||||||
int daemonize = 1, long_index = 0, opt;
|
|
||||||
int version = FCOPY_CURRENT_VERSION;
|
|
||||||
@@ -150,7 +166,7 @@ int main(int argc, char *argv[])
|
|
||||||
struct hv_do_fcopy copy;
|
|
||||||
__u32 kernel_modver;
|
|
||||||
} buffer = { };
|
|
||||||
- int in_handshake = 1;
|
|
||||||
+ int in_handshake;
|
|
||||||
|
|
||||||
static struct option long_options[] = {
|
|
||||||
{"help", no_argument, 0, 'h' },
|
|
||||||
@@ -179,6 +195,12 @@ int main(int argc, char *argv[])
|
|
||||||
openlog("HV_FCOPY", 0, LOG_USER);
|
|
||||||
syslog(LOG_INFO, "starting; pid is:%d", getpid());
|
|
||||||
|
|
||||||
+reopen_fcopy_fd:
|
|
||||||
+ if (fcopy_fd != -1)
|
|
||||||
+ close(fcopy_fd);
|
|
||||||
+ /* Remove any possible partially-copied file on error */
|
|
||||||
+ hv_copy_cancel();
|
|
||||||
+ in_handshake = 1;
|
|
||||||
fcopy_fd = open("/dev/vmbus/hv_fcopy", O_RDWR);
|
|
||||||
|
|
||||||
if (fcopy_fd < 0) {
|
|
||||||
@@ -205,7 +227,7 @@ int main(int argc, char *argv[])
|
|
||||||
len = pread(fcopy_fd, &buffer, sizeof(buffer), 0);
|
|
||||||
if (len < 0) {
|
|
||||||
syslog(LOG_ERR, "pread failed: %s", strerror(errno));
|
|
||||||
- exit(EXIT_FAILURE);
|
|
||||||
+ goto reopen_fcopy_fd;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (in_handshake) {
|
|
||||||
@@ -234,14 +256,20 @@ int main(int argc, char *argv[])
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
+ error = HV_E_FAIL;
|
|
||||||
syslog(LOG_ERR, "Unknown operation: %d",
|
|
||||||
buffer.hdr.operation);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * pwrite() may return an error due to the faked CANCEL_FCOPY
|
|
||||||
+ * message upon hibernation. Ignore the error by resetting the
|
|
||||||
+ * dev file, i.e. closing and re-opening it.
|
|
||||||
+ */
|
|
||||||
if (pwrite(fcopy_fd, &error, sizeof(int), 0) != sizeof(int)) {
|
|
||||||
syslog(LOG_ERR, "pwrite failed: %s", strerror(errno));
|
|
||||||
- exit(EXIT_FAILURE);
|
|
||||||
+ goto reopen_fcopy_fd;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/hv_get_dhcp_info.sh b/hv_get_dhcp_info.sh
|
|
||||||
index c38686c..2f2a3c7 100644
|
|
||||||
--- a/hv_get_dhcp_info.sh
|
|
||||||
+++ b/hv_get_dhcp_info.sh
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
# the script prints the string "Disabled" to stdout.
|
|
||||||
#
|
|
||||||
# Each Distro is expected to implement this script in a distro specific
|
|
||||||
-# fashion. For instance on Distros that ship with Network Manager enabled,
|
|
||||||
+# fashion. For instance, on Distros that ship with Network Manager enabled,
|
|
||||||
# this script can be based on the Network Manager APIs for retrieving DHCP
|
|
||||||
# information.
|
|
||||||
|
|
||||||
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
|
||||||
index dbf6e8b..ee9c1bb 100644
|
|
||||||
--- a/hv_kvp_daemon.c
|
|
||||||
+++ b/hv_kvp_daemon.c
|
|
||||||
@@ -76,7 +76,7 @@ enum {
|
|
||||||
DNS
|
|
||||||
};
|
|
||||||
|
|
||||||
-static int in_hand_shake = 1;
|
|
||||||
+static int in_hand_shake;
|
|
||||||
|
|
||||||
static char *os_name = "";
|
|
||||||
static char *os_major = "";
|
|
||||||
@@ -286,7 +286,7 @@ static int kvp_key_delete(int pool, const __u8 *key, int key_size)
|
|
||||||
* Found a match; just move the remaining
|
|
||||||
* entries up.
|
|
||||||
*/
|
|
||||||
- if (i == num_records) {
|
|
||||||
+ if (i == (num_records - 1)) {
|
|
||||||
kvp_file_info[pool].num_records--;
|
|
||||||
kvp_update_file(pool);
|
|
||||||
return 0;
|
|
||||||
@@ -700,7 +700,7 @@ static void kvp_get_ipconfig_info(char *if_name,
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * Gather the DNS state.
|
|
||||||
+ * Gather the DNS state.
|
|
||||||
* Since there is no standard way to get this information
|
|
||||||
* across various distributions of interest; we just invoke
|
|
||||||
* an external script that needs to be ported across distros
|
|
||||||
@@ -809,7 +809,7 @@ kvp_get_ip_info(int family, char *if_name, int op,
|
|
||||||
int sn_offset = 0;
|
|
||||||
int error = 0;
|
|
||||||
char *buffer;
|
|
||||||
- struct hv_kvp_ipaddr_value *ip_buffer;
|
|
||||||
+ struct hv_kvp_ipaddr_value *ip_buffer = NULL;
|
|
||||||
char cidr_mask[5]; /* /xyz */
|
|
||||||
int weight;
|
|
||||||
int i;
|
|
||||||
@@ -1051,7 +1051,7 @@ static int parse_ip_val_buffer(char *in_buf, int *offset,
|
|
||||||
char *start;
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * in_buf has sequence of characters that are seperated by
|
|
||||||
+ * in_buf has sequence of characters that are separated by
|
|
||||||
* the character ';'. The last sequence does not have the
|
|
||||||
* terminating ";" character.
|
|
||||||
*/
|
|
||||||
@@ -1178,6 +1178,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
|
|
||||||
FILE *file;
|
|
||||||
char cmd[PATH_MAX];
|
|
||||||
char *mac_addr;
|
|
||||||
+ int str_len;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Set the configuration for the specified interface with
|
|
||||||
@@ -1301,8 +1302,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
|
|
||||||
* invoke the external script to do its magic.
|
|
||||||
*/
|
|
||||||
|
|
||||||
- snprintf(cmd, sizeof(cmd), KVP_SCRIPTS_PATH "%s %s",
|
|
||||||
- "hv_set_ifconfig", if_file);
|
|
||||||
+ str_len = snprintf(cmd, sizeof(cmd), KVP_SCRIPTS_PATH "%s %s",
|
|
||||||
+ "hv_set_ifconfig", if_file);
|
|
||||||
+ /*
|
|
||||||
+ * This is a little overcautious, but it's necessary to suppress some
|
|
||||||
+ * false warnings from gcc 8.0.1.
|
|
||||||
+ */
|
|
||||||
+ if (str_len <= 0 || (unsigned int)str_len >= sizeof(cmd)) {
|
|
||||||
+ syslog(LOG_ERR, "Cmd '%s' (len=%d) may be too long",
|
|
||||||
+ cmd, str_len);
|
|
||||||
+ return HV_E_FAIL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (system(cmd)) {
|
|
||||||
syslog(LOG_ERR, "Failed to execute cmd '%s'; error: %d %s",
|
|
||||||
cmd, errno, strerror(errno));
|
|
||||||
@@ -1349,7 +1360,7 @@ void print_usage(char *argv[])
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
- int kvp_fd, len;
|
|
||||||
+ int kvp_fd = -1, len;
|
|
||||||
int error;
|
|
||||||
struct pollfd pfd;
|
|
||||||
char *p;
|
|
||||||
@@ -1375,6 +1386,8 @@ int main(int argc, char *argv[])
|
|
||||||
daemonize = 0;
|
|
||||||
break;
|
|
||||||
case 'h':
|
|
||||||
+ print_usage(argv);
|
|
||||||
+ exit(0);
|
|
||||||
default:
|
|
||||||
print_usage(argv);
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
@@ -1387,14 +1400,6 @@ int main(int argc, char *argv[])
|
|
||||||
openlog("KVP", 0, LOG_USER);
|
|
||||||
syslog(LOG_INFO, "KVP starting; pid is:%d", getpid());
|
|
||||||
|
|
||||||
- kvp_fd = open("/dev/vmbus/hv_kvp", O_RDWR | O_CLOEXEC);
|
|
||||||
-
|
|
||||||
- if (kvp_fd < 0) {
|
|
||||||
- syslog(LOG_ERR, "open /dev/vmbus/hv_kvp failed; error: %d %s",
|
|
||||||
- errno, strerror(errno));
|
|
||||||
- exit(EXIT_FAILURE);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
/*
|
|
||||||
* Retrieve OS release information.
|
|
||||||
*/
|
|
||||||
@@ -1410,6 +1415,18 @@ int main(int argc, char *argv[])
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
+reopen_kvp_fd:
|
|
||||||
+ if (kvp_fd != -1)
|
|
||||||
+ close(kvp_fd);
|
|
||||||
+ in_hand_shake = 1;
|
|
||||||
+ kvp_fd = open("/dev/vmbus/hv_kvp", O_RDWR | O_CLOEXEC);
|
|
||||||
+
|
|
||||||
+ if (kvp_fd < 0) {
|
|
||||||
+ syslog(LOG_ERR, "open /dev/vmbus/hv_kvp failed; error: %d %s",
|
|
||||||
+ errno, strerror(errno));
|
|
||||||
+ exit(EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Register ourselves with the kernel.
|
|
||||||
*/
|
|
||||||
@@ -1443,9 +1460,7 @@ int main(int argc, char *argv[])
|
|
||||||
if (len != sizeof(struct hv_kvp_msg)) {
|
|
||||||
syslog(LOG_ERR, "read failed; error:%d %s",
|
|
||||||
errno, strerror(errno));
|
|
||||||
-
|
|
||||||
- close(kvp_fd);
|
|
||||||
- return EXIT_FAILURE;
|
|
||||||
+ goto reopen_kvp_fd;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -1479,7 +1494,7 @@ int main(int argc, char *argv[])
|
|
||||||
case KVP_OP_GET_IP_INFO:
|
|
||||||
kvp_ip_val = &hv_msg->body.kvp_ip_val;
|
|
||||||
|
|
||||||
- error = kvp_mac_to_ip(kvp_ip_val);
|
|
||||||
+ error = kvp_mac_to_ip(kvp_ip_val);
|
|
||||||
|
|
||||||
if (error)
|
|
||||||
hv_msg->error = error;
|
|
||||||
@@ -1604,13 +1619,17 @@ int main(int argc, char *argv[])
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* Send the value back to the kernel. */
|
|
||||||
+ /*
|
|
||||||
+ * Send the value back to the kernel. Note: the write() may
|
|
||||||
+ * return an error due to hibernation; we can ignore the error
|
|
||||||
+ * by resetting the dev file, i.e. closing and re-opening it.
|
|
||||||
+ */
|
|
||||||
kvp_done:
|
|
||||||
len = write(kvp_fd, hv_msg, sizeof(struct hv_kvp_msg));
|
|
||||||
if (len != sizeof(struct hv_kvp_msg)) {
|
|
||||||
syslog(LOG_ERR, "write failed; error: %d %s", errno,
|
|
||||||
strerror(errno));
|
|
||||||
- exit(EXIT_FAILURE);
|
|
||||||
+ goto reopen_kvp_fd;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
|
|
||||||
index 18b27cc..3dd064c 100644
|
|
||||||
--- a/hv_set_ifconfig.sh
|
|
||||||
+++ b/hv_set_ifconfig.sh
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
# be used to configure the interface.
|
|
||||||
#
|
|
||||||
# Each Distro is expected to implement this script in a distro specific
|
|
||||||
-# fashion. For instance on Distros that ship with Network Manager enabled,
|
|
||||||
+# fashion. For instance, on Distros that ship with Network Manager enabled,
|
|
||||||
# this script can be based on the Network Manager APIs for configuring the
|
|
||||||
# interface.
|
|
||||||
#
|
|
||||||
diff --git a/hv_vss_daemon.c b/hv_vss_daemon.c
|
|
||||||
index 34031a2..8fe0a5c 100644
|
|
||||||
--- a/hv_vss_daemon.c
|
|
||||||
+++ b/hv_vss_daemon.c
|
|
||||||
@@ -36,6 +36,10 @@
|
|
||||||
#include <linux/hyperv.h>
|
|
||||||
#include <syslog.h>
|
|
||||||
#include <getopt.h>
|
|
||||||
+#include <stdbool.h>
|
|
||||||
+#include <dirent.h>
|
|
||||||
+
|
|
||||||
+static bool fs_frozen;
|
|
||||||
|
|
||||||
/* Don't use syslog() in the function since that can cause write to disk */
|
|
||||||
static int vss_do_freeze(char *dir, unsigned int cmd)
|
|
||||||
@@ -51,7 +55,7 @@ static int vss_do_freeze(char *dir, unsigned int cmd)
|
|
||||||
* If a partition is mounted more than once, only the first
|
|
||||||
* FREEZE/THAW can succeed and the later ones will get
|
|
||||||
* EBUSY/EINVAL respectively: there could be 2 cases:
|
|
||||||
- * 1) a user may mount the same partition to differnt directories
|
|
||||||
+ * 1) a user may mount the same partition to different directories
|
|
||||||
* by mistake or on purpose;
|
|
||||||
* 2) The subvolume of btrfs appears to have the same partition
|
|
||||||
* mounted more than once.
|
|
||||||
@@ -68,6 +72,55 @@ static int vss_do_freeze(char *dir, unsigned int cmd)
|
|
||||||
return !!ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static bool is_dev_loop(const char *blkname)
|
|
||||||
+{
|
|
||||||
+ char *buffer;
|
|
||||||
+ DIR *dir;
|
|
||||||
+ struct dirent *entry;
|
|
||||||
+ bool ret = false;
|
|
||||||
+
|
|
||||||
+ buffer = malloc(PATH_MAX);
|
|
||||||
+ if (!buffer) {
|
|
||||||
+ syslog(LOG_ERR, "Can't allocate memory!");
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ snprintf(buffer, PATH_MAX, "%s/loop", blkname);
|
|
||||||
+ if (!access(buffer, R_OK | X_OK)) {
|
|
||||||
+ ret = true;
|
|
||||||
+ goto free_buffer;
|
|
||||||
+ } else if (errno != ENOENT) {
|
|
||||||
+ syslog(LOG_ERR, "Can't access: %s; error:%d %s!",
|
|
||||||
+ buffer, errno, strerror(errno));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ snprintf(buffer, PATH_MAX, "%s/slaves", blkname);
|
|
||||||
+ dir = opendir(buffer);
|
|
||||||
+ if (!dir) {
|
|
||||||
+ if (errno != ENOENT)
|
|
||||||
+ syslog(LOG_ERR, "Can't opendir: %s; error:%d %s!",
|
|
||||||
+ buffer, errno, strerror(errno));
|
|
||||||
+ goto free_buffer;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ while ((entry = readdir(dir)) != NULL) {
|
|
||||||
+ if (strcmp(entry->d_name, ".") == 0 ||
|
|
||||||
+ strcmp(entry->d_name, "..") == 0)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ snprintf(buffer, PATH_MAX, "%s/slaves/%s", blkname,
|
|
||||||
+ entry->d_name);
|
|
||||||
+ if (is_dev_loop(buffer)) {
|
|
||||||
+ ret = true;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ closedir(dir);
|
|
||||||
+free_buffer:
|
|
||||||
+ free(buffer);
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int vss_operate(int operation)
|
|
||||||
{
|
|
||||||
char match[] = "/dev/";
|
|
||||||
@@ -75,6 +128,7 @@ static int vss_operate(int operation)
|
|
||||||
struct mntent *ent;
|
|
||||||
struct stat sb;
|
|
||||||
char errdir[1024] = {0};
|
|
||||||
+ char blkdir[23]; /* /sys/dev/block/XXX:XXX */
|
|
||||||
unsigned int cmd;
|
|
||||||
int error = 0, root_seen = 0, save_errno = 0;
|
|
||||||
|
|
||||||
@@ -96,10 +150,15 @@ static int vss_operate(int operation)
|
|
||||||
while ((ent = getmntent(mounts))) {
|
|
||||||
if (strncmp(ent->mnt_fsname, match, strlen(match)))
|
|
||||||
continue;
|
|
||||||
- if (stat(ent->mnt_fsname, &sb) == -1)
|
|
||||||
- continue;
|
|
||||||
- if (S_ISBLK(sb.st_mode) && major(sb.st_rdev) == LOOP_MAJOR)
|
|
||||||
- continue;
|
|
||||||
+ if (stat(ent->mnt_fsname, &sb)) {
|
|
||||||
+ syslog(LOG_ERR, "Can't stat: %s; error:%d %s!",
|
|
||||||
+ ent->mnt_fsname, errno, strerror(errno));
|
|
||||||
+ } else {
|
|
||||||
+ sprintf(blkdir, "/sys/dev/block/%d:%d",
|
|
||||||
+ major(sb.st_rdev), minor(sb.st_rdev));
|
|
||||||
+ if (is_dev_loop(blkdir))
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
if (hasmntopt(ent, MNTOPT_RO) != NULL)
|
|
||||||
continue;
|
|
||||||
if (strcmp(ent->mnt_type, "vfat") == 0)
|
|
||||||
@@ -109,18 +168,27 @@ static int vss_operate(int operation)
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
error |= vss_do_freeze(ent->mnt_dir, cmd);
|
|
||||||
- if (error && operation == VSS_OP_FREEZE)
|
|
||||||
- goto err;
|
|
||||||
+ if (operation == VSS_OP_FREEZE) {
|
|
||||||
+ if (error)
|
|
||||||
+ goto err;
|
|
||||||
+ fs_frozen = true;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
endmntent(mounts);
|
|
||||||
|
|
||||||
if (root_seen) {
|
|
||||||
error |= vss_do_freeze("/", cmd);
|
|
||||||
- if (error && operation == VSS_OP_FREEZE)
|
|
||||||
- goto err;
|
|
||||||
+ if (operation == VSS_OP_FREEZE) {
|
|
||||||
+ if (error)
|
|
||||||
+ goto err;
|
|
||||||
+ fs_frozen = true;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (operation == VSS_OP_THAW && !error)
|
|
||||||
+ fs_frozen = false;
|
|
||||||
+
|
|
||||||
goto out;
|
|
||||||
err:
|
|
||||||
save_errno = errno;
|
|
||||||
@@ -129,6 +197,7 @@ err:
|
|
||||||
endmntent(mounts);
|
|
||||||
}
|
|
||||||
vss_operate(VSS_OP_THAW);
|
|
||||||
+ fs_frozen = false;
|
|
||||||
/* Call syslog after we thaw all filesystems */
|
|
||||||
if (ent)
|
|
||||||
syslog(LOG_ERR, "FREEZE of %s failed; error:%d %s",
|
|
||||||
@@ -150,13 +219,13 @@ void print_usage(char *argv[])
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
- int vss_fd, len;
|
|
||||||
+ int vss_fd = -1, len;
|
|
||||||
int error;
|
|
||||||
struct pollfd pfd;
|
|
||||||
int op;
|
|
||||||
struct hv_vss_msg vss_msg[1];
|
|
||||||
int daemonize = 1, long_index = 0, opt;
|
|
||||||
- int in_handshake = 1;
|
|
||||||
+ int in_handshake;
|
|
||||||
__u32 kernel_modver;
|
|
||||||
|
|
||||||
static struct option long_options[] = {
|
|
||||||
@@ -172,6 +241,8 @@ int main(int argc, char *argv[])
|
|
||||||
daemonize = 0;
|
|
||||||
break;
|
|
||||||
case 'h':
|
|
||||||
+ print_usage(argv);
|
|
||||||
+ exit(0);
|
|
||||||
default:
|
|
||||||
print_usage(argv);
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
@@ -184,6 +255,18 @@ int main(int argc, char *argv[])
|
|
||||||
openlog("Hyper-V VSS", 0, LOG_USER);
|
|
||||||
syslog(LOG_INFO, "VSS starting; pid is:%d", getpid());
|
|
||||||
|
|
||||||
+reopen_vss_fd:
|
|
||||||
+ if (vss_fd != -1)
|
|
||||||
+ close(vss_fd);
|
|
||||||
+ if (fs_frozen) {
|
|
||||||
+ if (vss_operate(VSS_OP_THAW) || fs_frozen) {
|
|
||||||
+ syslog(LOG_ERR, "failed to thaw file system: err=%d",
|
|
||||||
+ errno);
|
|
||||||
+ exit(EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ in_handshake = 1;
|
|
||||||
vss_fd = open("/dev/vmbus/hv_vss", O_RDWR);
|
|
||||||
if (vss_fd < 0) {
|
|
||||||
syslog(LOG_ERR, "open /dev/vmbus/hv_vss failed; error: %d %s",
|
|
||||||
@@ -236,8 +319,7 @@ int main(int argc, char *argv[])
|
|
||||||
if (len != sizeof(struct hv_vss_msg)) {
|
|
||||||
syslog(LOG_ERR, "read failed; error:%d %s",
|
|
||||||
errno, strerror(errno));
|
|
||||||
- close(vss_fd);
|
|
||||||
- return EXIT_FAILURE;
|
|
||||||
+ goto reopen_vss_fd;
|
|
||||||
}
|
|
||||||
|
|
||||||
op = vss_msg->vss_hdr.operation;
|
|
||||||
@@ -264,14 +346,18 @@ int main(int argc, char *argv[])
|
|
||||||
default:
|
|
||||||
syslog(LOG_ERR, "Illegal op:%d\n", op);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * The write() may return an error due to the faked VSS_OP_THAW
|
|
||||||
+ * message upon hibernation. Ignore the error by resetting the
|
|
||||||
+ * dev file, i.e. closing and re-opening it.
|
|
||||||
+ */
|
|
||||||
vss_msg->error = error;
|
|
||||||
len = write(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
|
|
||||||
if (len != sizeof(struct hv_vss_msg)) {
|
|
||||||
syslog(LOG_ERR, "write failed; error: %d %s", errno,
|
|
||||||
strerror(errno));
|
|
||||||
-
|
|
||||||
- if (op == VSS_OP_FREEZE)
|
|
||||||
- vss_operate(VSS_OP_THAW);
|
|
||||||
+ goto reopen_vss_fd;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/lsvmbus b/lsvmbus
|
|
||||||
index 55e7374..099f2c4 100644
|
|
||||||
--- a/lsvmbus
|
|
||||||
+++ b/lsvmbus
|
|
||||||
@@ -4,10 +4,10 @@
|
|
||||||
import os
|
|
||||||
from optparse import OptionParser
|
|
||||||
|
|
||||||
+help_msg = "print verbose messages. Try -vv, -vvv for more verbose messages"
|
|
||||||
parser = OptionParser()
|
|
||||||
-parser.add_option("-v", "--verbose", dest="verbose",
|
|
||||||
- help="print verbose messages. Try -vv, -vvv for \
|
|
||||||
- more verbose messages", action="count")
|
|
||||||
+parser.add_option(
|
|
||||||
+ "-v", "--verbose", dest="verbose", help=help_msg, action="count")
|
|
||||||
|
|
||||||
(options, args) = parser.parse_args()
|
|
||||||
|
|
||||||
@@ -21,27 +21,28 @@ if not os.path.isdir(vmbus_sys_path):
|
|
||||||
exit(-1)
|
|
||||||
|
|
||||||
vmbus_dev_dict = {
|
|
||||||
- '{0e0b6031-5213-4934-818b-38d90ced39db}' : '[Operating system shutdown]',
|
|
||||||
- '{9527e630-d0ae-497b-adce-e80ab0175caf}' : '[Time Synchronization]',
|
|
||||||
- '{57164f39-9115-4e78-ab55-382f3bd5422d}' : '[Heartbeat]',
|
|
||||||
- '{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}' : '[Data Exchange]',
|
|
||||||
- '{35fa2e29-ea23-4236-96ae-3a6ebacba440}' : '[Backup (volume checkpoint)]',
|
|
||||||
- '{34d14be3-dee4-41c8-9ae7-6b174977c192}' : '[Guest services]',
|
|
||||||
- '{525074dc-8985-46e2-8057-a307dc18a502}' : '[Dynamic Memory]',
|
|
||||||
- '{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}' : 'Synthetic mouse',
|
|
||||||
- '{f912ad6d-2b17-48ea-bd65-f927a61c7684}' : 'Synthetic keyboard',
|
|
||||||
- '{da0a7802-e377-4aac-8e77-0558eb1073f8}' : 'Synthetic framebuffer adapter',
|
|
||||||
- '{f8615163-df3e-46c5-913f-f2d2f965ed0e}' : 'Synthetic network adapter',
|
|
||||||
- '{32412632-86cb-44a2-9b5c-50d1417354f5}' : 'Synthetic IDE Controller',
|
|
||||||
- '{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}' : 'Synthetic SCSI Controller',
|
|
||||||
- '{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}' : 'Synthetic fiber channel adapter',
|
|
||||||
- '{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}' : 'Synthetic RDMA adapter',
|
|
||||||
- '{44c4f61d-4444-4400-9d52-802e27ede19f}' : 'PCI Express pass-through',
|
|
||||||
- '{276aacf4-ac15-426c-98dd-7521ad3f01fe}' : '[Reserved system device]',
|
|
||||||
- '{f8e65716-3cb3-4a06-9a60-1889c5cccab5}' : '[Reserved system device]',
|
|
||||||
- '{3375baf4-9e15-4b30-b765-67acb10d607b}' : '[Reserved system device]',
|
|
||||||
+ '{0e0b6031-5213-4934-818b-38d90ced39db}': '[Operating system shutdown]',
|
|
||||||
+ '{9527e630-d0ae-497b-adce-e80ab0175caf}': '[Time Synchronization]',
|
|
||||||
+ '{57164f39-9115-4e78-ab55-382f3bd5422d}': '[Heartbeat]',
|
|
||||||
+ '{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}': '[Data Exchange]',
|
|
||||||
+ '{35fa2e29-ea23-4236-96ae-3a6ebacba440}': '[Backup (volume checkpoint)]',
|
|
||||||
+ '{34d14be3-dee4-41c8-9ae7-6b174977c192}': '[Guest services]',
|
|
||||||
+ '{525074dc-8985-46e2-8057-a307dc18a502}': '[Dynamic Memory]',
|
|
||||||
+ '{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}': 'Synthetic mouse',
|
|
||||||
+ '{f912ad6d-2b17-48ea-bd65-f927a61c7684}': 'Synthetic keyboard',
|
|
||||||
+ '{da0a7802-e377-4aac-8e77-0558eb1073f8}': 'Synthetic framebuffer adapter',
|
|
||||||
+ '{f8615163-df3e-46c5-913f-f2d2f965ed0e}': 'Synthetic network adapter',
|
|
||||||
+ '{32412632-86cb-44a2-9b5c-50d1417354f5}': 'Synthetic IDE Controller',
|
|
||||||
+ '{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}': 'Synthetic SCSI Controller',
|
|
||||||
+ '{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}': 'Synthetic fiber channel adapter',
|
|
||||||
+ '{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}': 'Synthetic RDMA adapter',
|
|
||||||
+ '{44c4f61d-4444-4400-9d52-802e27ede19f}': 'PCI Express pass-through',
|
|
||||||
+ '{276aacf4-ac15-426c-98dd-7521ad3f01fe}': '[Reserved system device]',
|
|
||||||
+ '{f8e65716-3cb3-4a06-9a60-1889c5cccab5}': '[Reserved system device]',
|
|
||||||
+ '{3375baf4-9e15-4b30-b765-67acb10d607b}': '[Reserved system device]',
|
|
||||||
}
|
|
||||||
|
|
||||||
+
|
|
||||||
def get_vmbus_dev_attr(dev_name, attr):
|
|
||||||
try:
|
|
||||||
f = open('%s/%s/%s' % (vmbus_sys_path, dev_name, attr), 'r')
|
|
||||||
@@ -52,6 +53,7 @@ def get_vmbus_dev_attr(dev_name, attr):
|
|
||||||
|
|
||||||
return lines
|
|
||||||
|
|
||||||
+
|
|
||||||
class VMBus_Dev:
|
|
||||||
pass
|
|
||||||
|
|
||||||
@@ -66,12 +68,13 @@ for f in os.listdir(vmbus_sys_path):
|
|
||||||
|
|
||||||
chn_vp_mapping = get_vmbus_dev_attr(f, 'channel_vp_mapping')
|
|
||||||
chn_vp_mapping = [c.strip() for c in chn_vp_mapping]
|
|
||||||
- chn_vp_mapping = sorted(chn_vp_mapping,
|
|
||||||
- key = lambda c : int(c.split(':')[0]))
|
|
||||||
+ chn_vp_mapping = sorted(
|
|
||||||
+ chn_vp_mapping, key=lambda c: int(c.split(':')[0]))
|
|
||||||
|
|
||||||
- chn_vp_mapping = ['\tRel_ID=%s, target_cpu=%s' %
|
|
||||||
- (c.split(':')[0], c.split(':')[1])
|
|
||||||
- for c in chn_vp_mapping]
|
|
||||||
+ chn_vp_mapping = [
|
|
||||||
+ '\tRel_ID=%s, target_cpu=%s' %
|
|
||||||
+ (c.split(':')[0], c.split(':')[1]) for c in chn_vp_mapping
|
|
||||||
+ ]
|
|
||||||
d = VMBus_Dev()
|
|
||||||
d.sysfs_path = '%s/%s' % (vmbus_sys_path, f)
|
|
||||||
d.vmbus_id = vmbus_id
|
|
||||||
@@ -85,7 +88,7 @@ for f in os.listdir(vmbus_sys_path):
|
|
||||||
vmbus_dev_list.append(d)
|
|
||||||
|
|
||||||
|
|
||||||
-vmbus_dev_list = sorted(vmbus_dev_list, key = lambda d : int(d.vmbus_id))
|
|
||||||
+vmbus_dev_list = sorted(vmbus_dev_list, key=lambda d: int(d.vmbus_id))
|
|
||||||
|
|
||||||
format0 = '%2s: %s'
|
|
||||||
format1 = '%2s: Class_ID = %s - %s\n%s'
|
|
||||||
@@ -95,9 +98,15 @@ for d in vmbus_dev_list:
|
|
||||||
if verbose == 0:
|
|
||||||
print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
|
|
||||||
elif verbose == 1:
|
|
||||||
- print (('VMBUS ID ' + format1) % \
|
|
||||||
- (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
|
|
||||||
+ print(
|
|
||||||
+ ('VMBUS ID ' + format1) %
|
|
||||||
+ (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
|
|
||||||
+ )
|
|
||||||
else:
|
|
||||||
- print (('VMBUS ID ' + format2) % \
|
|
||||||
- (d.vmbus_id, d.class_id, d.dev_desc, \
|
|
||||||
- d.device_id, d.sysfs_path, d.chn_vp_mapping))
|
|
||||||
+ print(
|
|
||||||
+ ('VMBUS ID ' + format2) %
|
|
||||||
+ (
|
|
||||||
+ d.vmbus_id, d.class_id, d.dev_desc,
|
|
||||||
+ d.device_id, d.sysfs_path, d.chn_vp_mapping
|
|
||||||
+ )
|
|
||||||
+ )
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,6 +1,7 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Hyper-V FCOPY daemon
|
Description=Hyper-V FCOPY daemon
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
|
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
|
||||||
|
IgnoreOnIsolate=1
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/usr/sbin/hypervfcopyd -n
|
ExecStart=/usr/sbin/hypervfcopyd -n
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Hyper-V VSS daemon
|
Description=Hyper-V VSS daemon
|
||||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
|
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
|
||||||
|
IgnoreOnIsolate=1
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/usr/sbin/hypervvssd -n
|
ExecStart=/usr/sbin/hypervvssd -n
|
||||||
|
|||||||
Loading…
Reference in new issue