- Devel - libvirt List Archives

[Libvir] [PATCH] Add virConnectGetHostname and virConnectGetURI calls, virsh commands, and some related fixes
by Richard W.M. Jones 26 Jun '07

26 Jun '07

This patch adds two calls: /** + * virConnectGetHostname: + * @conn: pointer to a hypervisor connection + * + * This returns the system hostname on which the hypervisor is + * running (the result of the gethostname(2) system call). If + * we are connected to a remote system, then this returns the + * hostname of the remote system. + * + * Returns the hostname which must be freed by the caller, or + * NULL if there was an error. + */ +char * +virConnectGetHostname (virConnectPtr conn) and: +/** + * virConnectGetURI: + * @conn: pointer to a hypervisor connection + * + * This returns the URI (name) of the hypervisor connection. + * Normally this is the same as or similar to the string passed + * to the virConnectOpen/virConnectOpenReadOnly call, but + * the driver may make the URI canonical. If name == NULL + * was passed to virConnectOpen, then the driver will return + * a non-NULL URI which can be used to connect to the same + * hypervisor later. + * + * Returns the URI string which must be freed by the caller, or + * NULL if there was an error. + */ +char * +virConnectGetURI (virConnectPtr conn) It also fixes a kind of accidental memory leak which turns out not to be a memory leak. In the current version of libvirt CVS, when using remote connections, remote's private data is not freed by remote_internal.c. However it turns out that it _is_ freed by qemuNetworkClose. Obviously some confusion there, but this patch fixes that. (Fixing that is a dependency of this patch, which is why the two are done together in one patch). I've added "virsh hostname" and "virsh uri" commands: $ src/virsh -c test:///default uri test:///default $ src/virsh -c test:///default hostname localhost.localdomain (Yeah, I haven't set the hostname on this machine ...) I've updated the Xen, test and remote drivers to support the calls. However I didn't update qemu because of Dan's big changes to qemu. Once we have decided whether to put in Dan's changes, I'll go back and implement this for qemu. (I'm actually not sure I would need to implement them, if remote supports the calls already). I haven't updated the Python bindings, but will do so next. I decided not to implement the proposed virConnectGetTransport call because I think it needs more thought. It would obviously be useful to find out whether the current connection is local or remote, encrypted or unencrypted, authenticated or unauthenticated, because all of these things could be usefully communicated back to the user by icons in virt-manager. Simply returning the transport name doesn't really do this. The user might also want to find out _how_ the session is encrypted (what TLS parameters are in use), and again a simple string can't do that. Before applying this patch you will need to do: rm qemud/remote_dispatch_localvars.h \ qemud/remote_dispatch_proc_switch.h \ qemud/remote_dispatch_prototypes.h \ qemud/remote_protocol.c \ qemud/remote_protocol.h and after applying you will need to do: make -C qemud remote_protocol.c Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 5

[Libvir] [PATCH] Add virDomainGetConnect and virNetworkGetConnect
by Richard W.M. Jones 25 Jun '07

25 Jun '07

As described in this thread: https://www.redhat.com/archives/libvir-list/2007-June/thread.html#00352 * These functions don't change the reference count for virConnectPtr. It's be a pain in the neck for callers otherwise. * I haven't changed the Python bindings, because I'm not confident enough that I can do that correctly and keep it backwards compatible for all callers (and anyway what would happen if newer Python bindings were used together with an older libvirt?). However I did add a comment to the generator noting that this could be changed in future. * I tested this with the OCaml bindings with no apparent ill-effects. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 2

[Libvir] [PATCH] Cleanup - remove virDomainKernel structure
by Richard W.M. Jones 25 Jun '07

25 Jun '07

... unless anyone can remember what it was for. It still builds fine without it. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] OCaml bindings for libvirt
by Richard W.M. Jones 25 Jun '07

25 Jun '07

