From 475f72a18a0774507b6ed9bad3178b51f3db72c0333cae325f9f64608da75279 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 28 Jun 2017 12:15:23 +0000 Subject: [PATCH] - Check VSS daemon is listening before a hot backup (bnc#1029693) - fix a compile warning in snprintf - kvp: ensure kvp device fd is closed on exec - lsvmbus: add pci pass-through UUID OBS-URL: https://build.opensuse.org/package/show/Virtualization/hyper-v?expand=0&rev=121 --- hyper-v.changes | 8 ++++++++ hyper-v.lsvmbus.py | 1 + hyper-v.spec | 2 +- hyper-v.tools.hv.hv_kvp_daemon.c | 4 ++-- hyper-v.tools.hv.hv_vss_daemon.c | 3 +++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/hyper-v.changes b/hyper-v.changes index c530047..6817dc8 100644 --- a/hyper-v.changes +++ b/hyper-v.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 28 12:04:38 UTC 2017 - ohering@suse.de + +- Check VSS daemon is listening before a hot backup (bnc#1029693) +- fix a compile warning in snprintf +- kvp: ensure kvp device fd is closed on exec +- lsvmbus: add pci pass-through UUID + ------------------------------------------------------------------- Wed May 4 13:29:54 UTC 2016 - ohering@suse.de diff --git a/hyper-v.lsvmbus.py b/hyper-v.lsvmbus.py index 3620913..6e2df99 100644 --- a/hyper-v.lsvmbus.py +++ b/hyper-v.lsvmbus.py @@ -35,6 +35,7 @@ vmbus_dev_dict = { '{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]', diff --git a/hyper-v.spec b/hyper-v.spec index f8aa01f..c8e5542 100644 --- a/hyper-v.spec +++ b/hyper-v.spec @@ -1,7 +1,7 @@ # # spec file for package hyper-v # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/hyper-v.tools.hv.hv_kvp_daemon.c b/hyper-v.tools.hv.hv_kvp_daemon.c index 11e6b50..cb838d8 100644 --- a/hyper-v.tools.hv.hv_kvp_daemon.c +++ b/hyper-v.tools.hv.hv_kvp_daemon.c @@ -702,7 +702,7 @@ static char *kvp_mac_to_if_name(char *mac) if (dir == NULL) return NULL; - snprintf(dev_id, sizeof(dev_id), kvp_net_dir); + snprintf(dev_id, sizeof(dev_id), "%s", kvp_net_dir); q = dev_id + strlen(kvp_net_dir); while ((entry = readdir(dir)) != NULL) { @@ -1434,7 +1434,7 @@ 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); + 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", diff --git a/hyper-v.tools.hv.hv_vss_daemon.c b/hyper-v.tools.hv.hv_vss_daemon.c index fac1063..d65e8c8 100644 --- a/hyper-v.tools.hv.hv_vss_daemon.c +++ b/hyper-v.tools.hv.hv_vss_daemon.c @@ -250,6 +250,9 @@ int main(int argc, char *argv[]) syslog(LOG_ERR, "/etc/fstab and /proc/mounts"); } break; + case VSS_OP_HOT_BACKUP: + syslog(LOG_INFO, "VSS: op=CHECK HOT BACKUP\n"); + break; default: syslog(LOG_ERR, "Illegal op:%d\n", op); }