[libvirt] [PATCH] conf: reject controllers with duplicate indexes

2013-04-25 Thread Ján Tomko 
Reject multiple controllers with the same index,
except for USB controllers.
Multi-function USB controllers can have the same index.
---
 src/conf/domain_conf.c | 59 ++
 1 file changed, 59 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cb69178..b6323fd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2594,6 +2594,63 @@ virDomainDeviceInfoIterate(virDomainDefPtr def,
 
 
 static int
+virDomainDefRejectDuplicateControllers(virDomainDefPtr def)
+{
+int max_idx[VIR_DOMAIN_CONTROLLER_TYPE_LAST];
+virBitmapPtr bitmaps[VIR_DOMAIN_CONTROLLER_TYPE_LAST] = { NULL };
+virDomainControllerDefPtr cont;
+size_t nbitmaps = 0;
+int ret = -1;
+bool b;
+int i;
+
+memset(max_idx, -1, sizeof(max_idx)/sizeof(max_idx[0]));
+
+for (i = 0; i  def-ncontrollers; i++) {
+cont = def-controllers[i];
+if (cont-idx  max_idx[cont-type])
+max_idx[cont-type] = cont-idx;
+}
+
+/* multiple USB controllers with the same index are allowed */
+max_idx[VIR_DOMAIN_CONTROLLER_TYPE_USB] = -1;
+
+for (i = 0; i  VIR_DOMAIN_CONTROLLER_TYPE_LAST; i++) {
+if (max_idx[i] = 0  !(bitmaps[i] = virBitmapNew(max_idx[i] + 1)))
+goto no_memory;
+nbitmaps++;
+}
+
+for (i = 0; i  def-ncontrollers; i++) {
+cont = def-controllers[i];
+
+if (max_idx[cont-type] == -1)
+continue;
+
+ignore_value(virBitmapGetBit(bitmaps[cont-type], cont-idx, b));
+if (b) {
+virReportError(VIR_ERR_XML_ERROR,
+   _(Multiple '%s' controllers with index '%d'),
+   virDomainControllerTypeToString(cont-type),
+   cont-idx);
+goto cleanup;
+}
+ignore_value(virBitmapSetBit(bitmaps[cont-type], cont-idx));
+}
+
+ret = 0;
+cleanup:
+for (i = 0; i  nbitmaps; i++)
+virBitmapFree(bitmaps[i]);
+return ret;
+
+no_memory:
+virReportOOMError();
+goto cleanup;
+}
+
+
+static int
 virDomainDefPostParseInternal(virDomainDefPtr def,
   virCapsPtr caps ATTRIBUTE_UNUSED)
 {
@@ -2673,6 +2730,8 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
 }
 }
 
+if (virDomainDefRejectDuplicateControllers(def)  0)
+return -1;
 return 0;
 
 no_memory:
-- 
1.8.1.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] conf: reject controllers with duplicate indexes

2013-04-25 Thread Eric Blake 
On 04/25/2013 05:41 AM, Ján Tomko wrote:
 Reject multiple controllers with the same index,
 except for USB controllers.
 Multi-function USB controllers can have the same index.
 ---

Compared to the earlier version you posted as patch 6/5 on the pci
patches, you changed to a stack allocation of the bitmaps.

  src/conf/domain_conf.c | 59 
 ++
  1 file changed, 59 insertions(+)
 

 +virDomainDefRejectDuplicateControllers(virDomainDefPtr def)
 +{
 +int max_idx[VIR_DOMAIN_CONTROLLER_TYPE_LAST];
 +virBitmapPtr bitmaps[VIR_DOMAIN_CONTROLLER_TYPE_LAST] = { NULL };
 +virDomainControllerDefPtr cont;
 +size_t nbitmaps = 0;
 +int ret = -1;
 +bool b;
 +int i;
 +
 +memset(max_idx, -1, sizeof(max_idx)/sizeof(max_idx[0]));

That's too small.  If VIR_DOMAIN_CONTROLLER_TYPE_LAST is 8, it only sets
2 entries and leaves the last 6 uninitialized.  You want:

memset(max_idx, -1, sizeof(max_idx));

ACK with the fixed initialization.

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] conf: reject controllers with duplicate indexes

2013-04-25 Thread Ján Tomko 
On 04/25/2013 04:36 PM, Eric Blake wrote:
 On 04/25/2013 05:41 AM, Ján Tomko wrote:
 Reject multiple controllers with the same index,
 except for USB controllers.
 Multi-function USB controllers can have the same index.
 ---
 
 Compared to the earlier version you posted as patch 6/5 on the pci
 patches, you changed to a stack allocation of the bitmaps.
 
  src/conf/domain_conf.c | 59 
 ++
  1 file changed, 59 insertions(+)

 
 +virDomainDefRejectDuplicateControllers(virDomainDefPtr def)
 +{
 +int max_idx[VIR_DOMAIN_CONTROLLER_TYPE_LAST];
 +virBitmapPtr bitmaps[VIR_DOMAIN_CONTROLLER_TYPE_LAST] = { NULL };
 +virDomainControllerDefPtr cont;
 +size_t nbitmaps = 0;
 +int ret = -1;
 +bool b;
 +int i;
 +
 +memset(max_idx, -1, sizeof(max_idx)/sizeof(max_idx[0]));
 
 That's too small.  If VIR_DOMAIN_CONTROLLER_TYPE_LAST is 8, it only sets
 2 entries and leaves the last 6 uninitialized.  You want:
 
 memset(max_idx, -1, sizeof(max_idx));
 
 ACK with the fixed initialization.
 

Thanks, I've fixed it and pushed it.

Jan

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list