Re: [libvirt] [PATCH v2 1/2] add pci-bridge controller type

On Tue, Jan 08, 2013 at 09:58:49AM +0800, liguang wrote: > Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com&gt; > --- > src/conf/device_conf.c | 12 +++++++++++- > src/conf/device_conf.h | 1 + > src/conf/domain_conf.c | 5 ++++- > src/conf/domain_conf.h | 1 + > 4 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c > index 7b97f45..1c06ed0 100644 > --- a/src/conf/device_conf.c > +++ b/src/conf/device_conf.c > @@ -51,16 +51,18 @@ int > virDevicePCIAddressParseXML(xmlNodePtr node, > virDevicePCIAddressPtr addr) > { > - char *domain, *slot, *bus, *function, *multi; > + char *domain, *slot, *bus, *function, *multi, *bridge; > int ret = -1; > > memset(addr, 0, sizeof(*addr)); > + addr->bridge = -1; > > domain = virXMLPropString(node, "domain"); > bus = virXMLPropString(node, "bus"); > slot = virXMLPropString(node, "slot"); > function = virXMLPropString(node, "function"); > multi = virXMLPropString(node, "multifunction"); > + bridge = virXMLPropString(node, "bridge"); > > if (domain && > virStrToLong_ui(domain, NULL, 0, &addr->domain) < 0) { > @@ -98,6 +100,14 @@ virDevicePCIAddressParseXML(xmlNodePtr node, > goto cleanup; > > } > + > + if (bridge && > + virStrToLong_i(bridge, NULL, 0, &addr->bridge) < 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("pci-bridge number must be >= 0 ")); > + goto cleanup; > + } This is bogus - there's no need for a new 'bridge' attribute - we have 'bus' which is sufficient.

Daniel