From 75422b0d38029d2e098309da4dd7199dc7b2d2a9 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Thu, 25 Feb 2010 17:24:43 +0530 Subject: qdev: Add a DEV_NVECTORS_UNSPECIFIED enum for unspecified nr of MSI vectors net.c used a constant to signify no MSI vectors were specified. Extend that to all qdev devices. Signed-off-by: Amit Shah Reported-by: "Michael S. Tsirkin" Signed-off-by: Anthony Liguori --- hw/qdev.c | 2 +- hw/qdev.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/qdev.c b/hw/qdev.c index d0052d436c..b634890068 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -387,7 +387,7 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd) qdev_prop_set_vlan(dev, "vlan", nd->vlan); if (nd->netdev) qdev_prop_set_netdev(dev, "netdev", nd->netdev); - if (nd->nvectors != NIC_NVECTORS_UNSPECIFIED && + if (nd->nvectors != DEV_NVECTORS_UNSPECIFIED && qdev_prop_exists(dev, "vectors")) { qdev_prop_set_uint32(dev, "vectors", nd->nvectors); } diff --git a/hw/qdev.h b/hw/qdev.h index 0eb45b0476..adfcf795c3 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -24,6 +24,10 @@ enum DevState { DEV_STATE_INITIALIZED, }; +enum { + DEV_NVECTORS_UNSPECIFIED = -1, +}; + /* This structure should not be accessed directly. We declare it here so that it can be embedded in individual device state structures. */ struct DeviceState { -- cgit v1.2.3