- Devel - libvirt List Archives

[libvirt] [PATCH] cleanup virDomainCreateLinux into virDomainDefineXML
by Daniel Veillard 10 Oct '08

10 Oct '08

As promised in the libvirt-qpid thread, virDomainCreateLinux() call name makes no sense (anymore), and it should be renamed, i guess since virDomainCreate() already exist and by similarity with virDomainDefineXML() the best name is virDomainCreateXML(). The associated patch rename virDomainCreateLinux to virDomainCreateXML create a small function virDomainCreateLinux calling the former, document it as deprecated. To help comprehension of the source code it's also best to rename the internal driver method in a similar way, which inflates the patch a bit but is IMHO worth it. The patch also fixes a few #elif define(__sun__) and turn them into the correct #elif defined(__sun__) cpp instructions, and changes include/libvirt/virterror.h to improve the generated HTML page about the deprected fileds in the structure, since we need to regenerate the API xml and the docs, it was a good opportunity for that small change. I removed the docs/ subdir part from the patch as it's generated and mostly unreadable, that keeps it smaller too. 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 2

[libvirt] [PATCH] fix index creation for disks > {sd,hd,xvd,vd}z
by Chris Wright 10 Oct '08

10 Oct '08

Calling virDiskNameToIndex with a disk name > {sd,hd,xvd,vd}z, such as vdaa, generates a bogus index. Account for iterations through the loop. Old behaviour: vda -> 0 vdz -> 25 vdaa -> 0 vdaz -> 25 New behaviour: vda -> 0 vdz -> 25 vdaa -> 26 vdaz -> 51 This was discovered by Sanjay Rao, thanks for the report. Signed-off-by: Chris Wright <chrisw(a)redhat.com> Cc: Mark Wagner <mwagner(a)redhat.com> Cc: Sanjay Rao <srao(a)redhat.com> --- src/domain_conf.c | 2 +- src/util.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 6a35064..b5897a7 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -3395,7 +3395,7 @@ char *virDomainConfigFile(virConnectPtr conn, /* Translates a device name of the form (regex) "[fhv]d[a-z]+" into * the corresponding bus,index combination (e.g. sda => (0,0), sdi (1,1), - * hdd => (1,1), vdaa => (0,27)) + * hdd => (1,1), vdaa => (0,26)) * @param disk The disk device * @param busIdx parsed bus number * @param devIdx parsed device number diff --git a/src/util.c b/src/util.c index ca14be1..56390d7 100644 --- a/src/util.c +++ b/src/util.c @@ -1055,7 +1055,7 @@ const char *virEnumToString(const char *const*types, } /* Translates a device name of the form (regex) "[fhv]d[a-z]+" into - * the corresponding index (e.g. sda => 1, hdz => 26, vdaa => 27) + * the corresponding index (e.g. sda => 0, hdz => 25, vdaa => 26) * @param name The name of the device * @return name's index, or -1 on failure */ @@ -1075,8 +1075,8 @@ int virDiskNameToIndex(const char *name) { if (!ptr) return -1; - while (*ptr) { - idx = idx * 26; + for (i = 0; *ptr; i++) { + idx = (idx + i) * 26; if (!c_islower(*ptr)) return -1;

3 2

[libvirt] Libvirt.org will be down in an hour till tomorrow morning
by Daniel Veillard 10 Oct '08

10 Oct '08

There is major electric change at the hosting place for libvirt.org and the server will need to be shutdown for the night (french time, i.e. beginning of the afternoon US EST time). Hopefully the services will be restarted tomorrow morning, sorry for the disruption and the late announcement, I just learned about it... 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 2

[libvirt] Xen and out of memory stuff, blocks libvirtd
by Stefan de Konink 09 Oct '08

09 Oct '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 [2008-10-08 19:14:05 13001] ERROR (XendCheckpoint:157) Save failed on domain klant1_monetdb (17) - resuming. Traceback (most recent call last): File "usr/lib64/python2.5/site-packages/xen/xend/XendCheckpoint.py", line 125, in save forkHelper(cmd, fd, saveInputHandler, False) File "usr/lib64/python2.5/site-packages/xen/xend/XendCheckpoint.py", line 358, in forkHelper child = xPopen3(cmd, True, -1, [fd, xc.handle()]) File "usr/lib64/python2.5/site-packages/xen/util/xpopen.py", line 100, in __init__ self.pid = os.fork() OSError: [Errno 12] Cannot allocate memory [2008-10-08 19:14:05 13001] DEBUG (XendDomainInfo:2456) XendDomainInfo.resumeDomain(17) After this point, I am unable to contact the libvird daemon. Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEAREKAAYFAkjs7qQACgkQYH1+F2Rqwn0heQCeNJWDo2h3BR1IhcXmt+w9tpjD 304An1SlqWbig7nL8jgeElzJgu/KqgIa =dl3M -----END PGP SIGNATURE-----

2 7

[libvirt] [PATCH] Unify *ReportError logic
by Cole Robinson 09 Oct '08

09 Oct '08

Currently, most src/* files have their own ReportError function. Some support printf style arguments, others only allow reporting a single string message. The code for all of them does virtually the same thing, possibly passing a different constant off to another function. The attached patch adds a function to virterror.c which encapsulates the common ReportError logic. I used this to replace qemudReportError with a macro, which also allows passing off filename and line number info if we wanted to do something with it later. I did just the one function conversion to see what people think: if I'm missing something, or ideas for anything else to add. Seems to work as expected in my testing. Thanks, Cole

3 5

[libvirt] first argument in virDomainMigrate, is it free'ed?
by Stefan de Konink 09 Oct '08

09 Oct '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi, I saw that freeing the dom after a migration takes place results in: libvir: Domain error : invalid domain pointer in virDomainFree Now I wonder, if this is the case, could a normale migrate function 'just' be: domain = virDomainMigrate(domain, ....) Or is this unsafe; for example as a domain migration fails? Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEAREKAAYFAkjqOYwACgkQYH1+F2Rqwn0NZACffFESznbeElKNVgt65YXPGzXX ausAmwZ7HScE0/RTtDWm2uug/dC1S21K =xpn6 -----END PGP SIGNATURE-----

3 3

[libvirt] Xen Migration does not work
by Stefan de Konink 09 Oct '08

09 Oct '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 I'm try to migrate using libvirt: virsh # migrate 0802367323_PIQ002 xen://xen002.local/ libvir: Xen Daemon error : POST operation failed: xend_post: error from xen daemon: (xend.err 'Missing parameter: node') virsh -v 0.4.6 Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEAREKAAYFAkjpagoACgkQYH1+F2Rqwn0yogCfd0+rK0mNrLpmmwclAjRpevlg w4EAn2VOWooBbch7awWpRJs/1Sn7G5ZW =6eZd -----END PGP SIGNATURE-----

3 5

[libvirt] [PATCH] Add generic parameter=value support for virsh's schedinfo command
by Dan Smith 09 Oct '08

09 Oct '08

This patch maintains the two Xen-specific --weight and --cap options, but adds support for setting arbitrary parameters by specifying them in param=value syntax. Changes to the virsh manual are included. Changes: - Replace use of 'a' conversion modifier with pre-alloc diff -r 51fd150edd42 -r e441b1a06f1c docs/virsh.pod --- a/docs/virsh.pod Tue Oct 07 11:45:52 2008 -0700 +++ b/docs/virsh.pod Wed Oct 08 07:59:11 2008 -0700 @@ -318,12 +318,14 @@ with all the same limitations. Open network connections may be severed upon restore, as TCP timeouts may have expired. +=item B<schedinfo> optional I<--set> B<parameter=value> I<domain-id> + =item B<schedinfo> optional I<--weight> B<number> optional I<--cap> B<number> I<domain-id> -Allows to show (and set) the domain scheduler parameters. This is currently -only defined for XEN_CREDIT scheduler, and the optional weight and cap -arguments allows to set the associated parameters in that scheduler if -provided. +Allows to show (and set) the domain scheduler parameters. + +B<Note>: The weight and cap parameters are defined only for the +XEN_CREDIT scheduler and are now I<DEPRECATED>. =item B<setmem> I<domain-id> B<kilobytes> diff -r 51fd150edd42 -r e441b1a06f1c src/virsh.c --- a/src/virsh.c Tue Oct 07 11:45:52 2008 -0700 +++ b/src/virsh.c Wed Oct 08 07:59:11 2008 -0700 @@ -1112,6 +1112,7 @@ static const vshCmdOptDef opts_schedinfo[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, + {"set", VSH_OT_STRING, VSH_OFLAG_NONE, gettext_noop("parameter=value")}, {"weight", VSH_OT_INT, VSH_OFLAG_NONE, gettext_noop("weight for XEN_CREDIT")}, {"cap", VSH_OT_INT, VSH_OFLAG_NONE, gettext_noop("cap for XEN_CREDIT")}, {NULL, 0, 0, NULL} @@ -1121,6 +1122,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) { char *schedulertype; + char *set; + char *param_name = NULL; + long long int param_value = 0; virDomainPtr dom; virSchedParameterPtr params = NULL; int i, ret; @@ -1128,6 +1132,7 @@ int nr_inputparams = 0; int inputparams = 0; int weightfound = 0; + int setfound = 0; int weight = 0; int capfound = 0; int cap = 0; @@ -1141,7 +1146,7 @@ if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) return FALSE; - /* Currently supports Xen Credit only */ + /* Deprecated Xen-only options */ if(vshCommandOptBool(cmd, "weight")) { weight = vshCommandOptInt(cmd, "weight", &weightfound); if (!weightfound) { @@ -1160,6 +1165,25 @@ } else { nr_inputparams++; } + } + + if(vshCommandOptBool(cmd, "set")) { + set = vshCommandOptString(cmd, "set", &setfound); + if (!setfound) { + vshError(ctl, FALSE, "%s", _("Error getting param")); + goto cleanup; + } + + param_name = vshMalloc(ctl, strlen(set) + 1); + if (param_name == NULL) + goto cleanup; + + if (sscanf(set, "%[^=]=%i", param_name, &param_value) != 2) { + vshError(ctl, FALSE, "%s", _("Invalid value of param")); + goto cleanup; + } + + nr_inputparams++; } params = vshMalloc(ctl, sizeof (virSchedParameter) * nr_inputparams); @@ -1180,7 +1204,14 @@ params[inputparams].value.ui = cap; inputparams++; } - /* End Currently supports Xen Credit only */ + /* End Deprecated Xen-only options */ + + if (setfound) { + strncpy(params[inputparams].field,param_name,sizeof(params[0].field)); + params[inputparams].type = VIR_DOMAIN_SCHED_FIELD_LLONG; + params[inputparams].value.l = param_value; + inputparams++; + } assert (inputparams == nr_inputparams); @@ -1247,6 +1278,7 @@ } cleanup: free(params); + free(param_name); virDomainFree(dom); return ret_val; }

2 1

[libvirt] [PATCH] Add generic parameter=value support for virsh's schedinfo command
by Dan Smith 08 Oct '08

08 Oct '08

This patch maintains the two Xen-specific --weight and --cap options, but adds support for setting arbitrary parameters by specifying them in param=value syntax. Changes to the virsh manual are included. diff -r 51fd150edd42 -r aae58f42bd4a docs/virsh.pod --- a/docs/virsh.pod Tue Oct 07 11:45:52 2008 -0700 +++ b/docs/virsh.pod Tue Oct 07 13:53:49 2008 -0700 @@ -318,12 +318,14 @@ with all the same limitations. Open network connections may be severed upon restore, as TCP timeouts may have expired. +=item B<schedinfo> optional I<--set> B<parameter=value> I<domain-id> + =item B<schedinfo> optional I<--weight> B<number> optional I<--cap> B<number> I<domain-id> -Allows to show (and set) the domain scheduler parameters. This is currently -only defined for XEN_CREDIT scheduler, and the optional weight and cap -arguments allows to set the associated parameters in that scheduler if -provided. +Allows to show (and set) the domain scheduler parameters. + +B<Note>: The weight and cap parameters are defined only for the +XEN_CREDIT scheduler and are now I<DEPRECATED>. =item B<setmem> I<domain-id> B<kilobytes> diff -r 51fd150edd42 -r aae58f42bd4a src/virsh.c --- a/src/virsh.c Tue Oct 07 11:45:52 2008 -0700 +++ b/src/virsh.c Tue Oct 07 13:53:49 2008 -0700 @@ -1112,6 +1112,7 @@ static const vshCmdOptDef opts_schedinfo[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, + {"set", VSH_OT_STRING, VSH_OFLAG_NONE, gettext_noop("parameter=value")}, {"weight", VSH_OT_INT, VSH_OFLAG_NONE, gettext_noop("weight for XEN_CREDIT")}, {"cap", VSH_OT_INT, VSH_OFLAG_NONE, gettext_noop("cap for XEN_CREDIT")}, {NULL, 0, 0, NULL} @@ -1121,6 +1122,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) { char *schedulertype; + char *set; + char *param_name = NULL; + long long int param_value = 0; virDomainPtr dom; virSchedParameterPtr params = NULL; int i, ret; @@ -1128,6 +1132,7 @@ int nr_inputparams = 0; int inputparams = 0; int weightfound = 0; + int setfound = 0; int weight = 0; int capfound = 0; int cap = 0; @@ -1141,7 +1146,7 @@ if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) return FALSE; - /* Currently supports Xen Credit only */ + /* Deprecated Xen-only options */ if(vshCommandOptBool(cmd, "weight")) { weight = vshCommandOptInt(cmd, "weight", &weightfound); if (!weightfound) { @@ -1160,6 +1165,21 @@ } else { nr_inputparams++; } + } + + if(vshCommandOptBool(cmd, "set")) { + set = vshCommandOptString(cmd, "set", &setfound); + if (!setfound) { + vshError(ctl, FALSE, "%s", _("Error getting param")); + goto cleanup; + } + + if (sscanf(set, "%a[^=]=%i", &param_name, &param_value) != 2) { + vshError(ctl, FALSE, "%s", _("Invalid value of param")); + goto cleanup; + } + + nr_inputparams++; } params = vshMalloc(ctl, sizeof (virSchedParameter) * nr_inputparams); @@ -1180,7 +1200,14 @@ params[inputparams].value.ui = cap; inputparams++; } - /* End Currently supports Xen Credit only */ + /* End Deprecated Xen-only options */ + + if (setfound) { + strncpy(params[inputparams].field,param_name,sizeof(params[0].field)); + params[inputparams].type = VIR_DOMAIN_SCHED_FIELD_LLONG; + params[inputparams].value.l = param_value; + inputparams++; + } assert (inputparams == nr_inputparams); @@ -1247,6 +1274,7 @@ } cleanup: free(params); + free(param_name); virDomainFree(dom); return ret_val; }

2 2

[libvirt] [PATCH] Fix qemudDomainShutdown() memory leak
by Eduardo Habkost 08 Oct '08

08 Oct '08

qemudDomainShutdown() currently doesn't free the returned reply from qemudMonitorCommand(). Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- src/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 806608d..a88cb75 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2176,6 +2176,7 @@ static int qemudDomainShutdown(virDomainPtr dom) { "%s", _("shutdown operation failed")); return -1; } + VIR_FREE(info); return 0; } -- 1.5.5.GIT

2 1