On Mon, Nov 23, 2015 at 05:46:06PM +0000, Daniel P. Berrange wrote:
> On Mon, Nov 23, 2015 at 06:40:58PM +0100, Paolo Bonzini wrote:
> >
> >
> > On 18/11/2015 21:49, Michael S. Tsirkin wrote:
> > > On Wed, Nov 18, 2015 at 10:02:58AM +0100, marcandre.lur...@redhat.com
> > > wrote:
> > >> From: Marc-André Lureau <marcandre.lur...@redhat.com>
> > >>
> > >> vhost-user-test prints a warning. A test should not need to run on
> > >> hugetlbfs, let's silence the warning under qtest. The
> > >> condition can't check on qtest_enabled() since vhost-user-test actually
> > >> doesn't use qtest accel. However, qtest_driver() can be used, if
> > >> qtest_init() is called early enough. For that reason, move chardev and
> > >> qtest initialization early.
> > >>
> > >> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> > >
> > > Seems ok, and let us bring back the 2.4 test that was
> > > dropped in 2.5, but I'd like an ack on this from someone else.
> >
> > I wonder if we need the warning at all, but this patch is okay.
> >
> > Anyhow:
> >
> >
> >
> > - if (qemu_opts_foreach(qemu_find_opts("object"),
> > - object_create,
> > - object_create_initial, NULL)) {
> > + if (qemu_opts_foreach(qemu_find_opts("chardev"),
> > + chardev_init_func, NULL, NULL)) {
> > exit(1);
> > }
> >
> > - if (qemu_opts_foreach(qemu_find_opts("chardev"),
> > - chardev_init_func, NULL, NULL)) {
> > + if (qtest_chrdev) {
> > + Error *local_err = NULL;
> > + qtest_init(qtest_chrdev, qtest_log, &local_err);
> > + if (local_err) {
> > + error_report_err(local_err);
> > + exit(1);
> > + }
> > + }
> > +
> > + if (qemu_opts_foreach(qemu_find_opts("object"),
> > + object_create,
> > + object_create_initial, NULL)) {
> > exit(1);
> > }
> >
> >
> > Before: object-initial, chardev, qtest, object-late (not in the patch)
> >
> > After: chardev, qtest, object-initial, object-late (not in the patch)
> >
> > Objects must be initialized before chardev (except rng-egd) since in the
> > future chardev will need to use objects, in particular secret objects.
BTW, it was TLS credentials object that prompted my initial re-ordering,
but you're right that secret objects will need creation before chardevs
too, since TLS credentials will need secrets.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
