From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlW-00024O-Hw for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoLlO-00007l-47 for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:30 -0500 Received: from mail-oi0-f47.google.com ([209.85.218.47]:54273) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlO-000077-0b for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:22 -0500 Received: by mail-oi0-f47.google.com with SMTP id a3so7849089oib.20 for ; Tue, 11 Nov 2014 16:26:21 -0800 (PST) From: Greg Bellows Date: Tue, 11 Nov 2014 18:25:54 -0600 Message-Id: <1415751963-4081-7-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> References: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH v1 06/15] android-console: Add missing hw_has_battery prop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org, alex.bennee@linaro.org Cc: Greg Bellows Added the missing hw_has_battery property to the Goldfish batter state. This property indicates whether the device has a battery and controls whether some power commands are available. In the Android emulator this property is acquired from the AVD for the device. For now, this is wired as always enabled. Signed-off-by: Greg Bellows --- hw/misc/goldfish_battery.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/misc/goldfish_battery.c b/hw/misc/goldfish_battery.c index 89fd05d..a0bc379 100644 --- a/hw/misc/goldfish_battery.c +++ b/hw/misc/goldfish_battery.c @@ -52,6 +52,7 @@ struct goldfish_battery_state { uint32_t health; uint32_t present; uint32_t capacity; + uint32_t hw_has_battery;; }; /* update this each time you update the battery_state struct */ @@ -70,6 +71,7 @@ static const VMStateDescription goldfish_battery_vmsd = { VMSTATE_UINT32(health, struct goldfish_battery_state), VMSTATE_UINT32(present, struct goldfish_battery_state), VMSTATE_UINT32(capacity, struct goldfish_battery_state), + VMSTATE_UINT32(hw_has_battery, struct goldfish_battery_state), VMSTATE_END_OF_LIST() } }; @@ -146,6 +148,11 @@ static void goldfish_battery_realize(DeviceState *dev, Error **errp) // default values for the battery s->ac_online = 1; + /* TODO: The Android Emulator gets this attribute from the AVD + * hw-config-defs.h. For now we hard-code the value to match the + * other values. + */ + s->hw_has_battery = 1; s->status = POWER_SUPPLY_STATUS_CHARGING; s->health = POWER_SUPPLY_HEALTH_GOOD; s->present = 1; // battery is present -- 1.8.3.2