motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Convert atexit users to exit_notifier"

Browse source 
This reverts commit d7234f4d7e.

Conflicts:

	hw/xen_machine_pv.c

This should have never been committed.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2010-03-21 14:13:02 -05:00
parent 365c4243ec
commit 28695489e3
8 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xen_backend.h
View file

@ -97,7 +97,7 @@ extern struct XenDevOps xen_netdev_ops; /* xen_nic.c */
void xen_init_display(int domid);
/* configuration (aka xenbus setup) */
void xen_config_cleanup(Notifier *notifier);
void xen_config_cleanup(void);
int xen_config_dev_blk(DriveInfo *disk);
int xen_config_dev_nic(NICInfo *nic);
int xen_config_dev_vfb(int vdev, const char *type);

2
hw/xen_devconfig.c
View file

@ -17,7 +17,7 @@ static void xen_config_cleanup_dir(char *dir)
QTAILQ_INSERT_TAIL(&xs_cleanup, d, list);
}
void xen_config_cleanup(Notifier *notifier)
void xen_config_cleanup(void)
{
struct xs_dirs *d;

5
hw/xen_domainbuild.c
View file

@ -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;
}

3
hw/xen_machine_pv.c
View file

@ -42,7 +42,6 @@ static void xen_init_pv(ram_addr_t ram_size,
CPUState *env;
DriveInfo *dinfo;
int i;
static Notifier exit_notifier = { .notify = xen_config_cleanup };
/* Initialize a dummy CPU */
if (cpu_model == NULL) {
@ -106,7 +105,7 @@ static void xen_init_pv(ram_addr_t ram_size,
}
/* config cleanup hook */
exit_notifier_add(&exit_notifier);
atexit(xen_config_cleanup);
/* setup framebuffer */
xen_init_display(xen_domid);