<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">2014-03-04 20:38 GMT+08:00 Daniel P. Berrange <<a href="mailto:berrange@redhat.com" target="_blank">berrange@redhat.com</a>>: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div><div>On Sat, Mar 01, 2014 at 02:29:00PM +0800, Chunyan Liu wrote: > > Signed-off-by: Chunyan Liu <<a href="mailto:cyliu@suse.com" target="_blank">cyliu@suse.com</a>> > --- > src/qemu/qemu_conf.h | 8 -- > src/qemu/qemu_driver.c | 74 +++++++++---------- > src/qemu/qemu_hostdev.c | 192 ++++++++++++++++++++++++++++------------------- > src/qemu/qemu_hotplug.c | 1 + > 4 files changed, 151 insertions(+), 124 deletions(-) > > diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h > index ece185b..2ac88fb 100644 > --- a/src/qemu/qemu_conf.h > +++ b/src/qemu/qemu_conf.h > @@ -215,14 +215,6 @@ struct _virQEMUDriver { > /* Immutable pointer. self-locking APIs */ > virSecurityManagerPtr securityManager; > > - /* Immutable pointers. Requires locks to be held before > - * calling APIs. activePciHostdevs must be locked before > - * inactivePciHostdevs */ > - virPCIDeviceListPtr activePciHostdevs; > - virPCIDeviceListPtr inactivePciHostdevs; > - virUSBDeviceListPtr activeUsbHostdevs; > - virSCSIDeviceListPtr activeScsiHostdevs; > - > /* Immutable pointer. Unsafe APIs. XXX */ > virHashTablePtr sharedDevices; > > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index f36a8b4..7d924b2 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -95,6 +95,7 @@ > #include "viraccessapicheck.h" > #include "viraccessapicheckqemu.h" > #include "storage/storage_driver.h" > +#include "virhostdev.h" > > #define VIR_FROM_THIS VIR_FROM_QEMU > > @@ -695,18 +696,6 @@ qemuStateInitialize(bool privileged, > if (qemuSecurityInit(qemu_driver) < 0) > goto error; > > - if ((qemu_driver->activePciHostdevs = virPCIDeviceListNew()) == NULL) > - goto error; > - > - if ((qemu_driver->activeUsbHostdevs = virUSBDeviceListNew()) == NULL) > - goto error; > - > - if ((qemu_driver->inactivePciHostdevs = virPCIDeviceListNew()) == NULL) > - goto error; > - > - if ((qemu_driver->activeScsiHostdevs = virSCSIDeviceListNew()) == NULL) > - goto error; > - </div></div>I think we should obtain the hostdev manager instance here, and save a reference to it, so that later functions do not need to worry about failure of virHostdevManagerGetDefault() <div> </div></blockquote><div>we could: </div><div> add .hostdev_mgr to _virQEMUDriver, and add qemu_driver->hostdev_mgr = virHostdevManagerGetDefault() here. </div><div> Is that OK? </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <div> > diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c > index 5546693..eeb1f24 100644 > --- a/src/qemu/qemu_hotplug.c > +++ b/src/qemu/qemu_hotplug.c > @@ -50,6 +50,7 @@ > #include "virstoragefile.h" > #include "virstring.h" > #include "virtime.h" > +#include "virhostdev.h" </div>This seems bogus as you're not adding any code to this file which would use those APIs Regards, Daniel -- |: <a href="http://berrange.com" target="_blank">http://berrange.com</a> -o- <a href="http://www.flickr.com/photos/dberrange/" target="_blank">http://www.flickr.com/photos/dberrange/</a> :| |: <a href="http://libvirt.org" target="_blank">http://libvirt.org</a> -o- <a href="http://virt-manager.org" target="_blank">http://virt-manager.org</a> :| |: <a href="http://autobuild.org" target="_blank">http://autobuild.org</a> -o- <a href="http://search.cpan.org/~danberr/" target="_blank">http://search.cpan.org/~danberr/</a> :| |: <a href="http://entangle-photo.org" target="_blank">http://entangle-photo.org</a> -o- <a href="http://live.gnome.org/gtk-vnc" target="_blank">http://live.gnome.org/gtk-vnc</a> :| </blockquote></div> </div></div>