External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix driver ordering to make domain autostart work (Gerd von Egidy)

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-12-02 11:37:55 +00:00
parent a429e221df
commit 821b41f9f7
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -55,7 +55,7 @@ Patches have also been contributed by:
Chris Wrigh <chrisw@redhat.com>
Ben Guthro <bguthro@virtualiron.com>
Shigeki Sakamoto <fj0588di@aa.jp.fujitsu.com>
Gerd von Egidy <lists@egidy.de>
[....send patches to get your name here....]

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Dec 2 11:34:22 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* qemud/qemud.c: Registering network, storage & nodedev drivers
before any domain drivers, so domain autostart can rely on
network/storage autostarted objects. Patch from Gerd von Egidy
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

31
qemud/qemud.c
View File

@ -755,28 +755,26 @@ static struct qemud_server *qemudInitialize(int sigread) {
virInitialize();
/*
* Note that the order is important: the first ones have a higher
* priority when calling virStateInitialize. We must register
* the network, storage and nodedev drivers before any domain
* drivers, since their resources must be auto-started before
* any domains can be auto-started.
*/
#ifdef WITH_DRIVER_MODULES
/* We don't care if any of these fail, because the whole point
* is to allow users to only install modules they want to use.
* If they try to use a open a connection for a module that
* is not loaded they'll get a suitable error at that point
*/
virDriverLoadModule("qemu");
virDriverLoadModule("lxc");
virDriverLoadModule("uml");
virDriverLoadModule("network");
virDriverLoadModule("storage");
virDriverLoadModule("nodedev");
virDriverLoadModule("qemu");
virDriverLoadModule("lxc");
virDriverLoadModule("uml");
#else
#ifdef WITH_QEMU
qemuRegister();
#endif
#ifdef WITH_LXC
lxcRegister();
#endif
#ifdef WITH_UML
umlRegister();
#endif
#ifdef WITH_NETWORK
networkRegister();
#endif
@ -786,6 +784,15 @@ static struct qemud_server *qemudInitialize(int sigread) {
#if defined(HAVE_HAL) || defined(HAVE_DEVKIT)
nodedevRegister();
#endif
#ifdef WITH_QEMU
qemuRegister();
#endif
#ifdef WITH_LXC
lxcRegister();
#endif
#ifdef WITH_UML
umlRegister();
#endif
#endif
virEventRegisterImpl(virEventAddHandleImpl,