- Devel - libvirt List Archives

[Libvir] Release of libvirt-0.2.1
by Daniel Veillard 16 Mar '07

16 Mar '07

A lot of work had accumulated in CVS, and it was really time for a new release, it's available from: ftp://libvirt.org/libvirt * Various internal cleanups (Richard Jones,Daniel Berrange,Mark McLoughlin) * Bug fixes: - libvirt_qemud daemon path (Daniel Berrange) - libvirt config directory (Daniel Berrange and Mark McLoughlin) - memory leak in qemud (Mark) - various fixes on network support (Mark) - avoid Xen domain zombies on device hotplug errors (Daniel Berrange) - various fixes on qemud (Mark) - argsparsing (Richard Jones) - virsh -t argument (Saori Fukuta) - avoid virsh crash on TAB key (Daniel Berrange) - detect xend operation failures (Kazuki Mizushima) - don't listen on null socket (Rich Jones) - read-only socket cleanup (Rich Jones) - use of vnc port 5900 (Nobuhiro Itou) - assorted networking fixes (Daniel Berrange) - shutoff and shutdown mismatches (Kazuki Mizushima) - unlimited memory handling (Atsushi SAKAI) - python binding fixes (Tatsuro Enokura) * Build and portability fixes: - IA64 fixes (Atsushi SAKAI) - dependancies and build (Daniel Berrange) - fix xend port detection (Daniel Berrange) - icompile time warnings (Mark) - avoid const related compiler warnings (Daniel Berrange) - automated builds (Daniel Berrange) - pointer/int mismatch (Richard Jones) - configure time selection of drivers - libvirt spec hacking (Daniel Berrange) * Add support for network autostart and init scripts (Mark McLoughlin) * New API virConnectGetCapabilities() to detect the virtualization capabilities of a host (Richard Jones) * Minor improvements: - qemud signal handling (Mark) - don't shutdown or reboot domain0 (Kazuki Mizushima) - QEmu version autodetection (Daniel Berrange) - network UUIDs (Mark) - speed up UUID domain lookups (Tatsuro Enokura and Daniel Berrange) - support for paused QEmu CPU (Daniel Berrange) - keymap VNC attribute support (Takahashi Tomohiro and Daniel Berrange) - maximum number of virtual CPU (Masayuki Sunou) - virtsh --readonly option (Rich Jones) - python bindings for new functions (Daniel Berrange) * Documentation updates especially on the XML formats Thanks to everybody who contributed to this release ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] [PATCH] Check calls to printf-like functions (and some fixes) (second version)
by Richard W.M. Jones 16 Mar '07

16 Mar '07

-- Emerging Technologies, Red Hat http://et.redhat.com/~rjones/ 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 "[Negative numbers] darken the very whole doctrines of the equations and make dark of the things which are in their nature excessively obvious and simple" (Francis Maseres FRS, mathematician, 1759)

3 4

[Libvir] [PATCH] TODO macro shouldn't contain a semicolon
by Richard W.M. Jones 16 Mar '07

16 Mar '07

I don't think it's a good idea for macros which look like statements to behave differently from actual statements. This patch fixes the TODO macro in this way. Rich. -- Emerging Technologies, Red Hat http://et.redhat.com/~rjones/ 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 "[Negative numbers] darken the very whole doctrines of the equations and make dark of the things which are in their nature excessively obvious and simple" (Francis Maseres FRS, mathematician, 1759)

1 0

[Libvir] libvirt.py has the two functions that names are the same.
by Tatsuro Enokura 16 Mar '07

16 Mar '07

