- Devel - libvirt List Archives

Re: [libvirt] [Qemu-devel] [PATCH qom-next 2/7] qom: Add get_id
by Andreas Färber 08 Jun '12

08 Jun '12

Am 08.06.2012 09:44, schrieb Anthony Liguori: > On 06/08/2012 03:11 PM, Andreas Färber wrote: >> Am 08.06.2012 03:22, schrieb Anthony Liguori: >>> On 06/08/2012 03:31 AM, Andreas Färber wrote: >>>> From: Paolo Bonzini<pbonzini(a)redhat.com> >>>> >>>> Some classes may present objects differently in errors, for example if >>>> they >>>> are not part of the composition tree or if they are not assigned an >>>> id by >>>> the user. Let them do this with a get_id method on Object, and use the >>>> method consistently where a %(device) appears in the error. >>>> >>>> Signed-off-by: Paolo Bonzini<pbonzini(a)redhat.com> >>>> [AF: Renamed _object_get_id() to object_instance_get_id(), avoid ?:.] >>>> [AF: Use object_property_is_child().] >>>> Signed-off-by: Andreas Färber<afaerber(a)suse.de> >>> >>> Nack. >> >> Unfortunately that comment comes a bit late (original submission May >> 23rd, me specifically cc'ing you in my reply that it's new and not >> covered by your carte blanche). > > Uh, that was a week before the release. Don't send significant things > during the final part of a release and expect to get significant review. Well, obviously we were hoping to get this series committed immediately after the release, so we needed to get review before that. :) >> The general idea as I understand it is to have a mechanism for having >> devices fill in their ID into %(device) in the error messages once the >> code emitting those errors is at Object level. Peter's improved error >> message practically becomes "Property '.propertyname' ..." because >> without it we'll need to fill in "" in lack of an actual value. > > Ambiguity is fundamentally bad. If you want to return the path, return > the path. If you want to return the type, return the type. Returning > the type because we're too lazy to implement the path properly is not > acceptable and makes the error messages useless (because they're > ambiguous). > > Have a separate 'path' and 'typename' attribute in the errors. With > some cleverness, you can probably use '%p' and interpret the pointer an > as Object * and automagically generate an embedded 'device': { 'path': > '/path/to/device', 'typename': 'FancyType' }. > >>> >>> We should use a canonical path IMHO instead of returning a partial name. >>> >>> Partial names are ambiguous. >> >> Possibly, but a partial name still is an improvement over the current >> situation with no name at all. Also my previous request to not use >> %(device) for Object-level API was rejected with reference to existing >> QMP users, so by the same argument we cannot stuff a QOM path into >> %(device) either and would need a new QMP field %(path) or so. Cc'ing >> Luiz. > > Since qdev->id is NULL 90% of the time, I don't think a user can > realistically rely on it. I don't think changing the type of the data > in the error is going to be a problem. > > Doesn't libvirt ignore the contents of an error object? I'm out of my field there, those questions are for Luiz and the libvirt guys to answer. (Context is ongoing DeviceState -> Object transition on qom-next branch, properties being moved to Object and what info to include in Error objects then) If you reach consensus how to handle this, I can refactor accordingly, or Paolo could pick up my tweaked series again and refactor himself. Regards, Andreas >> There is no guarantee that the object actually has a canonical path at >> that point, and object_get_canonical_path() would g_assert() in such a >> case. -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

2 1

[libvirt] [PATCH v2] virsh: add keepalive protocol in virsh
by Guannan Ren 08 Jun '12

08 Jun '12

Bugzilla:https://bugzilla.redhat.com/show_bug.cgi?id=822839 add two general virsh options to support keepalive message protocol -i | --keepalive_interval interval time value (default 5 seconds) -n | --keepalive_count number of heartbeats (default 5 times) For non-p2p migration, start keepalive for remote driver to determine the status of network connection, aborting migrating job after defined amount of interval time. --- tools/virsh.c | 88 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 70 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0e41d00..602e5a5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -251,6 +251,8 @@ typedef struct __vshControl { bool readonly; /* connect readonly (first time only, not * during explicit connect command) */ + int keepalive_interval; /* interval time value */ + int keepalive_count; /* keepalive_count value */ char *logfile; /* log file name */ int log_fd; /* log file descriptor */ char *historydir; /* readline history directory name */ @@ -415,13 +417,14 @@ typedef struct __vshCtrlData { vshControl *ctl; const vshCmd *cmd; int writefd; + virConnectPtr dconn; } vshCtrlData; typedef void (*jobWatchTimeoutFunc) (vshControl *ctl, virDomainPtr dom, void *opaque); static bool -vshWatchJob(vshControl *ctl, +vshWatchJob(vshCtrlData *data, virDomainPtr dom, bool verbose, int pipe_fd, @@ -3334,6 +3337,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -3341,7 +3345,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, NULL, NULL, _("Save")); + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Save")); virThreadJoin(&workerThread); @@ -3608,6 +3612,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -3615,7 +3620,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Managedsave")); virThreadJoin(&workerThread); @@ -4086,6 +4091,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -4093,7 +4099,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, NULL, NULL, _("Dump")); + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Dump")); virThreadJoin(&workerThread); @@ -7213,6 +7219,12 @@ doMigrate (void *opaque) dconn = virConnectOpenAuth (desturi, virConnectAuthPtrDefault, 0); if (!dconn) goto out; + data->dconn = dconn; + if (virConnectSetKeepAlive(dconn, + ctl->keepalive_interval, + ctl->keepalive_count) < 0) + vshDebug(ctl, VSH_ERR_WARNING, "migrate: Failed to start keepalive\n"); + ddom = virDomainMigrate2(dom, dconn, xml, flags, dname, migrateuri, 0); if (ddom) { virDomainFree(ddom); @@ -7268,7 +7280,7 @@ vshMigrationTimeout(vshControl *ctl, } static bool -vshWatchJob(vshControl *ctl, +vshWatchJob(vshCtrlData *data, virDomainPtr dom, bool verbose, int pipe_fd, @@ -7286,6 +7298,7 @@ vshWatchJob(vshControl *ctl, char retchar; bool functionReturn = false; sigset_t sigmask, oldsigmask; + vshControl *ctl = data->ctl; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -7329,6 +7342,13 @@ repoll: goto cleanup; } + if (data->dconn && virConnectIsAlive(data->dconn) <= 0) { + virDomainAbortJob(dom); + vshError(ctl, "%s", + _("Lost connection to destination host")); + goto cleanup; + } + GETTIMEOFDAY(&curr); if (timeout && (((int)(curr.tv_sec - start.tv_sec) * 1000 + (int)(curr.tv_usec - start.tv_usec) / 1000) > @@ -7402,13 +7422,14 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, doMigrate, &data) < 0) goto cleanup; - functionReturn = vshWatchJob(ctl, dom, verbose, p[0], timeout, + functionReturn = vshWatchJob(&data, dom, verbose, p[0], timeout, vshMigrationTimeout, NULL, _("Migration")); virThreadJoin(&workerThread); @@ -18673,6 +18694,7 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) while (cmd) { struct timeval before, after; bool enable_timing = ctl->timing; + const char *driver = NULL; if ((ctl->conn == NULL || disconnected) && !(cmd->def->flags & VSH_CMD_FLAG_NOCONNECT)) @@ -18681,6 +18703,18 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) if (enable_timing) GETTIMEOFDAY(&before); + /* start keepalive for remote driver */ + driver = virConnectGetType(ctl->conn); + if (STREQ_NULLABLE(driver, "QEMU") || + STREQ_NULLABLE(driver, "xenlight") || + STREQ_NULLABLE(driver, "UML") || + STREQ_NULLABLE(driver, "LXC") || + STREQ_NULLABLE(driver, "remote")) + if (virConnectSetKeepAlive(ctl->conn, + ctl->keepalive_interval, + ctl->keepalive_count) < 0) + vshDebug(ctl, VSH_ERR_WARNING, "migrate: Failed to start keepalive\n"); + ret = cmd->def->handler(ctl, cmd); if (enable_timing) @@ -19959,17 +19993,19 @@ vshUsage(void) fprintf(stdout, _("\n%s [options]... [<command_string>]" "\n%s [options]... <command> [args...]\n\n" " options:\n" - " -c | --connect=URI hypervisor connection URI\n" - " -r | --readonly connect readonly\n" - " -d | --debug=NUM debug level [0-4]\n" - " -h | --help this help\n" - " -q | --quiet quiet mode\n" - " -t | --timing print timing information\n" - " -l | --log=FILE output logging to file\n" - " -v short version\n" - " -V long version\n" - " --version[=TYPE] version, TYPE is short or long (default short)\n" - " -e | --escape <char> set escape sequence for console\n\n" + " -c | --connect=URI hypervisor connection URI\n" + " -r | --readonly connect readonly\n" + " -d | --debug=NUM debug level [0-4]\n" + " -h | --help this help\n" + " -q | --quiet quiet mode\n" + " -t | --timing print timing information\n" + " -l | --log=FILE output logging to file\n" + " -v short version\n" + " -V long version\n" + " --version[=TYPE] version, TYPE is short or long (default short)\n" + " -e | --escape <char> set escape sequence for console\n" + " -i | --keepalive_interval interval time value (default 5 seconds)\n" + " -n | --keepalive_count number of heartbeats (default 5 times)\n\n" " commands (non interactive mode):\n\n"), progname, progname); for (grp = cmdGroups; grp->name; grp++) { @@ -20146,13 +20182,15 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) {"readonly", no_argument, NULL, 'r'}, {"log", required_argument, NULL, 'l'}, {"escape", required_argument, NULL, 'e'}, + {"keepalive_interval", required_argument, NULL, 'i'}, + {"keepalive_count", required_argument, NULL, 'n'}, {NULL, 0, NULL, 0} }; /* Standard (non-command) options. The leading + ensures that no * argument reordering takes place, so that command options are * not confused with top-level virsh options. */ - while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:e:", opt, NULL)) != -1) { + while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:e:i:n:", opt, NULL)) != -1) { switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &ctl->debug) < 0) { @@ -20201,6 +20239,18 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) exit(EXIT_FAILURE); } break; + case 'i': + if (virStrToLong_i(optarg, NULL, 10, &ctl->keepalive_interval) < 0) { + vshError(ctl, "%s", _("option -i takes a numeric argument")); + exit(EXIT_FAILURE); + } + break; + case 'n': + if (virStrToLong_i(optarg, NULL, 10, &ctl->keepalive_count) < 0) { + vshError(ctl, "%s", _("option -n takes a numeric argument")); + exit(EXIT_FAILURE); + } + break; default: vshError(ctl, _("unsupported option '-%c'. See --help."), arg); exit(EXIT_FAILURE); @@ -20232,6 +20282,8 @@ main(int argc, char **argv) ctl->log_fd = -1; /* Initialize log file descriptor */ ctl->debug = VSH_DEBUG_DEFAULT; ctl->escapeChar = CTRL_CLOSE_BRACKET; + ctl->keepalive_interval = 5; + ctl->keepalive_count = 5; if (!setlocale(LC_ALL, "")) { -- 1.7.7.5

3 3

[libvirt] [PATCH] add xhci support
by Gerd Hoffmann 08 Jun '12

08 Jun '12

qemu 1.1 features a xhci controller, this patch adds support for it. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 221e1d0..66f649c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -256,7 +256,8 @@ VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", - "pci-ohci") + "pci-ohci", + "nec-xhci") VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "mount", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8d5b35a..b13c3a5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -631,6 +631,7 @@ enum virDomainControllerModelUSB { VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3, VIR_DOMAIN_CONTROLLER_MODEL_USB_VT82C686B_UHCI, VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI, + VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b410648..506d368 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -164,6 +164,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "no-user-config", "hda-micro", /* 95 */ + "nec-usb-xhci", ); @@ -1419,6 +1420,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_VT82C686B_USB_UHCI); if (strstr(str, "name \"pci-ohci\"")) qemuCapsSet(flags, QEMU_CAPS_PCI_OHCI); + if (strstr(str, "name \"nec-usb-xhci\"")) + qemuCapsSet(flags, QEMU_CAPS_NEC_USB_XHCI); if (strstr(str, "name \"usb-redir\"")) qemuCapsSet(flags, QEMU_CAPS_USB_REDIR); if (strstr(str, "name \"usb-hub\"")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 64831e2..f9e62cb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -131,6 +131,7 @@ enum qemuCapsFlags { QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ + QEMU_CAPS_NEC_USB_XHCI = 96, /* -device nec-usb-xhci */ 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 fb8d9a3..908a24b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -106,7 +106,8 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "ich9-usb-uhci2", "ich9-usb-uhci3", "vt82c686b-usb-uhci", - "pci-ohci"); + "pci-ohci", + "nec-usb-xhci"); VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, @@ -2591,6 +2592,8 @@ qemuControllerModelUSBToCaps(int model) return QEMU_CAPS_VT82C686B_USB_UHCI; case VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI: return QEMU_CAPS_PCI_OHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI: + return QEMU_CAPS_NEC_USB_XHCI; default: return -1; } -- 1.7.1

