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

2015-09-11 Thread Michael Tokarev 
12.05.2015 05:25, shannon.z...@linaro.org wrote:
> From: Shannon Zhao 
[]
> -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()

2015-09-11 Thread Andreas Färber 
Am 11.09.2015 um 10:21 schrieb Michael Tokarev:
> 12.05.2015 05:25, shannon.z...@linaro.org wrote:
>> From: Shannon Zhao 
> []
>> -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 6/6] Add comma after DEFINE_PROP_END_OF_LIST()

2015-05-12 Thread Shannon Zhao 
On 2015/5/12 14:59, Peter Maydell wrote:
 On 12 May 2015 at 03:25,  shannon.z...@linaro.org wrote:
 From: Shannon Zhao shannon.z...@linaro.org

 Signed-off-by: Shannon Zhao zhaoshengl...@huawei.com
 Signed-off-by: Shannon Zhao shannon.z...@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()

2015-05-12 Thread Peter Maydell 
On 12 May 2015 at 03:25,  shannon.z...@linaro.org wrote:
 From: Shannon Zhao shannon.z...@linaro.org

 Signed-off-by: Shannon Zhao zhaoshengl...@huawei.com
 Signed-off-by: Shannon Zhao shannon.z...@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

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

2015-05-11 Thread shannon . zhao 
From: Shannon Zhao shannon.z...@linaro.org

Signed-off-by: Shannon Zhao zhaoshengl...@huawei.com
Signed-off-by: Shannon Zhao shannon.z...@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, 0x),
 DEFINE_PROP_UINT8(revision, XenPVDevice, revision, 0x01),
 DEFINE_PROP_UINT32(size, XenPVDevice, size, 0x40),
-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(),