From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH 1/3] acpi: Don't pass const pointers to object_property_add_uint*_ptr()
Date: Fri, 9 Oct 2020 15:15:18 -0400 [thread overview]
Message-ID: <20201009191520.1799419-2-ehabkost@redhat.com> (raw)
In-Reply-To: <20201009191520.1799419-1-ehabkost@redhat.com>
object_property_add_uint*_ptr() will be changed to get non-const
pointers. Adapt the ACPI code to that.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/acpi/ich9.c | 2 +-
hw/acpi/piix4.c | 10 +++++-----
hw/isa/lpc_ich9.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 95cb0f935b..9bb8d1b155 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -371,7 +371,7 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp)
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
{
- static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
+ static uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
pm->acpi_memory_hotplug.is_enabled = true;
pm->cpu_hotplug_legacy = true;
pm->disable_s3 = 0;
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 894d357f8c..1e8a15676d 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -439,11 +439,11 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque)
static void piix4_pm_add_propeties(PIIX4PMState *s)
{
- static const uint8_t acpi_enable_cmd = ACPI_ENABLE;
- static const uint8_t acpi_disable_cmd = ACPI_DISABLE;
- static const uint32_t gpe0_blk = GPE_BASE;
- static const uint32_t gpe0_blk_len = GPE_LEN;
- static const uint16_t sci_int = 9;
+ static uint8_t acpi_enable_cmd = ACPI_ENABLE;
+ static uint8_t acpi_disable_cmd = ACPI_DISABLE;
+ static uint32_t gpe0_blk = GPE_BASE;
+ static uint32_t gpe0_blk_len = GPE_LEN;
+ static uint16_t sci_int = 9;
object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD,
&acpi_enable_cmd, OBJ_PROP_FLAG_READ);
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 04e5323140..b9dc01f654 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -638,8 +638,8 @@ static void ich9_lpc_initfn(Object *obj)
{
ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj);
- static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE;
- static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
+ static uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE;
+ static uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_SCI_INT,
&lpc->sci_gsi, OBJ_PROP_FLAG_READ);
--
2.26.2
next prev parent reply other threads:[~2020-10-09 19:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 19:15 [PATCH 0/3] qom: Simplify pointer property getters/setters Eduardo Habkost
2020-10-09 19:15 ` Eduardo Habkost [this message]
2020-10-09 19:15 ` [PATCH 2/3] qom: Make object_property_add_uint*_ptr() get non-const pointers Eduardo Habkost
2020-10-09 19:15 ` [PATCH 3/3] qom: Simplify and merge pointer property getters/setters Eduardo Habkost
2020-10-09 20:02 ` Eric Blake
2020-10-09 20:09 ` fixup! " Eduardo Habkost
2020-10-21 13:09 ` [PATCH 0/3] qom: Simplify " Igor Mammedov
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=20201009191520.1799419-2-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=armbru@redhat.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=f4bug@amsat.org \
--cc=imammedo@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).