External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

Fix recording of UML driver watch to make inotify work

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-12-02 11:23:27 +00:00
parent fb23f4f4f4
commit a429e221df
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,4 +1,9 @@
Mon, 1 Dec 2008 16:01:54 +0100 Jim Meyering <meyering@redhat.com>
Tue Dec 2 11:21:22 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* src/uml_driver.c: Fix recording of watch number to make
inotify actually work.
Mon Dec 1 16:01:54 +0100 2008 Jim Meyering <meyering@redhat.com>
tests: daemon-conf: accommodate numeric-valued config params
This test would hang when failing to perturb the soon-to-be-
@ -16,7 +21,7 @@ Mon, 1 Dec 2008 16:01:54 +0100 Jim Meyering <meyering@redhat.com>
* qemud/libvirtd.conf: Normalize the spacing around each setting
that is to be perturbed by tests/daemon-conf.
Mon, 1 Dec 2008 10:30:10 +0100 Jim Meyering <meyering@redhat.com>
Mon Dec 1 10:30:10 +0100 2008 Jim Meyering <meyering@redhat.com>
uml: don't free an uninitialized variable
* src/uml_driver.c (umlDomainShutdown): Initialize "info".

12
src/uml_driver.c
View File

@ -348,16 +348,16 @@ umlStartup(void) {
return -1;
}
if ((uml_driver->inotifyWatch =
inotify_add_watch(uml_driver->inotifyFD,
uml_driver->monitorDir,
IN_CREATE | IN_MODIFY | IN_DELETE)) < 0) {
if (inotify_add_watch(uml_driver->inotifyFD,
uml_driver->monitorDir,
IN_CREATE | IN_MODIFY | IN_DELETE) < 0) {
umlShutdown();
return -1;
}
if (virEventAddHandle(uml_driver->inotifyFD, POLLIN,
umlInotifyEvent, uml_driver, NULL) < 0) {
if ((uml_driver->inotifyWatch =
virEventAddHandle(uml_driver->inotifyFD, POLLIN,
umlInotifyEvent, uml_driver, NULL)) < 0) {
umlShutdown();
return -1;
}