Weekend project: http://et.redhat.com/~rjones/ocaml-libvirt/ Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] Useful additional functions for libvirt
by Richard W.M. Jones 25 Jun '07

25 Jun '07

[I haven't implemented any of these yet, but if people think they're a good idea, or at least not an actively bad idea, then I'll post a patch.] virDomainGetConnection virNetworkGetConnection Purpose: Given a virDomainPtr or virNetworkPtr, obtain the virConnectPtr. Reason: All the language bindings to libvirt need to keep the virConnectPtr separately alongside the virDomain/NetworkPtr, in the main so that they can query if an error has happened from inside some deep call. This is wasteful since the connection pointer is already included in the virDomain or virNetwork structure, so we should just provide a call to get it. virConnectGetHostname virConnectGetTransport virConnectGetURI Purpose: Get the remote hostname, remote transport (tls, ssh, etc.), and URI. Reason: In virt-manager it would be nice to display the remote hostname. However doing this at the moment requires parsing the connection URI, which is duplicated code and also significantly complicated. Instead, allow the remote driver to just give us this information, and in non-remote cases default to something sensible. The case for the other two calls is weaker, but it might still be useful to know something about the security of the actual transport selected, and also to not have to keep the URI around with the connection (we might also canonicalise the transport for the user). virConnectPing Purpose: "Ping" the hypervisor to see if its up. Reason: Since we now support remote connections, there is a much more signficant chance that we will lose contact with the hypervisor, for example if the host goes down. This will do some very minimal operation to cheaply test whether the hypervisor can be contacted. Of course we could do something like 'virConnectNumOfDomains', but it's not clear to me that this operation would always be cheap (eg. if we had to implement it through xend). Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] [PATCH] Allow maxnames to be 0 in List{, Defined}{Domains, Networks}
by Richard W.M. Jones 25 Jun '07

25 Jun '07

It seems a bit pathological to check if maxNames <= 0 and throw an error if it is 0. In particular if you don't have any defined domains or networks (both fairly common scenarios) then this causes an error when you just pass the result of NumOfNetworks straight into ListNetworks. Backend drivers & QEMU seem to have no problem with maxNames being zero, so let's allow it. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] [PATCH] Fix virDomainGetMaxVcpus in remote case
by Richard W.M. Jones 25 Jun '07

25 Jun '07

There's a typo in the remote_internal.c driver which causes it to call the wrong back-end function for virDomainGetMaxVcpus. The simple fix is attached. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] [PATCH] Fix virDomainGetVcpus in the remote case
by Richard W.M. Jones 25 Jun '07

25 Jun '07

I wasn't copying enough data in the cpumaps parameter. This fixes that bug ... Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] can not use the monitor of Qemu-dm
by Saori Fukuta 25 Jun '07

25 Jun '07

Hi, I opened the new bugzilla: Summary: can not use the monitor of Qemu-dm URL: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=245284 And I attached the patch to fix this problem. Thanks, Saori Fukuta

4 5

[Libvir] [PATCH] Xen driver doesn't support autostart, so remove it from xen_unified
by Richard W.M. Jones 22 Jun '07

22 Jun '07

Our implementation of the Xen driver doesn't support autostart[*]. However xen_unified.c has a loop for get/setAutostart which causes it to return an error without setting virterror first. This patch removes that loop. Rich. [*] Although Xen supports it, by putting files in /etc/xen/autostart/ (at least that was the "old Xen" way before the current insanity of getting rid of config files was invented). -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] Avoid leak upon failed realloc
by Jim Meyering 22 Jun '07

22 Jun '07

