From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abOlP-00077a-Mx for qemu-devel@nongnu.org; Thu, 03 Mar 2016 03:37:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abOlN-00056Y-TG for qemu-devel@nongnu.org; Thu, 03 Mar 2016 03:37:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abOlN-00056U-MA for qemu-devel@nongnu.org; Thu, 03 Mar 2016 03:37:37 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 572BDC00F6FA for ; Thu, 3 Mar 2016 08:37:37 +0000 (UTC) From: Ladi Prosek Date: Thu, 3 Mar 2016 09:37:16 +0100 Message-Id: <1456994238-9585-3-git-send-email-lprosek@redhat.com> In-Reply-To: <1456994238-9585-1-git-send-email-lprosek@redhat.com> References: <1456994238-9585-1-git-send-email-lprosek@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/4] rng: move request queue from RngEgd to RngBackend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, pbonzini@redhat.com, Ladi Prosek , pagupta@redhat.com The 'requests' field now lives in the RngBackend parent class. There are no functional changes in this commit. Signed-off-by: Ladi Prosek --- backends/rng-egd.c | 28 +++++++++------------------- include/sysemu/rng.h | 11 +++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/backends/rng-egd.c b/backends/rng-egd.c index 0b2976a..b061362 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -25,19 +25,8 @@ typedef struct RngEgd CharDriverState *chr; char *chr_name; - - GSList *requests; } RngEgd; -typedef struct RngRequest -{ - EntropyReceiveFunc *receive_entropy; - uint8_t *data; - void *opaque; - size_t offset; - size_t size; -} RngRequest; - static void rng_egd_request_entropy(RngBackend *b, size_t size, EntropyReceiveFunc *receive_entropy, void *opaque) @@ -66,7 +55,7 @@ static void rng_egd_request_entropy(RngBackend *b, size_t size, size -= len; } - s->requests = g_slist_append(s->requests, req); + s->parent.requests = g_slist_append(s->parent.requests, req); } static void rng_egd_free_request(RngRequest *req) @@ -81,7 +70,7 @@ static int rng_egd_chr_can_read(void *opaque) GSList *i; int size = 0; - for (i = s->requests; i; i = i->next) { + for (i = s->parent.requests; i; i = i->next) { RngRequest *req = i->data; size += req->size - req->offset; } @@ -94,8 +83,8 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) RngEgd *s = RNG_EGD(opaque); size_t buf_offset = 0; - while (size > 0 && s->requests) { - RngRequest *req = s->requests->data; + while (size > 0 && s->parent.requests) { + RngRequest *req = s->parent.requests->data; int len = MIN(size, req->size - req->offset); memcpy(req->data + req->offset, buf + buf_offset, len); @@ -104,7 +93,8 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) size -= len; if (req->offset == req->size) { - s->requests = g_slist_remove_link(s->requests, s->requests); + s->parent.requests = g_slist_remove_link(s->parent.requests, + s->parent.requests); req->receive_entropy(req->opaque, req->data, req->size); @@ -117,12 +107,12 @@ static void rng_egd_free_requests(RngEgd *s) { GSList *i; - for (i = s->requests; i; i = i->next) { + for (i = s->parent.requests; i; i = i->next) { rng_egd_free_request(i->data); } - g_slist_free(s->requests); - s->requests = NULL; + g_slist_free(s->parent.requests); + s->parent.requests = NULL; } static void rng_egd_opened(RngBackend *b, Error **errp) diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h index c7da17d..084164c 100644 --- a/include/sysemu/rng.h +++ b/include/sysemu/rng.h @@ -25,6 +25,7 @@ #define RNG_BACKEND_CLASS(klass) \ OBJECT_CLASS_CHECK(RngBackendClass, (klass), TYPE_RNG_BACKEND) +typedef struct RngRequest RngRequest; typedef struct RngBackendClass RngBackendClass; typedef struct RngBackend RngBackend; @@ -32,6 +33,15 @@ typedef void (EntropyReceiveFunc)(void *opaque, const void *data, size_t size); +struct RngRequest +{ + EntropyReceiveFunc *receive_entropy; + uint8_t *data; + void *opaque; + size_t offset; + size_t size; +}; + struct RngBackendClass { ObjectClass parent_class; @@ -48,6 +58,7 @@ struct RngBackend /*< protected >*/ bool opened; + GSList *requests; }; /** -- 2.5.0