From nobody Wed Nov 5 14:26:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534872766884220.30489298265377; Tue, 21 Aug 2018 10:32:46 -0700 (PDT) Received: from localhost ([::1]:55094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsAWL-0005k2-3Q for importer@patchew.org; Tue, 21 Aug 2018 13:32:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA4Y-0001w7-ES for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA4V-0006lJ-1L for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:01 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:53039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA4R-0006e5-Ta for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:58 -0400 Received: by mail-wm0-x22d.google.com with SMTP id y139-v6so854437wmc.2 for ; Tue, 21 Aug 2018 10:03:55 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=02TAl30ECdTMXFdfp3nYaJBbiiT6dQfo8OVogx5Uch8=; b=PO9Z2oGbNVKyNT8Zi7oevxtINyYTrZLlSPrg2t4hKTL3q5t3liQZVjbT1fRKX7+WzS I0xrDPXcZ5ZLwLIKHVMuJZveq3uJkrFdnDNCo0Suuc/lYoKHKTsvh6IqVcXUeR/ddgxW +v2hHBD32M0Bnm4tswHR1VnjUHoGfOziOmyKsjcF9vM+61tY+MiLXBcnjIFdWMj0xUFm zP7ms+JbLSNVepApUMAJKRp8y+yAHplqvH4GA5mzJ32rTKyUC6waofB+WAwDccvgVFvg ZiQircB3gckU4ATmBFLb29OG00rNMcbeNKQqkMOQl7fINF1BPO/FNXd2kil27qEKTIPp jUTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=02TAl30ECdTMXFdfp3nYaJBbiiT6dQfo8OVogx5Uch8=; b=MSb6qPJim2wDeOQh7mQ6ACBlYPuAuEmxfqURfzE23qWEQXzWW+n3RRL9II+RRycHOR FZvrOBqxDcKOVCSAQ2GKihezFjn2j66GP5JRvh5SvGix1qmLRCCyce4L+aLV3DsYKMYi JRGBzT6iJBmpKNh0csHqQuLJKn2f5Fb1Pd39rJ4B8iZx2PGIiW+aohkrQpX7HA5qJ93I 6i9cALJ/0++bVHZ51ynuEyMYUyK2h0YqHrmahpaYbZbIAWD2oiBZoQWaV8OBWKU3V8gZ fkbQUd+M9t9HU7iD8n8FPP10vlEZYtk6x/CTKFSx2oR5Tjr8BADJNzJqxDNbFugmApHN q94g== X-Gm-Message-State: APzg51CimUXYvNkKcJ18CCNpB1iER5o75vNGjmoMyhCRoAOB0O5yqGXk AIAsbmGuWJDQ7k4Xint7bHo114G7 X-Google-Smtp-Source: ANB0VdahoUXWpykj1vLBIbR8LWB65FOb/5EdIooIoQLPTXSz7rIXa1UI2LzLj5krUcVj+C5P8C9UlQ== X-Received: by 2002:a1c:c147:: with SMTP id r68-v6mr119160wmf.161.1534871034491; Tue, 21 Aug 2018 10:03:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:19 +0200 Message-Id: <1534870966-9287-48-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 47/74] hw/intc/apic: Switch away from old_mmio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 From: Peter Maydell Switch the apic away from using the old_mmio MemoryRegionOps accessor functions. Signed-off-by: Peter Maydell Message-Id: <20180803101943.23722-1-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/intc/apic.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c index 6fda52b..97ffdd8 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -650,31 +650,17 @@ static void apic_timer(void *opaque) apic_timer_update(s, s->next_time); } =20 -static uint32_t apic_mem_readb(void *opaque, hwaddr addr) -{ - return 0; -} - -static uint32_t apic_mem_readw(void *opaque, hwaddr addr) -{ - return 0; -} - -static void apic_mem_writeb(void *opaque, hwaddr addr, uint32_t val) -{ -} - -static void apic_mem_writew(void *opaque, hwaddr addr, uint32_t val) -{ -} - -static uint32_t apic_mem_readl(void *opaque, hwaddr addr) +static uint64_t apic_mem_read(void *opaque, hwaddr addr, unsigned size) { DeviceState *dev; APICCommonState *s; uint32_t val; int index; =20 + if (size < 4) { + return 0; + } + dev =3D cpu_get_current_apic(); if (!dev) { return 0; @@ -765,11 +751,17 @@ static void apic_send_msi(MSIMessage *msi) apic_deliver_irq(dest, dest_mode, delivery, vector, trigger_mode); } =20 -static void apic_mem_writel(void *opaque, hwaddr addr, uint32_t val) +static void apic_mem_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) { DeviceState *dev; APICCommonState *s; int index =3D (addr >> 4) & 0xff; + + if (size < 4) { + return; + } + if (addr > 0xfff || !index) { /* MSI and MMIO APIC are at the same memory location, * but actually not on the global bus: MSI is on PCI bus @@ -880,10 +872,12 @@ static void apic_post_load(APICCommonState *s) } =20 static const MemoryRegionOps apic_io_ops =3D { - .old_mmio =3D { - .read =3D { apic_mem_readb, apic_mem_readw, apic_mem_readl, }, - .write =3D { apic_mem_writeb, apic_mem_writew, apic_mem_writel, }, - }, + .read =3D apic_mem_read, + .write =3D apic_mem_write, + .impl.min_access_size =3D 1, + .impl.max_access_size =3D 4, + .valid.min_access_size =3D 1, + .valid.max_access_size =3D 4, .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 --=20 1.8.3.1