Re: [Qemu-devel] [PATCH qom-next for-1.6 06/29] musicpal: QOM'ify musicpal_lcd_state

[Andreas Färber]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 27.07.2013 16:33, schrieb Jan Kiszka:
> On 2013-07-27 16:10, Andreas Färber wrote:
>> Needs the following addition:
>> 
>> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index
>> 6065051..9174b87 100644 --- a/hw/arm/musicpal.c +++
>> b/hw/arm/musicpal.c @@ -621,20 +621,21 @@ static const
>> GraphicHwOps musicpal_gfx_ops = { .gfx_update  = lcd_refresh, };
>> 
>> -static int musicpal_lcd_init(SysBusDevice *dev) +static int
>> musicpal_lcd_init(SysBusDevice *sbd) { +    DeviceState *dev =
>> DEVICE(sbd); musicpal_lcd_state *s = MUSICPAL_LCD(dev);
>> 
>> s->brightness = 7;
>> 
>> memory_region_init_io(&s->iomem, OBJECT(s), &musicpal_lcd_ops,
>> s, "musicpal-lcd", MP_LCD_SIZE); -    sysbus_init_mmio(dev,
>> &s->iomem); +    sysbus_init_mmio(sbd, &s->iomem);
>> 
>> -    s->con = graphic_console_init(DEVICE(dev),
>> &musicpal_gfx_ops, s); +    s->con = graphic_console_init(dev,
>> &musicpal_gfx_ops, s); qemu_console_resize(s->con, 128*3, 64*3);
>> 
>> -    qdev_init_gpio_in(&dev->qdev,
>> musicpal_lcd_gpio_brigthness_in, 3); +    qdev_init_gpio_in(dev,
>> musicpal_lcd_gpio_brigthness_in, 3);

"brightness" FWIW, but won't change it here. CC'ing Mr. codespell.

>> 
>> return 0; }
>> 
>> 
> 
> Didn't find the time to look at this yet. But do you have images to
> test the musicpal?

No, unfortunately I don't have any for the musicpal. I am relying on
make check and the few test images I have around, as well as trivially
being able to fix any breakage during Hard Freeze.

In this case it looked like a 1:1 relation between type and struct,
which should make the conversion unproblematic. (The not-so-trivial
cases have multiple device names in the subject.)

My latest WIP is on git://github.com/afaerber/qemu-cpu.git
qom-devices; if booting your favorite machine does not immediately
assert() then it should be OK. (ppc/s390x/arm KVM devices are still
being tested)

Andreas

- -- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAEBAgAGBQJR8+gIAAoJEPou0S0+fgE/QoQP/iOLNR4wFRZ5pBkZi2B/Nif6
Tszu86cOqrDvFnFRf1fcN3sYtieKzzq2iUOaVBh8LDWr0SFsWWf3NeCOWLUpr30p
dGMIjkgIdyojmPZiqvwme1MbW8D/pCz0IADlRYlZghwkGqV/iTClOCPqgf+e4Tj8
wi2aoeBk7IHTWfmMdOqnjNeQjM/a68vEQw48gLDqPa0p+eySvFAA8P0mdlRcatub
gvoRwME3PhmjQ13qOuWw+rEHlYFokZackF++cAigM9P7Fms108a49fYaj744d3m5
A0DBqm0aV+zrdnZPZjBvOFqb4h6UO2K2i9eSyxqS0FihI3UBKjlSkzwLcKUg3iDS
9diGV1y9SruLUyestGrrQhwMG/FacZ/kWPh6vi63BrlUQlkzjfEOBa14ABYib2cS
J/QX/f+h760mEorQlF2KubeLEpTQeHlD8edtJrM1T87G57CQGCUlnJjr8zIMMXd7
IOE81yaxOp9TNz+nKZiPncoJzTJjmlS59lcgCjuU9v6185o5b7hs4ya5+Rdx2Zqr
CitjVZuJmevn5zlgJunKrT/fbVrAuflULzB5BvzL+bVZltu/tHbkXgq1adQKg7ba
AUbHnHu+Gnw1fVhye9jOVzDO6ZKbIXqbgLAb925V9lD/iGPDPOQd9Awm7zE87Y1U
lkBdP+qRIZSXWZh8pwKV
=4Ye0
-----END PGP SIGNATURE-----