2 1

[libvirt] Libvirt Support Virtio-serail
by Pankaj Rawat 08 Jun '12

08 Jun '12

HI all, I wanted to know whether libvirt has any kind of support for virt-io serial or not If yes then how can I use it? Regards Pankaj Rawat DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

4 12

[libvirt] libvirt secret support password or encryption keys?
by Zhimou Peng 08 Jun '12

08 Jun '12

Hi all, # man virsh ... SECRET COMMMANDS The following commands manipulate "secrets" (e.g. passwords, passphrases -----> secret-set-value only support "passphrases" and encryption keys). Libvirt can store secrets independently from their So, will libvirt support other 2 kinds of secrets use, and other objects (e.g. volumes or domains) can refer to the secrets in the future? for encryption or possibly other uses. Secrets are identified using an UUID. See <http://libvirt.org/formatsecret.html> for documentation of the XML format used to represent properties of secrets. ... zhpeng BR

1 0

[libvirt] CPU topology 'sockets' handling guest vs host
by Daniel P. Berrange 08 Jun '12

08 Jun '12

On my x86_64 host I have a pair of Quad core CPUs, each in a separate NUMA node. The virsh capabilities topology data reports this: # virsh capabilities | xmllint --xpath /capabilities/host/cpu - <cpu> <arch>x86_64</arch> <model>Opteron_G3</model> <vendor>AMD</vendor> <topology sockets="1" cores="4" threads="1"/> <feature name="osvw"/> <feature name="3dnowprefetch"/> <feature name="cr8legacy"/> <feature name="extapic"/> <feature name="cmp_legacy"/> <feature name="3dnow"/> <feature name="3dnowext"/> <feature name="pdpe1gb"/> <feature name="fxsr_opt"/> <feature name="mmxext"/> <feature name="ht"/> <feature name="vme"/> </cpu> # virsh capabilities | xmllint --xpath /capabilities/host/topology - <topology> <cells num="2"> <cell id="0"> <cpus num="4"> <cpu id="0"/> <cpu id="1"/> <cpu id="2"/> <cpu id="3"/> </cpus> </cell> <cell id="1"> <cpus num="4"> <cpu id="4"/> <cpu id="5"/> <cpu id="6"/> <cpu id="7"/> </cpus> </cell> </cells> </topology> Note, it is reporting sockets=1, because sockets is the number of sockets *per* NUMA node. Now I try to figure the guest to match the host using: <cpu> <topology sockets='1' cores='4' threads='1'/> <numa> <cell cpus='0-3' memory='512000'/> <cell cpus='4-7' memory='512000'/> </numa> </cpu> And I get: error: Maximum CPUs greater than topology limit So, the XML checker is mistaking 'sockets' as the total number of sockets, rather than the per-node socket count. We need to fix this bogus check 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 :|

