github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-06 17:21:22 +00:00
Code Issues Projects Releases Wiki Activity

DM: refine cleanup functionality of virtual RTC

Browse Source 
The patch includes:
1. vrtc_cleanup -> vrtc_deinit to align with other devices
2. delete timer created in vrtc_init
3. make call to vrtc_deinit in cleanup path

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Eddie Dong <Eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei
2018-03-30 14:46:35 +08:00
committed by Jack Ren
parent 80a9fe5b37
commit eadc921bf0
4 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
devicemodel/hw/platform/rtc.c
View File

@@ -593,6 +593,12 @@ vrtc_create_timer(struct vrtc *vrtc, time_t sec, time_t nsec, void (*cb)())
return timerid;
}
static void
vrtc_delete_timer(timer_t timerid)
{
timer_delete(timerid);
}
static int
vrtc_time_update(struct vrtc *vrtc, time_t newtime, time_t newbase)
{
@@ -1103,6 +1109,7 @@ vrtc_init(struct vmctx *ctx, int local_time)
assert(vrtc != NULL);
memset(vrtc, 0, sizeof(struct vrtc));
vrtc->vm = ctx;
ctx->vrtc = vrtc;
pthread_mutex_init(&vrtc->mtx, NULL);
@@ -1157,7 +1164,24 @@ vrtc_init(struct vmctx *ctx, int local_time)
}
void
vrtc_cleanup(struct vrtc *vrtc)
vrtc_deinit(struct vmctx *ctx)
{
struct vrtc *vrtc = ctx->vrtc;
struct inout_port iop;
memset(&iop, 0, sizeof(struct inout_port));
iop.name = "rtc";
iop.port = IO_RTC;
iop.size = 1;
unregister_inout(&iop);
memset(&iop, 0, sizeof(struct inout_port));
iop.name = "rtc";
iop.port = IO_RTC + 1;
iop.size = 1;
unregister_inout(&iop);
vrtc_delete_timer(vrtc->update_timer_id);
free(vrtc);
ctx->vrtc = NULL;
}