From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwBQc-0000o3-Qs for qemu-devel@nongnu.org; Tue, 31 Jul 2012 08:20:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwBQW-0006To-Ms for qemu-devel@nongnu.org; Tue, 31 Jul 2012 08:19:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49619 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwBQW-0006TZ-D2 for qemu-devel@nongnu.org; Tue, 31 Jul 2012 08:19:52 -0400 Message-ID: <5017CD60.4060705@suse.de> Date: Tue, 31 Jul 2012 14:19:44 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1343417387-13953-1-git-send-email-i.mitsyanko@samsung.com> <1343417387-13953-12-git-send-email-i.mitsyanko@samsung.com> <87y5m0gssn.fsf@blackfin.pond.sub.org> In-Reply-To: <87y5m0gssn.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V4 11/12] SD card: introduce "spi" property for SD card objects List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, peter.maydell@linaro.org, benoit.canet@gmail.com, Igor Mitsyanko , stefanha@linux.vnet.ibm.com, e.voevodin@samsung.com, qemu-devel@nongnu.org, andrew.zaborowski@intel.com, kyungmin.park@samsung.com, pbonzini@redhat.com, wdongxu@linux.vnet.ibm.com Am 31.07.2012 11:54, schrieb Markus Armbruster: > Igor Mitsyanko writes: >=20 >> And drop passing is_spi argument to SDCardClass::init function. >> "spi" property could be set only while SD card object is not >> attached to any BlockDriverState. >> It defaults to "false". >> >> Signed-off-by: Igor Mitsyanko >> Cc: Paul Brook >> --- >> hw/sd.c | 33 +++++++++++++++++++++++++++++++-- >> hw/sd.h | 8 ++++++-- >> 2 files changed, 37 insertions(+), 4 deletions(-) >> >> diff --git a/hw/sd.c b/hw/sd.c >> index fe2c138..611e1f3 100644 >> --- a/hw/sd.c >> +++ b/hw/sd.c >> @@ -491,10 +491,9 @@ static const VMStateDescription sd_vmstate =3D { >> whether card should be in SSI or MMC/SD mode. It is also up to th= e >> board to ensure that ssi transfers only occur when the chip select >> is asserted. */ >> -static void sd_init_card(SDState *sd, BlockDriverState *bs, bool is_s= pi) >> +static void sd_init_card(SDState *sd, BlockDriverState *bs) >> { >> sd->buf =3D qemu_blockalign(bs, 512); >> - sd->spi =3D is_spi; >> sd->enable =3D true; >> sd_reset(sd, bs); >> if (sd->bdrv) { >> @@ -1766,10 +1765,40 @@ static void sd_class_init(ObjectClass *klass, = void *data) >> k->enable =3D sd_enable_card; >> } >> =20 >> +static void sd_is_spi(Object *obj, Visitor *v, void *opaque, >> + const char *name, Error **errp) >> +{ >> + SDState *sd =3D SD_CARD(obj); >> + >> + visit_type_bool(v, &sd->spi, name, errp); >> +} >> + >> +static void sd_set_spimode(Object *obj, Visitor *v, void *opaque, >> + const char *name, Error **errp) >> +{ >> + SDState *sd =3D SD_CARD(obj); >> + >> + if (sd->bdrv) { >> + error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(sd->= bdrv)); >> + } else { >> + visit_type_bool(v, &sd->spi, name, errp); >> + } >> +} >> + >> +static void sd_initfn(Object *obj) >> +{ >> + SDState *sd =3D SD_CARD(obj); >> + >> + sd->spi =3D false; >> + object_property_add(obj, "spi", "boolean", sd_is_spi, sd_set_spim= ode, >> + NULL, NULL, NULL); >> +} >> + >> static const TypeInfo sd_type_info =3D { >> .name =3D TYPE_SD_CARD, >> .parent =3D TYPE_OBJECT, >> .instance_size =3D sizeof(SDState), >> + .instance_init =3D sd_initfn, >> .class_init =3D sd_class_init, >> .class_size =3D sizeof(SDClass) >> }; >=20 > I suspect this would be much simpler the declarative way qdevs normally > use. For an example, check out scsi_hd_properties[] and its use in > hw/scsi-disk.c. [snip] For static properties bool support was missing some time ago... Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg