[libvirt] [PATCH v2 0/2] bhyve: implement connectDomainXMLToNative
Changes from v1: - Return both bhyveload and bhyve commands, not only bhyve. Roman Bogorodskiy (2): bhyve: improve bhyve_command.c testability bhyve: implement connectDomainXMLToNative src/bhyve/bhyve_command.c | 85 +++++++++++++++++++++++++---------------------- src/bhyve/bhyve_command.h | 8 +++-- src/bhyve/bhyve_driver.c | 59 ++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.c | 10 +++--- tests/bhyvexml2argvtest.c | 2 +- 5 files changed, 117 insertions(+), 47 deletions(-) -- 1.9.0
* bhyve_command.c (bhyveBuildNetArgStr, virBhyveProcessBuildBhyveCmd): add dryRun mode which doesn't create any devices when enabled * bhyve_command.c (virBhyveProcessBuildBhyveCmd, virBhyveProcessBuildDestroyCmd, virBhyveProcessBuildLoadCmd): accept virDomainDefPtr instead of virDomainObjPtr. --- src/bhyve/bhyve_command.c | 85 +++++++++++++++++++++++++---------------------- src/bhyve/bhyve_command.h | 6 ++-- src/bhyve/bhyve_process.c | 10 +++--- tests/bhyvexml2argvtest.c | 2 +- 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index a2da34a..91a8731 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -39,7 +39,7 @@ VIR_LOG_INIT("bhyve.bhyve_command"); static int -bhyveBuildNetArgStr(const virDomainDef *def, virCommandPtr cmd) +bhyveBuildNetArgStr(const virDomainDef *def, virCommandPtr cmd, bool dryRun) { virDomainNetDefPtr net = NULL; char *brname = NULL; @@ -78,35 +78,42 @@ bhyveBuildNetArgStr(const virDomainDef *def, virCommandPtr cmd) } } - if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, - def->uuid, tapfd, 1, - virDomainNetGetActualVirtPortProfile(net), - virDomainNetGetActualVlan(net), - VIR_NETDEV_TAP_CREATE_IFUP | VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { + if (!dryRun) + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + def->uuid, tapfd, 1, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + VIR_NETDEV_TAP_CREATE_IFUP | VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { + VIR_FREE(net->ifname); + VIR_FREE(brname); + return -1; + } + } + + if (!dryRun) { + realifname = virNetDevTapGetRealDeviceName(net->ifname); + + if (realifname == NULL) { VIR_FREE(net->ifname); VIR_FREE(brname); return -1; } - } - - realifname = virNetDevTapGetRealDeviceName(net->ifname); - if (realifname == NULL) { - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; + VIR_DEBUG("%s -> %s", net->ifname, realifname); + /* hack on top of other hack: we need to set + * interface to 'UP' again after re-opening to find its + * name + */ + if (virNetDevSetOnline(net->ifname, true) != 0) { + VIR_FREE(net->ifname); + VIR_FREE(brname); + return -1; + } + } else { + if (VIR_STRDUP(realifname, "tap0") < 0) + return -1; } - VIR_DEBUG("%s -> %s", net->ifname, realifname); - /* hack on top of other hack: we need to set - * interface to 'UP' again after re-opening to find its - * name - */ - if (virNetDevSetOnline(net->ifname, true) != 0) { - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; - } virCommandAddArg(cmd, "-s"); virCommandAddArgFormat(cmd, "1:0,virtio-net,%s,mac=%s", @@ -195,7 +202,7 @@ bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd) virCommandPtr virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def, bool dryRun) { /* * /usr/sbin/bhyve -c 2 -m 256 -AI -H -P \ @@ -209,17 +216,17 @@ virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, /* CPUs */ virCommandAddArg(cmd, "-c"); - virCommandAddArgFormat(cmd, "%d", vm->def->vcpus); + virCommandAddArgFormat(cmd, "%d", def->vcpus); /* Memory */ virCommandAddArg(cmd, "-m"); virCommandAddArgFormat(cmd, "%llu", - VIR_DIV_UP(vm->def->mem.max_balloon, 1024)); + VIR_DIV_UP(def->mem.max_balloon, 1024)); /* Options */ - if (vm->def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_DOMAIN_FEATURE_STATE_ON) + if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_DOMAIN_FEATURE_STATE_ON) virCommandAddArg(cmd, "-A"); /* Create an ACPI table */ - if (vm->def->features[VIR_DOMAIN_FEATURE_APIC] == VIR_DOMAIN_FEATURE_STATE_ON) + if (def->features[VIR_DOMAIN_FEATURE_APIC] == VIR_DOMAIN_FEATURE_STATE_ON) virCommandAddArg(cmd, "-I"); /* Present ioapic to the guest */ /* Clarification about -H and -P flags from Peter Grehan: @@ -238,13 +245,13 @@ virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, virCommandAddArgList(cmd, "-s", "0:0,hostbridge", NULL); /* Devices */ - if (bhyveBuildNetArgStr(vm->def, cmd) < 0) + if (bhyveBuildNetArgStr(def, cmd, dryRun) < 0) goto error; - if (bhyveBuildDiskArgStr(vm->def, cmd) < 0) + if (bhyveBuildDiskArgStr(def, cmd) < 0) goto error; - if (bhyveBuildConsoleArgStr(vm->def, cmd) < 0) + if (bhyveBuildConsoleArgStr(def, cmd) < 0) goto error; - virCommandAddArg(cmd, vm->def->name); + virCommandAddArg(cmd, def->name); return cmd; @@ -255,30 +262,30 @@ virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, virCommandPtr virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def) { virCommandPtr cmd = virCommandNew(BHYVECTL); virCommandAddArg(cmd, "--destroy"); - virCommandAddArgPair(cmd, "--vm", vm->def->name); + virCommandAddArgPair(cmd, "--vm", def->name); return cmd; } virCommandPtr virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def) { virCommandPtr cmd; virDomainDiskDefPtr disk; - if (vm->def->ndisks != 1) { + if (def->ndisks != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("domain should have one and only one disk defined")); return NULL; } - disk = vm->def->disks[0]; + disk = def->disks[0]; if (disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -297,14 +304,14 @@ virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, /* Memory */ virCommandAddArg(cmd, "-m"); virCommandAddArgFormat(cmd, "%llu", - VIR_DIV_UP(vm->def->mem.max_balloon, 1024)); + VIR_DIV_UP(def->mem.max_balloon, 1024)); /* Image path */ virCommandAddArg(cmd, "-d"); virCommandAddArg(cmd, virDomainDiskGetSource(disk)); /* VM name */ - virCommandAddArg(cmd, vm->def->name); + virCommandAddArg(cmd, def->name); return cmd; } diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index 66d934d..7a38353 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -28,14 +28,14 @@ # include "vircommand.h" virCommandPtr virBhyveProcessBuildBhyveCmd(bhyveConnPtr, - virDomainObjPtr vm); + virDomainDefPtr def, bool dryRun); virCommandPtr virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver, - virDomainObjPtr vm); + virDomainDefPtr def); virCommandPtr virBhyveProcessBuildLoadCmd(bhyveConnPtr driver, - virDomainObjPtr vm); + virDomainDefPtr def); #endif /* __BHYVE_COMMAND_H__ */ diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index a557bc5..855d175 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -128,7 +128,8 @@ virBhyveProcessStart(virConnectPtr conn, /* Call bhyve to start the VM */ if (!(cmd = virBhyveProcessBuildBhyveCmd(driver, - vm))) + vm->def, + false))) goto cleanup; virCommandSetOutputFD(cmd, &logfd); @@ -140,7 +141,7 @@ virBhyveProcessStart(virConnectPtr conn, /* Now bhyve command is constructed, meaning the * domain is ready to be started, so we can build * and execute bhyveload command */ - if (!(load_cmd = virBhyveProcessBuildLoadCmd(driver, vm))) + if (!(load_cmd = virBhyveProcessBuildLoadCmd(driver, vm->def))) goto cleanup; virCommandSetOutputFD(load_cmd, &logfd); virCommandSetErrorFD(load_cmd, &logfd); @@ -179,7 +180,8 @@ virBhyveProcessStart(virConnectPtr conn, cleanup: if (ret < 0) { virCommandPtr destroy_cmd; - if ((destroy_cmd = virBhyveProcessBuildDestroyCmd(driver, vm)) != NULL) { + if ((destroy_cmd = virBhyveProcessBuildDestroyCmd(driver, + vm->def)) != NULL) { virCommandSetOutputFD(load_cmd, &logfd); virCommandSetErrorFD(load_cmd, &logfd); ignore_value(virCommandRun(destroy_cmd, NULL)); @@ -227,7 +229,7 @@ virBhyveProcessStop(bhyveConnPtr driver, /* No matter if shutdown was successful or not, we * need to unload the VM */ - if (!(cmd = virBhyveProcessBuildDestroyCmd(driver, vm))) + if (!(cmd = virBhyveProcessBuildDestroyCmd(driver, vm->def))) goto cleanup; if (virCommandRun(cmd, NULL) < 0) diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index aedfb01..f6f2bc4 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -33,7 +33,7 @@ static int testCompareXMLToArgvFiles(const char *xml, vm.def = vmdef; - if (!(cmd = virBhyveProcessBuildBhyveCmd(&driver, &vm))) + if (!(cmd = virBhyveProcessBuildBhyveCmd(&driver, vmdef, false))) goto out; if (!(actualargv = virCommandToString(cmd))) -- 1.9.0
On Mon, Apr 14, 2014 at 08:25:14PM +0400, Roman Bogorodskiy wrote:
* bhyve_command.c (bhyveBuildNetArgStr, virBhyveProcessBuildBhyveCmd): add dryRun mode which doesn't create any devices when enabled * bhyve_command.c (virBhyveProcessBuildBhyveCmd, virBhyveProcessBuildDestroyCmd, virBhyveProcessBuildLoadCmd): accept virDomainDefPtr instead of virDomainObjPtr. --- src/bhyve/bhyve_command.c | 85 +++++++++++++++++++++++++---------------------- src/bhyve/bhyve_command.h | 6 ++-- src/bhyve/bhyve_process.c | 10 +++--- tests/bhyvexml2argvtest.c | 2 +- 4 files changed, 56 insertions(+), 47 deletions(-)
ACK, though I'm afraid I don't think this counts a post-freeze merge material 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 :|
The only accepted format for now is 'bhyve-argv' which prints out a bhyve command corresponding to the given domain definition. --- src/bhyve/bhyve_command.h | 2 ++ src/bhyve/bhyve_driver.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index 7a38353..31de97a 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -27,6 +27,8 @@ # include "domain_conf.h" # include "vircommand.h" +# define BHYVE_CONFIG_FORMAT_ARGV "bhyve-argv" + virCommandPtr virBhyveProcessBuildBhyveCmd(bhyveConnPtr, virDomainDefPtr def, bool dryRun); diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index fd8c248..0a849ca 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -53,6 +53,7 @@ #include "nodeinfo.h" #include "bhyve_driver.h" +#include "bhyve_command.h" #include "bhyve_process.h" #include "bhyve_utils.h" #include "bhyve_capabilities.h" @@ -587,6 +588,63 @@ bhyveConnectNumOfDefinedDomains(virConnectPtr conn) return count; } +static char * +bhyveConnectDomainXMLToNative(virConnectPtr conn, + const char *format, + const char *xmlData, + unsigned int flags) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + bhyveConnPtr privconn = conn->privateData; + virDomainDefPtr def = NULL; + virCommandPtr cmd = NULL, loadcmd = NULL; + virCapsPtr caps = NULL; + char *ret = NULL; + + virCheckFlags(0, NULL); + + if (virConnectDomainXMLToNativeEnsureACL(conn) < 0) + goto cleanup; + + if (STRNEQ(format, BHYVE_CONFIG_FORMAT_ARGV)) { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported config type %s"), format); + goto cleanup; + } + + if (!(caps = bhyveDriverGetCapabilities(privconn))) + goto cleanup; + + if (!(def = virDomainDefParseString(xmlData, caps, privconn->xmlopt, + 1 << VIR_DOMAIN_VIRT_BHYVE, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if (!(loadcmd = virBhyveProcessBuildLoadCmd(privconn, def))) + goto cleanup; + + if (!(cmd = virBhyveProcessBuildBhyveCmd(privconn, def, true))) + goto cleanup; + + virBufferAdd(&buf, virCommandToString(loadcmd), -1); + virBufferAddChar(&buf, '\n'); + virBufferAdd(&buf, virCommandToString(cmd), -1); + + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + + ret = virBufferContentAndReset(&buf); + + cleanup: + virCommandFree(loadcmd); + virCommandFree(cmd); + virDomainDefFree(def); + virObjectUnref(caps); + return ret; +} + static int bhyveConnectListAllDomains(virConnectPtr conn, virDomainPtr **domains, @@ -1122,6 +1180,7 @@ static virDriver bhyveDriver = { .connectListAllDomains = bhyveConnectListAllDomains, /* 1.2.2 */ .connectListDefinedDomains = bhyveConnectListDefinedDomains, /* 1.2.2 */ .connectNumOfDefinedDomains = bhyveConnectNumOfDefinedDomains, /* 1.2.2 */ + .connectDomainXMLToNative = bhyveConnectDomainXMLToNative, /* 1.2.4 */ .domainCreate = bhyveDomainCreate, /* 1.2.2 */ .domainCreateWithFlags = bhyveDomainCreateWithFlags, /* 1.2.3 */ .domainDestroy = bhyveDomainDestroy, /* 1.2.2 */ -- 1.9.0
On Mon, Apr 14, 2014 at 08:25:15PM +0400, Roman Bogorodskiy wrote:
The only accepted format for now is 'bhyve-argv' which prints out a bhyve command corresponding to the given domain definition. --- src/bhyve/bhyve_command.h | 2 ++ src/bhyve/bhyve_driver.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)
ACK, though again I think this is a new feature so has to wait till 1.2.5 opens for business
+ .connectDomainXMLToNative = bhyveConnectDomainXMLToNative, /* 1.2.4 */
which will mean tweaking this when pushing. 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 :|
Daniel P. Berrange wrote:
On Mon, Apr 14, 2014 at 08:25:15PM +0400, Roman Bogorodskiy wrote:
The only accepted format for now is 'bhyve-argv' which prints out a bhyve command corresponding to the given domain definition. --- src/bhyve/bhyve_command.h | 2 ++ src/bhyve/bhyve_driver.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)
ACK, though again I think this is a new feature so has to wait till 1.2.5 opens for business
+ .connectDomainXMLToNative = bhyveConnectDomainXMLToNative, /* 1.2.4 */
which will mean tweaking this when pushing.
Pushed with s/1.2.4/1.2.5/, thanks! Roman Bogorodskiy
Roman Bogorodskiy wrote:
Changes from v1: - Return both bhyveload and bhyve commands, not only bhyve.
Roman Bogorodskiy (2): bhyve: improve bhyve_command.c testability bhyve: implement connectDomainXMLToNative
src/bhyve/bhyve_command.c | 85 +++++++++++++++++++++++++---------------------- src/bhyve/bhyve_command.h | 8 +++-- src/bhyve/bhyve_driver.c | 59 ++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.c | 10 +++--- tests/bhyvexml2argvtest.c | 2 +- 5 files changed, 117 insertions(+), 47 deletions(-)
ping? Roman Bogorodskiy
participants (2)
-
Daniel P. Berrange -
Roman Bogorodskiy