[Qemu-devel] [PATCH 0/6] Blank property cleanup

[Qemu-devel] [PATCH 0/6] Blank property cleanup

[shannon.zhao]

From: Shannon Zhao <shannon.zhao@linaro.org>

After [1]"s390-virtio: use common features" and [2]"virtio: Move host
features to backends" applied, there are some Property arrays which only
contain the list terminator DEFINE_PROP_END_OF_LIST. This patchset
removes those arrays and other meaningless Property arrays and also adds
comma after DEFINE_PROP_END_OF_LIST().

[1] http://lists.gnu.org/archive/html/qemu-devel/2015-05/msg00259.html
[2] http://lists.gnu.org/archive/html/qemu-devel/2015-04/threads.html

Shannon Zhao (6):
  hw/s390x/s390-virtio-bus: Remove meaningless blank Property
  hw/virtio/virtio-balloon: Remove meaningless blank Property
  hw/virtio/virtio-pci: Remove meaningless blank Property
  hw/gpio/zaurus: Remove meaningless blank Property
  hw/arm/spitz: Remove meaningless blank Property
  Add comma after DEFINE_PROP_END_OF_LIST()

 hw/arm/spitz.c                     |  5 -----
 hw/audio/intel-hda.c               |  2 +-
 hw/char/virtio-serial-bus.c        |  2 +-
 hw/core/platform-bus.c             |  2 +-
 hw/dma/i82374.c                    |  2 +-
 hw/gpio/zaurus.c                   |  5 -----
 hw/i386/kvm/ioapic.c               |  2 +-
 hw/i386/xen/xen_pvdevice.c         |  2 +-
 hw/ide/mmio.c                      |  2 +-
 hw/ipack/ipack.c                   |  2 +-
 hw/isa/pc87312.c                   |  2 +-
 hw/misc/arm11scu.c                 |  2 +-
 hw/misc/macio/cuda.c               |  2 +-
 hw/misc/macio/macio.c              |  2 +-
 hw/nvram/mac_nvram.c               |  2 +-
 hw/pci-bridge/ioh3420.c            |  2 +-
 hw/pci-bridge/xio3130_downstream.c |  2 +-
 hw/pci-host/prep.c                 |  2 +-
 hw/pci-host/versatile.c            |  2 +-
 hw/pci/pci.c                       |  2 +-
 hw/pci/pcie_port.c                 |  4 ++--
 hw/s390x/s390-virtio-bus.c         | 15 ---------------
 hw/timer/a9gtimer.c                |  2 +-
 hw/timer/arm_mptimer.c             |  2 +-
 hw/usb/bus.c                       |  2 +-
 hw/virtio/virtio-balloon.c         |  5 -----
 hw/virtio/virtio-pci.c             |  5 -----
 target-arm/cpu.c                   |  2 +-
 target-i386/cpu.c                  |  4 ++--
 tests/test-qdev-global-props.c     |  2 +-
 30 files changed, 27 insertions(+), 62 deletions(-)

-- 
2.1.0

[Qemu-devel] [PATCH 1/6] hw/s390x/s390-virtio-bus: Remove meaningless blank Property

[shannon.zhao]

From: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 hw/s390x/s390-virtio-bus.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 1a72b56..273bd9c 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -536,17 +536,12 @@ static unsigned virtio_s390_get_features(DeviceState *d)
 
 /**************** S390 Virtio Bus Device Descriptions *******************/
 
-static Property s390_virtio_net_properties[] = {
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void s390_virtio_net_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
 
     k->realize = s390_virtio_net_realize;
-    dc->props = s390_virtio_net_properties;
     set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
 }
 
@@ -575,17 +570,12 @@ static const TypeInfo s390_virtio_blk = {
     .class_init    = s390_virtio_blk_class_init,
 };
 
-static Property s390_virtio_serial_properties[] = {
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void s390_virtio_serial_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
 
     k->realize = s390_virtio_serial_realize;
-    dc->props = s390_virtio_serial_properties;
     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 }
 
@@ -655,17 +645,12 @@ static const TypeInfo virtio_s390_device_info = {
     .abstract = true,
 };
 