3 4

[libvirt] [PATCH] Fix missing ) in 2 strings
by Cole Robinson 07 Jun '12

07 Jun '12

https://bugzilla.redhat.com/show_bug.cgi?id=801656 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/network_conf.c | 2 +- src/conf/nwfilter_conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6515efe..60cd888 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1200,7 +1200,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) case VIR_NETWORK_FORWARD_PASSTHROUGH: if (def->bridge) { virNetworkReportError(VIR_ERR_XML_ERROR, - _("bridge name not allowed in %s mode (network '%s'"), + _("bridge name not allowed in %s mode (network '%s')"), virNetworkForwardTypeToString(def->forwardType), def->name); goto error; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 0d6d0b6..8729f9c 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2663,7 +2663,7 @@ virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED, virNWFilterDefPtr def = NULL; xmlDocPtr xml; - if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition")))) { + if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition)")))) { def = virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } -- 1.7.7.6

2 2

[libvirt] [PATCH 1/1] Assign correct address type to spapr-vlan and spapr-vty.
by Li Zhang 07 Jun '12

07 Jun '12

For pseires guest, spapr-vlan and spapr-vty is based on spapr-vio address. According to model of network device, the address type should be assigned automatically. For serial device, serial pty device is recognized as spapr-vty device, which is also on spapr-vio. So this patch is to correct the address type of spapr-vlan and spapr-vty, and build correct command line of spapr-vty. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Reviewed-by: Michael Ellerman<michaele(a)au1.ibm.com> --- src/qemu/qemu_command.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9f99dce..3555756 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -790,6 +790,9 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ for (i = 0 ; i < def->nnets; i++) { + if (def->nets[i]->model && + STREQ(def->nets[i]->model, "spapr-vlan")) + def->nets[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; rc = qemuAssignSpaprVIOAddress(def, &def->nets[i]->info, 0x1000ul); if (rc) @@ -802,16 +805,20 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) model = qemuDefaultScsiControllerModel(def); if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI && - def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { + def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; - rc = qemuAssignSpaprVIOAddress(def, &def->controllers[i]->info, - 0x2000ul); - if (rc) - return rc; - } + rc = qemuAssignSpaprVIOAddress(def, &def->controllers[i]->info, + 0x2000ul); + if (rc) + return rc; } for (i = 0 ; i < def->nserials; i++) { + if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY && + STREQ(def->os.arch, "ppc64") && + STREQ(def->os.machine, "pseries")) + def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; rc = qemuAssignSpaprVIOAddress(def, &def->serials[i]->info, 0x30000000ul); if (rc) @@ -6175,10 +6182,14 @@ qemuBuildChrDeviceStr(virDomainChrDefPtr serial, virBuffer cmd = VIR_BUFFER_INITIALIZER; if (STREQ(os_arch, "ppc64") && STREQ(machine, "pseries")) { - virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", - serial->info.alias); - if (qemuBuildDeviceAddressStr(&cmd, &serial->info, qemuCaps) < 0) - goto error; + if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + serial->source.type == VIR_DOMAIN_CHR_TYPE_PTY && + serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { + virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", + serial->info.alias); + if (qemuBuildDeviceAddressStr(&cmd, &serial->info, qemuCaps) < 0) + goto error; + } } else virBufferAsprintf(&cmd, "isa-serial,chardev=char%s,id=%s", serial->info.alias, serial->info.alias); -- 1.7.9.5

2 2

[libvirt] [PATCH] build: allow building with newer glibc-headers and -O0
by Eric Blake 07 Jun '12

07 Jun '12

glibc 2.15 (on Fedora 17) coupled with explicit disabling of optimization during development dies a painful death: In file included from /usr/include/limits.h:27:0, from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/limits.h:169, from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/syslimits.h:7, from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/limits.h:34, from util/bitmap.c:26: /usr/include/features.h:314:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] cc1: all warnings being treated as errors Work around this by only conditionally defining _FORTIFY_SOURCE, in the case where glibc can actually use it. The trick is using AH_VERBATIM instead of AC_DEFINE. * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Squelch _FORTIFY_SOURCE when needed to avoid glibc #warnings. --- Pushing under the build-breaker rule. m4/virt-compile-warnings.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 5527bff..a91d69f 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -102,8 +102,12 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # Silence certain warnings in gnulib, and use improved glibc headers AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings. */ + #if __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 1.7.10.2

