[CAPRI]: Fix one of the hacks introduced for recent SR-IOV demo
[CAPRI]: Fix one of the hacks introduced for recent SR-IOV demo

For PV guests, comment back in the on-boot attaching of PCI devices that we've had for ages. Add 'log_exn_continue' wrapper to be sure.

For HVM guests, keep the SR-IOV-fixing hotplug behaviour.

Signed-off-by: David Scott <63c9eb0ea83039690fefa11afe17873ba8278a56@eu.citrix.com>

jjd27/xen-api,anoobs/xen-api,agimofcarmen/xen-api,cheng-z/xen-api,thomassa/xen-api,ravippandey/xen-api,johnelse/xcp-rrdd,djs55/xen-api,huizh/xen-api,salvocambria/xen-api,ravippandey/xen-api,djs55/xcp-networkd,agimofcarmen/xen-api,srowe/xen-api,huizh/xen-api,salvocambria/xen-api,koushikcgit/xcp-networkd,Frezzle/xen-api,robertbreker/xen-api,ravippandey/xen-api,cheng--zhang/xen-api,koushikcgit/xen-api,euanh/xen-api,Frezzle/xen-api,sharady/xcp-networkd,vasilenkomike/xen-api,salvocambria/xen-api,guard163/xen-api,rafalmiel/xen-api,sharady/xcp-networkd,cheng--zhang/xen-api,koushikcgit/xen-api,thomassa/xen-api,anoobs/xen-api,cheng--zhang/xen-api,simonjbeaumont/xcp-rrdd,koushikcgit/xen-api,huizh/xen-api,cheng-z/xen-api,simonjbeaumont/xen-api,djs55/xen-api,cheng-z/xen-api,ravippandey/xen-api,djs55/squeezed,cheng-z/xen-api,anoobs/xen-api,jjd27/xen-api,djs55/xcp-networkd,euanh/xen-api,rafalmiel/xen-api,guard163/xen-api,cheng-z/xen-api,euanh/xen-api,simonjbeaumont/xen-api,euanh/xen-api,rafalmiel/xen-api,huizh/xen-api,anoobs/xen-api,johnelse/xcp-rrdd,Frezzle/xen-api,simonjbeaumont/xcp-rrdd,robertbreker/xen-api,thomassa/xen-api,guard163/xen-api,koushikcgit/xcp-rrdd,djs55/xen-api,rafalmiel/xen-api,agimofcarmen/xen-api,srowe/xen-api,robertbreker/xen-api,koushikcgit/xen-api,Frezzle/xen-api,djs55/xen-api,cheng--zhang/xen-api,cheng--zhang/xen-api,djs55/xcp-rrdd,vasilenkomike/xen-api,agimofcarmen/xen-api,jjd27/xen-api,vasilenkomike/xen-api,robertbreker/xen-api,rafalmiel/xen-api,salvocambria/xen-api,koushikcgit/xen-api,huizh/xen-api,koushikcgit/xcp-networkd,robhoes/squeezed,srowe/xen-api,koushikcgit/xcp-rrdd,huizh/xen-api,agimofcarmen/xen-api,robertbreker/xen-api,srowe/xen-api,djs55/xcp-rrdd,guard163/xen-api,cheng-z/xen-api,rafalmiel/xen-api,euanh/xen-api,ravippandey/xen-api,jjd27/xen-api,vasilenkomike/xen-api,robertbreker/xen-api,agimofcarmen/xen-api,djs55/xen-api,jjd27/xen-api,salvocambria/xen-api,simonjbeaumont/xen-api,cheng--zhang/xen-api,jjd27/xen-api,Frezzle/xen-api,anoobs/xen-api,srowe/xen-api,cheng--zhang/xen-api,cheng-z/xen-api,simonjbeaumont/xen-api,ravippandey/xen-api,vasilenkomike/xen-api,vasilenkomike/xen-api,djs55/xen-api,koushikcgit/xen-api,anoobs/xen-api,thomassa/xen-api,euanh/xen-api,simonjbeaumont/xen-api,guard163/xen-api,thomassa/xen-api,thomassa/xen-api,salvocambria/xen-api,guard163/xen-api,koushikcgit/xcp-rrdd,simonjbeaumont/xen-api