From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XorFW-0003BF-6R for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:03:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XorFL-0008Ht-QF for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:03:34 -0500 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:39267 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XorFL-0008HG-Kq for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:03:23 -0500 References: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> <1415751963-4081-7-git-send-email-greg.bellows@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1415751963-4081-7-git-send-email-greg.bellows@linaro.org> Date: Thu, 13 Nov 2014 10:03:25 +0000 Message-ID: <87sihnh0ya.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [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: Greg Bellows Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, christoffer.dall@linaro.org Greg Bellows writes: > 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;; Double semi-colon > }; > > /* 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 -- Alex Bennée