| Message ID | 1267098884-5103-2-git-send-email-amit.shah@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Feb 25, 2010 at 05:24:44PM +0530, Amit Shah wrote: > Use the named constant instead of -1. > > Signed-off-by: Amit Shah <amit.shah@redhat.com> > Reported-by: "Michael S. Tsirkin" <mst@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/virtio-pci.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c > index bcd40f7..799f664 100644 > --- a/hw/virtio-pci.c > +++ b/hw/virtio-pci.c > @@ -500,8 +500,9 @@ static int virtio_serial_init_pci(PCIDevice *pci_dev) > if (!vdev) { > return -1; > } > - vdev->nvectors = proxy->nvectors == -1 ? proxy->max_virtserial_ports + 1 > - : proxy->nvectors; > + vdev->nvectors = proxy->nvectors == DEV_NVECTORS_UNSPECIFIED > + ? proxy->max_virtserial_ports + 1 > + : proxy->nvectors; > virtio_init_pci(proxy, vdev, > PCI_VENDOR_ID_REDHAT_QUMRANET, > PCI_DEVICE_ID_VIRTIO_CONSOLE, > @@ -585,7 +586,8 @@ static PCIDeviceInfo virtio_info[] = { > .init = virtio_serial_init_pci, > .exit = virtio_exit_pci, > .qdev.props = (Property[]) { > - DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, -1), > + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, > + DEV_NVECTORS_UNSPECIFIED), > DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), > DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), > DEFINE_PROP_UINT32("max_ports", VirtIOPCIProxy, max_virtserial_ports, > -- > 1.6.2.5 > >
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index bcd40f7..799f664 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -500,8 +500,9 @@ static int virtio_serial_init_pci(PCIDevice *pci_dev) if (!vdev) { return -1; } - vdev->nvectors = proxy->nvectors == -1 ? proxy->max_virtserial_ports + 1 - : proxy->nvectors; + vdev->nvectors = proxy->nvectors == DEV_NVECTORS_UNSPECIFIED + ? proxy->max_virtserial_ports + 1 + : proxy->nvectors; virtio_init_pci(proxy, vdev, PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_CONSOLE, @@ -585,7 +586,8 @@ static PCIDeviceInfo virtio_info[] = { .init = virtio_serial_init_pci, .exit = virtio_exit_pci, .qdev.props = (Property[]) { - DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, -1), + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, + DEV_NVECTORS_UNSPECIFIED), DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), DEFINE_PROP_UINT32("max_ports", VirtIOPCIProxy, max_virtserial_ports,
Use the named constant instead of -1. Signed-off-by: Amit Shah <amit.shah@redhat.com> Reported-by: "Michael S. Tsirkin" <mst@redhat.com> --- hw/virtio-pci.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)