OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

sparc32: convert slavio_misc to reset + vmsd

Browse Source 
Also remove unused include directive.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-10-24 15:27:23 +00:00
parent 0284dc5410
commit 1795057a8f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/slavio_misc.c
View File

@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
#include "sun4m.h"
#include "sysemu.h"
#include "sysbus.h"
@ -88,9 +87,9 @@ static void slavio_misc_update_irq(void *opaque)
}
}
static void slavio_misc_reset(void *opaque)
static void slavio_misc_reset(DeviceState *d)
{
MiscState *s = opaque;
MiscState *s = container_of(d, MiscState, busdev.qdev);
// Diagnostic and system control registers not cleared in reset
s->config = s->aux1 = s->aux2 = s->mctrl = 0;
@ -477,9 +476,8 @@ static int slavio_misc_init1(SysBusDevice *dev)
qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1);
vmstate_register(-1, &vmstate_misc, s);
qemu_register_reset(slavio_misc_reset, s);
slavio_misc_reset(s);
slavio_misc_reset(&s->busdev.qdev);
return 0;
}
@ -487,6 +485,8 @@ static SysBusDeviceInfo slavio_misc_info = {
.init = slavio_misc_init1,
.qdev.name = "slavio_misc",
.qdev.size = sizeof(MiscState),
.qdev.vmsd = &vmstate_misc,
.qdev.reset = slavio_misc_reset,
};
static SysBusDeviceInfo apc_info = {