- Devel - libvirt List Archives

[libvirt] [PATCH v2] virsh: Add two new commands to change media
by Osier Yang 22 Dec '11

22 Dec '11

eject-media to eject the media from, and insert-media to insert media into CDROM or floppy drive. --- Basically this patch is just rebaing of https://www.redhat.com/archives/libvir-list/2011-June/msg01516.html, with a bit improvement, as I explained in the mail thread, we don't have to wait for the new QEMU monitor commands, what we need is just separate the tray and media management in virsh, if one day QEMU gets the patch for those new commands pushed, we can switch to honor them easily (regardless of whether we do it inside updateDeviceFlags API or in new APIs). --- tools/virsh.c | 369 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 33 +++++ 2 files changed, 402 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 02f2e0d..228a9dc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13453,6 +13453,373 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) } /* + * "eject-media" command + */ +static const vshCmdInfo info_eject_media[] = { + {"help", N_("eject media from CD or floppy drive")}, + {"desc", N_("Eject media from CD or floppy drive.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_eject_media[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"target", VSH_OT_DATA, VSH_OFLAG_REQ, N_("target of disk device")}, + {"current", VSH_OT_BOOL, 0, N_("can be either or both of --live and --config, " + "depends on implementation of hypervisor driver")}, + {"live", VSH_OT_BOOL, 0, N_("alter live configuration of running domain")}, + {"config", VSH_OT_BOOL, 0, N_("alter persistent configuration, effect observed on next boot")}, + {"force", VSH_OT_BOOL, 0, N_("force media ejection")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdEjectMedia(vshControl *ctl, const vshCmd *cmd) +{ + xmlDocPtr xml = NULL; + xmlXPathObjectPtr obj=NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr cur = NULL; + xmlBufferPtr xml_buf = NULL; + virDomainPtr dom = NULL; + const char *target = NULL; + char *doc; + int i = 0, diff_tgt; + int ret; + bool functionReturn = false; + int flags = 0; + int config = vshCommandOptBool(cmd, "config"); + int live = vshCommandOptBool(cmd, "live"); + int current = vshCommandOptBool(cmd, "current"); + int force = vshCommandOptBool(cmd, "force"); + bool has_source = false; + + if (current) { + if (live || config) { + vshError(ctl, "%s", _("--current must be specified exclusively")); + return false; + } + flags = VIR_DOMAIN_AFFECT_CURRENT; + } else { + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + } + + if (force) + flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; + + if (!vshConnectionUsability(ctl, ctl->conn)) + goto cleanup; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + goto cleanup; + + if (vshCommandOptString(cmd, "target", &target) <= 0) + goto cleanup; + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); + else + doc = virDomainGetXMLDesc(dom, 0); + if (!doc) + goto cleanup; + + xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + VIR_FREE(doc); + if (!xml) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto cleanup; + } + ctxt = xmlXPathNewContext(xml); + if (!ctxt) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto cleanup; + } + + obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); + if ((obj == NULL) || (obj->type != XPATH_NODESET) || + (obj->nodesetval == NULL) || (obj->nodesetval->nodeNr == 0)) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto cleanup; + } + + /* search target */ + for (; i < obj->nodesetval->nodeNr; i++) { + xmlNodePtr n = obj->nodesetval->nodeTab[i]; + bool is_supported = false; + + /* Check if the disk is CDROM or floppy disk */ + if (xmlStrEqual(n->name, BAD_CAST "disk")) { + char *device_value = virXMLPropString(n, "device"); + + if (STREQ(device_value, "cdrom") || + STREQ(device_value, "floppy")) + is_supported = true; + + VIR_FREE(device_value); + } + + cur = obj->nodesetval->nodeTab[i]->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "target")) { + char *tmp_tgt = virXMLPropString(cur, "dev"); + + diff_tgt = STREQ(tmp_tgt, target); + VIR_FREE(tmp_tgt); + + if (diff_tgt && is_supported) { + goto hit; + } + } + + cur = cur->next; + } + } + vshError(ctl, _("No found CDROM or floppy disk whose target is %s"), target); + goto cleanup; + + hit: + xml_buf = xmlBufferCreate(); + if (!xml_buf) { + vshError(ctl, "%s", _("Failed to allocate memory")); + goto cleanup; + } + + cur = obj->nodesetval->nodeTab[i]->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "source")) { + xmlUnlinkNode(cur); + xmlFreeNode(cur); + has_source = true; + break; + } + + cur = cur->next; + } + + if (!has_source) { + vshError(ctl, _("The disk device whose target is '%s' doesn't " + "have media"), target); + goto cleanup; + } + + if (xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0) { + vshError(ctl, "%s", _("Failed to create XML")); + goto cleanup; + } + + ret = virDomainUpdateDeviceFlags(dom, (char *)xmlBufferContent(xml_buf), flags); + + if (ret != 0) { + vshError(ctl, "%s", _("Failed to eject media")); + } else { + vshPrint(ctl, "%s", _("Media ejected successfully\n")); + functionReturn = true; + } + + cleanup: + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + xmlBufferFree(xml_buf); + if (dom) + virDomainFree(dom); + return functionReturn; +} + +/* + * "insert-media" command + */ +static const vshCmdInfo info_insert_media[] = { + {"help", N_("insert media into CD or floppy drive")}, + {"desc", N_("Insert media into CD or floppy drive.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_insert_media[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"target", VSH_OT_DATA, VSH_OFLAG_REQ, N_("target of disk device")}, + {"source", VSH_OT_DATA, VSH_OFLAG_REQ, N_("source of the media")}, + {"current", VSH_OT_BOOL, 0, N_("can be either or both of --live and --config, " + "depends on implementation of hypervisor driver")}, + {"live", VSH_OT_BOOL, 0, N_("alter live configuration of running domain")}, + {"config", VSH_OT_BOOL, 0, N_("alter persistent configuration, effect observed on next boot")}, + {"force", VSH_OT_BOOL, 0, N_("force media insertion")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdInsertMedia(vshControl *ctl, const vshCmd *cmd) +{ + xmlDocPtr xml = NULL; + xmlXPathObjectPtr obj=NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr cur = NULL; + xmlNodePtr new_node = NULL; + xmlBufferPtr xml_buf = NULL; + virDomainPtr dom = NULL; + const char *target = NULL; + const char *source = NULL; + char *doc; + int i = 0, diff_tgt; + int ret; + bool functionReturn = false; + int flags = 0; + const char *disk_type = NULL; + int config = vshCommandOptBool(cmd, "config"); + int live = vshCommandOptBool(cmd, "live"); + int current = vshCommandOptBool(cmd, "current"); + int force = vshCommandOptBool(cmd, "force"); + + if (current) { + if (live || config) { + vshError(ctl, "%s", _("--current must be specified exclusively")); + return false; + } + flags = VIR_DOMAIN_AFFECT_CURRENT; + } else { + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + } + + if (force) + flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; + + if (!vshConnectionUsability(ctl, ctl->conn)) + goto cleanup; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + goto cleanup; + + if (vshCommandOptString(cmd, "target", &target) <= 0) + goto cleanup; + + if (vshCommandOptString(cmd, "source", &source) <= 0) + goto cleanup; + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); + else + doc = virDomainGetXMLDesc(dom, 0); + if (!doc) + goto cleanup; + + xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + VIR_FREE(doc); + if (!xml) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto cleanup; + } + ctxt = xmlXPathNewContext(xml); + if (!ctxt) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto cleanup; + } + + obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); + if ((obj == NULL) || (obj->type != XPATH_NODESET) || + (obj->nodesetval == NULL) || (obj->nodesetval->nodeNr == 0)) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto cleanup; + } + + /* search target */ + for (; i < obj->nodesetval->nodeNr; i++) { + xmlNodePtr n = obj->nodesetval->nodeTab[i]; + bool is_supported = false; + + /* Check if the disk is CDROM or floppy disk */ + if (xmlStrEqual(n->name, BAD_CAST "disk")) { + disk_type = virXMLPropString(n, "type"); + char *device_value = virXMLPropString(n, "device"); + + if (STREQ(device_value, "cdrom") || + STREQ(device_value, "floppy")) + is_supported = true; + + VIR_FREE(device_value); + } + + cur = obj->nodesetval->nodeTab[i]->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "target")) { + char *tmp_tgt = virXMLPropString(cur, "dev"); + + diff_tgt = STREQ(tmp_tgt, target); + VIR_FREE(tmp_tgt); + + if (diff_tgt && is_supported) { + goto hit; + } + } + + cur = cur->next; + } + VIR_FREE(disk_type); + } + vshError(ctl, _("No found CDROM or floppy disk whose target is %s"), target); + goto cleanup; + + hit: + xml_buf = xmlBufferCreate(); + if (!xml_buf) { + vshError(ctl, "%s", _("Failed to allocate memory")); + goto cleanup; + } + + cur = obj->nodesetval->nodeTab[i]->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "source")) { + vshError(ctl, _("The disk device whose target is '%s' has media, " + "you may need to eject it first"), target); + goto cleanup; + } + + cur = cur->next; + } + + /* Insert node <source> */ + new_node = xmlNewNode(NULL, BAD_CAST "source"); + xmlNewProp(new_node, (const xmlChar *)disk_type, (const xmlChar *)source); + VIR_FREE(disk_type); + xmlAddChild(obj->nodesetval->nodeTab[i], new_node); + + if (xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0) { + vshError(ctl, "%s", _("Failed to create XML")); + goto cleanup; + } + + ret = virDomainUpdateDeviceFlags(dom, (char *)xmlBufferContent(xml_buf), flags); + + if (ret != 0) { + vshError(ctl, "%s", _("Failed to insert media")); + } else { + vshPrint(ctl, "%s", _("Media inserted successfully\n")); + functionReturn = true; + } + + cleanup: + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + xmlBufferFree(xml_buf); + if (dom) + virDomainFree(dom); + return functionReturn; +} + +/* * "detach-disk" command */ static const vshCmdInfo info_detach_disk[] = { @@ -15600,7 +15967,9 @@ static const vshCmdDef domManagementCmds[] = { {"dump", cmdDump, opts_dump, info_dump, 0}, {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml, 0}, {"edit", cmdEdit, opts_edit, info_edit, 0}, + {"eject-media", cmdEjectMedia, opts_eject_media, info_eject_media, 0}, {"inject-nmi", cmdInjectNMI, opts_inject_nmi, info_inject_nmi, 0}, + {"insert-media", cmdInsertMedia, opts_insert_media, info_insert_media, 0}, {"send-key", cmdSendKey, opts_send_key, info_send_key}, {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave, 0}, {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove, diff --git a/tools/virsh.pod b/tools/virsh.pod index 6c10245..45a3fde 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1387,6 +1387,39 @@ option can be used to force device update, e.g., to eject a CD-ROM even if it is locked/mounted in the domain. See the documentation to learn about libvirt XML format for a device. +=item B<eject-media> I<domain-id> I<target> [I<--current>] [I<--live>] +[I<--config>] [I<--force>] + +Eject media from CD or floppy drive. The I<target> is the device as seen +from the domain. + +If I<--live> is specified, alter live configuration of running guest. +If I<--config> is specified, alter persistent configuration, effect observed +on next boot. +I<--current> can be either or both of I<live> and I<config>, depends on +the hypervisor's implementation. +Both I<--live> and I<--config> flags may be given, but I<--current> is +exclusive. If no flag is specified, behavior is different depending +on hypervisor. +The I<--force> option can be used to force media ejection. + +=item B<insert-media> I<domain-id> I<target> I<source> [I<--current>] +[I<--live>] [I<--config>] [I<--force>] + +Insert media into CD or floppy drive. The I<target> is the device as seen +from the domain. The I<source> specifies the path of the media which is to +be inserted. + +If I<--live> is specified, alter live configuration of running guest. +If I<--config> is specified, alter persistent configuration, effect observed +on next boot. +I<--current> can be either or both of I<live> and I<config>, depends on +the hypervisor's implementation. +Both I<--live> and I<--config> flags may be given, but I<--current> is +exclusive. If no flag is specified, behavior is different depending +on hypervisor. +The I<--force> option can be used to force media ejection. + =back =head1 NODEDEV COMMANDS -- 1.7.7.3