2 7

[libvirt] [PATCH] command: avoid potential deadlock on handshake
by Eric Blake 07 Jun '12

07 Jun '12

Similar to commit 858c247, the parent process should close it's copy of the end of the pipe given to the child; otherwise, if there is an extreme bug where the parent thinks the child reported an error and is waiting for the message to go along with it, but the child thinks it reported success and is waiting for the parent to acknowledge the success, we would get into deadlock. Thankfully, I don't think this deadlock is possible without at least one other bug in the code, but I did see exactly that sort of situation prior to commit da831af - if a double close bug in the parent causes the parent to read the wrong fd, it might assume the child failed, even though the child really sent success if only the parent had read from the correct location. * src/util/command.c (virCommandHandshakeWait): Close unused fds sooner. --- src/util/command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/command.c b/src/util/command.c index 62ea50b..62848cd 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -2507,6 +2507,11 @@ int virCommandHandshakeWait(virCommandPtr cmd) VIR_FORCE_CLOSE(cmd->handshakeWait[0]); return -1; } + /* Close the handshakeNotify fd before trying to read anything + * further on the handshakeWait pipe; so that a child waiting + * on our acknowledgment will die rather than deadlock. */ + VIR_FORCE_CLOSE(cmd->handshakeNotify[1]); + if ((len = saferead(cmd->handshakeWait[0], msg, 1024)) < 0) { VIR_FORCE_CLOSE(cmd->handshakeWait[0]); VIR_FREE(msg); -- 1.7.10.2

2 2

[libvirt] RFC: TODO list for a 1.0 release
by Daniel P. Berrange 07 Jun '12

07 Jun '12

We have mentioned a 1.0 release in passing a few times recently but we have never really set out a clear list of goals for such a notable release. This thread is an attempt to clarify such goals. To avoid making the 1.0 target too hard, we should aim for as *little* as possible on our TODO list. I think the priority here should be on public API level things, or core libvirt infrastructure, and not random impl details of specific hypervisors. In particular I think we should focus on things that make libvirt better to develop app against. IMHO we should have the following things in the 1.0 release - List object APIs which directly return the object instance https://bugzilla.redhat.com/show_bug.cgi?id=636096 * virConnectListAllDomains * virConnectListAllInterfaces * virConnectListAllNetworks * virConnectListAllNWFIlters * virConnectListAllNodeDevices * virConnectListAllSecrets * virConnectListAllStoragePools * virDomainListAllSnapshots * virStoragePoolListAllVolumes NB: with support across LXC, UML, Xen, LibXL, QEMU & ESX - Lifecycle events for all top level objects https://bugzilla.redhat.com/show_bug.cgi?id=636027 * virConnectInterfaceEventRegisterAny * virConnectNetworkEventRegisterAny * virConnectNWFilterEventRegisterAny * virConnectNodeDeviceEventRegisterAny * virConnectSecretEventRegisterAny * virConnectStoragePoolEventRegisterAny - Fine grained access control https://bugzilla.redhat.com/show_bug.cgi?id=636148 * Access control infrastructure * PolicyKit driver impl * Simple RBAC driver impl * SELinux driver impl (probably not needed for 1.0) Do you have suggestions for anything else that you think is very important for libvirt ? 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 :|

6 8

[libvirt] [PATCH] util: Fix deadlock in virLogReset
by Jiri Denemark 07 Jun '12

07 Jun '12

When libvirtd forks off a new child, the child then calls virLogReset(), which ends up closing file descriptors used as log outputs. However, we recently started logging closed file descriptors, which means we need to lock logging mutex which was already logged by virLogReset(). We don't really want to log anything when we are in the process of closing log outputs. --- src/util/logging.c | 5 +++-- src/util/virfile.c | 28 ++++++++++++++++------------ src/util/virfile.h | 22 ++++++++++++++++++---- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/util/logging.c b/src/util/logging.c index 23778d3..cf62184 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -864,10 +864,11 @@ static int virLogOutputToFd(const char *category ATTRIBUTE_UNUSED, return ret; } -static void virLogCloseFd(void *data) { +static void virLogCloseFd(void *data) +{ int fd = (intptr_t) data; - VIR_FORCE_CLOSE(fd); + VIR_LOG_CLOSE(fd); } static int virLogAddOutputToStderr(int priority) { diff --git a/src/util/virfile.c b/src/util/virfile.c index a0000d0..6c69217 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -43,7 +43,7 @@ __FUNCTION__, __LINE__, __VA_ARGS__) -int virFileClose(int *fdptr, bool preserve_errno, bool ignore_EBADF) +int virFileClose(int *fdptr, virFileCloseFlags flags) { int saved_errno = 0; int rc = 0; @@ -51,24 +51,28 @@ int virFileClose(int *fdptr, bool preserve_errno, bool ignore_EBADF) if (*fdptr < 0) return 0; - if (preserve_errno) + if (flags & VIR_FILE_CLOSE_PRESERVE_ERRNO) saved_errno = errno; rc = close(*fdptr); - if (rc < 0) { - if (errno == EBADF) { - if (!ignore_EBADF) - VIR_WARN("Tried to close invalid fd %d", *fdptr); + + if (!(flags & VIR_FILE_CLOSE_DONT_LOG)) { + if (rc < 0) { + if (errno == EBADF) { + if (!(flags & VIR_FILE_CLOSE_IGNORE_EBADF)) + VIR_WARN("Tried to close invalid fd %d", *fdptr); + } else { + char ebuf[1024] ATTRIBUTE_UNUSED; + VIR_DEBUG("Failed to close fd %d: %s", + *fdptr, virStrerror(errno, ebuf, sizeof(ebuf))); + } } else { - char ebuf[1024] ATTRIBUTE_UNUSED; - VIR_DEBUG("Failed to close fd %d: %s", - *fdptr, virStrerror(errno, ebuf, sizeof(ebuf))); + VIR_DEBUG("Closed fd %d", *fdptr); } - } else { - VIR_DEBUG("Closed fd %d", *fdptr); } *fdptr = -1; - if (preserve_errno) + + if (flags & VIR_FILE_CLOSE_PRESERVE_ERRNO) errno = saved_errno; return rc; diff --git a/src/util/virfile.h b/src/util/virfile.h index c033248..6882a73 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -31,16 +31,21 @@ # include "internal.h" # include "ignore-value.h" +typedef enum virFileCloseFlags { + VIR_FILE_CLOSE_PRESERVE_ERRNO = 1 << 0, + VIR_FILE_CLOSE_IGNORE_EBADF = 1 << 1, + VIR_FILE_CLOSE_DONT_LOG = 1 << 2, +} virFileCloseFlags; /* Don't call these directly - use the macros below */ -int virFileClose(int *fdptr, bool preserve_errno, bool ignore_EBADF) +int virFileClose(int *fdptr, virFileCloseFlags flags) ATTRIBUTE_RETURN_CHECK; int virFileFclose(FILE **file, bool preserve_errno) ATTRIBUTE_RETURN_CHECK; FILE *virFileFdopen(int *fdptr, const char *mode) ATTRIBUTE_RETURN_CHECK; /* For use on normal paths; caller must check return value, and failure sets errno per close. */ -# define VIR_CLOSE(FD) virFileClose(&(FD), false, false) +# define VIR_CLOSE(FD) virFileClose(&(FD), 0) # define VIR_FCLOSE(FILE) virFileFclose(&(FILE), false) /* Wrapper around fdopen that consumes fd on success. */ @@ -48,12 +53,21 @@ FILE *virFileFdopen(int *fdptr, const char *mode) ATTRIBUTE_RETURN_CHECK; /* For use on cleanup paths; errno is unaffected by close, and no return value to worry about. */ -# define VIR_FORCE_CLOSE(FD) ignore_value(virFileClose(&(FD), true, false)) +# define VIR_FORCE_CLOSE(FD) \ + ignore_value(virFileClose(&(FD), VIR_FILE_CLOSE_PRESERVE_ERRNO)) # define VIR_FORCE_FCLOSE(FILE) ignore_value(virFileFclose(&(FILE), true)) /* Similar VIR_FORCE_CLOSE() but ignores EBADF errors since they are expected * during mass close after fork(). */ -# define VIR_MASS_CLOSE(FD) ignore_value(virFileClose(&(FD), true, true)) +# define VIR_MASS_CLOSE(FD) \ + ignore_value(virFileClose(&(FD), \ + VIR_FILE_CLOSE_PRESERVE_ERRNO | \ + VIR_FILE_CLOSE_IGNORE_EBADF)) + +# define VIR_LOG_CLOSE(FD) \ + ignore_value(virFileClose(&(FD), \ + VIR_FILE_CLOSE_PRESERVE_ERRNO | \ + VIR_FILE_CLOSE_DONT_LOG)) /* Opaque type for managing a wrapper around a fd. */ struct _virFileWrapperFd; -- 1.7.10.2

2 1

[libvirt] Looking for libvirt for RHEL 6.1 to provide Memory related metrics.
by Roy, Kallol 07 Jun '12

07 Jun '12

Hello All, Can some one let me know if we have the latest libvirt version for RHEL 6.1 which would provided me Memory related counters/metrics. The latest libvirt which I found was on Fedora. Any pointer or expected dates of libvirt release on RHEL would be highly appreciated. Thanks and Regards, _____________________________________________________________________ Kallol Roy "Be kinder than necessary, for everyone you meet is fighting some kind of battle."

3 4

[libvirt] [PATCH] qemu: better detection of crashed domains
by Martin Kletzander 07 Jun '12

07 Jun '12

When libvirtd is started and there is an unusable/not-connectable leftover from earlier started machine, it's more reasonable to say that the machine "crashed" if we know it was started with "-no-shutdown". This patch fixes that and also changes the other result (when machine was started without "-no-shutdown") to "unknown", because the previous "failed" reason means (according to include/libvirt/libvirt.h.in:174), that the machine failed to start. --- src/qemu/qemu_process.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2adf570..604c31b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3141,7 +3141,17 @@ error: * to remove danger of it ending up running twice if * user tries to start it again later */ - qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) + /* If we couldn't get the monitor and qemu supports + * no-shutdown, we can safely say that the domain + * crashed ... */ + state = VIR_DOMAIN_SHUTOFF_CRASHED; + else + /* ... but if it doesn't we can't say what the state + * really is and FAILED means "failed to start" */ + state = VIR_DOMAIN_SHUTOFF_UNKNOWN; + + qemuProcessStop(driver, obj, 0, state); if (!obj->persistent) qemuDomainRemoveInactive(driver, obj); else -- 1.7.8.6

2 2

[libvirt] [PATCH] build: fix build without i18n
by Eric Blake 07 Jun '12

07 Jun '12

If you compile without NLS support, where _() is a no-op macro, then we end up passing a string literal to a char*, provoking: In file included from virsh.c:3639:0: virsh-edit.c: In function ‘cmdSaveImageEdit’: virsh-edit.c:97:13: error: assignment discards ‘const’ qualifier from pointer target type [-Werror] virsh-edit.c:106:13: error: assignment discards ‘const’ qualifier from pointer target type [-Werror] * tools/virsh-edit.c: Be const-safe. --- Pushing under the build-breaker rule. tools/virsh-edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index aa59f25..27140e2 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -55,7 +55,7 @@ do { char *doc = NULL; char *doc_edited = NULL; char *doc_reread = NULL; - char *msg = NULL; + const char *msg = NULL; /* Get the XML configuration of the object. */ doc = (EDIT_GET_XML); -- 1.7.10.2

1 0

[libvirt] [PATCH] spec: Build against systemd for udev
by Cole Robinson 06 Jun '12

06 Jun '12

They have now merged. Fedora details here: https://lists.fedoraproject.org/pipermail/devel/2012-June/168227.html Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3c544f1..a78b117 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -355,7 +355,11 @@ BuildRequires: augeas BuildRequires: hal-devel %endif %if %{with_udev} +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +BuildRequires: systemd-devel >= 185 +%else BuildRequires: libudev-devel >= 145 +%endif BuildRequires: libpciaccess-devel >= 0.10.9 %endif %if %{with_yajl} @@ -539,8 +543,12 @@ Requires: ebtables Requires: hal %endif %if %{with_udev} +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +Requires: systemd >= 185 +%else Requires: udev >= 145 %endif +%endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 -- 1.7.7.6

2 2

[libvirt] [PATCH] build: fix build of fresh checkout
by Eric Blake 06 Jun '12

06 Jun '12

Commit 7bff56a worked in an incremental build, but fails for a fresh clone; apparently, if make sees both an actual file spelling and an inference rule, only the exact spelling is used. CCLD libvirt_driver_test.la CC libvirt_driver_remote_la-remote_driver.lo remote/remote_driver.c:4707:34: fatal error: remote_client_bodies.h: No such file or directory compilation terminated. BUILT_SOURCES to the rescue, instead of trying to mess with .lo dependencies directly. * src/Makefile.am (REMOTE_DRIVER_PREREQS, %remote_driver.lo): Drop... (BUILT_SOURCES): ...and add here instead. --- Pushing under the build-breaker rule. src/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2d737af..60f5442 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -654,8 +654,7 @@ libvirt_driver_remote_la_LIBADD = $(GNUTLS_LIBS) \ libvirt-net-rpc.la libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) -REMOTE_DRIVER_PREREQS = $(REMOTE_DRIVER_GENERATED) -%remote_driver.lo: $(REMOTE_DRIVER_PREREQS) +BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED) endif WITH_REMOTE @@ -1297,7 +1296,7 @@ libvirt_la_BUILT_LIBADD += libvirt_probes.lo libvirt_la_DEPENDENCIES += libvirt_probes.lo libvirt_probes.o nodist_libvirt_la_SOURCES = libvirt_probes.h if WITH_REMOTE -REMOTE_DRIVER_PREREQS += libvirt_probes.h +nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h endif WITH_REMOTE BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp -- 1.7.10.2

