- Devel - libvirt List Archives

[Libvir] [PATCH] qemu: reset migration source if restore fails
by Jim Paris 10 Oct '07

10 Oct '07

With the latest KVM I'm having some issues with save/restore, but I think it's a kvm issue and not libvirt. The problems did expose a libvirt bug, though; patch below. -jim --- A failed restore of a configured VM would leave the migration source set incorrectly, preventing the VM from being started normally. Always clear migration source, then deal with failures. src/qemu_driver.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 87b66ad..bff17b0 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2083,6 +2083,7 @@ static int qemudDomainRestore(virConnectPtr conn, struct qemud_vm_def *def; struct qemud_vm *vm; int fd; + int ret; char *xml; struct qemud_save_header header; @@ -2161,18 +2162,17 @@ static int qemudDomainRestore(virConnectPtr conn, /* Set the migration source and start it up. */ snprintf(vm->migrateFrom, sizeof(vm->migrateFrom), "stdio"); vm->stdin = fd; - - if (qemudStartVMDaemon(conn, driver, vm) < 0) { + ret = qemudStartVMDaemon(conn, driver, vm); + close(fd); + vm->migrateFrom[0] = '\0'; + vm->stdin = -1; + if (ret < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, "failed to start VM"); if (!vm->configFile[0]) qemudRemoveInactiveVM(driver, vm); - close(fd); return -1; } - close(fd); - vm->migrateFrom[0] = '\0'; - vm->stdin = -1; /* If it was running before, resume it now. */ if (header.was_running) { -- 1.5.3.rc4

3 2

[Libvir] Win Pro 64 dies in second half of windows guest installation
by Lawrence Nitz 10 Oct '07

10 Oct '07

When I set up a guest VM using virtp-install on a Fedor a 7 system, the process gets as far as reading the raw device (/dev/scd0) for the install disk, writes the basic windows data onto the disk, and then reboots to complete the Windows installation. At this point the installation hangs, with a diagnostic that says the file cannot be found. The same error occurs whether the install is from the hard disk image or from the cd-rom. The install gets half done, and has nothing to read when the install program restarts itself. In the Virt manager the edit command allows me to edit the machine, but not to add back the cd drive, only add network cards and hard disk partitions. Any help by a more experienced virt-install user would be much appreciated. Larry Nitz.

1 0

[Libvir] Problems with defineXML in python..
by Mark Dehus 10 Oct '07

10 Oct '07

I am having some problems getting libvirt under python to work properly. I can setup new domains by using the createLinux() function, but when I attempt to use defineXML() it fails with no reason given other then "virDomainDefineXML() failed". I am using the same XML file for both functions. This is on a Ubuntu 7.04 server running python 2.5 & libvirt 0.1.8 (from the ubuntu universe repo). Here is my test code: import libvirt import sys import xml import random try: conn = libvirt.open(None) except Exception, e: print e if conn == None: print 'Failed to open connection to the hypervisor' sys.exit(1) create = True if create: xmlfile = open('webserv.xml') xmldesc = xmlfile.read() xmlfile.close() try: # webserv = conn.createLinux(xmldesc, 0) webserv = conn.defineXML(xmldesc) except Exception, e: print 'Failed to create webserv: %s' % e sys.exit(1) if webserv is None: print 'whoops this shouldnt happen!' conn.create(webserv) try: print "Domain 0: id %d running %s" % (webserv.ID(), webserv.OSType()) print webserv.info() print webserv.XMLDesc(0) except Exception, e: print e #webserv.shutdown() And the XML file: <domain type='xen' > <name>webserv</name> <os> <type>linux</type> <kernel>/boot/vmlinuz-2.6.19-4-generic-amd64</kernel> <initrd>/boot/initrd.img-2.6.19-4-generic-amd64</initrd> <root>/dev/hda1</root> </os> <memory>1024</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <interface type='bridge'> <source bridge='xenbr0'/> <mac address='00:16:3e:24:27:a5'/> <script path='vif-bridge'/> </interface> <graphics type='vnc' port='5902'/> <disk type='file' device='disk'> <driver name='tap' type='aio'/> <source file='/virtual/images/webserv/webserv.img'/> <target dev='hda1'/> </disk> <console tty='/dev/pts/4'/> </devices> </domain> Am I missing something simple, or is there a bug? Thanks!

2 1

[Libvir] [PATCH] Topology fix for "no cpus"
by beth kon 08 Oct '07

08 Oct '07

Here is a resubmission of this patch, corrected. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

2 1

[Libvir] [PATCH] Found minor bug in topology code
by beth kon 05 Oct '07

05 Oct '07

I found a problem with an error path... I was cutting off incrementing of a value in the loop then checking if it was too big after the loop, so the way it was structured, it could never happen. Here is the fix. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

2 1

[Libvir] PATCH: Updated patches for PolicyKit support
by Daniel P. Berrange 03 Oct '07

03 Oct '07

A few weeks back I posted some prototype patches for PolicyKit support to allow the main libvirt daemon socket to be made world-accessible. PolicyKit then can do ACLs on incoming connections, allowing definition of rules which could for example, allow only the user who owns the active X login sesion http://www.redhat.com/archives/libvir-list/2007-August/msg00027.html This is an updated patch which takes account of a change in the PolicyKit XML file syntax between 0.4 and 0.5 releases. The configure.in scripts has been tweaked to automatically disable PolicyKit if pkg-config is not available instead of aborting. The code for getting UNIX socket credentials has been factored out into its own method. There is still only a Linux implementation. I was going to take the code for other OS from DBus, but DBus is currently under a GPL/Academic license options, which is not compatible with LGPL. Fortunately DBus is in middle of re-licensing to X11 style which is LGPL compatible, so in a week or so's time we'll be able to safely take their OS portability code for socket credentials. I short-circuit the logic to always allow root. This allows existing people running libvirt tools as root to continue use without any regressions. There is one small issue still that the default policy I provide only allows the use of read-only connections if the user is logged into to the desktop. This is a partial regression - the admin can edit /etc/PolicyKit/PolicyKit.conf and add a site-local rule allowing all users access, regardless of whether they're in a session. I've spoken with David Zeuthan and he's going to add ability to specify rules for non-session clients in the default policy config files, which will fix this minor regression. Once this is done the libvirt default policy will be identical to current file permission based policy (root == full access, non-root == read only). As I mentioned previously, with this change it is now possible to open a full read-write connection from virt-manager running as non-root. Depending on site policy it will optionally prompt for root password (su style equiv) or the user's password (sudo style equiv) without needing virt-manager itself to gain any elevated privileges. When compiling with PolicyKit support, the default file permissions for both the main & readonly UNIX sockets in the daemon switch to 0777, instead of the previous 0700 & 0777. It is possible to turn off PolicyKit auth in the daemon config file, even if it is compiled in - in which case the default permissions get set back to 0700 & 0777. Although in previous feedback Daniel suggested I leave the LIBVIRTD_AUTH_POLKIT constant compiled in all the time, I feel it is better to remove it when the policykit support is disabled in configure. This removes the need to have extra switch/case statements to explicitly reject LIBVIRTD_AUTH_POLKIT auth, since it will be handle by the 'default:' statement which already has code to reject connections. I've done more extensive testing with virt-manager since my previous patch, and its working very nicely with the new UI which allows multiple hypervisor connections. Instead of asking for the root password up-front at app start time, we now only need ask for it if the user connects to a local HV. If they only ever manage remote connections we don't need to do anything with the local root password. 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 4

[Libvir] Release of libvirt-0.3.3
by Daniel Veillard 30 Sep '07

30 Sep '07

More than a month without a release ... it was clearly time to push the bits out. Available as usual from ftp://libvirt.org/libvirt/ A lot of new things in the last month: * New features: - Avahi mDNS daemon export (Daniel Berrange) - NUMA support (Beth Kan) * Documentation: - cleanups (Toth Istvan) - typos (Eduardo Pereira) * Bug fixes: - memory corruption on large dumps (Masayuki Sunou) - fix virsh vncdisplay command exit (Masayuki Sunou) - Fix network stats TX/RX result (Richard Jones) - warning on Xen 3.0.3 (Richard Jones) - missing buffer check in virDomainXMLDevID (Hugh Brock) - avoid zombies when using remote (Daniel Berrange) - xend connection error message (Richard Jones) - avoid ssh tty prompt (Daniel Berrange) - username handling for remote URIs (Fabian Deutsch) - fix potential crash on multiple input XML tags (Daniel Berrange) - Solaris Xen hypercalls fixup (Mark Johnson) * Improvements: - OpenVZ support (Shuveb Hussain and Anoop Cyriac) - CD-Rom reload on XEn (Hugh Brock) - PXE boot got QEmu/KVM (Daniel Berrange) - QEmu socket permissions customization (Daniel Berrange) - more QEmu support (Richard Jones) - better path detection for qemu and dnsmasq (Richard Jones) - QEmu flags are per-Domain (Daniel Berrange) - virsh freecell command - Solaris portability fixes (Mark Johnson) - default bootloader support (Daniel Berrange) - new virNodeGetFreeMemory API - vncpasswd extraction in configuration files if secure (Mark Johnson and Daniel Berrange) - Python bindings for block and interface statistics * Code cleanups: - virDrvOpenRemoteFlags definition (Richard Jones) - configure tests and output (Daniel Berrange) Thanks to everybody who helped with sugegstion, bug reports patches and more ! 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: vncpasswd
by Mark Johnson 30 Sep '07

30 Sep '07

This adds support for handling vncpasswd.. MRJ vncpasswd support diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1657,11 +1657,14 @@ xend_parse_sexp_desc(virConnectPtr conn, } else if (tmp && !strcmp(tmp, "vnc")) { int port = xenStoreDomainGetVNCPort(conn, domid); const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten"); + const char *vncPasswd = sexpr_node(node, "device/vfb/vncpasswd"); const char *keymap = sexpr_node(node, "device/vfb/keymap"); virBufferVSprintf(&buf, " <input type='mouse' bus='%s'/>\n", hvm ? "ps2": "xen"); virBufferVSprintf(&buf, " <graphics type='vnc' port='%d'", port); if (listenAddr) virBufferVSprintf(&buf, " listen='%s'", listenAddr); + if (vncPasswd) + virBufferVSprintf(&buf, " passwd='%s'", vncPasswd); if (keymap) virBufferVSprintf(&buf, " keymap='%s'", keymap); virBufferAdd(&buf, "/>\n", 3); @@ -1723,6 +1726,7 @@ xend_parse_sexp_desc(virConnectPtr conn, if (tmp[0] == '1') { int port = xenStoreDomainGetVNCPort(conn, domid); const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux"); + const char *vncPasswd = sexpr_fmt_node(root, "domain/image/%s/vncpasswd", hvm ? "hvm" : "linux"); const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux"); /* For Xen >= 3.0.3, don't generate a fixed port mapping * because it will almost certainly be wrong ! Just leave @@ -1736,6 +1740,8 @@ xend_parse_sexp_desc(virConnectPtr conn, virBufferVSprintf(&buf, " <graphics type='vnc' port='%d'", port); if (listenAddr) virBufferVSprintf(&buf, " listen='%s'", listenAddr); + if (vncPasswd) + virBufferVSprintf(&buf, " passwd='%s'", vncPasswd); if (keymap) virBufferVSprintf(&buf, " keymap='%s'", keymap); virBufferAdd(&buf, "/>\n", 3);

2 2

[Libvir] PATCH: Allow emptry bootloader
by Daniel P. Berrange 30 Sep '07

30 Sep '07

Latest XenD allows for default bootloader to be used if one is not defined for a paravirt OS. libvirt doesn't currently cope with this (see Solaris thread), since it requires either a bootloader or kernel to always be present. The attached patch allows for an emptry bootloader element to indicate that the domain should use the default. <domain type='xen' id='-1'> <name>rhel5pv</name> <uuid>614d7eb0-c6b1-5235-ac39-361b20f6cd49</uuid> <bootloader/> <os> <type>linux</type> </os> ...snip... </domain> The current API for looking up nodes in the SEXPR did not allow for the scenario where you might want to lookup a node with no content, eg (bootloader ) This distinction is needed here, so I added an sexpr_has() method to check for this. Second, it fixes a long standing bug where we'd record an error about the missing kernel or bootloader, but then continue generating (malformed) XML anyway. With this patch, it will correctly fail if the empty bootloader field is missing from the SEXPR. 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 4

[Libvir] [RFC][PATCH 0/2] Tested NUMA patches for available memory and topology
by beth kon 30 Sep '07

30 Sep '07

I have tested the patches on a NUMA and a non-NUMA configuration, and they fundamentally appear to work. The first patch is for accessing available memory on a per-node basis. The second patch is for accessing NUMA node topology. I've gotten some helpful suggestions about my string parsing code, introducing me to sscanf :-). I've become convinced that there are more elegant ways to do this which would have about the same level of error checking. However, I am out of time if Daniel wants to check this in this week. So I offer what I do have, which functions, but is not elegant. I have been playing with other ways to do this and am not far from finished. So, Daniel, you need to tell me if you want to take this code, and possibly upgrade to something more compact later, or if you'd like to wait for the next revision. One point to comment on for posterity is that the string returned from xend is not what might be expected. An example: printf("string is %s\n", tempstr); would return string is node0:0\n node1:1 So, this means that the '\n' sent by the xend python code is somehow translated to "\n". And the trailing '\n' that should be there isn't. Instead there is a '\0'. Looking at the xend code, it would appear this string should look like: "node0:0\n node1:1\n" where these are '\n'. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

4 11

[Libvir] Updated Solaris dom0 patch (part 1)
by Mark Johnson 29 Sep '07

29 Sep '07

I've broken this patch up into a few pieces to make it more reviewable and tried to address the comments from the previous patch (Jun 15th'ish if your looking). Here is first part... tested on today's CVS bits on a FC7 dom0 (LD_PRELOAD=src/.libs/libvirt.so src/.libs/virsh) One note, it looks like you still need a xend change on FC7 before the no kernel/bootloader option works. It looks like it's close though.. works fine with them of course. More details... [root@fedora solaris]# cat guest.py name = "solaris" vcpus = 1 memory = "512" #bootloader = "/usr/bin/pygrub" #kernel = "/platform/i86xpv/kernel/unix" #ramdisk = "/platform/i86pc/boot_archive" extra = "-k" root = "/dev/dsk/c0d0s0" disk = ['file:/export/guests/solaris/disk.img,0,w'] vif = ['bridge=xenbr0'] on_shutdown = "destroy" on_reboot = "restart" on_crash = "destroy" [root@fedora solaris]# xm list -l solaris (domain (on_crash destroy) (uuid 72f9b45e-4be9-bf1f-a500-3707b9c3922c) (bootloader_args ) (vcpus 1) (name solaris) (on_poweroff destroy) (on_reboot restart) (bootloader ) (maxmem 512) (memory 512) (shadow_memory 0) (cpu_weight 256) (cpu_cap 0) (features ) (on_xend_start ignore) (on_xend_stop ignore) (image (linux (kernel ) (args 'root=/dev/dsk/c0d0s0 -k'))) (status 0) (device (vif (bridge xenbr0) (uuid 9a8d5a2f-0a70-3a1f-fed0-fd2459e63733))) (device (vbd (uuid a6ba2241-1019-151e-6dd7-28638d3e17b7) (bootable 1) (driver paravirtualised) (dev 0) (uname file:/export/guests/solaris/disk.img) (mode w) ) ) ) [root@fedora solaris]# virsh # start solaris Domain solaris started virsh # dominfo solaris Id: 5 Name: solaris UUID: 72f9b45e-4be9-bf1f-a500-3707b9c3922c OS Type: linux State: no state CPU(s): 1 CPU time: 2.1s Max memory: 524288 kB Used memory: 524288 kB virsh # console solaris libvir: Xen Daemon error : internal error domain information incomplete, missing kernel & bootloader domain.xml:25: parser error : Opening and ending tag mismatch: os line 4 and domain </domain> ^ domain.xml:26: parser error : Premature end of data in tag domain line 1 ^ virsh # quit [root@fedora solaris]# xm console solaris Loading kmdb... SunOS Release 5.11 Version matrix-devel-build 32-bit Copyright 1983-2007 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. WARNING: Found xen v3.1.0-rc7-2934.fc7 but need xen v3.0.4-1-xvm WARNING: The kernel may not function correctly Hostname: unknown Reading ZFS config: done. Sep 28 18:48:53 unknown ntpdate[419]: no server suitable for synchronization found unknown console login: root Password: Last login: Fri Sep 28 18:45:46 on console Sep 28 18:50:30 unknown login: ROOT LOGIN /dev/console Sun Microsystems Inc. SunOS 5.11 matrix-devel-build October 2007 bfu'ed from /net/girltalk/export/xvm/matrix-devel/archives/i386/nightly-nd on 2007-09-28 Sun Microsystems Inc. SunOS 5.11 xen-nv66-2007-06-24 October 2007 # poweroff Sep 28 18:50:33 unknown poweroff: initiated by root on /dev/console [root@fedora solaris]# Thanks, MRJ --- Solaris dom0 support diff --git a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -56,9 +56,10 @@ typedef struct v0_hypercall_struct { unsigned long op; unsigned long arg[5]; } v0_hypercall_t; + +#ifdef __linux__ #define XEN_V0_IOCTL_HYPERCALL_CMD \ _IOC(_IOC_NONE, 'P', 0, sizeof(v0_hypercall_t)) - /* the new one */ typedef struct v1_hypercall_struct { @@ -67,8 +68,12 @@ typedef struct v1_hypercall_struct } v1_hypercall_t; #define XEN_V1_IOCTL_HYPERCALL_CMD \ _IOC(_IOC_NONE, 'P', 0, sizeof(v1_hypercall_t)) - typedef v1_hypercall_t hypercall_t; +#elif define(__sun__) +typedef privcmd_hypercall_t hypercall_t; +#else +#error "unsupported platform" +#endif #ifndef __HYPERVISOR_sysctl #define __HYPERVISOR_sysctl 35 @@ -314,6 +319,26 @@ typedef union xen_getschedulerid xen_get dominfo.v2.handle : \ dominfo.v2d5.handle)) + +static int +lock_pages(void *addr, size_t len) +{ +#ifdef __linux__ + return (mlock(addr, len)); +#elif define(__sun) + return (0); +#endif +} + +static int +unlock_pages(void *addr, size_t len) +{ +#ifdef __linux__ + return (munlock(addr, len)); +#elif define(__sun) + return (0); +#endif +} struct xen_v0_getdomaininfolistop { @@ -616,7 +641,17 @@ typedef struct xen_op_v2_dom xen_op_v2_d #include "xen_unified.h" #include "xen_internal.h" -#define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" +#ifdef __linux__ +#define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" +#define HYPERVISOR_CAPABILITIES "/sys/hypervisor/properties/capabilities" +#define CPUINFO "/proc/cpuinfo" +#elif define(__sun__) +#define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd" +#define HYPERVISOR_CAPABILITIES "" +#define CPUINFO "/dev/cpu/self/cpuid" +#else +#error "unsupported platform" +#endif #ifndef PROXY static const char * xenHypervisorGetType(virConnectPtr conn); @@ -773,7 +808,7 @@ xenHypervisorDoV0Op(int handle, xen_op_v hc.op = __HYPERVISOR_dom0_op; hc.arg[0] = (unsigned long) op; - if (mlock(op, sizeof(dom0_op_t)) < 0) { + if (lock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " locking", sizeof(*op)); return (-1); } @@ -783,7 +818,7 @@ xenHypervisorDoV0Op(int handle, xen_op_v virXenError(VIR_ERR_XEN_CALL, " ioctl ", xen_ioctl_hypercall_cmd); } - if (munlock(op, sizeof(dom0_op_t)) < 0) { + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " releasing", sizeof(*op)); ret = -1; } @@ -814,7 +849,7 @@ xenHypervisorDoV1Op(int handle, xen_op_v hc.op = __HYPERVISOR_dom0_op; hc.arg[0] = (unsigned long) op; - if (mlock(op, sizeof(dom0_op_t)) < 0) { + if (lock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " locking", sizeof(*op)); return (-1); } @@ -824,7 +859,7 @@ xenHypervisorDoV1Op(int handle, xen_op_v virXenError(VIR_ERR_XEN_CALL, " ioctl ", xen_ioctl_hypercall_cmd); } - if (munlock(op, sizeof(dom0_op_t)) < 0) { + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " releasing", sizeof(*op)); ret = -1; } @@ -856,7 +891,7 @@ xenHypervisorDoV2Sys(int handle, xen_op_ hc.op = __HYPERVISOR_sysctl; hc.arg[0] = (unsigned long) op; - if (mlock(op, sizeof(dom0_op_t)) < 0) { + if (lock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " locking", sizeof(*op)); return (-1); } @@ -866,7 +901,7 @@ xenHypervisorDoV2Sys(int handle, xen_op_ virXenError(VIR_ERR_XEN_CALL, " sys ioctl ", xen_ioctl_hypercall_cmd); } - if (munlock(op, sizeof(dom0_op_t)) < 0) { + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " releasing", sizeof(*op)); ret = -1; } @@ -898,7 +933,7 @@ xenHypervisorDoV2Dom(int handle, xen_op_ hc.op = __HYPERVISOR_domctl; hc.arg[0] = (unsigned long) op; - if (mlock(op, sizeof(dom0_op_t)) < 0) { + if (lock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " locking", sizeof(*op)); return (-1); } @@ -908,7 +943,7 @@ xenHypervisorDoV2Dom(int handle, xen_op_ virXenError(VIR_ERR_XEN_CALL, " ioctl ", xen_ioctl_hypercall_cmd); } - if (munlock(op, sizeof(dom0_op_t)) < 0) { + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { virXenError(VIR_ERR_XEN_CALL, " releasing", sizeof(*op)); ret = -1; } @@ -936,7 +971,7 @@ virXen_getdomaininfolist(int handle, int { int ret = -1; - if (mlock(XEN_GETDOMAININFOLIST_DATA(dominfos), + if (lock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), XEN_GETDOMAININFO_SIZE * maxids) < 0) { virXenError(VIR_ERR_XEN_CALL, " locking", XEN_GETDOMAININFO_SIZE * maxids); @@ -992,7 +1027,7 @@ virXen_getdomaininfolist(int handle, int if (ret == 0) ret = op.u.getdomaininfolist.num_domains; } - if (munlock(XEN_GETDOMAININFOLIST_DATA(dominfos), + if (unlock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), XEN_GETDOMAININFO_SIZE * maxids) < 0) { virXenError(VIR_ERR_XEN_CALL, " release", XEN_GETDOMAININFO_SIZE * maxids); @@ -1679,7 +1714,7 @@ virXen_setvcpumap(int handle, int id, un if (hypervisor_version > 1) { xen_op_v2_dom op; - if (mlock(cpumap, maplen) < 0) { + if (lock_pages(cpumap, maplen) < 0) { virXenError(VIR_ERR_XEN_CALL, " locking", maplen); return (-1); } @@ -1697,7 +1732,7 @@ virXen_setvcpumap(int handle, int id, un } ret = xenHypervisorDoV2Dom(handle, &op); - if (munlock(cpumap, maplen) < 0) { + if (unlock_pages(cpumap, maplen) < 0) { virXenError(VIR_ERR_XEN_CALL, " release", maplen); ret = -1; } @@ -1794,7 +1829,7 @@ virXen_getvcpusinfo(int handle, int id, ipt->cpu = op.u.getvcpuinfod5.online ? (int)op.u.getvcpuinfod5.cpu : -1; } if ((cpumap != NULL) && (maplen > 0)) { - if (mlock(cpumap, maplen) < 0) { + if (lock_pages(cpumap, maplen) < 0) { virXenError(VIR_ERR_XEN_CALL, " locking", maplen); return (-1); } @@ -1812,7 +1847,7 @@ virXen_getvcpusinfo(int handle, int id, op.u.getvcpumapd5.cpumap.nr_cpus = maplen * 8; } ret = xenHypervisorDoV2Dom(handle, &op); - if (munlock(cpumap, maplen) < 0) { + if (unlock_pages(cpumap, maplen) < 0) { virXenError(VIR_ERR_XEN_CALL, " release", maplen); ret = -1; } @@ -1963,6 +1998,7 @@ xenHypervisorInit(void) goto detect_v2; } +#ifndef __sun__ /* * check if the old hypercall are actually working */ @@ -1980,6 +2016,7 @@ xenHypervisorInit(void) hypervisor_version = 0; goto done; } +#endif /* * we faild to make any hypercall diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1280,9 +1280,7 @@ xend_parse_sexp_desc_os(virConnectPtr xe virBufferVSprintf(buf, " <type>hvm</type>\n"); tmp = sexpr_node(node, "domain/image/hvm/kernel"); if (tmp == NULL && !bootloader) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, - _("domain information incomplete, missing kernel & bootloader")); - return(-1); + virBufferVSprintf(buf, " \n"); } if (tmp) virBufferVSprintf(buf, " <loader>%s</loader>\n", tmp); @@ -1311,9 +1309,7 @@ xend_parse_sexp_desc_os(virConnectPtr xe virBufferVSprintf(buf, " <type>linux</type>\n"); tmp = sexpr_node(node, "domain/image/linux/kernel"); if (tmp == NULL && !bootloader) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, - _("domain information incomplete, missing kernel & bootloader")); - return(-1); + virBufferVSprintf(buf, " \n"); } if (tmp) virBufferVSprintf(buf, " <kernel>%s</kernel>\n", tmp); diff --git a/src/xml.c b/src/xml.c --- a/src/xml.c +++ b/src/xml.c @@ -703,10 +703,7 @@ virDomainParseXMLOSDescPV(virConnectPtr return (-1); } virBufferAdd(buf, "(image (linux ", 14); - if (kernel == NULL) { - virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); - return (-1); - } else { + if (kernel != NULL) { virBufferVSprintf(buf, "(kernel '%s')", (const char *) kernel); } if (initrd != NULL) diff --git a/src/xs_internal.c b/src/xs_internal.c --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -31,7 +31,13 @@ #include "xs_internal.h" #include "xen_internal.h" /* for xenHypervisorCheckID */ +#ifdef __linux__ #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" +#elif define(__sun__) +#define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd" +#else +#error "unsupported platform" +#endif #ifndef PROXY static char *xenStoreDomainGetOSType(virDomainPtr domain);

2 2

[Libvir] updated: Support Sun's Compiler
by Mark Johnson 29 Sep '07

29 Sep '07

I've cleaned up the patch from the previous comments... Sorry I'm off the original thread, switched over to mutt and am waiting for fetchmail to catch up with gmail.. tested on today's CVS bits on a FC7 dom0 (LD_PRELOAD=src/.libs/libvirt.so src/.libs/virsh) Thanks, MRJ --- fixes to compile with Sun's CC diff --git a/src/internal.h b/src/internal.h --- a/src/internal.h +++ b/src/internal.h @@ -25,11 +25,6 @@ extern "C" { #define _(str) dgettext(GETTEXT_PACKAGE, (str)) #define N_(str) dgettext(GETTEXT_PACKAGE, (str)) #define gettext_noop(str) (str) - -#ifdef __GNUC__ -#ifdef HAVE_ANSIDECL_H -#include <ansidecl.h> -#endif /* String equality tests, suggested by Jim Meyering. */ #define STREQ(a,b) (strcmp((a),(b)) == 0) @@ -39,6 +34,15 @@ extern "C" { #define STREQLEN(a,b,n) (strncmp((a),(b),(n)) == 0) #define STRNEQLEN(a,b,n) (strncmp((a),(b),(n)) != 0) +#ifndef __GNUC__ +#define __FUNCTION__ __func__ +#endif + +#ifdef __GNUC__ +#ifdef HAVE_ANSIDECL_H +#include <ansidecl.h> +#endif + /** * ATTRIBUTE_UNUSED: * @@ -61,7 +65,7 @@ extern "C" { #else #define ATTRIBUTE_UNUSED #define ATTRIBUTE_FORMAT(...) -#endif +#endif /* __GNUC__ */ /** * TODO: diff --git a/src/sexpr.c b/src/sexpr.c --- a/src/sexpr.c +++ b/src/sexpr.c @@ -80,11 +80,11 @@ sexpr_free(struct sexpr *sexpr) switch (sexpr->kind) { case SEXPR_CONS: - sexpr_free(sexpr->car); - sexpr_free(sexpr->cdr); + sexpr_free(sexpr->u.s.car); + sexpr_free(sexpr->u.s.cdr); break; case SEXPR_VALUE: - free(sexpr->value); + free(sexpr->u.value); break; case SEXPR_NIL: break; @@ -127,12 +127,12 @@ sexpr_string(const char *str, ssize_t le return ret; ret->kind = SEXPR_VALUE; if (len > 0) { - ret->value = strndup(str, len); + ret->u.value = strndup(str, len); } else { - ret->value = strdup(str); - } - - if (ret->value == NULL) { + ret->u.value = strdup(str); + } + + if (ret->u.value == NULL) { return NULL; } @@ -157,8 +157,8 @@ sexpr_cons(struct sexpr *car, struct sex if (ret == NULL) return ret; ret->kind = SEXPR_CONS; - ret->car = car; - ret->cdr = cdr; + ret->u.s.car = car; + ret->u.s.cdr = cdr; return ret; } @@ -174,12 +174,12 @@ append(struct sexpr *lst, struct sexpr * append(struct sexpr *lst, struct sexpr *value) { while (lst->kind != SEXPR_NIL) { - lst = lst->cdr; + lst = lst->u.s.cdr; } lst->kind = SEXPR_CONS; - lst->car = value; - lst->cdr = sexpr_nil(); + lst->u.s.car = value; + lst->u.s.cdr = sexpr_nil(); } /** @@ -228,18 +228,18 @@ sexpr2string(struct sexpr * sexpr, char if (tmp == 0) goto error; ret += tmp; - tmp = sexpr2string(sexpr->car, buffer + ret, n_buffer - ret); + tmp = sexpr2string(sexpr->u.s.car, buffer + ret, n_buffer - ret); if (tmp == 0) goto error; ret += tmp; - while (sexpr->cdr->kind != SEXPR_NIL) { - sexpr = sexpr->cdr; + while (sexpr->u.s.cdr->kind != SEXPR_NIL) { + sexpr = sexpr->u.s.cdr; tmp = snprintf(buffer + ret, n_buffer - ret, " "); if (tmp == 0) goto error; ret += tmp; tmp = - sexpr2string(sexpr->car, buffer + ret, n_buffer - ret); + sexpr2string(sexpr->u.s.car, buffer + ret, n_buffer - ret); if (tmp == 0) goto error; ret += tmp; @@ -250,12 +250,12 @@ sexpr2string(struct sexpr * sexpr, char ret += tmp; break; case SEXPR_VALUE: - if (strchr(sexpr->value, ' ')) + if (strchr(sexpr->u.value, ' ')) tmp = snprintf(buffer + ret, n_buffer - ret, "'%s'", - sexpr->value); + sexpr->u.value); else tmp = snprintf(buffer + ret, n_buffer - ret, "%s", - sexpr->value); + sexpr->u.value); if (tmp == 0) goto error; ret += tmp; @@ -346,8 +346,8 @@ _string2sexpr(const char *buffer, size_t ptr++; } - ret->value = strndup(start, ptr - start); - if (ret->value == NULL) { + ret->u.value = strndup(start, ptr - start); + if (ret->u.value == NULL) { virSexprError(VIR_ERR_NO_MEMORY, _("failed to copy a string")); } @@ -361,15 +361,15 @@ _string2sexpr(const char *buffer, size_t ptr++; } - ret->value = strndup(start, ptr - start); - if (ret->value == NULL) { + ret->u.value = strndup(start, ptr - start); + if (ret->u.value == NULL) { virSexprError(VIR_ERR_NO_MEMORY, _("failed to copy a string")); } } ret->kind = SEXPR_VALUE; - if (ret->value == NULL) + if (ret->u.value == NULL) goto error; } @@ -426,11 +426,11 @@ sexpr_lookup(struct sexpr *sexpr, const ptr = buffer; token = strsep(&ptr, "/"); - if (sexpr->kind != SEXPR_CONS || sexpr->car->kind != SEXPR_VALUE) { - return NULL; - } - - if (strcmp(sexpr->car->value, token) != 0) { + if (sexpr->kind != SEXPR_CONS || sexpr->u.s.car->kind != SEXPR_VALUE) { + return NULL; + } + + if (strcmp(sexpr->u.s.car->u.value, token) != 0) { return NULL; } @@ -440,16 +440,16 @@ sexpr_lookup(struct sexpr *sexpr, const if (token == NULL) continue; - sexpr = sexpr->cdr; - for (i = sexpr; i->kind != SEXPR_NIL; i = i->cdr) { + sexpr = sexpr->u.s.cdr; + for (i = sexpr; i->kind != SEXPR_NIL; i = i->u.s.cdr) { if (i->kind != SEXPR_CONS || - i->car->kind != SEXPR_CONS || - i->car->car->kind != SEXPR_VALUE) { + i->u.s.car->kind != SEXPR_CONS || + i->u.s.car->u.s.car->kind != SEXPR_VALUE) { continue; } - if (strcmp(i->car->car->value, token) == 0) { - sexpr = i->car; + if (strcmp(i->u.s.car->u.s.car->u.value, token) == 0) { + sexpr = i->u.s.car; break; } } @@ -463,10 +463,10 @@ sexpr_lookup(struct sexpr *sexpr, const return NULL; } - if (sexpr->kind != SEXPR_CONS || sexpr->cdr->kind != SEXPR_CONS) - return NULL; - - return sexpr->cdr; + if (sexpr->kind != SEXPR_CONS || sexpr->u.s.cdr->kind != SEXPR_CONS) + return NULL; + + return sexpr->u.s.cdr; } /** @@ -484,7 +484,7 @@ sexpr_node(struct sexpr *sexpr, const ch { struct sexpr *n = sexpr_lookup(sexpr, node); - return (n && n->car->kind == SEXPR_VALUE) ? n->car->value : NULL; + return (n && n->u.s.car->kind == SEXPR_VALUE) ? n->u.s.car->u.value : NULL; } /** diff --git a/src/sexpr.h b/src/sexpr.h --- a/src/sexpr.h +++ b/src/sexpr.h @@ -29,9 +29,9 @@ struct sexpr { struct { struct sexpr *car; struct sexpr *cdr; - }; + } s; char *value; - }; + } u; }; /* conversion to/from strings */ diff --git a/src/virsh.c b/src/virsh.c --- a/src/virsh.c +++ b/src/virsh.c @@ -4295,9 +4295,9 @@ vshDomainStateToString(int state) case VIR_DOMAIN_CRASHED: return gettext_noop("crashed"); default: - return gettext_noop("no state"); /* = dom0 state */ - } - return NULL; + ;/*FALLTHROUGH*/ + } + return gettext_noop("no state"); /* = dom0 state */ } static const char * @@ -4311,9 +4311,9 @@ vshDomainVcpuStateToString(int state) case VIR_VCPU_RUNNING: return gettext_noop("running"); default: - return gettext_noop("no state"); - } - return NULL; + ;/*FALLTHROUGH*/ + } + return gettext_noop("no state"); } static int @@ -4825,7 +4825,7 @@ vshParseArgv(vshControl * ctl, int argc, } last = argv[i]; } - end = end ? : argc; + end = end ? end : argc; /* standard (non-command) options */ while ((arg = getopt_long(end, argv, "d:hqtc:vrl:", opt, &idx)) != -1) { diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -189,9 +189,9 @@ virXendErrorInt(virConnectPtr conn, virE #define foreach(iterator, start) \ - for (_for_i = (start), *iterator = (start)->car; \ + for (_for_i = (start), *iterator = (start)->u.s.car; \ _for_i->kind == SEXPR_CONS; \ - _for_i = _for_i->cdr, iterator = _for_i->car) + _for_i = _for_i->u.s.cdr, iterator = _for_i->u.s.car) #define foreach_node(iterator, start, path) \ foreach(iterator, start) \ @@ -661,23 +661,22 @@ xend_node_op(virConnectPtr xend, const c * Returns 0 in case of success, -1 in case of failure. */ static int -xend_op_ext(virConnectPtr xend, const char *name, char *error, - size_t n_error, const char *key, ...) +xend_op(virConnectPtr xend, const char *name, const char *key, ...) { char buffer[1024]; + char error[1024]; va_list ap; int ret; snprintf(buffer, sizeof(buffer), "/xend/domain/%s", name); va_start(ap, key); - ret = xend_op_ext2(xend, buffer, error, n_error, key, ap); + ret = xend_op_ext2(xend, buffer, error, sizeof(error), key, ap); va_end(ap); return ret; } -#define xend_op(xend, name, key, ...) ({char error[1024]; xend_op_ext(xend, name, error, sizeof(error), key, __VA_ARGS__);}) #endif /* ! PROXY */ /** @@ -960,11 +959,11 @@ xenDaemonListDomainsOld(virConnectPtr xe if (root == NULL) goto error; - for (_for_i = root, node = root->car; _for_i->kind == SEXPR_CONS; - _for_i = _for_i->cdr, node = _for_i->car) { + for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS; + _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; - extra += strlen(node->value) + 1; + extra += strlen(node->u.value) + 1; count++; } @@ -976,13 +975,13 @@ xenDaemonListDomainsOld(virConnectPtr xe ptr += sizeof(char *) * (count + 1); i = 0; - for (_for_i = root, node = root->car; _for_i->kind == SEXPR_CONS; - _for_i = _for_i->cdr, node = _for_i->car) { + for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS; + _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; ret[i] = ptr; - strcpy(ptr, node->value); - ptr += strlen(node->value) + 1; + strcpy(ptr, node->u.value); + ptr += strlen(node->u.value) + 1; i++; } @@ -1461,8 +1460,8 @@ xend_parse_sexp_desc(virConnectPtr conn, if ((tmp != NULL) && (tmp[0] != 0)) virBufferVSprintf(&buf, " <emulator>%s</emulator>\n", tmp); - for (cur = root; cur->kind == SEXPR_CONS; cur = cur->cdr) { - node = cur->car; + for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { + node = cur->u.s.car; /* Normally disks are in a (device (vbd ...)) block but blktap disks ended up in a differently named (device (tap ....)) block.... */ @@ -1701,8 +1700,8 @@ xend_parse_sexp_desc(virConnectPtr conn, /* in case of HVM we have devices emulation */ if (hvm) { - for (cur = sexpr_lookup(root, "domain/image/hvm"); cur && cur->kind == SEXPR_CONS; cur = cur->cdr) { - node = cur->car; + for (cur = sexpr_lookup(root, "domain/image/hvm"); cur && cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { + node = cur->u.s.car; if (sexpr_lookup(node, "usbdevice")) { tmp = sexpr_node(node, "usbdevice"); if (tmp && *tmp) { @@ -2677,11 +2676,11 @@ xenDaemonListDomains(virConnectPtr conn, ret = 0; - for (_for_i = root, node = root->car; _for_i->kind == SEXPR_CONS; - _for_i = _for_i->cdr, node = _for_i->car) { + for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS; + _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; - id = xenDaemonDomainLookupByName_ids(conn, node->value, NULL); + id = xenDaemonDomainLookupByName_ids(conn, node->u.value, NULL); if (id >= 0) ids[ret++] = (int) id; if (ret >= maxids) @@ -2715,8 +2714,8 @@ xenDaemonNumOfDomains(virConnectPtr conn ret = 0; - for (_for_i = root, node = root->car; _for_i->kind == SEXPR_CONS; - _for_i = _for_i->cdr, node = _for_i->car) { + for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS; + _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; ret++; @@ -2884,11 +2883,11 @@ xenDaemonDomainGetVcpus(virDomainPtr dom memset(cpumaps, 0, maxinfo * maplen); /* scan the sexprs from "(vcpu (number x)...)" and get parameter values */ - for (s = root; s->kind == SEXPR_CONS; s = s->cdr) { - if ((s->car->kind == SEXPR_CONS) && - (s->car->car->kind == SEXPR_VALUE) && - !strcmp(s->car->car->value, "vcpu")) { - t = s->car; + for (s = root; s->kind == SEXPR_CONS; s = s->u.s.cdr) { + if ((s->u.s.car->kind == SEXPR_CONS) && + (s->u.s.car->u.s.car->kind == SEXPR_VALUE) && + !strcmp(s->u.s.car->u.s.car->u.value, "vcpu")) { + t = s->u.s.car; vcpu = ipt->number = sexpr_int(t, "vcpu/number"); if ((oln = sexpr_int(t, "vcpu/online")) != 0) { if (sexpr_int(t, "vcpu/running")) ipt->state = VIR_VCPU_RUNNING; @@ -2905,14 +2904,14 @@ xenDaemonDomainGetVcpus(virDomainPtr dom * get sexpr from "(cpumap (x y z...))" and convert values * to bitmap */ - for (t = t->cdr; t->kind == SEXPR_CONS; t = t->cdr) - if ((t->car->kind == SEXPR_CONS) && - (t->car->car->kind == SEXPR_VALUE) && - !strcmp(t->car->car->value, "cpumap") && - (t->car->cdr->kind == SEXPR_CONS)) { - for (t = t->car->cdr->car; t->kind == SEXPR_CONS; t = t->cdr) - if (t->car->kind == SEXPR_VALUE) { - cpu = strtol(t->car->value, NULL, 0); + for (t = t->u.s.cdr; t->kind == SEXPR_CONS; t = t->u.s.cdr) + if ((t->u.s.car->kind == SEXPR_CONS) && + (t->u.s.car->u.s.car->kind == SEXPR_VALUE) && + !strcmp(t->u.s.car->u.s.car->u.value, "cpumap") && + (t->u.s.car->u.s.cdr->kind == SEXPR_CONS)) { + for (t = t->u.s.car->u.s.cdr->u.s.car; t->kind == SEXPR_CONS; t = t->u.s.cdr) + if (t->u.s.car->kind == SEXPR_VALUE) { + cpu = strtol(t->u.s.car->u.value, NULL, 0); if (cpu >= 0 && (VIR_CPU_MAPLEN(cpu+1) <= maplen)) { VIR_USE_CPU(cpumap, cpu); } @@ -3434,8 +3433,8 @@ xenDaemonNumOfDefinedDomains(virConnectP ret = 0; - for (_for_i = root, node = root->car; _for_i->kind == SEXPR_CONS; - _for_i = _for_i->cdr, node = _for_i->car) { + for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS; + _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; ret++; @@ -3464,12 +3463,12 @@ int xenDaemonListDefinedDomains(virConne ret = 0; - for (_for_i = root, node = root->car; _for_i->kind == SEXPR_CONS; - _for_i = _for_i->cdr, node = _for_i->car) { + for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS; + _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; - names[ret++] = strdup(node->value); + names[ret++] = strdup(node->u.value); if (ret >= maxnames) break; }

2 2

Fwd: [Libvir] Updated Solaris dom0 patch (part 1)
by Mark Johnson 28 Sep '07

28 Sep '07

sorry, missed the cc..... ---------- Forwarded message ---------- From: Mark Johnson <johnson.nh(a)gmail.com> Date: Sep 28, 2007 4:09 PM Subject: Re: [Libvir] Updated Solaris dom0 patch (part 1) To: "Daniel P. Berrange" <berrange(a)redhat.com> On 9/28/07, Daniel P. Berrange <berrange(a)redhat.com> wrote: > On Fri, Sep 28, 2007 at 03:03:15PM -0400, Mark Johnson wrote: > > > > I've broken this patch up into a few pieces to make > > it more reviewable and tried to address the comments > > from the previous patch (Jun 15th'ish if your looking). > > > > Here is first part... > > > > tested on today's CVS bits on a FC7 dom0 > > (LD_PRELOAD=src/.libs/libvirt.so src/.libs/virsh) > > > > One note, it looks like you still need a xend change on > > FC7 before the no kernel/bootloader option works. It > > looks like it's close though.. works fine with them > > of course. > > > > > > More details... > > > > > > [root@fedora solaris]# cat guest.py > > name = "solaris" > > vcpus = 1 > > memory = "512" > > > > #bootloader = "/usr/bin/pygrub" > > #kernel = "/platform/i86xpv/kernel/unix" > > #ramdisk = "/platform/i86pc/boot_archive" > > extra = "-k" > > > > root = "/dev/dsk/c0d0s0" > > disk = ['file:/export/guests/solaris/disk.img,0,w'] > > Oooh, that's interesting. Can you explain a little about Solaris paravirt > disk naming, since it doesn't use xvdN/hdN/sdN style config ? No, it uses a disk #... 0, 1, 2, 3, 4.. We also have a PV :cdrom e.g. for an install... disk = ['file:/tank/guests/install/solaris/66-0624-nd.iso,6:cdrom,r', 'file:/tank/guests/install/solaris/disk.img,0,w'] > Does the > HVM disk naming still use the named devs ? Yes. That is the same. > Also one other question. There is a config option > > builder='linux' > > Which is never used on Linux since 'linux' is the default. Do you change > the default on Solaris, or dooes the existing 'linux' builder work just > fine with Solaris DomU images ? I guess the latter, since the SEXPR > you have below is using 'linux'. Yep, we use the linux domain builder... > > [root@fedora solaris]# xm list -l solaris > > (domain > > (on_crash destroy) > > (uuid 72f9b45e-4be9-bf1f-a500-3707b9c3922c) > > (bootloader_args ) > > (vcpus 1) > > (name solaris) > > (on_poweroff destroy) > > (on_reboot restart) > > (bootloader ) > > Since I notice it has the bootloader bit in the SEXPR, I'm thinking I'll > tweak our XML generation so it at least includes an empty <bootloade/> > since there may be tools using libvirt which expect at least one of <os> > or <bootloader> and using an empty tag may keep them happier. > > eg, it'd probably avoid this problem... OK. MRJ > > virsh # console solaris > > libvir: Xen Daemon error : internal error domain information incomplete, missing kernel & bootloader > > domain.xml:25: parser error : Opening and ending tag mismatch: os line 4 and domain > > </domain> > > ^ > > domain.xml:26: parser error : Premature end of data in tag domain line 1 > > > Though obviously your patch fixes that too. > > 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 -=| >

1 0

[Libvir] [RFC][PATCH 1/2] Tested NUMA patches for available memory and topology
by beth kon 28 Sep '07

28 Sep '07

Patch for accessing available memory. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

5 12

[Libvir] PATCH: Fix crash parsing input devices for QEMU
by Daniel P. Berrange 28 Sep '07

28 Sep '07

There is an edge case in parsing of input devices where if you have a PS2 mouse defined, before a USB tablet, it could generate a null pointer deference & thus crash. Normally you'd only have one pointer defined, but one might add a USB tablet for getting a improved mouse experience. 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] [RFC][PATCH 2/2] Tested NUMA patches for available memory and topology
by beth kon 28 Sep '07

28 Sep '07

Patch for accessing topology information. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

1 0

[Libvir] PATCH: Allow remote driver to handle any connection URI
by Daniel P. Berrange 28 Sep '07

28 Sep '07

We currently have logic in the remote driver so that it handles the local QEMU driver URIs, so they get re-directed to the daemon. It also handles networking APIs for Xen driver. For normal APIs, Xen has the auto-spawned setuid proxy daemon. This was very useful at the time we wrote it, but it only supports a handful of operations, and only in read-only mode. One other factor is that SUSE, for example, do not ship it because it is setuid. I don't know whether this is just a general policy, or just because they've not had time to audit it, but that's not very good for their users. With the development of the remote driver & the flexible UNIX socket perms & group ownership, or with policykit support it is possible to replace the proxy with calls straight to the remote daemon. So this patch is the first step by allowing the remote driver to handle any hypervisor connection URI. If it doesn't have a hostname or transport specified, then it automatically tries to connect to the local libvirt daemon over UNIX sockets. 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 -=|

4 7

[Libvir] virt-df (a 'df' tool for virtual domains)
by Richard W.M. Jones 27 Sep '07

27 Sep '07

Brave (or foolhardy?) souls may want to try out the almost-working version of 'virt-df' that I wrote: hg clone http://hg.et.redhat.com/virt/applications/virt-top--devel Usage is similar to ordinary 'df'. It understands the -h (human-readable) and -i (show inodes) options. You need to run it on the dom0, it won't work remotely. # virt-df.opt -c qemu:///system debian32kvm /dev/hda (3.9 GiB) /var/lib/xen/images/debian32kvm.img hda1 3662792 990276 2672516 Linux ext2/3 hda5 232908 Linux swap [The numbers are 1K blocks total, used, available] # virt-df.opt -c qemu:///system -h debian32kvm /dev/hda (3.9 GiB) /var/lib/xen/images/debian32kvm.img hda1 3.5 GiB 967.1 MiB 2.5 GiB Linux ext2/3 hda5 227.4 MiB Linux swap From the README file: virt-df is a 'df' tool for printing out the used and available disk space in all active and inactive domains. Without this tool you would need to log in to each domain individually or set up monitoring. It is only a proof-of-concept. Please bare in mind the following limitations when using this tool: (1) It does not work over remote connections. Part of the reason why I wrote virt-df was to get an idea of how the remote storage API for libvirt might look. (2) It only understands a limited set of partition types. Assuming that the files and partitions that we get back from libvirt / Xen correspond to block devices in the guests, we can go some way towards manually parsing those partitions to find out what they contain. We can read the MBR, EBR, superblocks and so on. However that's a lot of parsing work, and currently there is no library which understands a wide range of partition schemes and filesystem types (not even libparted which doesn't support LVM yet). The Linux kernel does support that, but there's not really any good way to access that work. The current implementation uses a hand-coded parser which understands some simple formats (MBR, EBR, ext2/3, not LVM yet but coming soon). In future we should use something like libparted. (3) The statistics you get are delayed. The real state of, for example, an ext2 filesystem is only stored in the memory of the guest's kernel. The ext2 superblock contains some meta-information about blocks used and free, but this superblock is not up to date. In fact the guest kernel may not update it even on a 'sync', not until the filesystem is unmounted. Some operations do appear to write the superblock, for example fsync(2) [that is my reading of the ext2/3 source code at least]. $ wc -l virt-df/*.ml 84 virt-df/virt_df_ext2.ml 24 virt-df/virt_df_linux_swap.ml 22 virt-df/virt_df_lvm2.ml 5 virt-df/virt_df_main.ml 460 virt-df/virt_df.ml 595 total 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 4

[Libvir] topology test program
by beth kon 27 Sep '07

27 Sep '07

Daniel, As we discussed, here is the program I was using for testing different topology strings. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

1 0

[Libvir] /etc/sysconfig/keyboard syntax subtilities
by Guillaume Rousse 27 Sep '07

27 Sep '07

virtmanager split content of /etc/sysconfig/keyboard on '"' for determining keyboard. On mandriva system, there isn't any quote in this file: see http://qa.mandriva.com/show_bug.cgi?id=34190 Here is a patch making parsing of this file a bit more robust. -- Guillaume Rousse Moyens Informatiques - INRIA Futurs Tel: 01 69 35 69 62

2 1

[Libvir] trouble using ssh tunnel for remote hypervisor
by Guillaume Rousse 27 Sep '07

27 Sep '07

Hello. I'm trying to use ssh tunnel for remote hypervisor access. However, I'm can't make it working... [guillaume@oberkampf ~]$ LC_ALL=C virsh --connect xen+ssh://root@acacia.futurs.inria.fr list --all libvir: error : could not connect to xen:// error: failed to connect to the hypervisor error: no valid connection On the remote host: [root@acacia ~]# libvirtd --verbose libvir: error : could not connect to xen:// It seems the error lies between libvirtd and the local hypervisor. And indeed, local usage of virsh with xen:// URLs fail: [root@acacia ~]# LC_ALL=C virsh -c xen:// list libvir: error : could not connect to xen:// error: failed to connect to the hypervisor error: no valid connection Using xen:///, instead of xen://, as explained at http://libvirt.org/uri.html, is OK, despite a few error messages: [root@acacia ~]# LC_ALL=C virsh -c xen:/// list libvir: Remote error : No such file or directory libvir: warning : Failed to find the network: Is the daemon running ? Id Name State ---------------------------------- 0 Domain-0 running 1 barman blocked 2 cocktail blocked 3 mojito blocked >From the documentation, it seems xen:// transport implies TLS, and requires an host name, so it is quite normal it fails here (I didn't generated any certificate). But how can I force libvirtd to use xen:/// transport then ? I don't see anything related in libvirt configuration documentation at http://libvirt.org/remote.html ? Neither about how to configure it for listening on unix transport, as explained in svn+ssh transport requirements on the same page (but I presume it is the default) ? Also, from where does those error and warning come ? [root@acacia ~]# LC_ALL=C virsh -c xen:/// list libvir: Remote error : No such file or directory libvir: warning : Failed to find the network: Is the daemon running ? [..] I'm using libvirt 0.3.2 on mandriva 2007.1, with xen 3.1.0. -- Guillaume Rousse Moyens Informatiques - INRIA Futurs Tel: 01 69 35 69 62

4 4

[Libvir] python libvirt methods to virDomainBlockStats and virDomainInterfaceStats
by Marco Sinhoreli 27 Sep '07

27 Sep '07

Hello all, I'm using libvirt from cvs, and in libvirt.h there are virDomainBlockStats, and virDomainInterfaceStats calls. I think it is compiled into libvirtmod, then I'm trying to write two methods, blockStats, and interfacesStats in the class virDomain at the libvirt.py library file. I'm not a specialist in python programming and it's not working. Bellow folow the code I have been wrote: def blockStats(self): """Block device stats for virDomainBlockStats """ ret = libvirtmod.virDomainBlockStats(self._o) if ret is None: raise libvirtError ('virDomainBlockStats() failed', dom=self) return ret def interfaceStats(self): """Network interface stats for virDomainInterfaceStats.""" ret = libvirtmod.virDomainInterfaceStats(self._o) if ret is None: raise libvirtError ('virDomainInterfaceStats() failed', dom=self) return ret Any help will be welcome. Best regards -- Marco Sinhoreli

2 3

[Libvir] [RFC][PATCH 1/2] NUMA memory and topology patches
by beth kon 26 Sep '07

26 Sep '07

[PATCH 1/2] - add capability to access free memory information on each NUMA cell. Signed-off-by: Beth Kon (eak(a)us.ibm.com) -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

4 9

[Libvir] [PATCH] virsh NUMA command freecell
by Daniel Veillard 26 Sep '07

26 Sep '07

Useful for testing the virNodeGetCellsFreeMemory() call, it requires the 3 precedent NUMA patches. The patch lack the documentation update. The function takes an optional argument which is the cell number. If no cell is provided it will print the total free memory available on the Node. A more useful function would be to find the cell with the most available memory, but that one should still be useful and not just for testing. 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] [RFC][PATCH 2/2] NUMA memory and topology patches
by beth kon 25 Sep '07

25 Sep '07

[PATCH 2/2] - add capability to access topology information (cell to cpu mapping) for each numa cell. Signed-off-by: Beth Kon (eak(a)us.ibm.com) -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

2 1