From nobody Tue Feb 10 10:03:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252596; cv=none; d=zohomail.com; s=zohoarc; b=hf9OrKxCLHV4ExVtXxMwwoiurRrcd5TmloVKu6bUPhDI3wH5J9n/b55ztWGT7mSpbPknz604KE82TIysqywgSPqGtyd79b6h87GwDO/VVCWGB19vFov3mJ+jE32U1mNARoc/hAQhn7ksYpSqeoql5fD0Wv3udOk/zeqasoN+I7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252596; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=elm9qcdGQk72gqB4ibNX9churq/FsJ3KEAhg0i9d3/Q=; b=nywkYRTUGAxYuD/HWZrWoLB3dZKUmLIPJiC6HfpRLFMboi06bOS9p6AKvBV0nwwsZUAtMgxavSz7qMhd6/77SxRKhYDmcfXheMzgeDN59vGQW/2CzCjY4bWk94/qSQ8kXDDvp+h/vpVoRT5BvSPoh/eZVPOMd8FhMDqkahr9Rgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1621252596862331.65193035716663; Mon, 17 May 2021 04:56:36 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id r12so6103115wrp.1 for ; Mon, 17 May 2021 04:56:36 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id e38sm19636720wmp.21.2021.05.17.04.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:34 -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=elm9qcdGQk72gqB4ibNX9churq/FsJ3KEAhg0i9d3/Q=; b=SyqO3x6epByKgiVLWqzXpweNnmkfuMBF6TP/J3mAS/ebit1aIkZ6bmRWh/W9+jWy65 m4rd+8JfD0NrO1Nslz6LEZmIYZyBvJH8M2a0O4ghYC78GDea9vos1kulWFkastZchLSy 9AYht9dxddRfJrXgEjwRpm0bFHdi3HxpQ+h2fLRDgIPh7Ggvzxw+yNa+Gtl+p5izjF+l SkRD9/HiFZ5D0d2O+jNWOYF+L8nYi3Ct6rTFeV/GiizBmUbmCC+dvjRnKN6N7MFcdQ17 0LJ3haMb4VCbb+l/UJwmev18IDyNuAacuEeOiEwe35pZlAIrWt9nfR5TqV3KOflNjN+Y euNA== 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=elm9qcdGQk72gqB4ibNX9churq/FsJ3KEAhg0i9d3/Q=; b=EJY0tme/Iis8inUak4MAM01KeZYkxcK6mT8GzjSNkmP3iRnDirGOPm2mezGR+qV2Ec qVgPVX1dMhkm+6N6nG13AiypByZHRFzy9sj8Rc8ub+cwvhBQyHT+Y2VF3Kl9gYTBSwqO vbpjTfL+x6QhmZRYPe0ZAU52Il+6yIczRkm5fi3O/vmtU3g1St7bei+K3pAFMVAlNtj4 k/N0vNkZaEQ1hXg12ya0HFvGuAnoEFL2h8y84gRaA9I+Xi4KN7VvmXXingH2oeTH3XcE T3w4O0HorkNMCCSL0g57aaH63o3QxP6Ly3YcLnEkQWRwbSu4i7o9ROkLVGVmeSbNrZy3 C3Ow== X-Gm-Message-State: AOAM53094pD5gr1jE5u2/R/e46FSulVqugnoLQ2EpVMti8xQf0hkQFRU e6vkfO13laaH57/+400yoXU= X-Google-Smtp-Source: ABdhPJw+jY8vbOb4NTf11Ar5/z/Y2VqSoIiQXVEgb3GcP+4fLXfc3/EzC+b8exRGrXuEtH2VPbMgMA== X-Received: by 2002:adf:cf09:: with SMTP id o9mr23207211wrj.334.1621252595011; Mon, 17 May 2021 04:56:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 13/15] sysemu/memory_mapping: Become target-agnostic Date: Mon, 17 May 2021 13:55:23 +0200 Message-Id: <20210517115525.1088693-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) target_ulong is target-specific, while hwaddr isn't. memory_mapping_list_add_merge_sorted() uses hwaddr arguments anyway, so use the hwaddr type for MemoryMapping::virt_addr. Remove the unnecessary "exec/cpu-defs.h" target-speficic header from "memory_mapping.h" and use the target-agnostic "hw/core/cpu.h" locally in memory_mapping.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/sysemu/memory_mapping.h | 3 +-- softmmu/memory_mapping.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mappin= g.h index 4b20f1a639e..771dba21773 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -15,7 +15,6 @@ #define MEMORY_MAPPING_H =20 #include "qemu/queue.h" -#include "exec/cpu-defs.h" #include "exec/memory.h" =20 typedef struct GuestPhysBlock { @@ -43,7 +42,7 @@ typedef struct GuestPhysBlockList { /* The physical and virtual address in the memory mapping are contiguous. = */ typedef struct MemoryMapping { hwaddr phys_addr; - target_ulong virt_addr; + hwaddr virt_addr; ram_addr_t length; QTAILQ_ENTRY(MemoryMapping) next; } MemoryMapping; diff --git a/softmmu/memory_mapping.c b/softmmu/memory_mapping.c index e7af2765466..7bb74df5a7a 100644 --- a/softmmu/memory_mapping.c +++ b/softmmu/memory_mapping.c @@ -17,6 +17,7 @@ #include "sysemu/memory_mapping.h" #include "exec/memory.h" #include "exec/address-spaces.h" +#include "hw/core/cpu.h" =20 //#define DEBUG_GUEST_PHYS_REGION_ADD =20 --=20 2.26.3