1 0

[libvirt] [PATCH] qemu: Support copy on read for disk
by Osier Yang 22 Dec '11

22 Dec '11

Upstream QEMU supports it since commit fb0490f69. --- docs/formatdomain.html.in | 9 +++++++++ docs/schemas/domaincommon.rng | 11 +++++++++++ src/conf/domain_conf.c | 24 +++++++++++++++++++++++- src/conf/domain_conf.h | 10 ++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++++++ 8 files changed, 70 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9cf0f12..779317f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1187,6 +1187,15 @@ <b>In general you should leave this option alone, unless you are very certain you know what you are doing.</b> </li> + <li> + The optional <code>copy_on_read</code> attribute controls + wether to copy read backing file into the image file. The + value can be either "on" or "off". + Copy-on-read avoids accessing the same backing file sectors + repeatedly and is useful when the backing file is over a slow + network. By default copy-on-read is off. + <span class='since'>Since 0.9.9 (QEMU and KVM only)</span> + </li> </ul> </dd> <dt><code>boot</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 553a6f0..b511ec2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -959,6 +959,14 @@ </choice> </attribute> </define> + <define name="copy_on_read"> + <attribute name='copy_on_read'> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </define> <define name="controller"> <element name="controller"> <choice> @@ -1308,6 +1316,9 @@ <optional> <ref name="event_idx"/> </optional> + <optional> + <ref name="copy_on_read"/> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2897b4a..a51eb40 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -208,6 +208,11 @@ VIR_ENUM_IMPL(virDomainVirtioEventIdx, VIR_DOMAIN_VIRTIO_EVENT_IDX_LAST, "on", "off") +VIR_ENUM_IMPL(virDomainDiskCopyOnRead, VIR_DOMAIN_DISK_COPY_ON_READ_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainDiskSnapshot, VIR_DOMAIN_DISK_SNAPSHOT_LAST, "default", "no", @@ -2621,6 +2626,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *iotag = NULL; char *ioeventfd = NULL; char *event_idx = NULL; + char *copy_on_read = NULL; char *devaddr = NULL; virStorageEncryptionPtr encryption = NULL; char *serial = NULL; @@ -2749,6 +2755,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, iotag = virXMLPropString(cur, "io"); ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); + copy_on_read = virXMLPropString(cur, "copy_on_read"); } else if (xmlStrEqual(cur->name, BAD_CAST "auth")) { authUsername = virXMLPropString(cur, "username"); if (authUsername == NULL) { @@ -3053,6 +3060,17 @@ virDomainDiskDefParseXML(virCapsPtr caps, def->event_idx = idx; } + if (copy_on_read) { + int cor; + if ((cor = virDomainDiskCopyOnReadTypeFromString(copy_on_read)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk copy_on_read mode '%s'"), + copy_on_read); + goto error; + } + def->copy_on_read = cor; + } + if (devaddr) { if (virDomainParseLegacyDeviceAddress(devaddr, &def->info.addr.pci) < 0) { @@ -3146,6 +3164,7 @@ cleanup: VIR_FREE(iotag); VIR_FREE(ioeventfd); VIR_FREE(event_idx); + VIR_FREE(copy_on_read); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -9768,6 +9787,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *iomode = virDomainDiskIoTypeToString(def->iomode); const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd); const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); + const char *copy_on_read = virDomainVirtioEventIdxTypeToString(def->copy_on_read); const char *startupPolicy = virDomainStartupPolicyTypeToString(def->startupPolicy); char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -9808,7 +9828,7 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); if (def->driverName || def->driverType || def->cachemode || - def->ioeventfd || def->event_idx) { + def->ioeventfd || def->event_idx || def->copy_on_read) { virBufferAddLit(buf, " <driver"); if (def->driverName) virBufferAsprintf(buf, " name='%s'", def->driverName); @@ -9826,6 +9846,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " ioeventfd='%s'", ioeventfd); if (def->event_idx) virBufferAsprintf(buf, " event_idx='%s'", event_idx); + if (def->copy_on_read) + virBufferAsprintf(buf, " copy_on_read='%s'", copy_on_read); virBufferAddLit(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1f6e442..4575ab2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -288,6 +288,14 @@ enum virDomainVirtioEventIdx { VIR_DOMAIN_VIRTIO_EVENT_IDX_LAST }; +enum virDomainDiskCopyOnRead { + VIR_DOMAIN_DISK_COPY_ON_READ_DEFAULT = 0, + VIR_DOMAIN_DISK_COPY_ON_READ_ON, + VIR_DOMAIN_DISK_COPY_ON_READ_OFF, + + VIR_DOMAIN_DISK_COPY_ON_READ_LAST +}; + enum virDomainDiskSnapshot { VIR_DOMAIN_DISK_SNAPSHOT_DEFAULT = 0, VIR_DOMAIN_DISK_SNAPSHOT_NO, @@ -363,6 +371,7 @@ struct _virDomainDiskDef { int iomode; int ioeventfd; int event_idx; + int copy_on_read; int snapshot; /* enum virDomainDiskSnapshot */ int startupPolicy; /* enum virDomainStartupPolicy */ unsigned int readonly : 1; @@ -1968,6 +1977,7 @@ VIR_ENUM_DECL(virDomainDiskSecretType) VIR_ENUM_DECL(virDomainDiskSnapshot) VIR_ENUM_DECL(virDomainIoEventFd) VIR_ENUM_DECL(virDomainVirtioEventIdx) +VIR_ENUM_DECL(virDomainDiskCopyOnRead) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModelSCSI) VIR_ENUM_DECL(virDomainControllerModelUSB) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4a86bdc..63c2947 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -290,6 +290,8 @@ virDomainDeviceTypeToString; virDomainDiskBusTypeToString; virDomainDiskCacheTypeFromString; virDomainDiskCacheTypeToString; +virDomainDiskCopyOnReadTypeFromString; +virDomainDiskCopyOnReadTypeToString; virDomainDiskDefAssignAddress; virDomainDiskDefForeachPath; virDomainDiskDefFree; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43c7578..f32c792 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,6 +144,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", + "drive-copy-on-read", ); struct qemu_feature_flags { @@ -1023,6 +1024,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_DRIVE_READONLY); if (strstr(help, "aio=threads|native")) qemuCapsSet(flags, QEMU_CAPS_DRIVE_AIO); + if (strstr(help, "copy-on-read=on|off")) + qemuCapsSet(flags, QEMU_CAPS_DRIVE_COPY_ON_READ); } if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) { const char *nl = strstr(p, "\n"); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c759baf..38106dd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -117,6 +117,7 @@ enum qemuCapsFlags { QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_DRIVE_COPY_ON_READ = 80, /* -drive copy-on-read */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ea1b763..629f13d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1926,6 +1926,17 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferAddLit(&opt, ",cache=off"); } + if (disk->copy_on_read) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ)) { + virBufferAsprintf(&opt, ",copy-on-read=%s", + virDomainDiskCopyOnReadTypeToString(disk->copy_on_read)); + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("copy_on_read is not supported by this QEMU binary")); + goto error; + } + } + if (qemuCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON)) { const char *wpolicy = NULL, *rpolicy = NULL; -- 1.7.7.3

2 2

[libvirt] [PATCH] qemuhelptest: Add new qemuCap flag
by Michal Privoznik 22 Dec '11

22 Dec '11

Latest patch a1a83c587443 introduces new qemu capability flag QEMU_CAPS_FSDEV_READONLY. However, it was missing in qemuhelptest making test for qemu-1.0 fail. --- Pushing under build-breaker rule. tests/qemuhelptest.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index f31c903..60155e7 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -647,7 +647,8 @@ mymain(void) QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_PCI_ROMBAR, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_NO_ACPI); + QEMU_CAPS_NO_ACPI, + QEMU_CAPS_FSDEV_READONLY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.3.4

