Commit 2f7b92a0 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw: move reset handlers from vl.c to hw/core 



They are small, it is not worth stubbing them.  Just include them
in user-mode emulators and unit tests as well.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 671ab436

hw/core/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
# core qdev-related obj files, also used by *-user:

common-obj-y += qdev.o qdev-properties.o

common-obj-y += bus.o

common-obj-y += bus.o reset.o

common-obj-y += fw-path-provider.o

# irq.o needed for qdev GPIO handling:

common-obj-y += irq.o

hw/core/reset.c

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 *  Reset handlers.

 *

 * Copyright (c) 2003-2008 Fabrice Bellard

 * Copyright (c) 2016 Red Hat, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#include "qemu/osdep.h"

#include "qemu/queue.h"

#include "sysemu/reset.h"



/* reset/shutdown handler */



typedef struct QEMUResetEntry {

    QTAILQ_ENTRY(QEMUResetEntry) entry;

    QEMUResetHandler *func;

    void *opaque;

} QEMUResetEntry;



static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =

    QTAILQ_HEAD_INITIALIZER(reset_handlers);



void qemu_register_reset(QEMUResetHandler *func, void *opaque)

{

    QEMUResetEntry *re = g_malloc0(sizeof(QEMUResetEntry));



    re->func = func;

    re->opaque = opaque;

    QTAILQ_INSERT_TAIL(&reset_handlers, re, entry);

}



void qemu_unregister_reset(QEMUResetHandler *func, void *opaque)

{

    QEMUResetEntry *re;



    QTAILQ_FOREACH(re, &reset_handlers, entry) {

        if (re->func == func && re->opaque == opaque) {

            QTAILQ_REMOVE(&reset_handlers, re, entry);

            g_free(re);

            return;

        }

    }

}



void qemu_devices_reset(void)

{

    QEMUResetEntry *re, *nre;



    /* reset all devices */

    QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {

        re->func(re->opaque);

    }

}

include/hw/hw.h

+1 −5
Original line number Diff line number Diff line
@@ -12,11 +12,7 @@ 
#include "hw/irq.h"

#include "migration/vmstate.h"

#include "qemu/module.h"



typedef void QEMUResetHandler(void *opaque);



void qemu_register_reset(QEMUResetHandler *func, void *opaque);

void qemu_unregister_reset(QEMUResetHandler *func, void *opaque);

#include "sysemu/reset.h"



void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);

include/sysemu/reset.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef QEMU_SYSEMU_RESET_H

#define QEMU_SYSEMU_RESET_H



typedef void QEMUResetHandler(void *opaque);



void qemu_register_reset(QEMUResetHandler *func, void *opaque);

void qemu_unregister_reset(QEMUResetHandler *func, void *opaque);

void qemu_devices_reset(void);



#endif

include/sysemu/sysemu.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ void qemu_system_vmstop_request_prepare(void); 
int qemu_shutdown_requested_get(void);

int qemu_reset_requested_get(void);

void qemu_system_killed(int signal, pid_t pid);

void qemu_devices_reset(void);

void qemu_system_reset(bool report);

void qemu_system_guest_panicked(void);

size_t qemu_target_page_bits(void);