Re: [libvirt] [PATCH v2 4/6] bhyve: automatically add 'isa' controller

When domain configuration requires the 'isa' controller to be present, automatically add it on domain post-parse stage. Now, as this controller is always available when needed, it's not necessary to implicitly add it to the bhyve command line, so remove bhyveBuildLPCArgStr().

Also, make bhyveDomainDefNeedsISAController() static as it's no longer used outside of bhyve_domain.c. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com&gt; --- src/bhyve/bhyve_command.c | 11 ----------- src/bhyve/bhyve_domain.c | 7 ++++++- src/bhyve/bhyve_domain.h | 2 -- tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 2 +- .../bhyvexml2argv-serial-grub-nocons.args | 2 +- .../bhyvexml2argvdata/bhyvexml2argv-serial-grub.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args | 4 ++-- .../bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args | 4 ++-- .../bhyvexml2argv-vnc-vgaconf-io.args | 4 ++-- .../bhyvexml2argv-vnc-vgaconf-off.args | 4 ++-- .../bhyvexml2argv-vnc-vgaconf-on.args | 4 ++-- tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args | 4 ++-- tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml | 3 +++ .../bhyvexml2xmlout-serial-grub-nocons.xml | 3 +++ .../bhyvexml2xmlout-serial-grub.xml | 3 +++ tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml | 3 +++ .../bhyvexml2xmlout-vnc-autoport.xml | 3 +++ .../bhyvexml2xmlout-vnc-vgaconf-io.xml | 3 +++ .../bhyvexml2xmlout-vnc-vgaconf-off.xml | 3 +++ .../bhyvexml2xmlout-vnc-vgaconf-on.xml | 3 +++ tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml | 3 +++ 22 files changed, 49 insertions(+), 30 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 2c90265a93..6e0af3892e 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -325,14 +325,6 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, return 0; } -static int -bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, - virCommandPtr cmd) -{ - virCommandAddArgList(cmd, "-s", "1,lpc", NULL); - return 0; -} - static int bhyveBuildGraphicsArgStr(const virDomainDef *def, virDomainGraphicsDefPtr graphics, @@ -634,9 +626,6 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, } } - if (nisacontrollers == 0 && bhyveDomainDefNeedsISAController(def))