2 1

[libvirt] [PATCH] Add new attribute writeout to <filesystem> element
by Deepak C Shetty 22 Dec '11

22 Dec '11

This introduces new attribute writeout with only supported value as immediate. This will be an optional attribute with no defaults. This helps specify whether to skip the host page cache. When writeout is specified, meaning when writeout=immediate a writeback is explicitly initiated for the dirty pages in the host page cache as part of the guest file write operation. Usage: <filesystem type='mount' accessmode='passthrough' writeout='immediate'> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> Currently this only works with type='mount' for the QEMU/KVM driver. Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 8 +++++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 29 +++++++++++++++++++++++++++-- src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_command.c | 9 +++++++++ 5 files changed, 58 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c57b7b3..803db8e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1303,7 +1303,7 @@ <source name='my-vm-template'/> <target dir='/'/> </filesystem> - <filesystem type='mount' accessmode='passthrough'> + <filesystem type='mount' accessmode='passthrough' writeout='immediate'> <driver type='path'/> <source dir='/export/to/guest'/> <target dir='/import/from/host'/> @@ -1379,6 +1379,12 @@ </dd> </dl> + The filesystem block has an optional attribute <code>writeout='immediate'</code> + to help specify whether to skip the host page cache. When writeout is specified, meaning when + writeout=immediate a writeback is explicitly initiated for the dirty pages in + the host page cache as part of the guest file write operation. When this attribute is not + specified, there are no defaults, meaning explicit writeback won't be initiated. + </dd> <dt><code>source</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 27ec1da..2298994 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1106,6 +1106,11 @@ <value>squash</value> </choice> </attribute> + <attribute name="writeout"> + <choice> + <value>immediate</value> + </choice> + </attribute> </optional> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2c91f82..80b8eab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -256,6 +256,9 @@ VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "mapped", "squash") +VIR_ENUM_IMPL(virDomainFSWriteout, VIR_DOMAIN_FS_WRITEOUT_LAST, + "default", + "immediate") VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", @@ -3258,6 +3261,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *source = NULL; char *target = NULL; char *accessmode = NULL; + char *writeout = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3286,6 +3290,17 @@ virDomainFSDefParseXML(xmlNodePtr node, def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; } + writeout = virXMLPropString(node, "writeout"); + if (writeout) { + if ((def->writeout = virDomainFSWriteoutTypeFromString(writeout)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown filesystem writeout '%s'"), writeout); + goto error; + } + } else { + def->writeout = VIR_DOMAIN_FS_WRITEOUT_DEFAULT; + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -3348,6 +3363,7 @@ cleanup: VIR_FREE(target); VIR_FREE(source); VIR_FREE(accessmode); + VIR_FREE(writeout); return def; @@ -10006,6 +10022,7 @@ virDomainFSDefFormat(virBufferPtr buf, const char *type = virDomainFSTypeToString(def->type); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); const char *fsdriver = virDomainFSDriverTypeTypeToString(def->fsdriver); + const char *writeout = virDomainFSWriteoutTypeToString(def->writeout); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -10022,12 +10039,20 @@ virDomainFSDefFormat(virBufferPtr buf, if (def->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || def->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) { virBufferAsprintf(buf, - " <filesystem type='%s' accessmode='%s'>\n", + " <filesystem type='%s' accessmode='%s'", type, accessmode); } else { virBufferAsprintf(buf, - " <filesystem type='%s'>\n", type); + " <filesystem type='%s'", type); } + + /* Dont generate anything if writeout is set to default */ + if (def->writeout) { + virBufferAsprintf(buf, " writeout='%s'", writeout); + } + + /* close the filesystem element */ + virBufferAddLit(buf,">\n"); if (def->fsdriver) { virBufferAsprintf(buf, " <driver type='%s'/>\n", fsdriver); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3229a6f..bf4d79b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -450,12 +450,21 @@ enum virDomainFSAccessMode { VIR_DOMAIN_FS_ACCESSMODE_LAST }; +/* Filesystem Writeout */ +enum virDomainFSWriteout { + VIR_DOMAIN_FS_WRITEOUT_DEFAULT = 0, + VIR_DOMAIN_FS_WRITEOUT_IMMEDIATE, + + VIR_DOMAIN_FS_WRITEOUT_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; int fsdriver; int accessmode; + int writeout; char *src; char *dst; unsigned int readonly : 1; @@ -1973,6 +1982,7 @@ VIR_ENUM_DECL(virDomainControllerModelUSB) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainFSDriverType) VIR_ENUM_DECL(virDomainFSAccessMode) +VIR_ENUM_DECL(virDomainFSWriteout) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) VIR_ENUM_DECL(virDomainNetVirtioTxMode) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1f70eb1..ccfd092 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -108,6 +108,10 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "handle"); +VIR_ENUM_DECL(qemuDomainFSWriteout) +VIR_ENUM_IMPL(qemuDomainFSWriteout, VIR_DOMAIN_FS_WRITEOUT_LAST, + "default", + "immediate"); static void uname_normalize (struct utsname *ut) @@ -1990,6 +1994,7 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); + const char *writeout = qemuDomainFSWriteoutTypeToString(fs->writeout); if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2014,6 +2019,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBufferAddLit(&opt, ",security_model=none"); } } + + if (fs->writeout != VIR_DOMAIN_FS_WRITEOUT_DEFAULT) { + virBufferAsprintf(&opt, ",writeout=%s", writeout); + } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",path=%s", fs->src);