1 0

[libvirt] Add virStorageVolResize()
by Zeeshan Ali (Khattak) 06 Jun '12

06 Jun '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add a new function to allow changing of capacity of storage volumes. --- include/libvirt/libvirt.h.in | 5 ++ src/driver.h | 5 ++ src/libvirt.c | 50 +++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 ++++- src/remote_protocol-structs | 6 +++ src/storage/storage_backend.h | 6 +++ src/storage/storage_backend_fs.c | 59 ++++++++++++++++++++++++++++ src/storage/storage_driver.c | 80 ++++++++++++++++++++++++++++++++++++++ src/util/storage_file.c | 16 ++++++++ src/util/storage_file.h | 2 + tools/virsh.c | 53 +++++++++++++++++++++++++ 13 files changed, 292 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e99cd00..b169592 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2386,6 +2386,11 @@ char * virStorageVolGetXMLDesc (virStorageVolPtr pool, char * virStorageVolGetPath (virStorageVolPtr vol); +int virStorageVolResize (virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags); + + /** * virKeycodeSet: * diff --git a/src/driver.h b/src/driver.h index df2aa60..c850926 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1261,6 +1261,10 @@ typedef int unsigned long long offset, unsigned long long length, unsigned int flags); +typedef int + (*virDrvStorageVolResize) (virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags); typedef int (*virDrvStoragePoolIsActive)(virStoragePoolPtr pool); @@ -1323,6 +1327,7 @@ struct _virStorageDriver { virDrvStorageVolGetInfo volGetInfo; virDrvStorageVolGetXMLDesc volGetXMLDesc; virDrvStorageVolGetPath volGetPath; + virDrvStorageVolResize volResize; virDrvStoragePoolIsActive poolIsActive; virDrvStoragePoolIsPersistent poolIsPersistent; }; diff --git a/src/libvirt.c b/src/libvirt.c index e9d638b..d1962a2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12927,6 +12927,56 @@ error: return NULL; } +/** + * virStorageVolResize: + * @vol: pointer to storage volume + * @capacity: new capacity + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Changes the capacity of the storage volume @vol to @capacity. The new + * capacity must not exceed the sum of current capacity of the volume and + * remainining free space of its parent pool. Also the new capacity must + * be greater than or equal to current allocation of the volume. + * + * Returns 0 on success, or -1 on error. + */ +int +virStorageVolResize(virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + virConnectPtr conn; + VIR_DEBUG("vol=%p capacity=%llu flags=%x", vol, capacity, flags); + + virResetLastError(); + + if (!VIR_IS_STORAGE_VOL(vol)) { + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + conn = vol->conn; + + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->volResize) { + int ret; + ret = conn->storageDriver->volResize(vol, capacity, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(vol->conn); + return -1; +} /** * virNodeNumOfDevices: diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 1340b0c..54a4f2c 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -520,6 +520,7 @@ LIBVIRT_0.9.10 { global: virDomainShutdownFlags; virStorageVolWipePattern; + virStorageVolResize; } LIBVIRT_0.9.9; # .... define new API here using predicted next version number .... diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f79f53e..2bb4cbf 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4837,6 +4837,7 @@ static virStorageDriver storage_driver = { .volGetInfo = remoteStorageVolGetInfo, /* 0.4.1 */ .volGetXMLDesc = remoteStorageVolGetXMLDesc, /* 0.4.1 */ .volGetPath = remoteStorageVolGetPath, /* 0.4.1 */ + .volResize = remoteStorageVolResize, /* 0.9.10 */ .poolIsActive = remoteStoragePoolIsActive, /* 0.7.3 */ .poolIsPersistent = remoteStoragePoolIsPersistent, /* 0.7.3 */ }; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 0f354bb..29f98fc 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1676,6 +1676,12 @@ struct remote_storage_vol_get_path_ret { remote_nonnull_string name; }; +struct remote_storage_vol_resize_args { + remote_nonnull_storage_vol vol; + unsigned hyper capacity; + unsigned int flags; +}; + /* Node driver calls: */ struct remote_node_num_of_devices_args { @@ -2667,7 +2673,8 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SET_INTERFACE_PARAMETERS = 256, /* autogen autogen */ REMOTE_PROC_DOMAIN_GET_INTERFACE_PARAMETERS = 257, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS = 258, /* autogen autogen */ - REMOTE_PROC_STORAGE_VOL_WIPE_PATTERN = 259 /* autogen autogen */ + REMOTE_PROC_STORAGE_VOL_WIPE_PATTERN = 259, /* autogen autogen */ + REMOTE_PROC_STORAGE_VOL_RESIZE = 300 /* autogen autogen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index de85862..9a60fc2 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1260,6 +1260,11 @@ struct remote_storage_vol_get_path_args { struct remote_storage_vol_get_path_ret { remote_nonnull_string name; }; +struct remote_storage_vol_resize_args { + remote_nonnull_storage_vol vol; + uint64_t capacity; + u_int flags; +}; struct remote_node_num_of_devices_args { remote_string cap; u_int flags; @@ -2101,4 +2106,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_GET_INTERFACE_PARAMETERS = 257, REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS = 258, REMOTE_PROC_STORAGE_VOL_WIPE_PATTERN = 259, + REMOTE_PROC_STORAGE_VOL_RESIZE = 300, }; diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 75ed676..a37bf7c 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -44,6 +44,11 @@ typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, virStoragePoolObjP typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags); +typedef int (*virStorageBackendVolumeResize)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags); /* File creation/cloning functions used for cloning between backends */ int virStorageBackendCreateRaw(virConnectPtr conn, @@ -78,6 +83,7 @@ struct _virStorageBackend { virStorageBackendCreateVol createVol; virStorageBackendRefreshVol refreshVol; virStorageBackendDeleteVol deleteVol; + virStorageBackendVolumeResize resizeVol; }; virStorageBackendPtr virStorageBackendForType(int type); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index d8dc29c..31f7c0a 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1187,6 +1187,62 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn, return 0; } +static int +virStorageBackendFilesystemResizeQemuImg(const char *path, + unsigned long long capacity) +{ + int ret = -1; + char *img_tool; + virCommandPtr cmd = NULL; + + /* KVM is usually ahead of qemu on features, so try that first */ + img_tool = virFindFileInPath("kvm-img"); + if (!img_tool) + img_tool = virFindFileInPath("qemu-img"); + + if (!img_tool) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unable to find kvm-img or qemu-img")); + return -1; + } + + cmd = virCommandNew(img_tool); + virCommandAddArgList(cmd, "resize", path, NULL); + virCommandAddArgFormat(cmd, "%llu", capacity); + + ret = virCommandRun(cmd, NULL); + + VIR_FREE(img_tool); + virCommandFree(cmd); + + return ret; +} + +/** + * Resize a volume + */ +static int +virStorageBackendFileSystemVolResize(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + virCheckFlags(0, -1); + + if (vol->target.format == VIR_STORAGE_FILE_RAW) { + return virStorageFileResize(vol->target.path, capacity); + } else if (vol->target.format == VIR_STORAGE_FILE_DIR) { + virStorageReportError(VIR_ERR_NO_SUPPORT, + "%s", _("Changing size of directory based " + "volumes is not supported")); + return -1; + } else { + return virStorageBackendFilesystemResizeQemuImg(vol->target.path, + capacity); + } +} + virStorageBackend virStorageBackendDirectory = { .type = VIR_STORAGE_POOL_DIR, @@ -1199,6 +1255,7 @@ virStorageBackend virStorageBackendDirectory = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #if WITH_STORAGE_FS @@ -1216,6 +1273,7 @@ virStorageBackend virStorageBackendFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; virStorageBackend virStorageBackendNetFileSystem = { .type = VIR_STORAGE_POOL_NETFS, @@ -1232,5 +1290,6 @@ virStorageBackend virStorageBackendNetFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index a332ada..76730b4 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1695,7 +1695,86 @@ out: return ret; } +static int +storageVolumeResize(virStorageVolPtr obj, + unsigned long long capacity, + unsigned int flags) +{ + virStorageDriverStatePtr driver = obj->conn->storagePrivateData; + virStorageBackendPtr backend; + virStoragePoolObjPtr pool = NULL; + virStorageVolDefPtr vol = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + storageDriverLock(driver); + pool = virStoragePoolObjFindByName(&driver->pools, obj->pool); + storageDriverUnlock(driver); + + if (!pool) { + virStorageReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching uuid")); + goto out; + } + + if (!virStoragePoolObjIsActive(pool)) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool is not active")); + goto out; + } + + if ((backend = virStorageBackendForType(pool->def->type)) == NULL) + goto out; + + vol = virStorageVolDefFindByName(pool, obj->name); + + if (vol == NULL) { + virStorageReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + obj->name); + goto out; + } + + if (vol->building) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still being allocated."), + vol->name); + goto out; + } + + if (capacity < vol->allocation) { + virStorageReportError(VIR_ERR_INVALID_ARG, + _("can't shrink capacity below " + "existing allocation")); + goto out; + } + + if (capacity > vol->allocation + pool->def->available) { + virStorageReportError(VIR_ERR_INVALID_ARG, + _("Not enough space left on storage pool")); + goto out; + } + + if (!backend->resizeVol) { + virStorageReportError(VIR_ERR_NO_SUPPORT, + _("storage pool does not support changing of " + "volume capacity")); + goto out; + } + + if (backend->resizeVol(obj->conn, pool, vol, capacity, flags) < 0) + goto out; + + vol->capacity = capacity; + ret = 0; + +out: + if (pool) + virStoragePoolObjUnlock(pool); + return ret; +} /* If the volume we're wiping is already a sparse file, we simply * truncate and extend it to its original size, filling it with @@ -2243,6 +2322,7 @@ static virStorageDriver storageDriver = { .volGetInfo = storageVolumeGetInfo, /* 0.4.0 */ .volGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ .volGetPath = storageVolumeGetPath, /* 0.4.0 */ + .volResize = storageVolumeResize, /* 0.9.10 */ .poolIsActive = storagePoolIsActive, /* 0.7.3 */ .poolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ diff --git a/src/util/storage_file.c b/src/util/storage_file.c index ba9cfc5..8260adb 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -931,6 +931,22 @@ virStorageFileFreeMetadata(virStorageFileMetadata *meta) VIR_FREE(meta); } +/** + * virStorageFileResize: + * + * Change the capacity of the raw storage file at 'path'. + */ +int +virStorageFileResize(const char *path, unsigned long long capacity) +{ + if (truncate(path, capacity) < 0) { + virReportSystemError(errno, _("Failed to truncate file '%s'"), path); + return -1; + } + + return 0; +} + #ifdef __linux__ # ifndef NFS_SUPER_MAGIC diff --git a/src/util/storage_file.h b/src/util/storage_file.h index b8920d0..96afb12 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -72,6 +72,8 @@ int virStorageFileGetMetadataFromFD(const char *path, void virStorageFileFreeMetadata(virStorageFileMetadata *meta); +int virStorageFileResize(const char *path, unsigned long long capacity); + enum { VIR_STORAGE_FILE_SHFS_NFS = (1 << 0), VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), diff --git a/tools/virsh.c b/tools/virsh.c index 74655c2..20d4bd0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11279,6 +11279,58 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) return ret; } +/* + * "vol-resize" command + */ +static const vshCmdInfo info_vol_resize[] = { + {"help", N_("resize a vol")}, + {"desc", N_("Resizes a storage vol.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_vol_resize[] = { + {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")}, + {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, N_("new capacity for the vol with optional k,M,G,T suffix")}, + {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdVolResize(vshControl *ctl, const vshCmd *cmd) +{ + virStorageVolPtr vol; + const char *capacityStr = NULL; + unsigned long long capacity = 0; + bool ret = true; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return false; + + if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", NULL))) + return false; + + if (vshCommandOptString(cmd, "capacity", &capacityStr) <= 0) + goto cleanup; + if (cmdVolSize(capacityStr, &capacity) < 0) { + vshError(ctl, _("Malformed size %s"), capacityStr); + goto cleanup; + } + + if (virStorageVolResize(vol, capacity, 0) == 0) { + vshPrint(ctl, "Size of volume '%s' successfully changed to %s\n", + virStorageVolGetName(vol), capacityStr); + ret = true; + } else { + vshError(ctl, "Failed to change size of volume '%s' to %s\n", + virStorageVolGetName(vol), capacityStr); + ret = false; + } + +cleanup: + virStorageVolFree(vol); + return ret; +} + /* * "vol-dumpxml" command @@ -16141,6 +16193,7 @@ static const vshCmdDef storageVolCmds[] = { {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool, 0}, {"vol-upload", cmdVolUpload, opts_vol_upload, info_vol_upload, 0}, {"vol-wipe", cmdVolWipe, opts_vol_wipe, info_vol_wipe, 0}, + {"vol-resize", cmdVolResize, opts_vol_resize, info_vol_resize, 0}, {NULL, NULL, NULL, NULL, 0} }; -- 1.7.7.5

4 18

[libvirt] [PATCH 0/3] openvz: allow for runtime quota updates
by Guido Günther 06 Jun '12

06 Jun '12

Hi, attached patches allow to change disk quota at runtime. This can later be extended to update network configuration as well. The patch revealed a problem of the openvz driver in genral: the openvzLoadDomains only reads the on disk configuration but doesn't check if running domains have (non persistent) diverging values due to openvz calls without the "--save" option but that's part of another patch. Cheers, -- Guido Guido Günther (3): Introduce virDomainFSIndexByName openvz: add persist parameter to openvzSetDiskQuota openvz: wire up domainUpdateDeviceFlags src/conf/domain_conf.c | 16 +++++++ src/conf/domain_conf.h | 1 + src/openvz/openvz_driver.c | 105 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 118 insertions(+), 4 deletions(-) -- 1.7.10

2 6

Re: [libvirt] How to add custom tag to the libvirt xml file for a new feature of the VM
by Eric Blake 06 Jun '12

06 Jun '12

[re-adding the list] On 06/05/2012 09:53 PM, Yashwanth K P wrote: >>> I am working on libvirt development and I wanted to add a custom tag to >>> the libvirt xml to add a new feature to the VM. I am having trouble >>> getting started with this. It would be really helpful if you can help me >>> get started with this and guide me on what part of the source code that >>> has to be modified to achieve the goal. >> It would help if we knew more information about what you wanted. >> > What I would like to do is that I want to add a new tag to the xml file > which which when parsed should have an effect on the cpuset value of the > vcpu tag. Thus starting the VM with a particular set of CPUs to run on. > I am not sure on to implement this since I am new to development by > making changes in the source code. It would be really helpful if u guide > me to achive the goal. This is already possible, via the 'cpuset' attribute of the top-level <vcpu> element: http://libvirt.org/formatdomain.html#elementsCPUAllocation -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] Looking for libvirt for RHEL 6.1 to provide Memory related metrics.
by Roy, Kallol 06 Jun '12

06 Jun '12

Hello All, Can some one let me know if we have the latest libvirt version for RHEL 6.1 which would provided me Memory related counters/metrics. The latest libvirt which I found was on Fedora. Any pointer or expected dates of libvirt release on RHEL would be highly appreciated. Thanks and Regards, _____________________________________________________________________ Kallol Roy "Be kinder than necessary, for everyone you meet is fighting some kind of battle."

1 0

[libvirt] [PATCH] daemon: Do not lose storage driver
by Osier Yang 06 Jun '12

06 Jun '12

Per WITH_STORAGE_DIR is always defined as long as libvirtd is built, it's fine to use it as the condition. --- daemon/libvirtd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c74cd43..7db02e3 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -366,7 +366,7 @@ static void daemonInitialize(void) # ifdef WITH_NETWORK virDriverLoadModule("network"); # endif -# ifdef WITH_STORAGE +# ifdef WITH_STORAGE_DIR virDriverLoadModule("storage"); # endif # ifdef WITH_NODE_DEVICES -- 1.7.7.3

2 3

[libvirt] [Fwd: error: this function is not supported by the connection driver : virConnectNumOfStoragePool]
by Onkar 05 Jun '12

05 Jun '12

Hello All, Any idea on this issue ? Regards, Onkar -------- Forwarded Message -------- From: Onkar <kernzap(a)gmail.com> To: libvir-list <libvir-list(a)redhat.com> Subject: error: this function is not supported by the connection driver : virConnectNumOfStoragePool Date: Wed, 30 May 2012 21:29:42 +0530 Hello, I configured libvirt like this ./configure --prefix=/ --exec-prefix=/usr/ --libdir=/usr/lib64/ --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-qemu --with-libvirtd --with-selinux --with-network --with-libblkid and then, make -j4 make install and then # virsh list --all Id Name State ---------------------------------------------------- - vm1 shut off # virsh pool-list --all error: Failed to list active pools error: this function is not supported by the connection driver: virConnectNumOfStoragePools getting this error , any clues on why is this error ? Regards, Onkar

4 4

[libvirt] Schedule of next release
by Daniel Veillard 05 Jun '12

05 Jun '12

I just looked and we are at 142 patches since the 0.9.12 release. If we were to keep the 1 month between releases schedule we would need to enter freeze at the end of the week, and that mean a relatively small release next. So I suggests to delay the release by 2 more weeks which also has the advantage to get back to the end of the month deadline which is easy to remember. So unless there is a pressing issue to make a release soon which I don't know about, let's plan to enter freeze around Jun 22 for a release at the end of month. As a note it seems that the rate of changes to libvirt is decreasing a bit (see http://veillard.com/commits_by_year_month.png which I generated at the end of may with gitstats) so maybe we should start planning for slighty longuer release cycles. Let's see how the trend evolves, but I doubt the rate wil increase over the summer :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH v3 0/2] Rework RPC message buffer
by Michal Privoznik 05 Jun '12

05 Jun '12

This patch set tries to fix corner cases where libvirt runs on huge system, e.g. 4K CPU monster. In these cases, capabilities XML is enormously big, as we are transferring info about each singe CPU core (to which NUMA node it belongs, etc.). This XML is bigger than our RPC limit, therefore users cannot get it as it is dropped on server, leaving them with inability to connect. Therefore we need to increase those limits (whole RPC message and RPC string). However, simple lifting up will work, but increase mem usage. Therefore I've reworked RPC buffer handling: changed it from 'statically' to dynamically allocated. So in most cases - when small messages are sent - this will even decrease our memory consumption. Leaving us flexible for corner cases described above. On the other hand, I realize we've had our history with RPC breakage. So I think I'll require more than 1 ACK before pushing. (I guess Eric's ACK still holds) diff to v2: -suggestions from Eric's review included diff to v1: -couple of fixes (1/2) -increased other limits as well (2/2) Michal Privoznik (2): rpc: Switch to dynamically allocated message buffer rpc: Size up RPC limits src/libvirt.c | 2 + src/remote/remote_protocol.x | 20 +- src/rpc/virnetclient.c | 16 ++- src/rpc/virnetmessage.c | 12 ++- src/rpc/virnetmessage.h | 5 +- src/rpc/virnetprotocol.x | 6 +- src/rpc/virnetserverclient.c | 24 +++- tests/virnetmessagetest.c | 393 +++++++++++++++++++++++------------------- 8 files changed, 281 insertions(+), 197 deletions(-) -- 1.7.8.5

2 4