From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH v3] xen/keyhandler: Rework keyhandler infrastructure Date: Thu, 24 Sep 2015 13:09:50 +0100 Message-ID: <5603E80E.8090606@citrix.com> References: <1443092706-29270-1-git-send-email-andrew.cooper3@citrix.com> <5603FE9A02000078000A5430@prv-mh.provo.novell.com> <5603E2EE.6040804@citrix.com> <5604016A02000078000A5476@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5604016A02000078000A5476@prv-mh.provo.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: Keir Fraser , Xen-devel List-Id: xen-devel@lists.xenproject.org On 24/09/15 12:58, Jan Beulich wrote: >>>> On 24.09.15 at 13:47, wrote: >> On 24/09/15 12:46, Jan Beulich wrote: >>>>>> On 24.09.15 at 13:05, wrote: >>>> +static struct keyhandler { >>>> + union { >>>> + keyhandler_fn_t *fn; >>>> + irq_keyhandler_fn_t *irq_fn; >>>> + }; >>>> + >>>> + const char *desc; /* Description for help message. >> */ >>>> + bool_t irq_callback, /* Call in irq context? if not, tasklet context. >> */ >>>> + diagnostic; /* Include in 'dump all' handler. >> */ >>>> +} key_table[128] __read_mostly = >>>> +{ >>>> +#define KEYHANDLER(k, f, desc, diag) \ >>>> + [k] = { .fn = (f), desc, 0, diag } >>>> + >>>> +#define IRQ_KEYHANDLER(k, f, desc, diag) \ >>>> + [k] = { .irq_fn = (f), desc, 1, diag } >>> I'm sorry for noticing only now, but I'm afraid these (looking as >>> odd - but correct - as the other ones did) won't build with older >>> gcc either. >> Urgh yes. I think we might have to just explicitly typecast the >> pointer, because .irq_fn is uninitialised in older GCC. Would that be ok? > Yes, certainly better than re-adding the u name. Another > alternative would be a void * as the first union alternative, > but I suppose future gcc might become more strict about > conversions between function and data pointers... This appears to work for me. diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 7d168e9..8c43d85 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -43,10 +43,10 @@ } key_table[128] __read_mostly = { #define KEYHANDLER(k, f, desc, diag) \ - [k] = { .fn = (f), desc, 0, diag } + [k] = { { f }, desc, 0, diag } #define IRQ_KEYHANDLER(k, f, desc, diag) \ - [k] = { .irq_fn = (f), desc, 1, diag } + [k] = { { (keyhandler_fn_t*)f }, desc, 1, diag } IRQ_KEYHANDLER('A', do_toggle_alt_key, "toggle alternative key handling", 0), IRQ_KEYHANDLER('d', dump_registers, "dump registers", 1),