3 5

[libvirt] question of kvm
by hero 22 Dec '11

22 Dec '11

I want to back up my VM including my own data, but the VM must be 'PASUED' or 'SHUT OFF' if I use 'virt-clone', I want to know how to back up my VM when it's running like make a ghost of windows. Thansk! SunYongGang

2 1

[libvirt] [PATCH 0/4] virsh: Make more commands cancelable via ^C
by Michal Privoznik 22 Dec '11

22 Dec '11

Currently, only migration command allows job progress reporting and cancel via SIGINT. However, there are more job oriented commands which take long time to finish and user might want to cancel them like he can do in migration. Such commands are: dump, save, managedsave. Michal Privoznik (4): virsh: Move job watch code to a separate function virsh: Use do_job_watch in cmdDump virsh: Use do_job_watch in cmdSave virsh: Use do_job_watch in cmdManagedSave tools/virsh.c | 425 +++++++++++++++++++++++++++++++++++++++++-------------- tools/virsh.pod | 24 ++-- 2 files changed, 330 insertions(+), 119 deletions(-) -- 1.7.3.4

2 10

[libvirt] [libvirt-glib 1/2] Add python example for LibvirtGConfig
by Christophe Fergeau 22 Dec '11

22 Dec '11

--- examples/config-test.py | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) create mode 100644 examples/config-test.py diff --git a/examples/config-test.py b/examples/config-test.py new file mode 100644 index 0000000..92e8a89 --- /dev/null +++ b/examples/config-test.py @@ -0,0 +1,96 @@ +#!/usr/bin/python + +from gi.repository import LibvirtGConfig; + +domain = LibvirtGConfig.Domain.new() +domain.set_name("foo") +domain.set_memory(1024*1024*1024) +domain.set_vcpus(2) +domain.set_lifecycle(LibvirtGConfig.DomainLifecycleEvent.ON_POWEROFF, + LibvirtGConfig.DomainLifecycleAction.DESTROY) + +clock = LibvirtGConfig.DomainClock.new() +clock.set_offset(LibvirtGConfig.DomainClockOffset.UTC) +domain.set_clock(clock) + +os = LibvirtGConfig.DomainOs.new() +os.set_os_type(LibvirtGConfig.DomainOsType.HVM) +os.set_arch("x86_64") +devices = [ LibvirtGConfig.DomainOsBootDevice.CDROM, + LibvirtGConfig.DomainOsBootDevice.NETWORK ] +os.set_boot_devices(devices) +domain.set_os(os) + +disk = LibvirtGConfig.DomainDisk.new() +disk.set_type(LibvirtGConfig.DomainDiskType.FILE) +disk.set_guest_device_type(LibvirtGConfig.DomainDiskGuestDeviceType.DISK) +disk.set_source("/tmp/foo/bar") +disk.set_driver_name("qemu") +disk.set_driver_type("qcow2") +disk.set_target_bus(LibvirtGConfig.DomainDiskBus.IDE) +disk.set_target_dev("hda") +domain.add_device(disk) + +interface = LibvirtGConfig.DomainInterfaceNetwork.new() +interface.set_source("default") +domain.add_device(interface) + +interface = LibvirtGConfig.DomainInterfaceUser.new() +interface.set_ifname("eth0") +interface.set_link_state(LibvirtGConfig.DomainInterfaceLinkState.UP) +interface.set_mac("00:11:22:33:44:55") +interface.set_model("foo") +domain.add_device(interface) + +input = LibvirtGConfig.DomainInput.new() +input.set_device_type(LibvirtGConfig.DomainInputDeviceType.TABLET) +input.set_bus(LibvirtGConfig.DomainInputBus.USB) +domain.add_device(input) + +graphics = LibvirtGConfig.DomainGraphicsSpice.new() +graphics.set_port(1234) +domain.add_device(graphics) + +video = LibvirtGConfig.DomainVideo.new() +video.set_model(LibvirtGConfig.DomainVideoModel.QXL) +domain.add_device(video) + +console = LibvirtGConfig.DomainConsole.new() +pty = LibvirtGConfig.DomainChardevSourcePty.new() +console.set_source(pty) +domain.add_device(console) + +print domain.to_xml() + + +pool = LibvirtGConfig.StoragePool.new() +pool.set_pool_type(LibvirtGConfig.StoragePoolType.DIR) + +pool_source = LibvirtGConfig.StoragePoolSource.new() +pool_source.set_directory("/foo/bar") +pool.set_source(pool_source) + +perms = LibvirtGConfig.StoragePermissions.new() +perms.set_owner(1001) +perms.set_group(1005) +perms.set_mode(0744) +perms.set_label("virt_image_t") + +pool_target = LibvirtGConfig.StoragePoolTarget.new() +pool_target.set_path("/dev/disk/by-path") +pool_target.set_permissions(perms) +pool.set_target(pool_target) + +print pool.to_xml() + + +vol = LibvirtGConfig.StorageVol.new() +vol.set_name("my-vol") +vol.set_capacity(0xdeadbeef) + +vol_target = LibvirtGConfig.StorageVolTarget.new() +vol_target.set_format("qcow2") +vol_target.set_permissions(perms) +vol.set_target(vol_target) + +print vol.to_xml() -- 1.7.7.4

