Patchwork [06/21] qdev: push "type" property up to Object

login
register
mail settings
Submitter Paolo Bonzini
Date May 23, 2012, 5:18 p.m.
Message ID <4FBD1BF3.5000901@redhat.com>
Download mbox | patch
Permalink /patch/160973/
State New
Headers show

Comments

Paolo Bonzini - May 23, 2012, 5:18 p.m.
Il 23/05/2012 19:06, Andreas Färber ha scritto:
> Am 02.05.2012 13:30, schrieb Paolo Bonzini:
>> Now that Object is a type, add an instance_init function and push
>> the "type" property from qdev to there.
>>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> The rebased version from qdev-props-4 breaks and hangs `make check`:
> 
> GTESTER check-qtest-sparc
> qemu-system-sparc: Insufficient permission to perform this operation
> 
> Paolo, can you please investigate?

Please try this patch (untested; please add my signed-off-by if you end
up committing it).

There is also a "type" property in arm_l2x0.c, but it seems unused.

Paolo
Andreas Färber - May 23, 2012, 5:40 p.m.
Am 23.05.2012 19:18, schrieb Paolo Bonzini:
> Il 23/05/2012 19:06, Andreas Färber ha scritto:
>> Am 02.05.2012 13:30, schrieb Paolo Bonzini:
>>> Now that Object is a type, add an instance_init function and push
>>> the "type" property from qdev to there.
>>>
>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>
>> The rebased version from qdev-props-4 breaks and hangs `make check`:
>>
>> GTESTER check-qtest-sparc
>> qemu-system-sparc: Insufficient permission to perform this operation
>>
>> Paolo, can you please investigate?
> 
> Please try this patch (untested; please add my signed-off-by if you end
> up committing it).

Tested make check and PReP. I added some braces missing in the original
code to please checkpatch.pl and applied both to qom-next:
http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/qom-next

Paolo, please let me know if you're okay with my commit messages, then I
can override the author to be you as well (same for preceding one).

BTW note that I usually update subjects to start with a capital letter
to visually separate the lowercase topic from the actual summary. ;)

> There is also a "type" property in arm_l2x0.c, but it seems unused.

Peter, can we drop that property? I'd insert such a patch before then.

Thanks,
Andreas
Paolo Bonzini - May 23, 2012, 6 p.m.
Il 23/05/2012 19:40, Andreas Färber ha scritto:
> Paolo, please let me know if you're okay with my commit messages, then I
> can override the author to be you as well (same for preceding one).

Don't worry, you have carte blanche. :)

Paolo

Patch

