From 990353a8ddac5eda342f4dc6ce94d856cf3eb4bf Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Thu, 24 Oct 2013 12:48:46 +0900 Subject: [PATCH] A ESM implementation changes for systemd. For systemd boot progress monitor, introduce 'mode' specifier. Change-Id: I0d79a4167b7034126b9b4bb1c6cbced37fa589d7 Signed-off-by: SeokYeon Hwang --- tizen/src/hw/maru_virtio_esm.c | 18 ++++++++++++------ tizen/src/skin/maruskin_server.c | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tizen/src/hw/maru_virtio_esm.c b/tizen/src/hw/maru_virtio_esm.c index 1f54d7eb2a..fd7d8e0c78 100644 --- a/tizen/src/hw/maru_virtio_esm.c +++ b/tizen/src/hw/maru_virtio_esm.c @@ -34,6 +34,7 @@ MULTI_DEBUG_CHANNEL(qemu, virtio-esm); struct progress_info { + char mode; uint16_t percentage; }; @@ -57,19 +58,24 @@ static void virtio_esm_handle(VirtIODevice *vdev, VirtQueue *vq) TRACE("virtio element out number : %d\n", elem.out_num); if (elem.out_num != 1) { - ERR("virtio element out number is wierd."); + ERR("virtio element out number is wierd.\n"); } else { TRACE("caramis elem.out_sg[0].iov_len : %x\n", elem.out_sg[0].iov_len); TRACE("caramis elem.out_sg[0].iov_base : %x\n", elem.out_sg[0].iov_base); - if (elem.out_sg[0].iov_len != 2) { - ERR("out lenth is wierd."); + if (elem.out_sg[0].iov_len != 4) { + ERR("out lenth is wierd.\n"); } else { - progress.percentage = *((uint16_t*)elem.out_sg[0].iov_base); - INFO("boot up progress is [%u] percent done.\n", progress.percentage); + progress = *((struct progress_info*)elem.out_sg[0].iov_base); + TRACE("Boot up progress is [%u] percent done at %s.\n", + progress.percentage, + progress.mode == 's' || progress.mode == 'S' ? "system mode" : "user mode"); /* notify to skin */ - //notify_booting_progress(0, progress.percentage); + if(progress.mode == 's' || progress.mode == 'S') + notify_booting_progress(1, progress.percentage); + else + notify_booting_progress(0, progress.percentage); } } diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c index d2723810ba..bf38df492b 100644 --- a/tizen/src/skin/maruskin_server.c +++ b/tizen/src/skin/maruskin_server.c @@ -395,7 +395,7 @@ void notify_booting_progress(unsigned int layer, int progress_value) snprintf(progress_data, PROGRESS_DATA_LENGTH, "%d%03d", layer % 10, progress_value); - INFO("booting...%s\%\n", progress_data); + TRACE("booting...%s\%\n", progress_data); if (client_sock) { if (0 > send_skin_data(client_sock, -- 2.34.1