diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-21 14:13:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-21 14:13:02 -0500 |
| commit | 28695489e392e2bd34cf4ccf8611d431808e084c (patch) | |
| tree | 8edbda8b30cb4bbbd4636c1c9dbb8c6ecead181a /hw/xen_domainbuild.c | |
| parent | 365c4243ecdd0eb2372ce4a5bb20ded77c755c1d (diff) | |
| download | qemu-28695489e392e2bd34cf4ccf8611d431808e084c.zip qemu-28695489e392e2bd34cf4ccf8611d431808e084c.tar.gz qemu-28695489e392e2bd34cf4ccf8611d431808e084c.tar.bz2 | |
Revert "Convert atexit users to exit_notifier"
This reverts commit d7234f4d7e373a708e1df9ab565a71b71b189025.
Conflicts:
hw/xen_machine_pv.c
This should have never been committed.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/xen_domainbuild.c')
| -rw-r--r-- | hw/xen_domainbuild.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/xen_domainbuild.c b/hw/xen_domainbuild.c index b735ca4..2f59856 100644 --- a/hw/xen_domainbuild.c +++ b/hw/xen_domainbuild.c @@ -211,7 +211,7 @@ static int xen_domain_watcher(void) } /* normal cleanup */ -static void xen_domain_cleanup(Notifier *notifier) +static void xen_domain_cleanup(void) { char *dom; @@ -232,7 +232,6 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, unsigned int xenstore_port = 0, console_port = 0; unsigned long xenstore_mfn = 0, console_mfn = 0; int rc; - static Notifier exit_notifier = { .notify = xen_domain_cleanup }; memcpy(uuid, qemu_uuid, sizeof(uuid)); rc = xc_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); @@ -241,7 +240,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, goto err; } qemu_log("xen: created domain %d\n", xen_domid); - exit_notifier_add(&exit_notifier); + atexit(xen_domain_cleanup); if (xen_domain_watcher() == -1) { goto err; } |