This matters only if/when this realloc call fails. And then, only in the small way that with this patch, there's a slightly better chance of recovering from the low-memory condition. 2007-06-22 Jim Meyering <jim(a)meyering.net> * qemud/driver.c (qemudMonitorCommand): Avoid leak upon failed realloc. Index: qemud/driver.c =================================================================== RCS file: /data/cvs/libvirt/qemud/driver.c,v retrieving revision 1.21 diff -u -p -r1.21 driver.c --- qemud/driver.c 15 Jun 2007 13:44:19 -0000 1.21 +++ qemud/driver.c 22 Jun 2007 09:43:59 -0000 @@ -75,6 +75,7 @@ int qemudMonitorCommand(struct qemud_ser for (;;) { char data[1024]; int got = read(vm->monitor, data, sizeof(data)); + char *b; if (got == 0) { if (buf) @@ -91,8 +92,11 @@ int qemudMonitorCommand(struct qemud_ser free(buf); return -1; } - if (!(buf = realloc(buf, size+got+1))) + if (!(b = realloc(buf, size+got+1))) { + free(buf); return -1; + } + buf = b; memmove(buf+size, data, got); buf[size+got] = '\0'; size += got;

3 3

[Libvir] [PATCH] Add support for scheduler functions in remote
by Richard W.M. Jones 22 Jun '07

22 Jun '07

This is a rather tedious patch, but I've tested it against the Xen driver and it works for getting and setting the various parameters and scheduler type. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] Fix string handling in virDomain{Get, Set}SchedulerParameters
by Richard W.M. Jones 22 Jun '07

22 Jun '07

This small patch fixes some bugs in the handling of the field string in virDomainGetSchedulerParameters and makes a similar pre-emptive fix to virDomainSetSchedulerParameters. Also, please don't use !strcmp(a,b), because it confuses me. Better is to write strcmp(a,b) == 0 to mean "strings match" and strcmp(a,b) != 0 to mean "strings don't match". Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

4 10

[Libvir] [PATCH] Fix remote virDomainGetXMLDesc
by Richard W.M. Jones 21 Jun '07

21 Jun '07

I was wondering why dumpxml didn't work on remote connections. Turned out to be the same bug that Dan found last week: https://www.redhat.com/archives/libvir-list/2007-June/msg00186.html The attached patch includes that fix, plus it adds proper error handling into xend_internal.c:xenDaemonDomainDumpXML and related functions. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 2

[Libvir] [PATCH] Fix remote virConnectGetMaxVcpus
by Richard W.M. Jones 21 Jun '07

21 Jun '07

I've been going over the interface to libvirt, trying out every call locally and remotely with all possible combinations of parameters that I can think of. Not surprisingly one or two problems have cropped up. So here's a short series of patches to fix the problems I've found. virConnectGetMaxVcpus has a second "type" parameter. In practice this isn't used and can be passed as NULL. However that fails in the remote case. The fix is simple enough -- attached. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] [PATCH] Correct documentation for virConnectOpen*
by Richard W.M. Jones 20 Jun '07

20 Jun '07

Simple patch to fix the currently incorrect documentation for these two functions. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] RFC: replace "no support for hypervisor" error
by Richard W.M. Jones 20 Jun '07

20 Jun '07

The "no support for hypervisor" error is both very common and pretty annoying because it gives you nowhere to go to find out what you did wrong. $ virsh -c xen://localhost/ libvir: Xen Daemon error : no support for hypervisor virsh: error: failed to connect to the hypervisor (The actual problem is that my URI is wrong, which is a separate bug in the Xen driver. But the error message gives me no particular indication of what is wrong or how to correct the situation). I think there are several possible solutions to this - discuss, or suggest your own. (1) Document the URI formats fully. -- This is a feature which has been requested a few times and I will do it anyway if Daniel Veillard will do the magic to set up a "http://libvirt.org/uri.html" page. (2) Add a method to query available drivers and URI syntax. -- Something along the lines of char *virQueryDrivers (void); Note that it doesn't need an open connection. -- The remote case would have to be handled specially because you want to find out what's available locally and what's available remotely, and in the remote case you do need some sort of a connection. (3) Split VIR_ERR_NO_SUPPORT into two categories. Currently this category mixes up cases where we fail to open a connection, and cases where there is no driver support for a particular operation (even with an open connection). In the first case, go through all the places which return this error and add proper diagnostic information to the error messages. -- Again, I am prepared to do this if people think it's a good idea. (4) Add diagnostics to higher layers such as virsh and virt-manager. -- I would be less happy with this because it ends up repeating code, and the diagnostics could get out of date w.r.t. what libvirt can do. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 11

