[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/41] qdev: Use appropriate getter/setters type
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 19/41] qdev: Use appropriate getter/setters type |
Date: |
Fri, 9 Jun 2017 15:47:03 +0200 |
From: Marc-André Lureau <address@hidden>
Based on the underlying type of the data accessed, use the appropriate
getters/setters:
* AcpiPmInfo members s3_disabled, s4_disabled are bool, member s4_val is
an uint8_t
* Property ACPI_PCIHP_IO_PROP is defined with
object_property_add_uint32_ptr()
* Property PCIE_HOST_MCFG_SIZE is implemented with visit_type_uint64()
* PCIDevice property "addr" is backed by PCIDevice member devfn, which
is an int32_t
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[More verbose commit message]
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/i386/acpi-build.c | 12 ++++++------
hw/pci-host/gpex.c | 2 +-
hw/pci-host/q35.c | 2 +-
hw/pci-host/xilinx-pcie.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 3eb4367..b2dc3d8 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -149,21 +149,21 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
/* Fill in optional s3/s4 related properties */
o = object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, NULL);
if (o) {
- pm->s3_disabled = qnum_get_int(qobject_to_qnum(o));
+ pm->s3_disabled = qnum_get_uint(qobject_to_qnum(o));
} else {
pm->s3_disabled = false;
}
qobject_decref(o);
o = object_property_get_qobject(obj, ACPI_PM_PROP_S4_DISABLED, NULL);
if (o) {
- pm->s4_disabled = qnum_get_int(qobject_to_qnum(o));
+ pm->s4_disabled = qnum_get_uint(qobject_to_qnum(o));
} else {
pm->s4_disabled = false;
}
qobject_decref(o);
o = object_property_get_qobject(obj, ACPI_PM_PROP_S4_VAL, NULL);
if (o) {
- pm->s4_val = qnum_get_int(qobject_to_qnum(o));
+ pm->s4_val = qnum_get_uint(qobject_to_qnum(o));
} else {
pm->s4_val = false;
}
@@ -528,7 +528,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope,
PCIBus *bus,
bsel = object_property_get_qobject(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
NULL);
if (bsel) {
- int64_t bsel_val = qnum_get_int(qobject_to_qnum(bsel));
+ uint64_t bsel_val = qnum_get_uint(qobject_to_qnum(bsel));
aml_append(parent_scope, aml_name_decl("BSEL", aml_int(bsel_val)));
notify_method = aml_method("DVNT", 2, AML_NOTSERIALIZED);
@@ -638,7 +638,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope,
PCIBus *bus,
/* If bus supports hotplug select it and notify about local events */
if (bsel) {
- int64_t bsel_val = qnum_get_int(qobject_to_qnum(bsel));
+ uint64_t bsel_val = qnum_get_uint(qobject_to_qnum(bsel));
aml_append(method, aml_store(aml_int(bsel_val), aml_name("BNUM")));
aml_append(method,
@@ -2619,7 +2619,7 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_SIZE, NULL);
assert(o);
- mcfg->mcfg_size = qnum_get_int(qobject_to_qnum(o));
+ mcfg->mcfg_size = qnum_get_uint(qobject_to_qnum(o));
qobject_decref(o);
return true;
}
diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index e2629ce..83084b9 100644
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -94,7 +94,7 @@ static void gpex_host_initfn(Object *obj)
object_initialize(root, sizeof(*root), TYPE_GPEX_ROOT_DEVICE);
object_property_add_child(obj, "gpex_root", OBJECT(root), NULL);
- qdev_prop_set_uint32(DEVICE(root), "addr", PCI_DEVFN(0, 0));
+ qdev_prop_set_int32(DEVICE(root), "addr", PCI_DEVFN(0, 0));
qdev_prop_set_bit(DEVICE(root), "multifunction", false);
}
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index c2f2af5..564f6cb 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -172,7 +172,7 @@ static void q35_host_initfn(Object *obj)
object_initialize(&s->mch, sizeof(s->mch), TYPE_MCH_PCI_DEVICE);
object_property_add_child(OBJECT(s), "mch", OBJECT(&s->mch), NULL);
- qdev_prop_set_uint32(DEVICE(&s->mch), "addr", PCI_DEVFN(0, 0));
+ qdev_prop_set_int32(DEVICE(&s->mch), "addr", PCI_DEVFN(0, 0));
qdev_prop_set_bit(DEVICE(&s->mch), "multifunction", false);
object_property_add(obj, PCI_HOST_PROP_PCI_HOLE_START, "uint32",
diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c
index a968cea..2c78dcf 100644
--- a/hw/pci-host/xilinx-pcie.c
+++ b/hw/pci-host/xilinx-pcie.c
@@ -150,7 +150,7 @@ static void xilinx_pcie_host_init(Object *obj)
object_initialize(root, sizeof(*root), TYPE_XILINX_PCIE_ROOT);
object_property_add_child(obj, "root", OBJECT(root), NULL);
- qdev_prop_set_uint32(DEVICE(root), "addr", PCI_DEVFN(0, 0));
+ qdev_prop_set_int32(DEVICE(root), "addr", PCI_DEVFN(0, 0));
qdev_prop_set_bit(DEVICE(root), "multifunction", false);
}
--
2.7.5
- [Qemu-devel] [PULL 31/41] pc: use get_uint() for "apic-id" property, (continued)
- [Qemu-devel] [PULL 31/41] pc: use get_uint() for "apic-id" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 17/41] qdev: avoid type casts between signed and unsigned, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 07/41] qapi: Remove visit_start_alternate() parameter promote_int, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 08/41] tests: remove /{qnum, qlist, dict}/destroy test, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 37/41] pnv-core: use get_uint() for "core-pir" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 34/41] arm: use get_uint() for "mp-affinity" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 28/41] acpi: use get_uint() for various acpi properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 22/41] pc-dimm: make "size" property uint64, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 21/41] pc-dimm: use get_uint() for dimm properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 39/41] i386/cpu: use get_uint() for "min-level"/"min-xlevel" properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 19/41] qdev: Use appropriate getter/setters type,
Markus Armbruster <=
- [Qemu-devel] [PULL 06/41] qapi: merge QInt and QFloat in QNum, Markus Armbruster, 2017/06/09
- Re: [Qemu-devel] [PULL 00/41] QAPI patches for 2017-06-09, no-reply, 2017/06/09
- Re: [Qemu-devel] [PULL 00/41] QAPI patches for 2017-06-09, no-reply, 2017/06/09
- Re: [Qemu-devel] [PULL 00/41] QAPI patches for 2017-06-09, Peter Maydell, 2017/06/12