Commit 55ddfe8e authored by Jan Kiszka's avatar Jan Kiszka Committed by Anthony Liguori
Browse files

Rework reset handler management



Convert the reset handler maintenance code to TAILQ services.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 76e30d0f
...@@ -3442,12 +3442,13 @@ void vm_start(void) ...@@ -3442,12 +3442,13 @@ void vm_start(void)
/* reset/shutdown handler */ /* reset/shutdown handler */
typedef struct QEMUResetEntry { typedef struct QEMUResetEntry {
TAILQ_ENTRY(QEMUResetEntry) entry;
QEMUResetHandler *func; QEMUResetHandler *func;
void *opaque; void *opaque;
struct QEMUResetEntry *next;
} QEMUResetEntry; } QEMUResetEntry;
static QEMUResetEntry *first_reset_entry; static TAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =
TAILQ_HEAD_INITIALIZER(reset_handlers);
static int reset_requested; static int reset_requested;
static int shutdown_requested; static int shutdown_requested;
static int powerdown_requested; static int powerdown_requested;
...@@ -3501,16 +3502,11 @@ static void do_vm_stop(int reason) ...@@ -3501,16 +3502,11 @@ static void do_vm_stop(int reason)
void qemu_register_reset(QEMUResetHandler *func, void *opaque) void qemu_register_reset(QEMUResetHandler *func, void *opaque)
{ {
QEMUResetEntry **pre, *re; QEMUResetEntry *re = qemu_mallocz(sizeof(QEMUResetEntry));
pre = &first_reset_entry;
while (*pre != NULL)
pre = &(*pre)->next;
re = qemu_mallocz(sizeof(QEMUResetEntry));
re->func = func; re->func = func;
re->opaque = opaque; re->opaque = opaque;
re->next = NULL; TAILQ_INSERT_TAIL(&reset_handlers, re, entry);
*pre = re;
} }
void qemu_system_reset(void) void qemu_system_reset(void)
...@@ -3518,7 +3514,7 @@ void qemu_system_reset(void) ...@@ -3518,7 +3514,7 @@ void qemu_system_reset(void)
QEMUResetEntry *re; QEMUResetEntry *re;
/* reset all devices */ /* reset all devices */
for(re = first_reset_entry; re != NULL; re = re->next) { TAILQ_FOREACH(re, &reset_handlers, entry) {
re->func(re->opaque); re->func(re->opaque);
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment