From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6xmQ-0006Lf-4I for qemu-devel@nongnu.org; Wed, 07 Aug 2013 03:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6xmE-00059h-6r for qemu-devel@nongnu.org; Wed, 07 Aug 2013 03:03:34 -0400 Received: from mail-pb0-f47.google.com ([209.85.160.47]:53025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6xmE-00059Q-0I for qemu-devel@nongnu.org; Wed, 07 Aug 2013 03:03:22 -0400 Received: by mail-pb0-f47.google.com with SMTP id rr4so546432pbb.34 for ; Wed, 07 Aug 2013 00:03:20 -0700 (PDT) Message-ID: <5201F12B.6050101@ozlabs.ru> Date: Wed, 07 Aug 2013 17:03:07 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1375777673-20274-1-git-send-email-aik@ozlabs.ru> <1375777673-20274-7-git-send-email-aik@ozlabs.ru> <5200CC0D.5000908@suse.de> In-Reply-To: <5200CC0D.5000908@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 6/6] xics-kvm: Support for in-kernel XICS interrupt controller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: Anthony Liguori , Alexander Graf , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paul Mackerras , David Gibson On 08/06/2013 08:12 PM, Andreas Färber wrote: >> + /* Call emulated XICS implementation for consistency */ >> + assert(xics_info && xics_info->cpu_setup); >> + xics_info->cpu_setup(icp, cpu); >> +} >> + >> +void xics_kvm_set_nr_irqs(XICSState *icp, uint32_t nr_irqs) >> +{ >> + icp->ics = ICS(object_new(TYPE_ICS_KVM)); >> + object_property_add_child(OBJECT(icp), "ics", OBJECT(icp->ics), NULL); >> + icp->ics->icp = icp; > > instance_init + object_initialize()? Create ICS_KVM in instance_init of XICS_KVM and initialize it here? Why split? > >> + icp->nr_irqs = icp->ics->nr_irqs = nr_irqs; >> +} >> + >> +void xics_kvm_set_nr_servers(XICSState *icp, uint32_t nr_servers) >> +{ >> + int i; >> + >> + icp->nr_servers = nr_servers; >> + >> + icp->ss = g_malloc0(icp->nr_servers*sizeof(ICPState)); >> + for (i = 0; i < icp->nr_servers; i++) { >> + char buffer[32]; >> + object_initialize(&icp->ss[i], TYPE_ICP_KVM); >> + snprintf(buffer, sizeof(buffer), "icp[%d]", i); >> + object_property_add_child(OBJECT(icp), buffer, OBJECT(&icp->ss[i]), NULL); >> + } >> +} >> + >> +static void rtas_dummy(PowerPCCPU *cpu, sPAPREnvironment *spapr, >> + uint32_t token, >> + uint32_t nargs, target_ulong args, >> + uint32_t nret, target_ulong rets) >> +{ >> + error_report("pseries: %s must never be called for in-kernel XICS\n", >> + __func__); >> +} >> + >> +static void xics_kvm_realize(DeviceState *dev, Error **errp) >> +{ >> + KVMXICSState *icpkvm = KVM_XICS(dev); >> + XICSState *icp = XICS_COMMON(dev); >> + int i, rc; >> + Error *error = NULL; >> + struct kvm_create_device xics_create_device = { >> + .type = KVM_DEV_TYPE_XICS, >> + .flags = 0, >> + }; >> + >> + assert(kvm_enabled()); >> + assert(kvm_check_extension(kvm_state, KVM_CAP_IRQ_XICS)); > > error_setg() - if device can be created without accel=kvm (which it > looks as if it can) then you should just error out the nice way here. I check kvm_enabled() (I thought I check both but was wrong, will fix it) where I try to create XICS_KVM so we should not be here if that check failed. -- Alexey