Hi, When I used the lookupByName() function of libvirt.py, it failed with the following error messages. ------ Traceback (most recent call last): File "./virt-install.mod", line 569, in <module> main() File "./virt-install.mod", line 499, in main guest, hvm, conn) File "./virt-install.mod", line 187, in get_disks disk, size) File "./virt-install.mod", line 186, in <lambda> map(lambda d, s: get_disk(d, s, sparse, guest, hvm, conn), File "./virt-install.mod", line 131, in get_disk vm = conn.lookupByName(name) File "/usr/lib/python2.5/site-packages/libvirt.py", line 483, in lookupByName if ret is None:raise libvirtError('virNetworkLookupByName() failed', conn=self) libvirt.libvirtError: virNetworkLookupByName() failed ------ The lookupByName() function is the same name for domain and for network in libvirt.py. The lookupByUUIDstring() function is similar. I think that generator of libvirt.py's function is incorrect. Thanks, Tatsuro Enokura --- cat /usr/lib/python2.5/site-packages/libvirt.py .. snip .. def lookupByName(self, name): """Try to lookup a domain on the given hypervisor based on its name. """ ret = libvirtmod.virDomainLookupByName(self._o, name) if ret is None:raise libvirtError('virDomainLookupByName() failed', conn=self) __tmp = virDomain(_obj=ret) __tmp.ref = self return __tmp def lookupByName(self, name): """Try to lookup a network on the given hypervisor based on its name. """ ret = libvirtmod.virNetworkLookupByName(self._o, name) if ret is None:raise libvirtError('virNetworkLookupByName() failed', conn=self) __tmp = virNetwork(_obj=ret) __tmp.ref = self return __tmp def lookupByUUIDString(self, uuidstr): """Try to lookup a network on the given hypervisor based on its UUID. """ ret = libvirtmod.virNetworkLookupByUUIDString(self._o, uuidstr) if ret is None:raise libvirtError('virNetworkLookupByUUIDString() failed', conn=self) __tmp = virNetwork(_obj=ret) __tmp.ref = self return __tmp def lookupByUUIDString(self, uuidstr): """Try to lookup a domain on the given hypervisor based on its UUID. """ ret = libvirtmod.virDomainLookupByUUIDString(self._o, uuidstr) if ret is None:raise libvirtError('virDomainLookupByUUIDString() failed', conn=self) __tmp = virDomain(_obj=ret) __tmp.ref = self return __tmp .. snip .. --

2 3

[Libvir] [PATCH] Fix dom0 maxmem display for memmax not set case
by Atsushi SAKAI 16 Mar '07

16 Mar '07

Hi, This patch intends to fix dom0 maxmem display. If we do NOT set maximum memory, max_pages (in Xen) are set maximum value(0xFFFFFFFF). This display confuses user. For x86 cases, following data are shown on "virsh dominfo 0" (please case 4kb page size This case max_pages x 4 is output). Max memory: 4294967292 kB This patch fix as follows Max memory: no limit (This comment is taken from xentop :-)) This problem is already cared on xentop (Xen performance tool). Signed-off-by: Atsushi SAKAI <sakaia(a)jp.fujitsu.com> Thanks Atsushi SAKAI diff -urpN libvirt.orig/src/virsh.c libvirt/src/virsh.c --- libvirt.orig/src/virsh.c 2007-03-09 22:44:24.000000000 +0900 +++ libvirt/src/virsh.c 2007-03-15 20:13:04.000000000 +0900 @@ -1186,8 +1186,13 @@ cmdDominfo(vshControl * ctl, vshCmd * cm vshPrint(ctl, "%-15s %.1lfs\n", _("CPU time:"), cpuUsed); } - vshPrint(ctl, "%-15s %lu kB\n", _("Max memory:"), + if (info.maxMem != UINT_MAX) + vshPrint(ctl, "%-15s %lu kB\n", _("Max memory:"), info.maxMem); + else + vshPrint(ctl, "%-15s %-15s\n", _("Max memory:"), + _("no limit")); + vshPrint(ctl, "%-15s %lu kB\n", _("Used memory:"), info.memory); diff -urpN libvirt.orig/src/xen_internal.c libvirt/src/xen_internal.c --- libvirt.orig/src/xen_internal.c 2007-03-15 16:43:16.000000000 +0900 +++ libvirt/src/xen_internal.c 2007-03-15 19:38:17.000000000 +0900 @@ -1598,7 +1598,9 @@ xenHypervisorGetDomInfo(virConnectPtr co */ info->cpuTime = XEN_GETDOMAININFO_CPUTIME(dominfo); info->memory = XEN_GETDOMAININFO_TOT_PAGES(dominfo) * kb_per_pages; - info->maxMem = XEN_GETDOMAININFO_MAX_PAGES(dominfo) * kb_per_pages; + info->maxMem = XEN_GETDOMAININFO_MAX_PAGES(dominfo); + if(info->maxMem != UINT_MAX) + info->maxMem *= kb_per_pages; info->nrVirtCpu = XEN_GETDOMAININFO_CPUCOUNT(dominfo); return (0); }

2 3

[Libvir] [PATCH] Make libvirt build when xen-devel is not installed
by Hugh Brock 15 Mar '07

15 Mar '07

After the Capabilities patch went in, we discovered that although we could supposedly build libvirt without xen-devel installed, in fact we needed to be more aggressive with ifdefs (and conditionally turn off compilation of some tests that only test xen features). This patch makes it possible to compile libvirt with neither qemu nor xen-devel installed. Signed-off-by: Hugh Brock <hbrock(a)redhat.com> -- Red Hat Virtualization Group http://redhat.com/virtualization Hugh Brock | virt-manager http://virt-manager.org hbrock(a)redhat.com | virtualization library http://libvirt.org

2 1

[Libvir] virConnectGetCapabilities patch, 2007-03-15 (version 2)
by Richard W.M. Jones 15 Mar '07

15 Mar '07

This is the latest version of the capabilities patch, which should address all concerns which have been raised since the last version. Also attached, example XML produced by different backends. Note as before this has not been tested in the Xen case, because I don't have access to a working Xen machine (laptop still broken, desktop still lacking working SATA drivers, other desktop still lacking wired network...). Rich. -- Emerging Technologies, Red Hat http://et.redhat.com/~rjones/ 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 "[Negative numbers] darken the very whole doctrines of the equations and make dark of the things which are in their nature excessively obvious and simple" (Francis Maseres FRS, mathematician, 1759) <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> </host> <guest> <os_type>hvm</os_type> <arch name="x86_64"> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <domain type="qemu"/> <machine>pc</machine> <machine>isapc</machine> <domain type="kqemu"/> <domain type="kvm"> <emulator>/usr/bin/qemu-kvm</emulator> </domain> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="i686"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <domain type="qemu"/> <machine>pc</machine> <machine>isapc</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="mips"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mips</emulator> <domain type="qemu"/> <machine>mips</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="mipsel"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mipsel</emulator> <domain type="qemu"/> <machine>mips</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="sparc"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-sparc</emulator> <domain type="qemu"/> <machine>sun4m</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="ppc"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-ppc</emulator> <domain type="qemu"/> <machine>g3bw</machine> <machine>mac99</machine> <machine>prep</machine> </arch> </guest> </capabilities> <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> </host> <guest> <os_type>hvm</os_type> <arch name="x86_64"> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <domain type="qemu"/> <machine>pc</machine> <machine>isapc</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="i686"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <domain type="qemu"/> <machine>pc</machine> <machine>isapc</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="mips"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mips</emulator> <domain type="qemu"/> <machine>mips</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="mipsel"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mipsel</emulator> <domain type="qemu"/> <machine>mips</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="sparc"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-sparc</emulator> <domain type="qemu"/> <machine>sun4m</machine> </arch> </guest> <guest> <os_type>hvm</os_type> <arch name="ppc"> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-ppc</emulator> <domain type="qemu"/> <machine>g3bw</machine> <machine>mac99</machine> <machine>prep</machine> </arch> </guest> </capabilities> <capabilities> <host> <cpu> <arch>i686</arch> <features> <pae/> <nonpae/> </features> </cpu> </host> <guest> <os_type>linux</os_type> <arch name="i686"> <wordsize>32</wordsize> <domain type="test"/> </arch> <features> <pae/> <nonpae/> </features> </guest> </capabilities>

1 0

[Libvir] Proposed XML format for capabilities, with examples [long]
by Richard W.M. Jones 15 Mar '07

15 Mar '07

Lots of people had various things to say about the first capabilities patches (see thread starting here: https://www.redhat.com/archives/libvir-list/2007-March/msg00153.html) So I thought I'd try to pull together ideas into a single thread, and post some information about what this is trying to achieve and some example proposed XML. Motivation ---------- At the moment there is a considerable amount of conditional code in libvirt clients. For example the following code from virt-manager (src/virtManager/create.py): if self.connection.get_type() == "QEMU": <------- 1 self.window.get_widget("virt-method-pv").set_sensitive(False) self.window.get_widget("virt-method-fv").set_active(True) self.window.get_widget("virt-method-fv-unsupported").hide() self.window.get_widget("virt-method-fv-disabled").hide() else: self.window.get_widget("virt-method-pv").set_sensitive(True) self.window.get_widget("virt-method-pv").set_active(True) if virtinst.util.is_hvm_capable(): <--------- 2 self.window.get_widget("virt-method-fv").set_sensitive(True) self.window.get_widget("virt-method-fv-unsupported").hide() self.window.get_widget("virt-method-fv-disabled").hide() This hopefully demonstrates two points which I'd like to fix: Firstly having code which requires knowledge of what a driver is capable of (line 1 above) is not scalable as we add more and more types of virtualisation (OpenVZ, VMWare, ...). Secondly the virtinst.util module does some probing to find out what the local hardware is capable of (line 2 above), and that won't work over remote connections. Thirdly, although you can only really connect to one driver at a time (except in the Xen case, but that's just weird), the <domain> description required by virDomainCreateLinux is to some extent driver-specific. So you need additional logic when creating domains, and for some of those (eg. qemu/kqemu/kvm) it's non-trivial and depends on information that you "just know" about the driver. The proposed new API ("virConnectGetCapabilities") would return an XML description of the capabilities of the driver / hypervisor. In the remote case, probing would be done on the remote machine. In either case the idea would be to remove conditional code from virt-manager, remove local hardware probing from virtinst, and provide some description of what optional features the <domain> XML supports. In the next two sections I'll analyse the problem areas in the current virtinst and virt-manager. You may want to skip the next two sections and go straight to the example XML. Analysis of virtinst -------------------- The main issue is with virtinst/util.py which contains the following functions which do local probing: (1) is_pae_capable: host supports PAE? Uses Linux-specific /proc/cpuinfo (2) is_hvm_capable: host supports HVM & enabled in Xen? Uses Xen-specific /sys/hypervisor/properties/capabilities (3) is_kqemu_capable: [Linux] kernel supports kqemu? Uses Linux-specific /dev/kqemu (4) is_kvm_capable: [Linux] kernel supports kvm? Uses Linux-specific /dev/kvm In virtinst/FullVirtGuest.py: (5) "emulator" and "loader" must be specified for Xen/QEMU and Xen guests respectively. They have architecture- and distro-specific paths which refer to files on the remote machine. In virtinst/ParaVirtGuest.py: (6) Uses "xm console" to connect to the console in the Xen case (but then this sort of paravirtualisation implies Xen). In virtinst/DistroManager.py: (7) We download the kernel and boot.iso files, and download and modify the initrd file. [Comment: I'm not sure that capabilities can solve this, but it does need to be fixed properly for the remote case to work]. Analysis of virt-manager ------------------------ In src/virtManager/create.py: (8) Tries to detect if VT-x/AMD-V is present in the hardware but disabled in the BIOS by doing some Xen-specific heuristics. (9) Paravirt and fullvirt dialogs are enabled based on the type of the connection (eg. if self.connection.get_type() == "QEMU" it disables paravirt). (10) CPU architecture combo box is enabled only for type == "QEMU". (11) Similarly, the "accelerate" checkbox is enabled only for type == "QEMU". [Comment: Dan tells me that this requirement comes about because kqemu is sometimes unreliable, so users need a way to disable it]. (12) Local media are required for FV installs. Also we use HAL to detect media inserted and removed. [Comment: Can be solved separately by abstracting storage]. In the *.glade files: (13) The list of CPU architectures for qemu is hard-coded in the interface description file. Other areas which are beyond the role of capabilities: * Remote console * Serial console * Saving images Proposed XML format ------------------- My thoughts are that capabilities need to return the following information about the underlying driver/hypervisor: * Host CPU flags (1,8) * List of guest architectures supported. For each of these: - Model of virtualised CPU (10,13) example: x86_64 - Name of the virtualised machine (if applic.) example: pc - Virtualised CPU features: PAE, ... - Fullvirt flag: can we run an unmodified OS as a guest? (2,9) or Paravirt: what sort of paravirt API does a guest need (eg. xen, pvops, VMI, ...)? - The <domain type='?'> for this guest example: kqemu - The <domain><os><type machine='?'> for this guest (if applic.) example: pc - Suggested emulator and loader paths (5) - Driver-specific flags which libvirt clients would not be required to understand, but could be used to enhance libvirt clients. examples: uses kqemu, uses kvm (3,4,11) (Notes: (a) I have flattened qemu's nested arch/machine list, because I there is not a natural hierarchy. (b) The guest architectures list is a Cartesian product, although at the moment the worst case (qemu) would only have about 14 entries. An alternate way to do this is discussed at the end. (c) The host CPU model is already provided by virNodeGetInfo). Example: Xen ------------ For Xen the primary source for capabilities are the files /sys/hypervisor/properties/capabilities and /proc/cpuinfo. A Xen driver might present the following description of its capabilities: <capabilities> <host> <cpu_flags> <cpu_flag> vmx </cpu_flag> <cpu_flag> pae </cpu_flag>  </cpu_flags> </host> <guest_architectures> <guest_architecture> <model> x86_64 </model> <paravirt> xen </paravirt> <domain_type> xen </domain_type> <emulator> /usr/lib/xen/bin/qemu-dm </emulator> </guest_architecture> <guest_architecture> <model> i686 </model> <pae/> <paravirt> xen </paravirt> <domain_type> xen </domain_type> <emulator> /usr/lib/xen/bin/qemu-dm </emulator> </guest_architecture> <guest_architecture> <model> i686 </model> <fullvirt/> <domain_type> xen </domain_type> <loader> /usr/lib/xen/boot/hvmloader </loader> <emulator> /usr/lib/xen/bin/qemu-dm </emulator> </guest_architecture> <guest_architecture> <model> i686 </model> <pae/> <fullvirt/> <domain_type> xen </domain_type> <loader> /usr/lib/xen/boot/hvmloader </loader> <emulator> /usr/lib/xen/bin/qemu-dm </emulator> </guest_architecture> <guest_architecture> <model> x86_64 </model> <fullvirt/> <domain_type> xen </domain_type> <loader> /usr/lib/xen/boot/hvmloader </loader> <emulator> /usr/lib/xen/bin/qemu-dm </emulator> </guest_architecture> </guest_architectures> </capabilities> Example: qemu + kqemu + kvm --------------------------- Qemu has by far the longest list of supported guest architectures. Out of the box it supports 10 distinct machine types and then you can add 4 extra machine types if the kernel can do kqemu and kvm, making 14 in all. Below I have abbreviated this list for clarity. <capabilities> <host> <cpu_flags> <cpu_flag> vmx </cpu_flag> <cpu_flag> pae </cpu_flag>  </cpu_flags> </host> <guest_architectures> <guest_architecture> <model> sparc </model> <machine> sun4m </machine> <fullvirt/> <domain_type> qemu </domain_type> <machine_type> sun4m </machine_type> <emulator> /usr/bin/qemu-system-sparc </emulator> </guest_architecture> <guest_architecture> <model> i686 </model> <machine> pc </machine> <fullvirt/> <domain_type> qemu </domain_type> <machine_type> pc </machine_type> <emulator> /usr/bin/qemu </emulator> </guest_architecture> <guest_architecture> <model> x86_64 </model> <machine> pc </machine> <fullvirt/> <domain_type> kqemu </domain_type> <machine_type> pc </machine_type> <emulator> /usr/bin/qemu </emulator> <qemu_uses_kqemu /> </guest_architecture> <guest_architecture> <model> x86_64 </model> <machine> pc </machine> <fullvirt/> <domain_type> kvm </domain_type> <machine_type> pc </machine_type> <emulator> /usr/bin/qemu-kvm </emulator> <qemu_uses_kvm /> </guest_architecture> </guest_architecture> </capabilities> Guest architectures: Cartesian product or UI builder? ----------------------------------------------------- Currently the list of guest architectures is a flat list, worst case 5 entries long for Xen and 14 entries long for qemu. Presenting this in user interfaces could be challenging. One suggestion is that the user interface looks like: [*] Show only fullvirt [*] Show only PC architectures [ ] Show 32 bit architectures [*] Show 64 bit architectures | Shorter list of architectures which match | the criteria checked above. | ... | Another is that we change the XML description so that it matches the UI. For instance: <guest_architecture> <models> <model> sparc </model> <model> ppc </model> ... Or: <pae> <can_enable/> <can_disable/> </pae> This is relatively easy to do with qemu, but the format of Xen's /sys/hypervisor/properties/capabilities makes it quite hard. i18n ---- Some proposed features may make translation challenging. For example qemu supports a whole list of machine types ("pc", "sun4m", etc.) and it would be nice for libvirt clients to be able to provide some sort of description for the user. It would not be wise to carry this description in the XML because it would not be possible to localise it. To avoid all libvirt clients duplicating and maintaining lists of machine types and descriptions, it may be worth adding a call to the API along the lines of: virConnectGetMachineDescription (const char *machine_name, const char *lang); (where lang == NULL would mean to use the current language). [EOF] -- Emerging Technologies, Red Hat http://et.redhat.com/~rjones/ 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 "[Negative numbers] darken the very whole doctrines of the equations and make dark of the things which are in their nature excessively obvious and simple" (Francis Maseres FRS, mathematician, 1759)

2 5

[Libvir] virConnectGetCapabilities patch, 2007-03-15
by Richard W.M. Jones 15 Mar '07

15 Mar '07

The latest version is attached. This should satisfy all concerns which have been raised with the previous versions. Rich. -- Emerging Technologies, Red Hat http://et.redhat.com/~rjones/ 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 "[Negative numbers] darken the very whole doctrines of the equations and make dark of the things which are in their nature excessively obvious and simple" (Francis Maseres FRS, mathematician, 1759)

1 0

[Libvir] [PATCH]fix the judgment of the domain state between hypervisor and xend
by Kazuki Mizushima 15 Mar '07

15 Mar '07

Hi, According to the xm & virsh man page, I make a patch which fixes the judgment of the domain state between xenHypervisorDriver and xenDaemonDriver. Signed-off-by: Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> Thanks, Kazuki Mizushima Index: xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.101 diff -u -p -r1.101 xend_internal.c --- xend_internal.c 8 Mar 2007 14:12:06 -0000 1.101 +++ xend_internal.c 14 Mar 2007 10:42:16 -0000 @@ -1722,9 +1722,9 @@ sexpr_to_xend_domain_info(virDomainPtr d if (strchr(flags, 'c')) info->state = VIR_DOMAIN_CRASHED; else if (strchr(flags, 's')) - info->state = VIR_DOMAIN_SHUTDOWN; - else if (strchr(flags, 'd')) info->state = VIR_DOMAIN_SHUTOFF; + else if (strchr(flags, 'd')) + info->state = VIR_DOMAIN_SHUTDOWN; else if (strchr(flags, 'p')) info->state = VIR_DOMAIN_PAUSED; else if (strchr(flags, 'b'))

2 2