From 28695489e392e2bd34cf4ccf8611d431808e084c Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Sun, 21 Mar 2010 14:13:02 -0500 Subject: 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 --- hw/xen_domainbuild.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hw/xen_domainbuild.c') diff --git a/hw/xen_domainbuild.c b/hw/xen_domainbuild.c index b735ca453..2f59856f7 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; } -- cgit v1.2.3