diff --git a/hw/m48t59.c b/hw/m48t59.c
index 24dcbfa..3cc2178 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -65,7 +65,7 @@  struct M48t59State {
     /* NVRAM storage */
     uint8_t *buffer;
     /* Model parameters */
-    uint32_t type; /* 2 = m48t02, 8 = m48t08, 59 = m48t59 */
+    uint32_t model; /* 2 = m48t02, 8 = m48t08, 59 = m48t59 */
     /* NVRAM storage */
     uint16_t addr;
     uint8_t  lock;
@@ -197,9 +197,9 @@  void m48t59_write (void *opaque, uint32_t addr, uint32_t val)
 	NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
 
     /* check for NVRAM access */
-    if ((NVRAM->type == 2 && addr < 0x7f8) ||
-        (NVRAM->type == 8 && addr < 0x1ff8) ||
-        (NVRAM->type == 59 && addr < 0x1ff0))
+    if ((NVRAM->model == 2 && addr < 0x7f8) ||
+        (NVRAM->model == 8 && addr < 0x1ff8) ||
+        (NVRAM->model == 59 && addr < 0x1ff0))
         goto do_write;
 
     /* TOD access */
@@ -334,7 +334,7 @@  void m48t59_write (void *opaque, uint32_t addr, uint32_t val)
 	tmp = from_bcd(val);
 	if (tmp >= 0 && tmp <= 99) {
 	    get_time(NVRAM, &tm);
-            if (NVRAM->type == 8)
+            if (NVRAM->model == 8)
                 tm.tm_year = from_bcd(val) + 68; // Base year is 1968
             else
                 tm.tm_year = from_bcd(val);
@@ -362,9 +362,9 @@  uint32_t m48t59_read (void *opaque, uint32_t addr)
     uint32_t retval = 0xFF;
 
     /* check for NVRAM access */
-    if ((NVRAM->type == 2 && addr < 0x078f) ||
-        (NVRAM->type == 8 && addr < 0x1ff8) ||
-        (NVRAM->type == 59 && addr < 0x1ff0))
+    if ((NVRAM->model == 2 && addr < 0x078f) ||
+        (NVRAM->model == 8 && addr < 0x1ff8) ||
+        (NVRAM->model == 59 && addr < 0x1ff0))
         goto do_read;
 
     /* TOD access */
@@ -439,7 +439,7 @@  uint32_t m48t59_read (void *opaque, uint32_t addr)
     case 0x07FF:
         /* year */
         get_time(NVRAM, &tm);
-        if (NVRAM->type == 8)
+        if (NVRAM->model == 8)
             retval = to_bcd(tm.tm_year - 68); // Base year is 1968
         else
             retval = to_bcd(tm.tm_year);
@@ -633,7 +633,7 @@  static const MemoryRegionOps m48t59_io_ops = {
 
 /* Initialisation routine */
 M48t59State *m48t59_init(qemu_irq IRQ, target_phys_addr_t mem_base,
-                         uint32_t io_base, uint16_t size, int type)
+                         uint32_t io_base, uint16_t size, int model)
 {
     DeviceState *dev;
     SysBusDevice *s;
@@ -641,7 +641,7 @@  M48t59State *m48t59_init(qemu_irq IRQ, target_phys_addr_t mem_base,
     M48t59State *state;
 
     dev = qdev_create(NULL, "m48t59");
-    qdev_prop_set_uint32(dev, "type", type);
+    qdev_prop_set_uint32(dev, "model", model);
     qdev_prop_set_uint32(dev, "size", size);
     qdev_prop_set_uint32(dev, "io_base", io_base);
     qdev_init_nofail(dev);
@@ -661,14 +661,14 @@  M48t59State *m48t59_init(qemu_irq IRQ, target_phys_addr_t mem_base,
 }
 
 M48t59State *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
-                             int type)
+                             int model)
 {
     M48t59ISAState *d;
     ISADevice *dev;
     M48t59State *s;
 
     dev = isa_create(bus, "m48t59_isa");
-    qdev_prop_set_uint32(&dev->qdev, "type", type);
+    qdev_prop_set_uint32(&dev->qdev, "model", model);
     qdev_prop_set_uint32(&dev->qdev, "size", size);
     qdev_prop_set_uint32(&dev->qdev, "io_base", io_base);
     qdev_init_nofail(&dev->qdev);
@@ -686,7 +686,7 @@  M48t59State *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
 static void m48t59_init_common(M48t59State *s)
 {
     s->buffer = g_malloc0(s->size);
-    if (s->type == 59) {
+    if (s->model == 59) {
         s->alrm_timer = qemu_new_timer_ns(rtc_clock, &alarm_cb, s);
         s->wd_timer = qemu_new_timer_ns(vm_clock, &watchdog_cb, s);
     }
@@ -722,7 +722,7 @@  static int m48t59_init1(SysBusDevice *dev)
 
 static Property m48t59_isa_properties[] = {
     DEFINE_PROP_UINT32("size",    M48t59ISAState, state.size,    -1),
-    DEFINE_PROP_UINT32("type",    M48t59ISAState, state.type,    -1),
+    DEFINE_PROP_UINT32("model",   M48t59ISAState, state.model,    -1),
     DEFINE_PROP_HEX32( "io_base", M48t59ISAState, state.io_base,  0),
     DEFINE_PROP_END_OF_LIST(),
 };
@@ -746,7 +746,7 @@  static TypeInfo m48t59_isa_info = {
 
 static Property m48t59_properties[] = {
     DEFINE_PROP_UINT32("size",    M48t59SysBusState, state.size,    -1),
-    DEFINE_PROP_UINT32("type",    M48t59SysBusState, state.type,    -1),
+    DEFINE_PROP_UINT32("model",   M48t59SysBusState, state.model,    -1),
     DEFINE_PROP_HEX32( "io_base", M48t59SysBusState, state.io_base,  0),
     DEFINE_PROP_END_OF_LIST(),
 };