pool/hyper-v
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update hv_fcopy_daemon, kernel name changed to /dev/vmbus/hv_fcopy

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/hyper-v?expand=0&rev=87
This commit is contained in:
Olaf Hering 2014-02-12 09:33:38 +00:00 committed by Git OBS Bridge
parent e057412d0a
commit 041fbde687
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hyper-v.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 12 10:32:54 CET 2014 - ohering@suse.de
- Update hv_fcopy_daemon, kernel name changed to /dev/vmbus/hv_fcopy
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 23 17:00:54 CET 2014 - ohering@suse.de Thu Jan 23 17:00:54 CET 2014 - ohering@suse.de

2
hyper-v.spec
View File

@ -190,7 +190,7 @@ cat > ${d}/%{hv_vss_daemon}.rules <<EOF
SUBSYSTEM=="vmbus", ACTION=="add", ATTR{class_id}=="{35fa2e29-ea23-4236-96ae-3a6ebacba440}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_vss_daemon}.service" SUBSYSTEM=="vmbus", ACTION=="add", ATTR{class_id}=="{35fa2e29-ea23-4236-96ae-3a6ebacba440}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_vss_daemon}.service"
EOF EOF
cat > ${d}/%{hv_fcopy_daemon}.rules <<EOF cat > ${d}/%{hv_fcopy_daemon}.rules <<EOF
ACTION=="add", KERNEL=="hv_fcopy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_fcopy_daemon}.service" ACTION=="add", KERNEL=="vmbus/hv_fcopy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_fcopy_daemon}.service"
EOF EOF
# #
head -n 42 ${d}/*.rules head -n 42 ${d}/*.rules

15
hyper-v.tools.hv.hv_fcopy_daemon.c
View File

@ -126,7 +126,7 @@ static int hv_copy_cancel(void)
int main(void) int main(void)
{ {
int fd, fcopy_fd, len; int fd, fcopy_fd, len;
int error = 0; int error;
int version = FCOPY_CURRENT_VERSION; int version = FCOPY_CURRENT_VERSION;
char *buffer[4096 * 2]; char *buffer[4096 * 2];
struct hv_fcopy_hdr *in_msg; struct hv_fcopy_hdr *in_msg;
@ -139,7 +139,7 @@ int main(void)
openlog("HV_FCOPY", 0, LOG_USER); openlog("HV_FCOPY", 0, LOG_USER);
syslog(LOG_INFO, "HV_FCOPY starting; pid is:%d", getpid()); syslog(LOG_INFO, "HV_FCOPY starting; pid is:%d", getpid());
fcopy_fd = open("/dev/hv_fcopy", O_RDWR); fcopy_fd = open("/dev/vmbus/hv_fcopy", O_RDWR);
if (fcopy_fd < 0) { if (fcopy_fd < 0) {
syslog(LOG_ERR, "open /dev/hv_fcopy failed; error: %d %s", syslog(LOG_ERR, "open /dev/hv_fcopy failed; error: %d %s",
@ -160,15 +160,10 @@ int main(void)
* In this loop we process fcopy messages after the * In this loop we process fcopy messages after the
* handshake is complete. * handshake is complete.
*/ */
len = pread(fcopy_fd, buffer, (4096 * 2), 0); len = pread(fcopy_fd, buffer, (4096 * 2), 0);
if (len <= 0) { if (len < 0) {
if (!error) { syslog(LOG_ERR, "pread failed: %s", strerror(errno));
syslog(LOG_ERR, "Read error: %s", exit(EXIT_FAILURE);
strerror(errno));
error = HV_E_FAIL;
}
continue;
} }
in_msg = (struct hv_fcopy_hdr *)buffer; in_msg = (struct hv_fcopy_hdr *)buffer;