From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,
qemu-riscv@nongnu.org, qemu-block@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Bernhard Beschow" <shentey@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Titus Rwantare" <titusr@google.com>
Subject: [PULL 25/41] hw/i2c/pmbus_device: Fix modifying QOM class internals from instance
Date: Thu, 31 Aug 2023 14:56:27 +0200 [thread overview]
Message-ID: <20230831125646.67855-26-philmd@linaro.org> (raw)
In-Reply-To: <20230831125646.67855-1-philmd@linaro.org>
QOM object instance should not modify its class state (because
all other objects instanciated from this class get affected).
Instead of modifying the PMBusDeviceClass 'device_num_pages' field
the first time a instance is initialized (in pmbus_pages_alloc),
introduce a new pmbus_pages_num() helper which returns the page
number from the class without modifying the class state.
The code logic become slighly simplified.
Inspired-by: Bernhard Beschow <shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230523064408.57941-4-philmd@linaro.org>
---
hw/i2c/pmbus_device.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c
index 44fe4eddbb..8bc9d5108a 100644
--- a/hw/i2c/pmbus_device.c
+++ b/hw/i2c/pmbus_device.c
@@ -190,15 +190,18 @@ static void pmbus_quick_cmd(SMBusDevice *smd, uint8_t read)
}
}
+static uint8_t pmbus_pages_num(PMBusDevice *pmdev)
+{
+ const PMBusDeviceClass *k = PMBUS_DEVICE_GET_CLASS(pmdev);
+
+ /* some PMBus devices don't use the PAGE command, so they get 1 page */
+ return k->device_num_pages ? : 1;
+}
+
static void pmbus_pages_alloc(PMBusDevice *pmdev)
{
- /* some PMBus devices don't use the PAGE command, so they get 1 page */
- PMBusDeviceClass *k = PMBUS_DEVICE_GET_CLASS(pmdev);
- if (k->device_num_pages == 0) {
- k->device_num_pages = 1;
- }
- pmdev->num_pages = k->device_num_pages;
- pmdev->pages = g_new0(PMBusPage, k->device_num_pages);
+ pmdev->num_pages = pmbus_pages_num(pmdev);
+ pmdev->pages = g_new0(PMBusPage, pmdev->num_pages);
}
void pmbus_check_limits(PMBusDevice *pmdev)
--
2.41.0
next prev parent reply other threads:[~2023-08-31 13:09 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 12:56 [PULL 00/41] Misc patches for 2023-08-31 Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 01/41] accel: Remove HAX accelerator Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 02/41] accel/tcg: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 03/41] qemu/uri: Use QueryParams type definition Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 04/41] bulk: Do not declare function prototypes using 'extern' keyword Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 05/41] hw/net/i82596: Include missing 'exec/address-spaces.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 06/41] hw/dma/etraxfs: Include missing 'exec/memory.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 07/41] exec/address-spaces.h: Remove unuseful 'exec/memory.h' include Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 08/41] target/ppc/pmu: Include missing 'qemu/timer.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 09/41] target/riscv/pmu: Restrict 'qemu/log.h' include to source Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 10/41] target/translate: Include missing 'exec/cpu_ldst.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 11/41] target/translate: Remove unnecessary " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 12/41] target/translate: Restrict 'exec/cpu_ldst.h' to user emulation Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 13/41] target/helpers: Remove unnecessary 'exec/cpu_ldst.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 14/41] target/helpers: Remove unnecessary 'qemu/main-loop.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 15/41] target/mips: Remove unused headers in lcsr_helper.c Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 16/41] target/xtensa: Include missing 'qemu/atomic.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 17/41] qemu/processor: Remove unused " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 18/41] exec/translation-block: Clean up includes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 19/41] chardev/char-fe: Document FEWatchFunc typedef Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 20/41] hw/char: Have FEWatchFunc handlers return G_SOURCE_CONTINUE/REMOVE Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 21/41] hw/char/pl011: Restrict MemoryRegionOps implementation access sizes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 22/41] hw/char/pl011: Display register name in trace events Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 23/41] hw/char/pl011: Remove duplicated PL011_INT_[RT]X definitions Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 24/41] hw/char/pl011: Replace magic values by register field definitions Philippe Mathieu-Daudé
2023-08-31 12:56 ` Philippe Mathieu-Daudé [this message]
2023-08-31 12:56 ` [PULL 26/41] hw/i2c: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 27/41] hw/ide: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 28/41] hw/display: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 29/41] hw/mips: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 30/41] hw/sd: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 31/41] hw/usb: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 32/41] hw/usb/hcd-xhci: Avoid variable-length array in xhci_get_port_bandwidth() Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 33/41] hw/i386: Remove unuseful kvmclock_create() stub Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 34/41] hw/i386: Rename 'hw/kvm/clock.h' -> 'hw/i386/kvm/clock.h' Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 35/41] util/fifo8: Fix typo in fifo8_push_all() description Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 36/41] util: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 37/41] ui: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 38/41] docs/style: permit inline loop variables Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 39/41] meson: Fix MESONINTROSPECT parsing Philippe Mathieu-Daudé
2023-08-31 13:06 ` Michael Tokarev
2023-08-31 13:47 ` Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 40/41] build: Only define OS_OBJECT_USE_OBJC with gcc Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 41/41] tests/tcg/aarch64: Rename bti-crt.inc.c -> bti-crt.c.inc Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831125646.67855-26-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=shentey@gmail.com \
--cc=titusr@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).