-static Property s390_virtio_scsi_properties[] = {
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void s390_virtio_scsi_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
 
     k->realize = s390_virtio_scsi_realize;
-    dc->props = s390_virtio_scsi_properties;
     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
-- 
2.1.0

Re: [Qemu-devel] [PATCH 1/6] hw/s390x/s390-virtio-bus: Remove meaningless blank Property

[Cornelia Huck]

On Tue, 12 May 2015 10:25:16 +0800
shannon.zhao@linaro.org wrote:

> From: Shannon Zhao <shannon.zhao@linaro.org>
> 
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
>  hw/s390x/s390-virtio-bus.c | 15 ---------------
>  1 file changed, 15 deletions(-)
> 

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Re: [Qemu-devel] [PATCH 1/6] hw/s390x/s390-virtio-bus: Remove meaningless blank Property

[Peter Maydell]

On 12 May 2015 at 03:25,  <shannon.zhao@linaro.org> wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
>  hw/s390x/s390-virtio-bus.c | 15 ---------------
>  1 file changed, 15 deletions(-)
>
> diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
> index 1a72b56..273bd9c 100644
> --- a/hw/s390x/s390-virtio-bus.c
> +++ b/hw/s390x/s390-virtio-bus.c
> @@ -536,17 +536,12 @@ static unsigned virtio_s390_get_features(DeviceState *d)
>

Net and scsi are already fixed in master (I had to do that
as part of the conflict resolution between your virtio
patches and Cornelia's).

-- PMM

Re: [Qemu-devel] [PATCH 1/6] hw/s390x/s390-virtio-bus: Remove meaningless blank Property

[Shannon Zhao]

On 2015/5/12 15:52, Peter Maydell wrote:
> On 12 May 2015 at 03:25,  <shannon.zhao@linaro.org> wrote:
>> > From: Shannon Zhao <shannon.zhao@linaro.org>
>> >
>> > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
>> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> > ---
>> >  hw/s390x/s390-virtio-bus.c | 15 ---------------
>> >  1 file changed, 15 deletions(-)
>> >
>> > diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
>> > index 1a72b56..273bd9c 100644
>> > --- a/hw/s390x/s390-virtio-bus.c
>> > +++ b/hw/s390x/s390-virtio-bus.c
>> > @@ -536,17 +536,12 @@ static unsigned virtio_s390_get_features(DeviceState *d)
>> >
> Net and scsi are already fixed in master (I had to do that
> as part of the conflict resolution between your virtio
> patches and Cornelia's).

Ok, so need to respin?

-- 
Shannon

Re: [Qemu-devel] [PATCH 1/6] hw/s390x/s390-virtio-bus: Remove meaningless blank Property

[Michael Tokarev]

Applied (finally!) to -trivial, without already fixed -net and -scsi bits.
Thanks!

/mjt

Re: [Qemu-devel] [PATCH 1/6] hw/s390x/s390-virtio-bus: Remove meaningless blank Property

[Andreas Färber]

Michael,

Am 11.09.2015 um 10:00 schrieb Michael Tokarev:
> Applied (finally!) to -trivial, without already fixed -net and -scsi bits.
> Thanks!

Can you please tweak the subjects? I found "blank Property" a very
troubling thing to read. In fact it's an empty Property[] array.

Thanks,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)

[Qemu-devel] [PATCH 2/6] hw/virtio/virtio-balloon: Remove meaningless blank Property

[shannon.zhao]

From: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 hw/virtio/virtio-balloon.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 484c3c3..a3f5709 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -417,16 +417,11 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
     virtio_cleanup(vdev);
 }
 
-static Property virtio_balloon_properties[] = {
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void virtio_balloon_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
 
-    dc->props = virtio_balloon_properties;
     set_bit(DEVICE_CATEGORY_MISC, dc->categories);
     vdc->realize = virtio_balloon_device_realize;
     vdc->unrealize = virtio_balloon_device_unrealize;
-- 
2.1.0

Re: [Qemu-devel] [PATCH 2/6] hw/virtio/virtio-balloon: Remove meaningless blank Property

[Michael Tokarev]

12.05.2015 05:25, shannon.zhao@linaro.org wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
> 
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
>  hw/virtio/virtio-balloon.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
> index 484c3c3..a3f5709 100644
> --- a/hw/virtio/virtio-balloon.c
> +++ b/hw/virtio/virtio-balloon.c
> @@ -417,16 +417,11 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
>      virtio_cleanup(vdev);
>  }
>  
> -static Property virtio_balloon_properties[] = {
> -    DEFINE_PROP_END_OF_LIST(),
> -};

Current balloon properties list isnt' empty, so this patch isn't needed anymore.

/mjt

[Qemu-devel] [PATCH 3/6] hw/virtio/virtio-pci: Remove meaningless blank Property

[shannon.zhao]

From: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 hw/virtio/virtio-pci.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 5c173c4..47be00f 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1410,10 +1410,6 @@ static const TypeInfo virtio_net_pci_info = {
 
 /* virtio-rng-pci */
 
-static Property virtio_rng_pci_properties[] = {
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void virtio_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
 {
     VirtIORngPCI *vrng = VIRTIO_RNG_PCI(vpci_dev);
@@ -1440,7 +1436,6 @@ static void virtio_rng_pci_class_init(ObjectClass *klass, void *data)
 
     k->realize = virtio_rng_pci_realize;
     set_bit(DEVICE_CATEGORY_MISC, dc->categories);
-    dc->props = virtio_rng_pci_properties;
 
     pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
     pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_RNG;
-- 
2.1.0

Re: [Qemu-devel] [PATCH 3/6] hw/virtio/virtio-pci: Remove meaningless blank Property

[Michael Tokarev]

Applied (finally!) to -trivial, thanks!

/mjt

[Qemu-devel] [PATCH 4/6] hw/gpio/zaurus: Remove meaningless blank Property

[shannon.zhao]

From: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 hw/gpio/zaurus.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index 24a7727..aa8ee5f 100644
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -235,10 +235,6 @@ static const VMStateDescription vmstate_scoop_regs = {
     },
 };
 
-static Property scoop_sysbus_properties[] = {
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void scoop_sysbus_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -247,7 +243,6 @@ static void scoop_sysbus_class_init(ObjectClass *klass, void *data)
     k->init = scoop_init;
     dc->desc = "Scoop2 Sharp custom ASIC";
     dc->vmsd = &vmstate_scoop_regs;
-    dc->props = scoop_sysbus_properties;
 }
 
 static const TypeInfo scoop_sysbus_info = {
-- 
2.1.0

Re: [Qemu-devel] [PATCH 4/6] hw/gpio/zaurus: Remove meaningless blank Property

[Michael Tokarev]

Applied (finally!) to -trivial, thanks!

/mjt

[Qemu-devel] [PATCH 5/6] hw/arm/spitz: Remove meaningless blank Property

[shannon.zhao]

From: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 hw/arm/spitz.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 5bf032a..fdb1010 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -1060,10 +1060,6 @@ static VMStateDescription vmstate_spitz_kbd = {
     },
 };
 
-static Property spitz_keyboard_properties[] = {
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void spitz_keyboard_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -1071,7 +1067,6 @@ static void spitz_keyboard_class_init(ObjectClass *klass, void *data)
 
     k->init = spitz_keyboard_init;
     dc->vmsd = &vmstate_spitz_kbd;
-    dc->props = spitz_keyboard_properties;
 }
 
 static const TypeInfo spitz_keyboard_info = {
-- 
2.1.0

Re: [Qemu-devel] [PATCH 5/6] hw/arm/spitz: Remove meaningless blank Property

[Michael Tokarev]

Aplied (finally!) to -trivial, thanks!

/mjt

[Qemu-devel] [PATCH 6/6] Add comma after DEFINE_PROP_END_OF_LIST()

[shannon.zhao]

From: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 hw/audio/intel-hda.c               | 2 +-
 hw/char/virtio-serial-bus.c        | 2 +-
 hw/core/platform-bus.c             | 2 +-
 hw/dma/i82374.c                    | 2 +-
 hw/i386/kvm/ioapic.c               | 2 +-
 hw/i386/xen/xen_pvdevice.c         | 2 +-
 hw/ide/mmio.c                      | 2 +-
 hw/ipack/ipack.c                   | 2 +-
 hw/isa/pc87312.c                   | 2 +-
 hw/misc/arm11scu.c                 | 2 +-
 hw/misc/macio/cuda.c               | 2 +-
 hw/misc/macio/macio.c              | 2 +-
 hw/nvram/mac_nvram.c               | 2 +-
 hw/pci-bridge/ioh3420.c            | 2 +-
 hw/pci-bridge/xio3130_downstream.c | 2 +-
 hw/pci-host/prep.c                 | 2 +-
 hw/pci-host/versatile.c            | 2 +-
 hw/pci/pci.c                       | 2 +-
 hw/pci/pcie_port.c                 | 4 ++--
 hw/timer/a9gtimer.c                | 2 +-
 hw/timer/arm_mptimer.c             | 2 +-
 hw/usb/bus.c                       | 2 +-
 target-arm/cpu.c                   | 2 +-
 target-i386/cpu.c                  | 4 ++--
 tests/test-qdev-global-props.c     | 2 +-
 25 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 433463e..d2b3f37 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -31,7 +31,7 @@
 
 static Property hda_props[] = {
     DEFINE_PROP_UINT32("cad", HDACodecDevice, cad, -1),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static const TypeInfo hda_codec_bus_info = {
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 16aa156..bce8842 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -776,7 +776,7 @@ static void virtser_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent);
 static Property virtser_props[] = {
     DEFINE_PROP_UINT32("nr", VirtIOSerialPort, id, VIRTIO_CONSOLE_BAD_ID),
     DEFINE_PROP_STRING("name", VirtIOSerialPort, name),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 #define TYPE_VIRTIO_SERIAL_BUS "virtio-serial-bus"
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index 0f052b3..777428d 100644
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -227,7 +227,7 @@ static void platform_bus_realize(DeviceState *dev, Error **errp)
 static Property platform_bus_properties[] = {
     DEFINE_PROP_UINT32("num_irqs", PlatformBusDevice, num_irqs, 0),
     DEFINE_PROP_UINT32("mmio_size", PlatformBusDevice, mmio_size, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void platform_bus_class_init(ObjectClass *klass, void *data)
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index b8ad2e6..003153e 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -151,7 +151,7 @@ static void i82374_isa_realize(DeviceState *dev, Error **errp)
 
 static Property i82374_properties[] = {
     DEFINE_PROP_UINT32("iobase", ISAi82374State, iobase, 0x400),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void i82374_class_init(ObjectClass *klass, void *data)
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index d2a6c4c..8e39850 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -138,7 +138,7 @@ static void kvm_ioapic_realize(DeviceState *dev, Error **errp)
 
 static Property kvm_ioapic_properties[] = {
     DEFINE_PROP_UINT32("gsi_base", KVMIOAPICState, kvm_gsi_base, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void kvm_ioapic_class_init(ObjectClass *klass, void *data)
diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index c218947..c68d1ef 100644
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -106,7 +106,7 @@ static Property xen_pv_props[] = {
     DEFINE_PROP_UINT16("device-id", XenPVDevice, device_id, 0xffff),
     DEFINE_PROP_UINT8("revision", XenPVDevice, revision, 0x01),
     DEFINE_PROP_UINT32("size", XenPVDevice, size, 0x400000),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void xen_pv_class_init(ObjectClass *klass, void *data)
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index b6ce62a..91142db 100644
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -142,7 +142,7 @@ static void mmio_ide_initfn(Object *obj)
 
 static Property mmio_ide_properties[] = {
     DEFINE_PROP_UINT32("shift", MMIOState, shift, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void mmio_ide_class_init(ObjectClass *oc, void *data)
diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c
index 59bfe28..17577b6 100644
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -71,7 +71,7 @@ static void ipack_device_unrealize(DeviceState *dev, Error **errp)
 
 static Property ipack_device_props[] = {
     DEFINE_PROP_INT32("slot", IPackDevice, slot, -1),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void ipack_device_class_init(ObjectClass *klass, void *data)
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 3b1fcec..9c780fe 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -373,7 +373,7 @@ static const VMStateDescription vmstate_pc87312 = {
 static Property pc87312_properties[] = {
     DEFINE_PROP_UINT32("iobase", PC87312State, iobase, 0x398),
     DEFINE_PROP_UINT8("config", PC87312State, config, 1),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void pc87312_class_init(ObjectClass *klass, void *data)
diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c
index a791675..7243f18 100644
--- a/hw/misc/arm11scu.c
+++ b/hw/misc/arm11scu.c
@@ -73,7 +73,7 @@ static void arm11_scu_init(Object *obj)
 
 static Property arm11_scu_properties[] = {
     DEFINE_PROP_UINT32("num-cpu", ARM11SCUState, num_cpu, 1),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void arm11_scu_class_init(ObjectClass *oc, void *data)
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index f3984e3..6f9d1dc 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -727,7 +727,7 @@ static void cuda_initfn(Object *obj)
 
 static Property cuda_properties[] = {
     DEFINE_PROP_UINT64("frequency", CUDAState, frequency, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void cuda_class_init(ObjectClass *oc, void *data)
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 063ad80..fc77162 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -379,7 +379,7 @@ static void macio_newworld_class_init(ObjectClass *oc, void *data)
 
 static Property macio_properties[] = {
     DEFINE_PROP_UINT64("frequency", MacIOState, frequency, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void macio_class_init(ObjectClass *klass, void *data)
diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index d35f8a3..986e56e 100644
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -111,7 +111,7 @@ static void macio_nvram_unrealizefn(DeviceState *dev, Error **errp)
 static Property macio_nvram_properties[] = {
     DEFINE_PROP_UINT32("size", MacIONVRAMState, size, 0),
     DEFINE_PROP_UINT32("it_shift", MacIONVRAMState, it_shift, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void macio_nvram_class_init(ObjectClass *oc, void *data)
diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index cce2fdd..c02ba57 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -162,7 +162,7 @@ static void ioh3420_exitfn(PCIDevice *d)
 static Property ioh3420_props[] = {
     DEFINE_PROP_BIT(COMPAT_PROP_PCP, PCIDevice, cap_present,
                     QEMU_PCIE_SLTCAP_PCP_BITNR, true),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static const VMStateDescription vmstate_ioh3420 = {
diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
index b3a6479..de8bc35 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -150,7 +150,7 @@ PCIESlot *xio3130_downstream_init(PCIBus *bus, int devfn, bool multifunction,
 static Property xio3130_downstream_props[] = {
     DEFINE_PROP_BIT(COMPAT_PROP_PCP, PCIDevice, cap_present,
                     QEMU_PCIE_SLTCAP_PCP_BITNR, true),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static const VMStateDescription vmstate_xio3130_downstream = {
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index c63f45d..693be23 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -374,7 +374,7 @@ static Property raven_pcihost_properties[] = {
     DEFINE_PROP_UINT32("elf-machine", PREPPCIState, pci_dev.elf_machine,
                        EM_NONE),
     DEFINE_PROP_STRING("bios-name", PREPPCIState, pci_dev.bios_name),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void raven_pcihost_class_init(ObjectClass *klass, void *data)
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 6d23553..4ff9421 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -489,7 +489,7 @@ static const TypeInfo versatile_pci_host_info = {
 static Property pci_vpb_properties[] = {
     DEFINE_PROP_UINT8("broken-irq-mapping", PCIVPBState, irq_mapping_prop,
                       PCI_VPB_IRQMAP_ASSUME_OK),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void pci_vpb_class_init(ObjectClass *klass, void *data)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index f5c7a99..2c1afa9 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -58,7 +58,7 @@ static Property pci_props[] = {
                     QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false),
     DEFINE_PROP_BIT("command_serr_enable", PCIDevice, cap_present,
                     QEMU_PCI_CAP_SERR_BITNR, true),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static const VMStateDescription vmstate_pcibus = {
diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index 40ca8d5..fd95cd7 100644
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -123,7 +123,7 @@ static Property pcie_port_props[] = {
     DEFINE_PROP_UINT16("aer_log_max", PCIEPort,
                        parent_obj.parent_obj.exp.aer_log.log_max,
                        PCIE_AER_LOG_MAX_DEFAULT),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void pcie_port_class_init(ObjectClass *oc, void *data)
@@ -144,7 +144,7 @@ static const TypeInfo pcie_port_type_info = {
 static Property pcie_slot_props[] = {
     DEFINE_PROP_UINT8("chassis", PCIESlot, chassis, 0),
     DEFINE_PROP_UINT16("slot", PCIESlot, slot, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void pcie_slot_class_init(ObjectClass *oc, void *data)
diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index dd4aae8..06c934b 100644
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -341,7 +341,7 @@ static const VMStateDescription vmstate_a9_gtimer = {
 
 static Property a9_gtimer_properties[] = {
     DEFINE_PROP_UINT32("num-cpu", A9GTimerState, num_cpu, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void a9_gtimer_class_init(ObjectClass *klass, void *data)
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 8b93b3c..25ad290 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -264,7 +264,7 @@ static const VMStateDescription vmstate_arm_mptimer = {
 
 static Property arm_mptimer_properties[] = {
     DEFINE_PROP_UINT32("num-cpu", ARMMPTimerState, num_cpu, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void arm_mptimer_class_init(ObjectClass *klass, void *data)
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 3751675..9a47005 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -18,7 +18,7 @@ static Property usb_props[] = {
                     USB_DEV_FLAG_FULL_PATH, true),
     DEFINE_PROP_BIT("msos-desc", USBDevice, flags,
                     USB_DEV_FLAG_MSOS_DESC_ENABLE, true),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void usb_bus_class_init(ObjectClass *klass, void *data)
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 3ca3fa8..bfe6298 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -1194,7 +1194,7 @@ static Property arm_cpu_properties[] = {
     DEFINE_PROP_BOOL("start-powered-off", ARMCPU, start_powered_off, false),
     DEFINE_PROP_UINT32("psci-conduit", ARMCPU, psci_conduit, 0),
     DEFINE_PROP_UINT32("midr", ARMCPU, midr, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void arm_cpu_class_init(ObjectClass *oc, void *data)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 3305e09..578e22f 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1410,7 +1410,7 @@ static X86CPUDefinition host_cpudef;
 
 static Property host_x86_cpu_properties[] = {
     DEFINE_PROP_BOOL("migratable", X86CPU, migratable, true),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 /* class_init for the "host" CPU model
@@ -2956,7 +2956,7 @@ static Property x86_cpu_properties[] = {
     DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0),
     DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0),
     DEFINE_PROP_UINT32("xlevel2", X86CPU, env.cpuid_xlevel2, 0),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c
index 0be9835..0cc6efd 100644
--- a/tests/test-qdev-global-props.c
+++ b/tests/test-qdev-global-props.c
@@ -46,7 +46,7 @@ typedef struct MyType {
 static Property static_props[] = {
     DEFINE_PROP_UINT32("prop1", MyType, prop1, PROP_DEFAULT),
     DEFINE_PROP_UINT32("prop2", MyType, prop2, PROP_DEFAULT),
-    DEFINE_PROP_END_OF_LIST()
+    DEFINE_PROP_END_OF_LIST(),
 };
 
 static void static_prop_class_init(ObjectClass *oc, void *data)
-- 
2.1.0

Re: [Qemu-devel] [PATCH 6/6] Add comma after DEFINE_PROP_END_OF_LIST()

[Peter Maydell]

On 12 May 2015 at 03:25,  <shannon.zhao@linaro.org> wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
> diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
> index 433463e..d2b3f37 100644
> --- a/hw/audio/intel-hda.c
> +++ b/hw/audio/intel-hda.c
> @@ -31,7 +31,7 @@
>
>  static Property hda_props[] = {
>      DEFINE_PROP_UINT32("cad", HDACodecDevice, cad, -1),
> -    DEFINE_PROP_END_OF_LIST()
> +    DEFINE_PROP_END_OF_LIST(),
>  };

Why do we need to do this? The usual reason for having a comma
after the last item in an array is so that if we add another
item after it later we don't have to edit the line that used to
be last. But with these lists the DEFINE_PROP_END_OF_LIST()
line remains last by definition -- new entries will always go
above it, and anything below it would be a bug. So there's no
point in having a comma after it.

-- PMM

Re: [Qemu-devel] [PATCH 6/6] Add comma after DEFINE_PROP_END_OF_LIST()

[Shannon Zhao]

On 2015/5/12 14:59, Peter Maydell wrote:
> On 12 May 2015 at 03:25,  <shannon.zhao@linaro.org> wrote:
>> From: Shannon Zhao <shannon.zhao@linaro.org>
>>
>> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> ---
>> diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
>> index 433463e..d2b3f37 100644
>> --- a/hw/audio/intel-hda.c
>> +++ b/hw/audio/intel-hda.c
>> @@ -31,7 +31,7 @@
>>
>>  static Property hda_props[] = {
>>      DEFINE_PROP_UINT32("cad", HDACodecDevice, cad, -1),
>> -    DEFINE_PROP_END_OF_LIST()
>> +    DEFINE_PROP_END_OF_LIST(),
>>  };
> 
> Why do we need to do this? The usual reason for having a comma
> after the last item in an array is so that if we add another
> item after it later we don't have to edit the line that used to
> be last. But with these lists the DEFINE_PROP_END_OF_LIST()
> line remains last by definition -- new entries will always go
> above it, and anything below it would be a bug. So there's no
> point in having a comma after it.
> 

Here I just want to make the code style consistent. If this is not
necessary, we can drop this one.

-- 
Shannon

Re: [Qemu-devel] [PATCH 6/6] Add comma after DEFINE_PROP_END_OF_LIST()

[Michael Tokarev]

12.05.2015 05:25, shannon.zhao@linaro.org wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
[]
> -    DEFINE_PROP_END_OF_LIST()
> +    DEFINE_PROP_END_OF_LIST(),
[]

I don't see a reason doing this.

Thanks,

/mjt

Re: [Qemu-devel] [PATCH 6/6] Add comma after DEFINE_PROP_END_OF_LIST()

[Andreas Färber]

Am 11.09.2015 um 10:21 schrieb Michael Tokarev:
> 12.05.2015 05:25, shannon.zhao@linaro.org wrote:
>> From: Shannon Zhao <shannon.zhao@linaro.org>
> []
>> -    DEFINE_PROP_END_OF_LIST()
>> +    DEFINE_PROP_END_OF_LIST(),
> []
> 
> I don't see a reason doing this.

Yeah, "end of list" means nothing follows after, so no comma needed.

HTE,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)

Re: [Qemu-devel] [PATCH 0/6] Blank property cleanup

[Shannon Zhao]

Ping...

On 2015/5/12 10:25, shannon.zhao@linaro.org wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
> 
> After [1]"s390-virtio: use common features" and [2]"virtio: Move host
> features to backends" applied, there are some Property arrays which only
> contain the list terminator DEFINE_PROP_END_OF_LIST. This patchset
> removes those arrays and other meaningless Property arrays and also adds
> comma after DEFINE_PROP_END_OF_LIST().
> 
> [1] http://lists.gnu.org/archive/html/qemu-devel/2015-05/msg00259.html
> [2] http://lists.gnu.org/archive/html/qemu-devel/2015-04/threads.html
> 
> Shannon Zhao (6):
>   hw/s390x/s390-virtio-bus: Remove meaningless blank Property
>   hw/virtio/virtio-balloon: Remove meaningless blank Property
>   hw/virtio/virtio-pci: Remove meaningless blank Property
>   hw/gpio/zaurus: Remove meaningless blank Property
>   hw/arm/spitz: Remove meaningless blank Property
>   Add comma after DEFINE_PROP_END_OF_LIST()
> 
>  hw/arm/spitz.c                     |  5 -----
>  hw/audio/intel-hda.c               |  2 +-
>  hw/char/virtio-serial-bus.c        |  2 +-
>  hw/core/platform-bus.c             |  2 +-
>  hw/dma/i82374.c                    |  2 +-
>  hw/gpio/zaurus.c                   |  5 -----
>  hw/i386/kvm/ioapic.c               |  2 +-
>  hw/i386/xen/xen_pvdevice.c         |  2 +-
>  hw/ide/mmio.c                      |  2 +-
>  hw/ipack/ipack.c                   |  2 +-
>  hw/isa/pc87312.c                   |  2 +-
>  hw/misc/arm11scu.c                 |  2 +-
>  hw/misc/macio/cuda.c               |  2 +-
>  hw/misc/macio/macio.c              |  2 +-
>  hw/nvram/mac_nvram.c               |  2 +-
>  hw/pci-bridge/ioh3420.c            |  2 +-
>  hw/pci-bridge/xio3130_downstream.c |  2 +-
>  hw/pci-host/prep.c                 |  2 +-
>  hw/pci-host/versatile.c            |  2 +-
>  hw/pci/pci.c                       |  2 +-
>  hw/pci/pcie_port.c                 |  4 ++--
>  hw/s390x/s390-virtio-bus.c         | 15 ---------------
>  hw/timer/a9gtimer.c                |  2 +-
>  hw/timer/arm_mptimer.c             |  2 +-
>  hw/usb/bus.c                       |  2 +-
>  hw/virtio/virtio-balloon.c         |  5 -----
>  hw/virtio/virtio-pci.c             |  5 -----
>  target-arm/cpu.c                   |  2 +-
>  target-i386/cpu.c                  |  4 ++--
>  tests/test-qdev-global-props.c     |  2 +-
>  30 files changed, 27 insertions(+), 62 deletions(-)
> 

-- 
Shannon