Re: [libvirt] [PATCH] domaincapstest: add bhyve caps test

On 03/19/2017 07:05 AM, Roman Bogorodskiy wrote: > * Extract filling bhyve capabilities from virBhyveDomainCapsBuild() > into a new function virBhyveDomainCapsFill() to make testing > easier by not having to mock firmware directory listing and > hypervisor capabilities probing > * Also, just presence of the firmware files is not sufficient > to enable os.loader.supported, hypervisor should support UEFI > boot too > * Add tests to domaincapstest for the main caps possible flows: > - when UEFI bootrom is supported > - when video (fbus) is supported > - neither of above is supported > --- > src/bhyve/bhyve_capabilities.c | 72 +++++++++++++++-------- > src/bhyve/bhyve_capabilities.h | 3 + > tests/Makefile.am | 4 ++ > tests/domaincapsschemadata/bhyve_basic.x86_64.xml | 32 ++++++++++ > tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml | 49 +++++++++++++++ > tests/domaincapsschemadata/bhyve_uefi.x86_64.xml | 41 +++++++++++++ > tests/domaincapstest.c | 65 ++++++++++++++++++++ > 7 files changed, 242 insertions(+), 24 deletions(-) > create mode 100644 tests/domaincapsschemadata/bhyve_basic.x86_64.xml > create mode 100644 tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml > create mode 100644 tests/domaincapsschemadata/bhyve_uefi.x86_64.xml

> --- /dev/null > +++ b/tests/domaincapsschemadata/bhyve_basic.x86_64.xml > @@ -0,0 +1,32 @@ > +<domainCapabilities> > + <path>/usr/sbin/bhyve</path> > + <domain>bhyve</domain> > + <machine>(null)</machine> This doesn't feel right. We should not output machine if it's NULL. We might need to change docs too: http://libvirt.org/formatdomaincaps.html#elements since there is no machine type in bhyve. I'll post a patch for that after which you'll need to regenerate the output of your tests. After that you have my ACK and you can push this one. Michal