[libvirt] [PATCH 07/14] xenconfig: Drop unused sexpr parsing infrastructure

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/libvirt_xenconfig.syms | 2 - src/xenconfig/xen_sxpr.c | 1137 ------------------------------------ src/xenconfig/xen_sxpr.h | 13 - 3 files changed, 1152 deletions(-) diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms index d5b4115c5a..d182f54e2f 100644 --- a/src/libvirt_xenconfig.syms +++ b/src/libvirt_xenconfig.syms @@ -5,10 +5,8 @@ # xenconfig/xen_sxpr.h xenGetDomIdFromSxpr; xenGetDomIdFromSxprString; -xenParseSxpr; xenParseSxprChar; xenParseSxprSound; -xenParseSxprString; xenParseSxprVifRate; # xenconfig/xen_xm.h diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index a9a420ac3a..4328875475 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -66,103 +66,6 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int *id) } -/** - * xenParseSxprOS: - * @node: the root of the parsed S-Expression - * @def: the domain config - * @hvm: true or 1 if node contains HVM S-Expression - * - * Parse the xend sexp for description of os and append it to buf. - * - * Returns 0 in case of success and -1 in case of error - */ -static int -xenParseSxprOS(const struct sexpr *node, - virDomainDefPtr def, - int hvm) -{ - if (hvm) { - if (VIR_ALLOC(def->os.loader) < 0) - goto error; - if (sexpr_node_copy(node, "domain/image/hvm/loader", &def->os.loader->path) < 0) - goto error; - if (def->os.loader->path == NULL) { - if (sexpr_node_copy(node, "domain/image/hvm/kernel", &def->os.loader->path) < 0) - goto error; - - if (def->os.loader->path == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("domain information incomplete, missing HVM loader")); - return -1; - } - } else { - if (sexpr_node_copy(node, "domain/image/hvm/kernel", &def->os.kernel) < 0) - goto error; - if (sexpr_node_copy(node, "domain/image/hvm/ramdisk", &def->os.initrd) < 0) - goto error; - if (sexpr_node_copy(node, "domain/image/hvm/args", &def->os.cmdline) < 0) - goto error; - if (sexpr_node_copy(node, "domain/image/hvm/root", &def->os.root) < 0) - goto error; - } - } else { - if (sexpr_node_copy(node, "domain/image/linux/kernel", &def->os.kernel) < 0) - goto error; - if (sexpr_node_copy(node, "domain/image/linux/ramdisk", &def->os.initrd) < 0) - goto error; - if (sexpr_node_copy(node, "domain/image/linux/args", &def->os.cmdline) < 0) - goto error; - if (sexpr_node_copy(node, "domain/image/linux/root", &def->os.root) < 0) - goto error; - } - - /* If HVM kenrel == loader, then old xend, so kill off kernel */ - if (hvm && - def->os.kernel && - STREQ(def->os.kernel, def->os.loader->path)) { - VIR_FREE(def->os.kernel); - } - /* Drop kernel argument that has no value */ - if (hvm && - def->os.kernel && *def->os.kernel == '\0' && - def->os.loader) { - VIR_FREE(def->os.kernel); - } - - if (!def->os.kernel && - hvm) { - const char *boot = sexpr_node(node, "domain/image/hvm/boot"); - if ((boot != NULL) && (boot[0] != 0)) { - while (*boot && - def->os.nBootDevs < VIR_DOMAIN_BOOT_LAST) { - if (*boot == 'a') - def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_FLOPPY; - else if (*boot == 'c') - def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_DISK; - else if (*boot == 'd') - def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_CDROM; - else if (*boot == 'n') - def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_NET; - boot++; - } - } - } - - if (!hvm && - !def->os.kernel && - !def->os.bootloader) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("domain information incomplete, missing kernel & bootloader")); - return -1; - } - - return 0; - - error: - return -1; -} - - /** * xenParseSxprChar: * @value: A string describing a character device. @@ -369,320 +272,6 @@ xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec) } -/** - * xenParseSxprDisks: - * @def: the domain config - * @root: root S-expression - * @hvm: true or 1 if node contains HVM S-Expression - * - * This parses out block devices from the domain S-expression - * - * Returns 0 if successful or -1 if failed. - */ -static int -xenParseSxprDisks(virDomainDefPtr def, - const struct sexpr *root, - int hvm) -{ - const struct sexpr *cur, *node; - virDomainDiskDefPtr disk = NULL; - - for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { - node = cur->u.s.car; - /* Normally disks are in a (device (vbd ...)) block - but blktap disks ended up in a differently named - (device (tap ....)) block.... */ - if (sexpr_lookup(node, "device/vbd") || - sexpr_lookup(node, "device/tap") || - sexpr_lookup(node, "device/tap2")) { - char *offset; - const char *src = NULL; - const char *dst = NULL; - const char *mode = NULL; - const char *bootable = NULL; - - /* Again dealing with (vbd...) vs (tap ...) differences */ - if (sexpr_lookup(node, "device/vbd")) { - src = sexpr_node(node, "device/vbd/uname"); - dst = sexpr_node(node, "device/vbd/dev"); - mode = sexpr_node(node, "device/vbd/mode"); - bootable = sexpr_node(node, "device/vbd/bootable"); - } else if (sexpr_lookup(node, "device/tap2")) { - src = sexpr_node(node, "device/tap2/uname"); - dst = sexpr_node(node, "device/tap2/dev"); - mode = sexpr_node(node, "device/tap2/mode"); - bootable = sexpr_node(node, "device/tap2/bootable"); - } else { - src = sexpr_node(node, "device/tap/uname"); - dst = sexpr_node(node, "device/tap/dev"); - mode = sexpr_node(node, "device/tap/mode"); - bootable = sexpr_node(node, "device/tap/bootable"); - } - - if (!(disk = virDomainDiskDefNew(NULL))) - goto error; - - if (dst == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("domain information incomplete, vbd has no dev")); - goto error; - } - - if (src == NULL) { - /* There is a case without the uname to the CD-ROM device */ - offset = strchr(dst, ':'); - if (!offset || - !hvm || - STRNEQ(offset, ":cdrom")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("domain information incomplete, vbd has no src")); - goto error; - } - } - - if (src != NULL) { - offset = strchr(src, ':'); - if (!offset) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot parse vbd filename, missing driver name")); - goto error; - } - - if (sexpr_lookup(node, "device/tap2") && - STRPREFIX(src, "tap:")) { - if (virDomainDiskSetDriver(disk, "tap2") < 0) - goto error; - } else { - char *tmp; - if (VIR_STRNDUP(tmp, src, offset - src) < 0) - goto error; - if (virDomainDiskSetDriver(disk, tmp) < 0) { - VIR_FREE(tmp); - goto error; - } - VIR_FREE(tmp); - } - - src = offset + 1; - - if (STREQ(virDomainDiskGetDriver(disk), "tap") || - STREQ(virDomainDiskGetDriver(disk), "tap2")) { - char *driverType = NULL; - - offset = strchr(src, ':'); - if (!offset) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot parse vbd filename, missing driver type")); - goto error; - } - - if (VIR_STRNDUP(driverType, src, offset - src) < 0) - goto error; - if (STREQ(driverType, "aio")) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); - else - virDomainDiskSetFormat(disk, - virStorageFileFormatTypeFromString(driverType)); - VIR_FREE(driverType); - if (virDomainDiskGetFormat(disk) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown driver type %s"), src); - goto error; - } - - src = offset + 1; - /* Its possible to use blktap driver for block devs - too, but kinda pointless because blkback is better, - so we assume common case here. If blktap becomes - omnipotent, we can revisit this, perhaps stat()'ing - the src file in question */ - virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE); - } else if (STREQ(virDomainDiskGetDriver(disk), "phy")) { - virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK); - } else if (STREQ(virDomainDiskGetDriver(disk), "file")) { - virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE); - } - } else { - /* No CDROM media so can't really tell. We'll just - call if a FILE for now and update when media - is inserted later */ - virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE); - } - - if (STREQLEN(dst, "ioemu:", 6)) - dst += 6; - - disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; - offset = strrchr(dst, ':'); - if (offset) { - if (STREQ(offset, ":cdrom")) { - disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; - } else if (STREQ(offset, ":disk")) { - /* The default anyway */ - } else { - /* Unknown, lets pretend its a disk too */ - } - offset[0] = '\0'; - } - - if (VIR_STRDUP(disk->dst, dst) < 0) - goto error; - if (virDomainDiskSetSource(disk, src) < 0) - goto error; - - if (STRPREFIX(disk->dst, "xvd")) - disk->bus = VIR_DOMAIN_DISK_BUS_XEN; - else if (STRPREFIX(disk->dst, "hd")) - disk->bus = VIR_DOMAIN_DISK_BUS_IDE; - else if (STRPREFIX(disk->dst, "sd")) - disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; - else - disk->bus = VIR_DOMAIN_DISK_BUS_IDE; - - if (mode && - strchr(mode, 'r')) - disk->src->readonly = true; - if (mode && - strchr(mode, '!')) - disk->src->shared = true; - - if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) - goto error; - - /* re-order disks if there is a bootable device */ - if (STREQ_NULLABLE(bootable, "1")) { - def->disks[def->ndisks++] = def->disks[0]; - def->disks[0] = disk; - } else { - def->disks[def->ndisks++] = disk; - } - disk = NULL; - } - } - - return 0; - - error: - virDomainDiskDefFree(disk); - return -1; -} - - -/** - * xenParseSxprNets: - * @def: the domain config - * @root: root S-expression - * - * This parses out network devices from the domain S-expression - * - * Returns 0 if successful or -1 if failed. - */ -static int -xenParseSxprNets(virDomainDefPtr def, - const struct sexpr *root) -{ - virDomainNetDefPtr net = NULL; - const struct sexpr *cur, *node; - const char *tmp; - int vif_index = 0; - - for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { - node = cur->u.s.car; - if (sexpr_lookup(node, "device/vif")) { - const char *tmp2, *model, *type; - tmp2 = sexpr_node(node, "device/vif/script"); - tmp = sexpr_node(node, "device/vif/bridge"); - model = sexpr_node(node, "device/vif/model"); - type = sexpr_node(node, "device/vif/type"); - - if (VIR_ALLOC(net) < 0) - goto cleanup; - - if (tmp != NULL || - (tmp2 != NULL && STREQ(tmp2, DEFAULT_VIF_SCRIPT))) { - net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - /* XXX virtual network reverse resolve */ - - if (VIR_STRDUP(net->data.bridge.brname, tmp) < 0) - goto cleanup; - if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && - VIR_STRDUP(net->script, tmp2) < 0) - goto cleanup; - tmp = sexpr_node(node, "device/vif/ip"); - if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0) < 0) - goto cleanup; - } else { - net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - if (VIR_STRDUP(net->script, tmp2) < 0) - goto cleanup; - tmp = sexpr_node(node, "device/vif/ip"); - if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0) < 0) - goto cleanup; - } - - tmp = sexpr_node(node, "device/vif/vifname"); - /* If vifname is specified in xend config, include it in net - * definition regardless of domain state. If vifname is not - * specified, only generate one if domain is active (id != -1). */ - if (tmp) { - if (VIR_STRDUP(net->ifname, tmp) < 0) - goto cleanup; - } else if (def->id != -1) { - if (virAsprintf(&net->ifname, "vif%d.%d", def->id, vif_index) < 0) - goto cleanup; - } - - tmp = sexpr_node(node, "device/vif/mac"); - if (tmp) { - if (virMacAddrParse(tmp, &net->mac) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed mac address '%s'"), tmp); - goto cleanup; - } - } - - if (model) { - if (virDomainNetSetModelString(net, model) < 0) - goto cleanup; - } else { - if (type && STREQ(type, "netfront")) - net->model = VIR_DOMAIN_NET_MODEL_NETFRONT; - } - - tmp = sexpr_node(node, "device/vif/rate"); - if (tmp) { - virNetDevBandwidthPtr bandwidth; - unsigned long long kbytes_per_sec; - - if (xenParseSxprVifRate(tmp, &kbytes_per_sec) < 0) - goto cleanup; - - if (VIR_ALLOC(bandwidth) < 0) - goto cleanup; - if (VIR_ALLOC(bandwidth->out) < 0) { - VIR_FREE(bandwidth); - goto cleanup; - } - - bandwidth->out->average = kbytes_per_sec; - net->bandwidth = bandwidth; - } - - if (VIR_APPEND_ELEMENT(def->nets, def->nnets, net) < 0) - goto cleanup; - - vif_index++; - } - } - - return 0; - - cleanup: - virDomainNetDefFree(net); - return -1; -} - - /** * xenParseSxprSound: * @def: the domain config @@ -765,729 +354,3 @@ xenParseSxprSound(virDomainDefPtr def, error: return -1; } - - -/** - * xenParseSxprUSB: - * @def: the domain config - * @root: root S-expression - * - * This parses out USB devices from the domain S-expression - * - * Returns 0 if successful or -1 if failed. - */ -static int -xenParseSxprUSB(virDomainDefPtr def, - const struct sexpr *root) -{ - struct sexpr *cur, *node; - const char *tmp; - - for (cur = sexpr_lookup(root, "domain/image/hvm"); cur && cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { - node = cur->u.s.car; - if (sexpr_lookup(node, "usbdevice")) { - tmp = sexpr_node(node, "usbdevice"); - if (tmp && *tmp) { - if (STREQ(tmp, "tablet") || - STREQ(tmp, "mouse") || - STREQ(tmp, "keyboard")) { - virDomainInputDefPtr input; - if (VIR_ALLOC(input) < 0) - goto error; - input->bus = VIR_DOMAIN_INPUT_BUS_USB; - if (STREQ(tmp, "tablet")) - input->type = VIR_DOMAIN_INPUT_TYPE_TABLET; - else if (STREQ(tmp, "mouse")) - input->type = VIR_DOMAIN_INPUT_TYPE_MOUSE; - else - input->type = VIR_DOMAIN_INPUT_TYPE_KBD; - - if (VIR_APPEND_ELEMENT(def->inputs, def->ninputs, input) < 0) { - VIR_FREE(input); - goto error; - } - } else { - /* XXX Handle other non-input USB devices later */ - } - } - } - } - return 0; - - error: - return -1; -} - - -/* - * xenParseSxprGraphicsOld: - * @def: the domain config - * @root: root S-expression - * @hvm: true or 1 if root contains HVM S-Expression - * @vncport: VNC port number - * - * This parses out VNC devices from the domain S-expression - * - * Returns 0 if successful or -1 if failed. - */ -static int -xenParseSxprGraphicsOld(virDomainDefPtr def, - const struct sexpr *root, - int hvm, - int vncport) -{ - const char *tmp; - virDomainGraphicsDefPtr graphics = NULL; - - if ((tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux")) && - tmp[0] == '1') { - /* Graphics device (HVM, or old (pre-3.0.4) style PV VNC config) */ - int port; - const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux"); - const char *vncPasswd = sexpr_fmt_node(root, "domain/image/%s/vncpasswd", hvm ? "hvm" : "linux"); - const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux"); - const char *unused = sexpr_fmt_node(root, "domain/image/%s/vncunused", hvm ? "hvm" : "linux"); - - port = vncport; - - if (VIR_ALLOC(graphics) < 0) - goto error; - - graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC; - if ((unused && STREQ(unused, "1")) || port == -1) - graphics->data.vnc.autoport = true; - graphics->data.vnc.port = port; - - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto error; - - if (VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0) - goto error; - - if (VIR_STRDUP(graphics->data.vnc.keymap, keymap) < 0) - goto error; - - if (VIR_ALLOC_N(def->graphics, 1) < 0) - goto error; - def->graphics[0] = graphics; - def->ngraphics = 1; - graphics = NULL; - } else if ((tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux")) && - tmp[0] == '1') { - /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */ - const char *display = sexpr_fmt_node(root, "domain/image/%s/display", hvm ? "hvm" : "linux"); - const char *xauth = sexpr_fmt_node(root, "domain/image/%s/xauthority", hvm ? "hvm" : "linux"); - - if (VIR_ALLOC(graphics) < 0) - goto error; - - graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL; - if (VIR_STRDUP(graphics->data.sdl.display, display) < 0) - goto error; - if (VIR_STRDUP(graphics->data.sdl.xauth, xauth) < 0) - goto error; - - if (VIR_ALLOC_N(def->graphics, 1) < 0) - goto error; - def->graphics[0] = graphics; - def->ngraphics = 1; - graphics = NULL; - } - - return 0; - - error: - virDomainGraphicsDefFree(graphics); - return -1; -} - - -/* - * xenParseSxprGraphicsNew: - * @def: the domain config - * @root: root S-expression - * @vncport: VNC port number - * - * This parses out VNC devices from the domain S-expression - * - * Returns 0 if successful or -1 if failed. - */ -static int -xenParseSxprGraphicsNew(virDomainDefPtr def, - const struct sexpr *root, int vncport) -{ - virDomainGraphicsDefPtr graphics = NULL; - const struct sexpr *cur, *node; - const char *tmp; - int typeVal; - - /* append network devices and framebuffer */ - for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { - node = cur->u.s.car; - if (sexpr_lookup(node, "device/vfb")) { - /* New style graphics config for PV guests in >= 3.0.4, - * or for HVM guests in >= 3.0.5 */ - if (sexpr_node(node, "device/vfb/type")) { - tmp = sexpr_node(node, "device/vfb/type"); - } else if (sexpr_node(node, "device/vfb/vnc")) { - tmp = "vnc"; - } else if (sexpr_node(node, "device/vfb/sdl")) { - tmp = "sdl"; - } else { - tmp = "unknown"; - } - - if (VIR_ALLOC(graphics) < 0) - goto error; - - if ((typeVal = virDomainGraphicsTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown graphics type '%s'"), tmp); - goto error; - } - graphics->type = typeVal; - - if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { - const char *display = sexpr_node(node, "device/vfb/display"); - const char *xauth = sexpr_node(node, "device/vfb/xauthority"); - if (VIR_STRDUP(graphics->data.sdl.display, display) < 0) - goto error; - if (VIR_STRDUP(graphics->data.sdl.xauth, xauth) < 0) - goto error; - } else { - int port; - const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten"); - const char *vncPasswd = sexpr_node(node, "device/vfb/vncpasswd"); - const char *keymap = sexpr_node(node, "device/vfb/keymap"); - const char *unused = sexpr_node(node, "device/vfb/vncunused"); - - port = vncport; - - /* Didn't find port entry in xenstore */ - if (port == -1) { - const char *str = sexpr_node(node, "device/vfb/vncdisplay"); - int val; - if (str != NULL && virStrToLong_i(str, NULL, 0, &val) == 0) - port = val; - } - - if ((unused && STREQ(unused, "1")) || port == -1) - graphics->data.vnc.autoport = true; - - if (port >= 0 && port < 5900) - port += 5900; - graphics->data.vnc.port = port; - - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto error; - - if (VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0) - goto error; - - if (VIR_STRDUP(graphics->data.vnc.keymap, keymap) < 0) - goto error; - } - - if (VIR_ALLOC_N(def->graphics, 1) < 0) - goto error; - def->graphics[0] = graphics; - def->ngraphics = 1; - graphics = NULL; - break; - } - } - - return 0; - - error: - virDomainGraphicsDefFree(graphics); - return -1; -} - - -/** - * xenParseSxprPCI: - * @def: the domain config - * @root: root sexpr - * - * This parses out PCI devices from the domain sexpr - * - * Returns 0 if successful or -1 if failed. - */ -static int -xenParseSxprPCI(virDomainDefPtr def, - const struct sexpr *root) -{ - const struct sexpr *cur, *tmp = NULL, *node; - virDomainHostdevDefPtr dev = NULL; - - /* - * With the (domain ...) block we have the following odd setup - * - * (device - * (pci - * (dev (domain 0x0000) (bus 0x00) (slot 0x1b) (func 0x0)) - * (dev (domain 0x0000) (bus 0x00) (slot 0x13) (func 0x0)) - * ) - * ) - * - * Normally there is one (device ...) block per device, but in - * weird world of Xen PCI, once (device ...) covers multiple - * devices. - */ - - for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { - node = cur->u.s.car; - if ((tmp = sexpr_lookup(node, "device/pci")) != NULL) - break; - } - - if (!tmp) - return 0; - - for (cur = tmp; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { - const char *domain = NULL; - const char *bus = NULL; - const char *slot = NULL; - const char *func = NULL; - int domainID; - int busID; - int slotID; - int funcID; - - node = cur->u.s.car; - if (!sexpr_lookup(node, "dev")) - continue; - - if (!(domain = sexpr_node(node, "dev/domain"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing PCI domain")); - goto error; - } - if (!(bus = sexpr_node(node, "dev/bus"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing PCI bus")); - goto error; - } - if (!(slot = sexpr_node(node, "dev/slot"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing PCI slot")); - goto error; - } - if (!(func = sexpr_node(node, "dev/func"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing PCI func")); - goto error; - } - - if (virStrToLong_i(domain, NULL, 0, &domainID) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse PCI domain '%s'"), domain); - goto error; - } - if (virStrToLong_i(bus, NULL, 0, &busID) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse PCI bus '%s'"), bus); - goto error; - } - if (virStrToLong_i(slot, NULL, 0, &slotID) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse PCI slot '%s'"), slot); - goto error; - } - if (virStrToLong_i(func, NULL, 0, &funcID) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse PCI func '%s'"), func); - goto error; - } - - if (!(dev = virDomainHostdevDefNew())) - goto error; - - dev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; - dev->managed = false; - dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; - dev->source.subsys.u.pci.addr.domain = domainID; - dev->source.subsys.u.pci.addr.bus = busID; - dev->source.subsys.u.pci.addr.slot = slotID; - dev->source.subsys.u.pci.addr.function = funcID; - - if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, dev) < 0) - goto error; - } - - return 0; - - error: - virDomainHostdevDefFree(dev); - return -1; -} - - -/** - * xenParseSxpr: - * @root: the root of the parsed S-Expression - * @cpus: set of cpus the domain may be pinned to - * @tty: the console pty path - * @vncport: VNC port number - * - * Parse the xend S-expression description and turn it into a virDomainDefPtr - * representing these settings as closely as is practical. - * - * Returns the domain config or NULL in case of error. - * The caller must free() the returned value. - */ -virDomainDefPtr -xenParseSxpr(const struct sexpr *root, - const char *cpus, - char *tty, - int vncport, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt) -{ - const char *tmp; - virDomainDefPtr def; - int hvm = 0, vmlocaltime; - unsigned int vcpus; - - if (!(def = virDomainDefNew())) - goto error; - - tmp = sexpr_node(root, "domain/domid"); - def->virtType = VIR_DOMAIN_VIRT_XEN; - if (tmp) - def->id = sexpr_int(root, "domain/domid"); - else - def->id = -1; - - if (sexpr_node_copy(root, "domain/name", &def->name) < 0) - goto error; - if (def->name == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("domain information incomplete, missing name")); - goto error; - } - - tmp = sexpr_node(root, "domain/uuid"); - if (tmp == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("domain information incomplete, missing name")); - goto error; - } - if (virUUIDParse(tmp, def->uuid) < 0) - goto error; - - if (sexpr_node_copy(root, "domain/description", &def->description) < 0) - goto error; - - hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0; - if (!hvm) { - if (sexpr_node_copy(root, "domain/bootloader", - &def->os.bootloader) < 0) - goto error; - - if (!def->os.bootloader && - sexpr_has(root, "domain/bootloader") && - VIR_STRDUP(def->os.bootloader, "") < 0) - goto error; - - if (def->os.bootloader && - sexpr_node_copy(root, "domain/bootloader_args", - &def->os.bootloaderArgs) < 0) - goto error; - } - - def->os.type = (hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_LINUX); - - if (def->id != 0) { - if (sexpr_lookup(root, "domain/image")) { - if (xenParseSxprOS(root, def, hvm) < 0) - goto error; - } - } - - virDomainDefSetMemoryTotal(def, (sexpr_u64(root, "domain/maxmem") << 10)); - def->mem.cur_balloon = (sexpr_u64(root, "domain/memory") << 10); - - if (def->mem.cur_balloon > virDomainDefGetMemoryTotal(def)) - def->mem.cur_balloon = virDomainDefGetMemoryTotal(def); - - if (cpus != NULL) { - if (virBitmapParse(cpus, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto error; - - if (virBitmapIsAllClear(def->cpumask)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'cpumask': %s"), - cpus); - goto error; - } - } - - if (virDomainDefSetVcpusMax(def, sexpr_int(root, "domain/vcpus"), xmlopt) < 0) - goto error; - - vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail")); - if (!vcpus || virDomainDefGetVcpusMax(def) < vcpus) - vcpus = virDomainDefGetVcpusMax(def); - - if (virDomainDefSetVcpus(def, vcpus) < 0) - goto error; - - tmp = sexpr_node(root, "domain/on_poweroff"); - if (tmp != NULL) { - if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown lifecycle type %s"), tmp); - goto error; - } - } else { - def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; - } - - tmp = sexpr_node(root, "domain/on_reboot"); - if (tmp != NULL) { - if ((def->onReboot = virDomainLifecycleActionTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown lifecycle type %s"), tmp); - goto error; - } - } else { - def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART; - } - - tmp = sexpr_node(root, "domain/on_crash"); - if (tmp != NULL) { - if ((def->onCrash = virDomainLifecycleActionTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown lifecycle type %s"), tmp); - goto error; - } - } else { - def->onCrash = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; - } - - if (hvm) { - if (sexpr_int(root, "domain/image/hvm/acpi")) - def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON; - if (sexpr_int(root, "domain/image/hvm/apic")) - def->features[VIR_DOMAIN_FEATURE_APIC] = VIR_TRISTATE_SWITCH_ON; - if (sexpr_int(root, "domain/image/hvm/pae")) - def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON; - if (sexpr_int(root, "domain/image/hvm/hap")) - def->features[VIR_DOMAIN_FEATURE_HAP] = VIR_TRISTATE_SWITCH_ON; - if (sexpr_int(root, "domain/image/hvm/viridian")) - def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] = VIR_TRISTATE_SWITCH_ON; - } - - /* 12aaf4a2486b (3.0.3) added a second low-priority 'localtime' setting */ - vmlocaltime = sexpr_int(root, "domain/localtime"); - if (hvm) { - const char *value = sexpr_node(root, "domain/image/hvm/localtime"); - int rtc_offset; - - if (value) { - if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown localtime offset %s"), value); - goto error; - } - } - def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE; - rtc_offset = sexpr_int(root, "domain/image/hvm/rtc_timeoffset"); - def->clock.data.variable.adjustment = rtc_offset; - def->clock.data.variable.basis = vmlocaltime ? - VIR_DOMAIN_CLOCK_BASIS_LOCALTIME : - VIR_DOMAIN_CLOCK_BASIS_UTC; - - if (sexpr_lookup(root, "domain/image/hvm/hpet")) { - virDomainTimerDefPtr timer; - - if (VIR_ALLOC_N(def->clock.timers, 1) < 0 || - VIR_ALLOC(timer) < 0) - goto error; - - timer->name = VIR_DOMAIN_TIMER_NAME_HPET; - timer->present = sexpr_int(root, "domain/image/hvm/hpet"); - timer->tickpolicy = -1; - timer->mode = -1; - timer->track = -1; - - def->clock.ntimers = 1; - def->clock.timers[0] = timer; - } - } else { - const char *value = sexpr_node(root, "domain/image/linux/localtime"); - if (value) { - if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown localtime offset %s"), value); - goto error; - } - } - /* PV domains do not have an emulated RTC and the offset is fixed. */ - if (vmlocaltime) - def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME; - else - def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC; - def->clock.data.utc_reset = true; - } /* !hvm */ - - if (sexpr_node_copy(root, hvm ? - "domain/image/hvm/device_model" : - "domain/image/linux/device_model", - &def->emulator) < 0) - goto error; - - /* append block devices */ - if (xenParseSxprDisks(def, root, hvm) < 0) - goto error; - - if (xenParseSxprNets(def, root) < 0) - goto error; - - if (xenParseSxprPCI(def, root) < 0) - goto error; - - /* New style graphics device config */ - if (xenParseSxprGraphicsNew(def, root, vncport) < 0) - goto error; - - /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */ - if ((def->ngraphics == 0) && - xenParseSxprGraphicsOld(def, root, hvm, vncport) < 0) - goto error; - - /* in case of HVM we have USB device emulation */ - if (hvm && - xenParseSxprUSB(def, root) < 0) - goto error; - - /* Character device config */ - if (hvm) { - const struct sexpr *serial_root; - bool have_multiple_serials = false; - - serial_root = sexpr_lookup(root, "domain/image/hvm/serial"); - if (serial_root) { - const struct sexpr *cur, *node, *cur2; - int ports_skipped = 0; - - for (cur = serial_root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { - node = cur->u.s.car; - - for (cur2 = node; cur2->kind == SEXPR_CONS; cur2 = cur2->u.s.cdr) { - tmp = cur2->u.s.car->u.value; - - if (tmp && STRNEQ(tmp, "none")) { - virDomainChrDefPtr chr; - if ((chr = xenParseSxprChar(tmp, tty)) == NULL) - goto error; - chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; - chr->target.port = def->nserials + ports_skipped; - if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0) { - virDomainChrDefFree(chr); - goto error; - } - } - else - ports_skipped++; - - have_multiple_serials = true; - } - } - } - - if (!have_multiple_serials) { - tmp = sexpr_node(root, "domain/image/hvm/serial"); - if (tmp && STRNEQ(tmp, "none")) { - virDomainChrDefPtr chr; - if ((chr = xenParseSxprChar(tmp, tty)) == NULL) - goto error; - chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; - chr->target.port = 0; - if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0) { - virDomainChrDefFree(chr); - goto error; - } - } - } - - tmp = sexpr_node(root, "domain/image/hvm/parallel"); - if (tmp && STRNEQ(tmp, "none")) { - virDomainChrDefPtr chr; - /* XXX does XenD stuff parallel port tty info into xenstore somewhere ? */ - if ((chr = xenParseSxprChar(tmp, NULL)) == NULL) - goto error; - chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL; - chr->target.port = 0; - if (VIR_APPEND_ELEMENT(def->parallels, def->nparallels, chr) < 0) { - virDomainChrDefFree(chr); - goto error; - } - } - } else if (def->id != 0) { - if (VIR_ALLOC_N(def->consoles, 1) < 0) - goto error; - def->nconsoles = 1; - /* Fake a paravirt console, since that's not in the sexpr */ - if (!(def->consoles[0] = xenParseSxprChar("pty", tty))) - goto error; - def->consoles[0]->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; - def->consoles[0]->target.port = 0; - def->consoles[0]->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; - } - VIR_FREE(tty); - - - /* Sound device config */ - if (hvm && - (tmp = sexpr_node(root, "domain/image/hvm/soundhw")) != NULL && - *tmp) { - if (xenParseSxprSound(def, tmp) < 0) - goto error; - } - - if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - xmlopt, NULL) < 0) - goto error; - - return def; - - error: - VIR_FREE(tty); - virDomainDefFree(def); - return NULL; -} - - -/** - * xenParseSxprString: - * @sexpr: the root of the parsed S-Expression - * @tty: the console pty path - * @vncport: VNC port number - * - * Parse the xend S-expression description and turn it into a virDomainDefPtr - * representing these settings as closely as is practical. - * - * Returns the domain config or NULL in case of error. - * The caller must free() the returned value. - */ -virDomainDefPtr -xenParseSxprString(const char *sexpr, - char *tty, - int vncport, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt) -{ - struct sexpr *root = string2sexpr(sexpr); - virDomainDefPtr def; - - if (!root) - return NULL; - - def = xenParseSxpr(root, NULL, tty, vncport, caps, xmlopt); - sexpr_free(root); - - return def; -} diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h index c888d06950..0081354688 100644 --- a/src/xenconfig/xen_sxpr.h +++ b/src/xenconfig/xen_sxpr.h @@ -31,19 +31,6 @@ int xenGetDomIdFromSxprString(const char *sexpr, int *id); int xenGetDomIdFromSxpr(const struct sexpr *root, int *id); -virDomainDefPtr xenParseSxprString(const char *sexpr, - char *tty, - int vncport, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt); - -virDomainDefPtr xenParseSxpr(const struct sexpr *root, - const char *cpus, - char *tty, - int vncport, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt); - int xenParseSxprSound(virDomainDefPtr def, const char *str); virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty); -- 2.21.0