[Libvir] Re: URI documentation and xen:/// patch
by Richard W.M. Jones 19 Jun '07

19 Jun '07

Daniel Veillard wrote: > On Tue, Jun 19, 2007 at 05:15:40PM +0100, Richard W.M. Jones wrote: >> Daniel Veillard wrote: >> $ virsh -c ///var/lib/xend/xend-socket list >> libvir: error : no support for hypervisor >> virsh: error: failed to connect to the hypervisor > > Hum, I not sure I ever tried to get that working. Maybe > file:///var/lib/xend/xend-socket > would work better, though libxml2 URI parsing should be able to > parse ///var/lib/xend/xend-socket and make it more or less equivalent > to the file:/// one. I would strace both to check. Yeah, I tried all the obvious ones like that. I'll run it under gdb later & find out what's really going on. I was just pointing out that it didn't seem to work right now ... Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] hypervisor version
by Mark Johnson 19 Jun '07

19 Jun '07

This is another patch which may not be popular? Xen's extra version does not fit in libvirt's release field (since it's part of an int). Instead of printing out the wrong value, just display major.minor in virsh. Mark

4 12

[Libvir] [PATCH] Fix the check of <cpumap> in virsh vcpupin
by Masayuki Sunou 19 Jun '07

19 Jun '07

Hi Because virsh vcpupin does not check a form of <cpumap>, when non-numerical letters are set, it does not become an error. This patch fixes it so that it become an error when non-numerical letters are set. Signed-off-by: Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> Thanks, Masayuki Sunou. ---------------------------------------------------------------------- Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.84 diff -u -p -r1.84 virsh.c --- src/virsh.c 15 Jun 2007 15:24:20 -0000 1.84 +++ src/virsh.c 18 Jun 2007 07:02:31 -0000 @@ -1530,6 +1530,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cm int vcpufound = 0; unsigned char *cpumap; int cpumaplen; + int i; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -1563,6 +1564,22 @@ cmdVcpupin(vshControl * ctl, vshCmd * cm return FALSE; } + for(i = 0; cpulist[i]; i++) { + if ((i == 0) || (i == strlen(cpulist)-1)) { + if (!isdigit(cpulist[i])) { + vshError(ctl, FALSE, _("Invalid format '%s'."), cpulist); + virDomainFree(dom); + return FALSE; + } + } else { + if(!isdigit(cpulist[i]) && cpulist[i] != ',') { + vshError(ctl, FALSE, _("Invalid format '%s'."), cpulist); + virDomainFree(dom); + return FALSE; + } + } + } + cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); cpumap = vshCalloc(ctl, 1, cpumaplen); ----------------------------------------------------------------------

3 7

[Libvir] [RFC] Device attach/detach on virsh
by Masayuki Sunou 19 Jun '07

19 Jun '07

