diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-21 18:06:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-21 18:06:12 +0100 |
| commit | 35858955e6c6f9ef41c199d15457c13426ac6434 (patch) | |
| tree | 4c65353b98b5ffac28e35b1555929f832d390f11 /hw | |
| parent | 147fc419734b057b9d9154c2ca0d9d397054104b (diff) | |
| parent | b0ddb8bf6bf1739240640f353fd49e9e5d3f85dc (diff) | |
| download | qemu-35858955e6c6f9ef41c199d15457c13426ac6434.zip qemu-35858955e6c6f9ef41c199d15457c13426ac6434.tar.gz qemu-35858955e6c6f9ef41c199d15457c13426ac6434.tar.bz2 | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.1' into staging
QOM and device refactorings
* Machine: Property name fixups for 2.1 ABI
# gpg: Signature made Mon 21 Jul 2014 18:00:23 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-2.1:
machine: Replace underscores in machine's property names
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/machine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index cbba679..7a66c57 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -239,11 +239,11 @@ static void machine_initfn(Object *obj) { object_property_add_str(obj, "accel", machine_get_accel, machine_set_accel, NULL); - object_property_add_bool(obj, "kernel_irqchip", + object_property_add_bool(obj, "kernel-irqchip", machine_get_kernel_irqchip, machine_set_kernel_irqchip, NULL); - object_property_add(obj, "kvm_shadow_mem", "int", + object_property_add(obj, "kvm-shadow-mem", "int", machine_get_kvm_shadow_mem, machine_set_kvm_shadow_mem, NULL, NULL, NULL); @@ -257,11 +257,11 @@ static void machine_initfn(Object *obj) machine_get_dtb, machine_set_dtb, NULL); object_property_add_str(obj, "dumpdtb", machine_get_dumpdtb, machine_set_dumpdtb, NULL); - object_property_add(obj, "phandle_start", "int", + object_property_add(obj, "phandle-start", "int", machine_get_phandle_start, machine_set_phandle_start, NULL, NULL, NULL); - object_property_add_str(obj, "dt_compatible", + object_property_add_str(obj, "dt-compatible", machine_get_dt_compatible, machine_set_dt_compatible, NULL); |