2 4

[libvirt] [PATCH] qemu: Support readonly filesystem passthrough
by Osier Yang 22 Dec '11

22 Dec '11

Upstream QEMU starts to support it from commit 2c74c2cb. --- docs/formatdomain.html.in | 5 +++-- src/qemu/qemu_capabilities.c | 7 ++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c57b7b3..9cf0f12 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1399,8 +1399,9 @@ <dt><code>readonly</code></dt> <dd> - An optional <code>readonly</code> attribute is available but currently - unused. + Enables exporting filesytem as a readonly mount for guest, by + default read-write access is given (currently only works for + QEMU/KVM driver). </dd> </dl> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index de2bc13..43c7578 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -143,6 +143,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "rombar", "ich9-ahci", "no-acpi", + "fsdev-readonly", ); struct qemu_feature_flags { @@ -981,6 +982,7 @@ qemuCapsComputeCmdFlags(const char *help, virBitmapPtr flags) { const char *p; + const char *fsdev; if (strstr(help, "-no-kqemu")) qemuCapsSet(flags, QEMU_CAPS_KQEMU); @@ -1077,8 +1079,11 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_NESTING); if (strstr(help, ",menu=on")) qemuCapsSet(flags, QEMU_CAPS_BOOT_MENU); - if (strstr(help, "-fsdev")) + if ((fsdev = strstr(help, "-fsdev"))) { qemuCapsSet(flags, QEMU_CAPS_FSDEV); + if (strstr(fsdev, "readonly")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 08d8457..c759baf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -116,6 +116,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ + QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9d3bc23..ea1b763 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2108,6 +2108,17 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",path=%s", fs->src); + if (fs->readonly) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_READONLY)) { + virBufferAddLit(&opt, ",readonly"); + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("readonly filesystem is not supported by this " + "QEMU binary")); + goto error; + } + } + if (virBufferError(&opt)) { virReportOOMError(); goto error; -- 1.7.7.3

2 2

[libvirt] question on kvm
by hero 22 Dec '11

22 Dec '11

on redhat5.6 and redhat 6.1, I can got the MAC address of the kvm VMs,but I don't know how to get the ip address of the VMs,and virsh has not got a command,can you help me to resolve it.

2 1

[libvirt] [PATCH] nwfilter: Do not require DHCP requests to be broadcast
by Stefan Berger 21 Dec '11

21 Dec '11

Remove the requirement that DHCP messages have to be broadcasted. --- src/nwfilter/nwfilter_ebiptables_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3245,9 +3245,8 @@ ebtablesApplyDHCPOnlyRules(const char *i virBufferAsprintf(&buf, CMD_DEF("$EBT -t nat -A %s" - " -s %s -d Broadcast " + " -s %s" " -p ipv4 --ip-protocol udp" - " --ip-src 0.0.0.0 --ip-dst 255.255.255.255" " --ip-sport 68 --ip-dport 67" " -j ACCEPT") CMD_SEPARATOR CMD_EXEC

2 2