I want to add I/F to do attach/detatch of VIF and VBD to virsh with virDomainAttachDevice()/virDomainDetachDevice(). And, I have two proposals about I/F for virsh to do attach/detach of VIF and VBD. proposal 1: Virsh catches MAC, bridge name, device name (physical,virtual), and another by the command option. ex) ------------------------------------------------------------------ # virsh help attach(detach)-vif(vbd) NAME attach(detach)-vif(vbd) - attach(detach) vif(vbd) SYNOPSIS * VIF attach(detach)-vif <domain> <MAC> <bridge> ... or * VBD attach(detach)-vbd <domain> <virt-dev> ... DESCRIPTION Attach(Detach) vif(vbd) device OPTIONS <domain> domain name, id or uuid * VIF <MAC> MAC address of vif <bridge> bridge name of vif ... * VBD <virt-dev> virtual device name of vbd <phy-dev> physical device name of vbd ... ------------------------------------------------------------------ <advantage> - I/F is easy to use than proposal 1. (Because the user does not have to make XML) <disadvantage> - I/F increases because I/F of VIF and VBD becomes separate. (So, the addition of I/F is necessary at any time for supporting devices other than VIF and VBD. ) - Handling of optional analysis, handling of XML making are necessary in virsh.c, and processing becomes complicated. proposal 2: virsh catches a definition of a device by XML ex) ------------------------------------------------------------------ # virsh help attach(detach)-device NAME attach(detach)-device - attach(detach) device from an XML file SYNOPSIS attach(detach)-device <domain> <file> DESCRIPTION Attach(Detach) device from an XML <file> OPTIONS <domain> domain name, id or uuid <file> XML file of device description ------------------------------------------------------------------ <advantage> - I/F is unified without affecting a device type. (I/F is simple) - Handling of virsh.c is simple. (Optional analysis is not necessary) <disadvantage> - The user has to describe XML.(It is troublesome) I think that specifications that a user is easy to use (proposal 1) are better. Please, give me an opinion which proposal is better. Thanks, Masayuki Sunou

6 28

[Libvir] PATCH 0/3: Refactor QEMU daemon
by Daniel P. Berrange 18 Jun '07

18 Jun '07

The 3 patches which follow are work-in-progress to re-factor the QEMU daemon / driver to eventually adhere to the main libvirt internal driver API. Once this work is complete, there will only need to be a single daemon running which can provide both remote & QEMU capabilities at once with no QEMU specific code in it. This is following some of the ideas I set out here http://www.redhat.com/archives/libvir-list/2007-May/msg00083.html Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 36

[Libvir] Register libvirtd ports with IANA ?
by Daniel P. Berrange 18 Jun '07

18 Jun '07

For the libvirtd we currently use two ports 16509 - TCP unencrypted stream 16514 - TLS encrypted stream My first thought is that we should really use consequetive port numbers eg 16510 and 16511. Second, we should register our port numbers with IANA http://www.iana.org/protocols/forms.htm Thoughts ? Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 7

[Libvir] PATCH: Fix marshalling of ID on wire with remote
by Daniel P. Berrange 18 Jun '07

18 Jun '07

THe code which marshalls virDomainptr objects onto the wire in the remote driver forgets to include the 'id' value. We get away with this for Xen and QEMU because they do most things based off name or UUID. The test driver however wants the ID number. The attached patch fixes this Dan -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 1

[Libvir] [PATCH] setmem checks
by Mark Johnson 18 Jun '07

18 Jun '07

This one may be a little contentious... This patch does a couple of things... It won't let you set memory if the value is greater that maxmem. It also will lower memory if max memory is set to less than memory. I think it's a good argument that this checking should be in the hypervisor control daemon. IMO, it should be both here and in the daemon. I have no idea why the patch diff is so big, Below is the diff after it is applied. A little easier to read. Mark [root@fedora libvirt]# diff src/virsh.orig src/virsh.c 1664a1665 > virDomainInfo info; 1673a1675,1677 > if (virDomainGetInfo(dom, &info) != 0) { > info.maxMem = 0; > } 1675c1679 < if (kilobytes <= 0) { --- > if ((kilobytes <= 0) || (kilobytes > info.maxMem)) { 1708a1713 > virDomainInfo info; 1723a1729,1737 > if (virDomainGetInfo(dom, &info) != 0) { > info.memory = 0x7fffffff; > } > > if (kilobytes < info.memory) { > if (virDomainSetMemory(dom, kilobytes) != 0) { > return FALSE; > } > } [root@fedora libvirt]#

5 12