From nobody Wed Nov 19 03:00:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614277211; cv=none; d=zohomail.com; s=zohoarc; b=kNearumiZ2lQKJl2vpMpo0n18Z8jEEL6TIBl/k0XYGEamuZnZNAhqgYGxIW3OFL16tZ9yYHcfMC9W0ljYoOBu1GZl8xcKUw3bQfUh3iM2EJn7lslCleUNnFReUqZV1/5+W3iKoAnQYIoYL+Zv0e0G/ASZ5FNV8Di0bGlZLnwgc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614277211; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=K9ksy8xl9ixiivlLqZ28C9ePMkW+YGg9cGZwNcxzbQY=; b=DedLIGmY+zY0Nr2ztRJOJrWWhWhu1y1VqTmrsS843WwWOhddA4/u+Me+SDmOemjTRbeQxXPyshkf02hMMMxKU2ViIlK1Ii+4Xrb/hBeAOC/fd5yv35F7v7nzpAm9Rd0lSdE4qA60gDXb1brbZV43Or1p7Nkw2A5yyAJThjDjIcw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1614277211592755.023825265723; Thu, 25 Feb 2021 10:20:11 -0800 (PST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-458-aj1lzdhiMDKmcYxxfb4n5A-1; Thu, 25 Feb 2021 13:20:07 -0500 Received: by mail-ej1-f72.google.com with SMTP id ci1so2859033ejc.0 for ; Thu, 25 Feb 2021 10:20:07 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c17sm721255edw.32.2021.02.25.10.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 10:20:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614277210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9ksy8xl9ixiivlLqZ28C9ePMkW+YGg9cGZwNcxzbQY=; b=LOwC5NUDBJbI+WzFlde5p9M7ocSH+romuqS4kmBm+wVVMKyBQvbpMLKacr0QKQvmcdRbqr Dm//a60jxvP6EcmaXNSmkTHB3o09ykALHju5cwqS0OCjrdyHhchUW/wlk+2Ud6bSj8Cw/o 5hkaS6LTRKLloZJpw6zwfaS+mVf+xco= X-MC-Unique: aj1lzdhiMDKmcYxxfb4n5A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K9ksy8xl9ixiivlLqZ28C9ePMkW+YGg9cGZwNcxzbQY=; b=h7Ct218JbIG4BxaceQM0dKaGO53Njr3CjypI6o+mexV1eWdHhXazY36jeyhsxPqq+6 6vKdMzeoy6G8ZNKYIGhqRfXruwJKlhPH9V8+mT4+XtjyyAD0pQOVSHNzap/dTrR5f+2h zhb2dnP6SG0zbVN5cICWDPaCotRWuPFS09QMCMq4l83yf0pKkraWrqsM152EZ6xD4gGx iGEjCBcgoRmxzFgi00GjHwYBw/DeLXbvBCEQBUqCT5FzM1GcLnp2fdkoHZGGtbqTHuKj RktTdfprhfFVIF3JNw06LBty8gcVEY2tpCCeMXHuh1vf7eHo4Qi5yIoi3tWEM1hfrcBU LCKw== X-Gm-Message-State: AOAM532V83dkbcVegVQoiu1J5P2fBeZA/6tb2zJO0HgxvAEsxPp5JXG3 xoX9lfC9S+cuoK4Ae/f2IvPvJ06VkzFo7TGbWiFjl2ieicBhSu9ngw8B3XIH9zG9FOfvXdn0BCO kcQWsCCzVfAX4pg== X-Received: by 2002:aa7:da18:: with SMTP id r24mr4337335eds.371.1614277206215; Thu, 25 Feb 2021 10:20:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMf2e7If0HNHQ4T5hvHvpXYHSBTkVxFQBpc5ebFvevw4r+jMwIyUjEboxIr/5FHEY2wsAqhA== X-Received: by 2002:aa7:da18:: with SMTP id r24mr4337312eds.371.1614277205965; Thu, 25 Feb 2021 10:20:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Gibson , Paolo Bonzini , qemu-ppc@nongnu.org, Greg Kurz , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] exec/memory: Use struct Object typedef Date: Thu, 25 Feb 2021 19:20:03 +0100 Message-Id: <20210225182003.3629342-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We forward-declare Object typedef in "qemu/typedefs.h" since commit ca27b5eb7cd ("qom/object: Move Object typedef to 'qemu/typedefs.h'"). Use it everywhere to make the code simpler. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: Laurent Vivier --- include/exec/memory.h | 32 ++++++++++++++++---------------- include/hw/ppc/pnv_xscom.h | 2 +- hw/ppc/pnv_xscom.c | 2 +- softmmu/memory.c | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index c6fb714e499..54ccf1a5f09 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -828,7 +828,7 @@ static inline bool MemoryRegionSection_eq(MemoryRegionS= ection *a, * @size: size of the region; any subregions beyond this size will be clip= ped */ void memory_region_init(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size); =20 @@ -876,7 +876,7 @@ void memory_region_unref(MemoryRegion *mr); * @size: size of the region. */ void memory_region_init_io(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, @@ -898,7 +898,7 @@ void memory_region_init_io(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the cal= ler. */ void memory_region_init_ram_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -920,7 +920,7 @@ void memory_region_init_ram_nomigrate(MemoryRegion *mr, * The only difference is part of the RAM region can be remapped. */ void memory_region_init_ram_shared_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, bool share, @@ -946,7 +946,7 @@ void memory_region_init_ram_shared_nomigrate(MemoryRegi= on *mr, * RAM memory region to be migrated; that is the responsibility of the cal= ler. */ void memory_region_init_resizeable_ram(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, uint64_t max_size, @@ -979,7 +979,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the cal= ler. */ void memory_region_init_ram_from_file(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, uint64_t align, @@ -1005,7 +1005,7 @@ void memory_region_init_ram_from_file(MemoryRegion *m= r, * RAM memory region to be migrated; that is the responsibility of the cal= ler. */ void memory_region_init_ram_from_fd(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, bool share, @@ -1030,7 +1030,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the cal= ler. */ void memory_region_init_ram_ptr(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, void *ptr); @@ -1058,7 +1058,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, * (For RAM device memory regions, migrating the contents rarely makes sen= se.) */ void memory_region_init_ram_device_ptr(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, void *ptr); @@ -1076,7 +1076,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *= mr, * @size: size of the region. */ void memory_region_init_alias(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, MemoryRegion *orig, hwaddr offset, @@ -1101,7 +1101,7 @@ void memory_region_init_alias(MemoryRegion *mr, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -1124,7 +1124,7 @@ void memory_region_init_rom_nomigrate(MemoryRegion *m= r, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, @@ -1183,7 +1183,7 @@ void memory_region_init_iommu(void *_iommu_mr, * If you pass a non-NULL non-device @owner then we will assert. */ void memory_region_init_ram(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -1210,7 +1210,7 @@ void memory_region_init_ram(MemoryRegion *mr, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -1241,7 +1241,7 @@ void memory_region_init_rom(MemoryRegion *mr, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_device(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, @@ -1254,7 +1254,7 @@ void memory_region_init_rom_device(MemoryRegion *mr, * * @mr: the memory region being queried. */ -struct Object *memory_region_owner(MemoryRegion *mr); +Object *memory_region_owner(MemoryRegion *mr); =20 /** * memory_region_size: get a memory region's size. diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h index 8578f5a207d..2ff9f7a8d6f 100644 --- a/include/hw/ppc/pnv_xscom.h +++ b/include/hw/ppc/pnv_xscom.h @@ -139,7 +139,7 @@ int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_off= set, void pnv_xscom_add_subregion(PnvChip *chip, hwaddr offset, MemoryRegion *mr); void pnv_xscom_region_init(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index e9ae1569ffc..be7018e8ac5 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -308,7 +308,7 @@ void pnv_xscom_add_subregion(PnvChip *chip, hwaddr offs= et, MemoryRegion *mr) } =20 void pnv_xscom_region_init(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, diff --git a/softmmu/memory.c b/softmmu/memory.c index 874a8fccdee..91f1bf47c30 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1581,7 +1581,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *= mr, =20 #ifdef CONFIG_POSIX void memory_region_init_ram_from_file(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, uint64_t align, @@ -1607,7 +1607,7 @@ void memory_region_init_ram_from_file(MemoryRegion *m= r, } =20 void memory_region_init_ram_from_fd(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, bool share, @@ -1679,7 +1679,7 @@ void memory_region_init_alias(MemoryRegion *mr, } =20 void memory_region_init_rom_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp) @@ -3205,7 +3205,7 @@ void mtree_info(bool flatview, bool dispatch_tree, bo= ol owner, bool disabled) } =20 void memory_region_init_ram(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp) @@ -3229,7 +3229,7 @@ void memory_region_init_ram(MemoryRegion *mr, } =20 void memory_region_init_rom(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp) @@ -3253,7 +3253,7 @@ void memory_region_init_rom(MemoryRegion *mr, } =20 void memory_region_init_rom_device(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, --=20 2.26.2