- Devel - libvirt List Archives

[Libvir] Reliably detecting if Intel VT is disabled in the BIOS
by Richard W.M. Jones 14 Mar '07

14 Mar '07

VMXON is the instruction which turns on Intel VT extensions[1]. This instruction can be enabled and disabled by setting a bit in a CPU register. Moreover, this CPU register itself can be locked so that no changes can be made until the CPU is power-cycled. In detail, the register is the IA32_FEATURE_CONTROL (0x3A) MSR. The relevant bits are: bit 0 Lock bit (0 = unlocked, 1 = permanently locked) bit 1 Enable VMXON in Intel Safer Mode Extensions (SMX) bit 2 Enable VMXON in normal operation So to find out if VT is possible with the CPU, use CPUID (in practice, check if "vmx" is in /proc/cpuinfo flags). To find out if VT can be turned on in the host, check bit 2 in the above register. There is a handy tool called msr-tools[2] which you can use: # ./rdmsr 0x3a ff03 (bit 2 is clear, so VT is _not_ enabled on this host). It seems that the BIOS locks the register (by writing 1 to bit 0). To find out if the BIOS has locked the register, use rdmsr again and look at the lowest bit. In the example above you can see that the BIOS disabled VT and locked the register. Once the register is locked, the only way around it is to reboot. If the register is unlocked you can enable VT by writing a 1 to bit 2. If you don't want to use the msr-tools, then direct access to the register can be had through /dev/cpu/<id>/msr. For example this is an strace of rdmsr 0x3a: open("/dev/cpu/0/msr", O_RDONLY) = 3 pread(3, "\3\377\0\0\0\0\0\0", 8, 58) = 8 However you need to be root to open /dev/cpu/0/msr. On machines which don't support the IA32_FEATURE_CONTROL MSR you will get an EIO error: pread(3, 0x7ffff81ec810, 8, 58) = -1 EIO (Input/output error) Rich. Notes: [1] I don't think this is possible with AMD's Pacifica extensions. I'm not sure if it's possible to disable these in the BIOS & lock them. [2] http://www.kernel.org/pub/linux/utils/cpu/msr-tools/ Sources: * linux/drivers/kvm/vmx.c: function vmx_disabled_by_bios * "Intel® Trusted Execution Technology Preliminary Architecture Specification" section 2.1.2 (http://download.intel.com/technology/security/downloads/31516803.pdf) -- 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] Add virConnectGetCapabilities call to return the capabilities of the driver / hypervisor
by Richard W.M. Jones 13 Mar '07

13 Mar '07

This patch: * Adds virConnectGetCapabilities which returns an XML description of the capabilities of the driver or hypervisor under this connection (see below for more about the XML format). * Adds virsh capabilities command. * Checks the Python binding works. Caveats: * Xen implementation (in xen_internal.c) is not tested because I don't have a working Xen machine right now. QEMU, test and remote work however. Example: $ virsh -c test:///default capabilities | tidy -xml -i -q <capabilities> <domain> <type>test</type> </domain> <host_features></host_features> <guest_architectures> <guest_architecture> <model>i686</model> <bits>32</bits> <guest_features> <accelerated /> <pae /> </guest_features> </guest_architecture> </guest_architectures> </capabilities> $ virsh -c qemu:///session capabilities | tidy -xml -i -q <capabilities> <domain> <type>qemu</type> </domain> <guest_architectures> <guest_architecture> <model>i686</model> <bits>32</bits> <features> <emulated /> </features> </guest_architecture> <guest_architecture> <model>x86_64</model> <bits>64</bits> <features> <emulated /> </features> </guest_architecture> [... other archs deleted ...] </guest_architectures> </capabilities> XML format: The <capabilities> node contains information about the host and a list of supported architectures for guests. About the host we return: <domain> <type> The default type acceptable when creating a domain. <host_features> <hvm> Does the host CPU support HVM? <type> Type of HVM (eg. "vmx") <bios_setting> "enabled" or "disabled" About the guest architectures we can return: <guest_architecture> <model> The (virtualised) CPU <bits> Bits <domain> <type> If different from the default type (eg. for kqemu) <features> <hvm> Full virt guest? <accelerated> Accelerated (eg. Xen or kqemu) <emulated> Emulated (eg. qemu or bochs) (and a few other esoteric flags here) 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)

4 13

[Libvir] virsh command is getting a connecting error
by Saori Fukuta 13 Mar '07

13 Mar '07

Hi, It was working fine on March 8th, but today it failed to do virsh command with an error message. # virsh list libvir: error : no support for hypervisor lt-virsh: error: failed to connect to the hypervisor This message is printed here because nb_network_drivers is 0. --- libvirt.c : virConnectOpen 317 if (ret->nb_drivers == 0 || ret->nb_network_drivers == 0) { 318 /* we failed to find an adequate driver */ 319 virLibConnError(NULL, VIR_ERR_NO_SUPPORT, name); 320 goto failed; 321 } I think the cause is because it failed to bind the socket at qemuOpenClientUNIX. --- qemu_internal.c : qemuOpenClientUNIX 232 /* 233 * now bind the socket to that address and listen on it 234 */ 235 if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { They are setting members of sockaddr: {sun_family = 1, sun_path = "/usr/var/run/libvirt/qemud-sock", '\0'} and connect returned -1 with errno that was 2(ENOENT). Is there any problem? Please tell me how I can use current virsh command. Thanks, Saori Fukuta.

2 2

[Libvir] Inconsistent networking between Xen & QEMU
by Daniel P. Berrange 09 Mar '07

09 Mar '07

In Xen it is possible to configure a VIF to enslave with an arbitrary bridge device using a fragment of XML like: <interface type='bridge'> <source bridge='xenbr0'/> <mac address='00:16:3E:66:94:9C'/> </interface> In this example I've enslaved to xenbr0 which is created by the Xen networking script, but this will work with any bridge device really. In QEMU the only bridging is available via the 'virtual networks' support in libvirt, by referencing a named bridge. For example <interface type='network'> <source network='default'/> <mac address='00:16:3E:66:94:9C'/> </interface> Now 'default' is merely defined to be backed by a bridge device 'virbr0' (although it does not neccessary get backed by a bridge) so the basic impl is basically just enslaving a TAP device. Anyway, we now have two different syntaxes in the XML for defining what is more or less the same thing which is a real PITA for the tools. It is useful to have the distinct representations - one is for 'managed' bridges, and the other is for 'unmanaged' bridges - we can do some much more interesting things with managed bridges. To improve life for the tools though I'd like to do two things as a high priority - Support managed networks in Xen - we can simply lookup the bridge device associated with a network and tell Xen to use vif-bridge with this device. For the reverse Xen will tell us what bridge device a guest is using, and we can reverse lookup the corresponding network - Support non-managed networks in QEMU - we can simply enslave the QEMU tap device to an arbitrary user specific bridge device. Until one of these two options is done, its going to be a PITA to support networking across QEMU & Xen in virt-manager/virt-install. 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 -=|

2 10

[Libvir] [PATCH] Add a default network
by Mark McLoughlin 09 Mar '07

09 Mar '07

Hey, So, we want to install a default network which guests can connect to. This can be seen as e.g. a replacement for xenbr0 as the default bridge for xen guests. A few things concern me about the patch, see below for my thinking. However, I'm happy to punt on all of these issues for now and go ahead with the patch. 1) Ordering - we want the default network to have a predictable bridge name, so instead of relying on it being the first network and ending up auto-allocated vnet0, we use virbr0. The alternative is to actually have an ordering scheme, e.g. #define LIBVIRT_AUTOSTART_PRIORITY_DISABLE -1 #define LIBVIRT_AUTOSTART_PRIORITY_FIRST 0 #define LIBVIRT_AUTOSTART_PRIORITY_LAST 99 #define LIBVIRT_AUTOSTART_PRIORITY_DEFAULT 50 int virNetworkSetAutostart(virDomainPtr domain, int priority); autostart/00-default.xml -> ../default.xml autostart/99-MyNetwork.xml -> ../MyNetwork.xml Maybe that's useful, but probably moreso for guests than networks. The "virbr0" solution is fine, IMHO. 2) IP address choice - I've randomly chosen 192.168.122.1/24 as the IP address for the network, and this could happen to clash with an existing network. Since we masquerade outgoing traffic, I think the only problem this would cause in practice would be where the host machine is already on a 192.168.122/24 subnet and it could find itself connecting to a guest rather than another machine on the physical subnet. It's a default configuration choice which admins can change, and I don't see it causing huge problems in practice, so I'm not overly concerned. If it did turn out to be a problem, I'd probably add something like: <ip type="auto" /> But I'm not anxious to go down that route right now. 3) UUID generation - there's no UUID specified, so the default network will have a different UUID across reboots. We could trivially save the UUID at first boot, but we'd really need to put it in /var then. IMHO, it's something we can fix later if it turns out to be important. Cheers, Mark.

3 8

[Libvir] Restarting of libvirt_qemud daemon
by Daniel P. Berrange 09 Mar '07

09 Mar '07

Thinking about later RPM upgrades I think we need to think about whether it will be possible to restart the libvirt_qemud while guests & networks are running. There's a couple of issues: - We do waitpid() to cleanup qemu & dnsmasq processes when we stop domains & networks, or to detect when they crash. For the former, we could may they daemons to avoid waitpid() cleanup, but we'd still need waitpid to be able to detect shutdowns. There is also the issue of enumerating running instances. - We always try to re-create a bridge device at startup, even if it already exists. Likewise we always try to add the IPtables rules & start dnsmasq. We can easily detect if the bridge already exists. I think we can probably double check iptables rulles too., The tricky one is figuring out whether a dnsmasq instance is still running. Dealing with theses not only helps planned restarts, but will also make it possible start up the daemon again after a crash without having to kill off all guests & networks manually. So I think it is worth investigating what we can do to enable restarts. It might be worth waiting until we sort out whether we'll merge libvirt_qemud with the generic libvirtd remote daemon though so we don't have to do the work twice over. 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 8

[Libvir] Stable UUID needed for default network
by Daniel P. Berrange 09 Mar '07

09 Mar '07

The UUID for the default network is not included in the example default config. So every time you restart the libvirt_qemud we get a randomly generated UUID. This isn't really in keeping with the idea of having a permanent UID :-) So I think we need to do two things: - In the 'make install' routine - if-and-only-if the $prefix/etc/libvirt/networks/default.xml file was newly installed, then stuff a random UUID into it, eg UUID=`uuidgen` sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ $prefix/etc/libvirt/networks/default.xml If the system doesn't have uuidgen, we can just ignore this step - In the RPM %post section we need to stuff in a UUID at install time if-and-only-if this is a new install - ie leave it alone during upgrades UUID=`uuidgen` sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ %(sysconfdir)/libvirt/networks/default.xml 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] Alternate dnsmasq command line args ?
by Daniel P. Berrange 09 Mar '07

09 Mar '07

Currently we launch dnsmasq with a command line looking like: dnsmasq --keep-in-foreground --bind-interfaces --pid-file --conf-file --except-interface lo --listen-address 192.168.122.1 --dhcp-range 192.168.122.2,192.168.122.254 This causes DNSMASQ to listen on any network interface configured with an IP address of '192.168.122.1', except for loopback. I know it would be kind of unusual, but it is possible two interface might be both configured with the same address. I think it may be safer if we explicitly tell it to use virbr0 instead eg --interface virbr0 --except-interface lo Yes, the --except-interface lo is still needed due to wierd ass dnsmasq rules which make it always use loopback unless you tell it not to. I'm also not clear why we use --conf-file - we're not actually telling it about any config file so this seems redundant ? 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 2

[Libvir] Generate python binding for network APIs
by Daniel P. Berrange 09 Mar '07

09 Mar '07

I was about to make use of the new networking APIs in virt-manager/virt-install when I discovered we don't have any python binding for it. Attached is the quickest patch I could write to support it - I basically copied all the virDomain related bits & s/Domain/Network/ throughout. A simple demo script works: #!/usr/bin/python import libvirt con = libvirt.open(None) n = con.listNetworks() print str(n) for name in n: net = con.lookupByName(name) print net.XMLDesc(0) print net.bridgeName() I think there are a couple more methods which need manual implementations though - eg UUIDString() is generated incorrectly - in fact the UUIDString() impl for virDomains is already broken, and so is the binding for VCPU pinning. 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 3

[Libvir] PATCH: Fix QEMU autostart/network behaviour
by Daniel P. Berrange 08 Mar '07

08 Mar '07

In my testing there appeared to be a couple of bugs with the QEMU driver and the interaction with networking - It was auto-starting the daemon even with qemu://system - It was opening the QEMU connection twice due to inverted check, and not opening it at all in the non-QEMU hv case. - Once that is fixed, then it SEGVs when using a Xen connection as uri->scheme is NULL That attached patch rectifies those flaws - Mark can you double check this just in case I've missed some edge case for the networking stuff - I have strace'd virsh when doing virsh list (as root & non-root) virsh --connect test://default list (as root & non-root) virsh --connect xen list (as root & non-root) virsh --connect qemu://session list (as non-root) virsh --connect qemu://system list (as root) virsh --connect qemu://session --readonly list (as non-root) virsh --connect qemu://system --readonly list (as root & non-root) And it appears to now be making the correct connectiosn to the QEMU daemons in all cases 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 -=|

2 1

[Libvir] [PATCH] libvirt.c: warning: dereferencing type-punned pointer will break strict-aliasing rules
by Richard W.M. Jones 08 Mar '07

08 Mar '07

I'm currently trying to get libvirt to compile with -Werror. One problem which came up early is the warning in $SUBJECT. The gcc info page (see -fstrict-aliasing) is pretty unclear about what exactly causes this problem, so the attached patch rewrites the code quite conservatively to avoid the problem. 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)

3 5

[Libvir] [RFC] Check host's minimum memory.
by Masayuki Sunou 08 Mar '07

08 Mar '07

Hi The minimum value of the memory guarded with virsh setmem is 4096KB(4MB). In general, when host's memory is set to 4MB, the host stops. Therefore, I propose the patch to which host's minimum value of the memory is guarded by 256MB. Signed-off-by: Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> Thanks, Masayuki Sunou. libvirt-0.2.0 -------------------------------------------------------------------------------- Index: libvirt/src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.97 diff -u -p -r1.97 xend_internal.c --- libvirt/src/xend_internal.c 2 Mar 2007 20:19:08 -0000 1.97 +++ libvirt/src/xend_internal.c 6 Mar 2007 01:42:44 -0000 @@ -2243,6 +2243,9 @@ xenDaemonDomainSetMemory(virDomainPtr do if (domain->id < 0 && domain->conn->xendConfigVersion < 3) return(-1); + if (domain->id == 0 && memory < (256 * 1024)) + return(-1); + snprintf(buf, sizeof(buf), "%lu", memory >> 10); return xend_op(domain->conn, domain->name, "op", "mem_target_set", "target", buf, NULL); Index: libvirt/src/xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.14 diff -u -p -r1.14 xm_internal.c --- libvirt/src/xm_internal.c 23 Feb 2007 08:51:30 -0000 1.14 +++ libvirt/src/xm_internal.c 6 Mar 2007 01:42:46 -0000 @@ -1025,6 +1025,9 @@ int xenXMDomainSetMemory(virDomainPtr do if (domain->id != -1) return (-1); + if (domain->id == 0 && memory < (256 * 1024)) + return(-1); + if (!(filename = virHashLookup(nameConfigMap, domain->name))) return (-1); Index: libvirt/src/xs_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xs_internal.c,v retrieving revision 1.32 diff -u -p -r1.32 xs_internal.c --- libvirt/src/xs_internal.c 23 Feb 2007 08:51:30 -0000 1.32 +++ libvirt/src/xs_internal.c 6 Mar 2007 01:42:46 -0000 @@ -434,6 +434,10 @@ xenStoreDomainSetMemory(virDomainPtr dom } if (domain->id == -1) return(-1); + + if (domain->id == 0 && memory < (256 * 1024)) + return(-1); + snprintf(value, 19, "%lu", memory); value[19] = 0; ret = virDomainDoStoreWrite(domain, "memory/target", &value[0]); --------------------------------------------------------------------------------

4 9

[Libvir] [PATCH] export virConf* symbols (second version)
by Richard W.M. Jones 08 Mar '07

08 Mar '07

Second version of that patch. 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)

3 3

[Libvir] [PATCH] Can specify VNC port number 5900
by Nobuhiro Itou 08 Mar '07

08 Mar '07

Hi The libvirt cannot specify VNC port number 5900. Currently if we specify the port 5900, The port number set to 5900+DomID. This patch fixes the port number from 5900+DomID to 5900 for this case. Signed-off-by: Nobuhiro Itou <fj0873gn(a)aa.jp.fujitsu.com> Thanks, Nobuhiro Itou. Index: xml.c =================================================================== RCS file: /data/cvs/libvirt/src/xml.c,v retrieving revision 1.62 diff -u -p -r1.62 xml.c --- xml.c 6 Mar 2007 20:00:17 -0000 1.62 +++ xml.c 8 Mar 2007 04:23:03 -0000 @@ -251,7 +251,7 @@ static int virDomainParseXMLGraphicsDesc long port = strtol((const char *)vncport, NULL, 10); if (port == -1) virBufferAdd(buf, "(vncunused 1)", 13); - else if (port > 5900) + else if (port >= 5900) virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900); xmlFree(vncport); } @@ -315,7 +315,7 @@ static int virDomainParseXMLGraphicsDesc long port = strtol((const char *)vncport, NULL, 10); if (port == -1) virBufferAdd(buf, "(vncunused 1)", 13); - else if (port > 5900) + else if (port >= 5900) virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900); xmlFree(vncport); }

3 2

[Libvir] [PATCH] check the maximum of virtual CPU
by Masayuki Sunou 08 Mar '07

08 Mar '07

Hi The maximum of virtual CPU is not guarded in virsh setvcpus now. Then, when 32767 was set to virtual CPU of virsh setvcpus, the problem that Xend became abnormal was detected. example: ---------------------------------------------------------------------- # virsh setvcpus 0 32767 libvir: Xen Daemon error : POST operation failed: (xend.err "(9, 'Bad file descriptor')") libvir: Xen error : failed Xen syscall ioctl 3166208 libvir: error : library call virDomainSetVcpus failed, possibly not supported # xm list -l Error: (9, 'Bad file descriptor') Usage: xm list [options] [Domain, ...] List information about all/some domains. -l, --long Output all VM details in SXP --label Include security labels --state=<state> Select only VMs with the specified state ---------------------------------------------------------------------- Therefore, I propose the correction that adjusts the maximum of virtual CPU to the same value as Xen. This patch is over 200lines. If you request, I am ready to repost it with split this patch. Signed-off-by: Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> Thanks, Masayuki Sunou. libvirt-0.2.0 ---------------------------------------------------------------------- diff -rup a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h --- a/include/libvirt/libvirt.h 2007-02-23 17:51:30.000000000 +0900 +++ b/include/libvirt/libvirt.h 2007-03-01 03:02:20.000000000 +0900 @@ -233,6 +233,7 @@ int virConnectGetVersion (virConnectPt unsigned long *hvVer); int virNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info); +int virGetCpuMax (virConnectPtr conn); /* * Gather list of running domains diff -rup a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in --- a/include/libvirt/libvirt.h.in 2007-02-23 17:51:30.000000000 +0900 +++ b/include/libvirt/libvirt.h.in 2007-03-01 03:02:50.000000000 +0900 @@ -233,6 +233,7 @@ int virConnectGetVersion (virConnectPt unsigned long *hvVer); int virNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info); +int virGetCpuMax (virConnectPtr conn); /* * Gather list of running domains diff -rup a/src/driver.h b/src/driver.h --- a/src/driver.h 2007-02-23 17:51:30.000000000 +0900 +++ b/src/driver.h 2007-03-01 03:09:32.000000000 +0900 @@ -140,6 +140,8 @@ typedef int typedef int (*virDrvDomainSetAutostart) (virDomainPtr domain, int autostart); +typedef int + (*virDrvGetCpuMax) (void); typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -191,6 +193,7 @@ struct _virDriver { virDrvDomainDetachDevice domainDetachDevice; virDrvDomainGetAutostart domainGetAutostart; virDrvDomainSetAutostart domainSetAutostart; + virDrvGetCpuMax cpumax; }; typedef int diff -rup a/src/libvirt.c b/src/libvirt.c --- a/src/libvirt.c 2007-02-23 17:51:30.000000000 +0900 +++ b/src/libvirt.c 2007-03-01 02:16:49.000000000 +0900 @@ -1670,6 +1670,35 @@ virNodeGetInfo(virConnectPtr conn, virNo return(0); } +/** + * virDrvGetCpuMax: + * + * Returns the maximum of CPU defined by Hypervisor. + * + * Returns the maximum of CPU or 0 in case of error. + */ +int +virGetCpuMax(virConnectPtr conn) { + int i; + int ret = -1; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (0); + } + + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->drivers[i] != NULL) && + (conn->drivers[i]->cpumax != NULL)) { + ret = conn->drivers[i]->cpumax(); + if (ret != 0) + return(ret); + } + } + virLibConnError(conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + /************************************************************************ * * * Handling of defined but not running domains * diff -rup a/src/libvirt_sym.version b/src/libvirt_sym.version --- a/src/libvirt_sym.version 2007-02-23 17:51:30.000000000 +0900 +++ b/src/libvirt_sym.version 2007-03-01 02:17:18.000000000 +0900 @@ -52,6 +52,7 @@ virConnResetLastError; virDefaultErrorFunc; virNodeGetInfo; + virGetCpuMax; virDomainSetVcpus; virDomainPinVcpu; diff -rup a/src/proxy_internal.c b/src/proxy_internal.c --- a/src/proxy_internal.c 2007-02-23 17:51:30.000000000 +0900 +++ b/src/proxy_internal.c 2007-03-01 02:17:40.000000000 +0900 @@ -83,6 +83,7 @@ static virDriver xenProxyDriver = { NULL, /* domainDetachDevice */ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ + NULL, /* cpumax */ }; /** diff -rup a/src/qemu_internal.c b/src/qemu_internal.c --- a/src/qemu_internal.c 2007-02-23 21:46:35.000000000 +0900 +++ b/src/qemu_internal.c 2007-03-01 02:18:02.000000000 +0900 @@ -1200,6 +1200,7 @@ static virDriver qemuDriver = { NULL, /* domainDetachDevice */ qemuDomainGetAutostart, /* domainGetAutostart */ qemuDomainSetAutostart, /* domainSetAutostart */ + NULL, /* cpumax */ }; static virNetworkDriver qemuNetworkDriver = { diff -rup a/src/test.c b/src/test.c --- a/src/test.c 2007-02-23 17:51:30.000000000 +0900 +++ b/src/test.c 2007-03-01 02:18:53.000000000 +0900 @@ -127,6 +127,7 @@ static virDriver testDriver = { NULL, /* domainDetachDevice */ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ + NULL, /* cpumax */ }; typedef struct _testDev { diff -rup a/src/virsh.c b/src/virsh.c --- a/src/virsh.c 2007-02-28 00:35:50.000000000 +0900 +++ b/src/virsh.c 2007-03-01 02:19:59.000000000 +0900 @@ -1383,6 +1383,7 @@ cmdSetvcpus(vshControl * ctl, vshCmd * c { virDomainPtr dom; int count; + int maxcpu; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) @@ -1397,6 +1398,18 @@ cmdSetvcpus(vshControl * ctl, vshCmd * c return FALSE; } + maxcpu = virGetCpuMax(ctl->conn); + if (!maxcpu) { + virDomainFree(dom); + return FALSE; + } + + if (count > maxcpu) { + vshError(ctl, FALSE, _("Too many virtual CPU's.")); + virDomainFree(dom); + return FALSE; + } + if (virDomainSetVcpus(dom, count) != 0) { ret = FALSE; } diff -rup a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c 2007-02-28 00:50:03.000000000 +0900 +++ b/src/xend_internal.c 2007-03-01 02:21:34.000000000 +0900 @@ -99,6 +99,7 @@ static virDriver xenDaemonDriver = { xenDaemonDetachDevice, /* domainDetachDevice */ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ + NULL, /* cpumax */ }; /** diff -rup a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c 2007-02-23 17:51:30.000000000 +0900 +++ b/src/xen_internal.c 2007-02-28 18:06:08.000000000 +0900 @@ -456,6 +456,7 @@ static virDriver xenHypervisorDriver = { NULL, /* domainDetachDevice */ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ + xenHypervisorGetCpuMax, /* cpumax */ }; #endif /* !PROXY */ @@ -1824,6 +1825,17 @@ xenHypervisorGetVcpus(virDomainPtr domai } #endif +/** + * xend_get_cpu_max: + * + * Returns the maximum of CPU defined by Xen. + */ +int +xenHypervisorGetCpuMax(void) +{ + return MAX_VIRT_CPUS; +} + /* * Local variables: * indent-tabs-mode: nil diff -rup a/src/xen_internal.h b/src/xen_internal.h --- a/src/xen_internal.h 2006-08-04 19:41:05.000000000 +0900 +++ b/src/xen_internal.h 2007-03-01 02:21:13.000000000 +0900 @@ -55,6 +55,7 @@ int xenHypervisorGetVcpus (virDomainPtr int maxinfo, unsigned char *cpumaps, int maplen); +int xenHypervisorGetCpuMax (void); #ifdef __cplusplus } diff -rup a/src/xm_internal.c b/src/xm_internal.c --- a/src/xm_internal.c 2007-02-23 17:51:30.000000000 +0900 +++ b/src/xm_internal.c 2007-03-01 02:23:54.000000000 +0900 @@ -108,6 +108,7 @@ static virDriver xenXMDriver = { NULL, /* domainDetachDevice */ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ + NULL, /* cpumax */ }; static void diff -rup a/src/xs_internal.c b/src/xs_internal.c --- a/src/xs_internal.c 2007-02-23 17:51:30.000000000 +0900 +++ b/src/xs_internal.c 2007-03-01 02:24:20.000000000 +0900 @@ -77,6 +77,7 @@ static virDriver xenStoreDriver = { NULL, /* domainDetachDevice */ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ + NULL, /* cpumax */ }; /**

5 14

[Libvir] Remote patch, 2007-02-28
by Richard W.M. Jones 08 Mar '07

08 Mar '07

http://www.annexia.org/tmp/libvirt-tls-20070228.patch Not an enormous amount of difference between this and the patch from two days ago. This patch correctly logs/audits new connections and fixes a whole collection of different bugs which used to happen when the server rejected a client connection. 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)

6 22

[Libvir] Reason for daemons?
by Shuveb Hussain 07 Mar '07

07 Mar '07

Hi, Any reason why actual requests are serviced by daemons? Is it just to increase the stability of the applications that link to libvirt or are there other reasons? I have started implementing OpenVZ support. Should I follow the same path and implement a daemon as well? Regards, -- Shuveb Hussain. I blog at http://binarykarma.org Spread the Karma.

2 1

[Libvir] [RFC] Host and guest capabilities
by Richard W.M. Jones 07 Mar '07

07 Mar '07

I've been looking into the parts of virtinst which try to probe the capabilities of the host directly, rather than being abstracted through libvirt (for example, opening and parsing /sys/hypervisor/properties/capabilities directly). Attached is a proposed API for probing the capabilities and supported guest architectures of the hypervisor / driver. I've implemented the virCapabilities part already. My original implementation of the guest architectures had virCapabilities containing a list of supported architectures, but that doesn't nearly cover the richness of what the underlying drivers could support, so I'm currently separating that out into a separate virConnectGetGuestArchitectures call. Let me know your opinions of this API. As an aside, the current virt-manager "choose paravirt / fullvirt" screen doesn't really capture the full, shall I say, ugliness of the possible choices for architecture, particularly when we add qemu, kqemu, and emulation in the mix. I suspect that presenting a list of architectures here, perhaps with some options to show only paravirt, show only fullvirt, show only accelerated ... 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)

3 6

[Libvir] Patch: Fix documentation and code of virGetDomain function
by Richard W.M. Jones 07 Mar '07

07 Mar '07

It turns out that you _can't_ pass name=NULL to virGetDomain, despite what the docs say. 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)

5 6

[Libvir] About the 'virsh start'
by Yoshihiko Yaegashi 07 Mar '07

07 Mar '07

Hi, The command 'virsh start' fails under the following conditions. - architecture:x86_64 - PV domain (f7test2) - After the install are done I attach a xend.log to a message. Thanks Yaegashi [2007-03-07 07:11:12 xend 30702] DEBUG (SrvDomain:76) Starting domain fc7test2 False [2007-03-07 07:11:12 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1288) XendDomainInfo.constructDomain [2007-03-07 07:11:12 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1334) XendDomainInfo.initDomain: 71 256 [2007-03-07 07:11:12 xend 19603] DEBUG (XendBootloader:64) Launching bootloader as ['/usr/bin/pygrub', '-q', '--output=/var/run/xend/boot/xenbl.16058', '/dev/sda13']. [2007-03-07 07:11:12 xend 30702] DEBUG (balloon:127) Balloon: 717020 KiB free; need 358400; done. [2007-03-07 07:11:12 xend 30702] INFO (image:125) buildDomain os=linux dom=71 vcpus=1 [2007-03-07 07:11:12 xend 30702] DEBUG (image:194) domid = 71 [2007-03-07 07:11:12 xend 30702] DEBUG (image:195) memsize = 350 [2007-03-07 07:11:12 xend 30702] DEBUG (image:196) image = /var/run/xend/boot/boot_kernel.EMjGRe [2007-03-07 07:11:12 xend 30702] DEBUG (image:197) store_evtchn = 1 [2007-03-07 07:11:12 xend 30702] DEBUG (image:198) console_evtchn = 2 [2007-03-07 07:11:12 xend 30702] DEBUG (image:199) cmdline = ro root=/dev/VolGroup00/LogVol00 rhgb quiet [2007-03-07 07:11:12 xend 30702] DEBUG (image:200) ramdisk = /var/run/xend/boot/boot_ramdisk.tAzsxc [2007-03-07 07:11:12 xend 30702] DEBUG (image:201) vcpus = 1 [2007-03-07 07:11:12 xend 30702] DEBUG (image:202) features = [2007-03-07 07:11:13 xend.XendDomainInfo 30702] INFO (XendDomainInfo:1198) createDevice: vif : {'bridge': 'xenbr0', 'mac': '00:16:3e:08:28:23', 'script': 'vif-bridge', 'uuid': '8df737da-edfa-83e9-614b-61c7ba127165', 'backend': 0} [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:115) DevController: writing {'backend-id': '0', 'mac': '00:16:3e:08:28:23', 'handle': '0', 'state': '1', 'backend': '/local/domain/0/backend/vif/71/0'} to /local/domain/71/device/vif/0. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:117) DevController: writing {'bridge': 'xenbr0', 'domain': 'fc7test2', 'handle': '0', 'uuid': '8df737da-edfa-83e9-614b-61c7ba127165', 'script': '/etc/xen/scripts/vif-bridge', 'state': '1', 'frontend': '/local/domain/71/device/vif/0', 'mac': '00:16:3e:08:28:23', 'online': '1', 'frontend-id': '71'} to /local/domain/0/backend/vif/71/0. [2007-03-07 07:11:13 xend.XendDomainInfo 30702] INFO (XendDomainInfo:1198) createDevice: vbd : {'uuid': 'd04e0343-9479-2279-4b51-0b284bdd7f4c', 'driver': 'paravirtualised', 'dev': 'xvda:disk', 'uname': 'phy:/dev/sda13', 'mode': 'w', 'backend': 0} [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:115) DevController: writing {'backend-id': '0', 'virtual-device': '51712', 'device-type': 'disk', 'state': '1', 'backend': '/local/domain/0/backend/vbd/71/51712'} to /local/domain/71/device/vbd/51712. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:117) DevController: writing {'domain': 'fc7test2', 'frontend': '/local/domain/71/device/vbd/51712', 'uuid': 'd04e0343-9479-2279-4b51-0b284bdd7f4c', 'dev': 'xvda', 'state': '1', 'params': '/dev/sda13', 'mode': 'w', 'online': '1', 'frontend-id': '71', 'type': 'phy'} to /local/domain/0/backend/vbd/71/51712. [2007-03-07 07:11:13 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1719) Storing VM details: {'on_xend_stop': 'ignore', 'shadow_memory': '0', 'uuid': 'ff828d32-70b2-53eb-4566-d08683974052', 'name': 'fc7test2', 'on_reboot': 'restart', 'start_time': '1173219073.18', 'on_poweroff': 'destroy', 'on_xend_start': 'ignore', 'on_crash': 'restart', 'xend/restart_count': '0', 'vcpus': '1', 'vcpu_avail': '1', 'memory': '350', 'image': "(linux (kernel /var/run/xend/boot/boot_kernel.EMjGRe) (ramdisk /var/run/xend/boot/boot_ramdisk.tAzsxc) (args 'ro root=/dev/VolGroup00/LogVol00 rhgb quiet'))", 'maxmem': '350'} [2007-03-07 07:11:13 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '419357', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '71', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '419358', 'store/port': '1'} [2007-03-07 07:11:13 xend 30702] DEBUG (XendDomain:428) Adding Domain: 71 [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices vif. [2007-03-07 07:11:13 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '419357', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '71', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '419358', 'store/port': '1'} [2007-03-07 07:11:13 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:798) XendDomainInfo.handleShutdownWatch [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:153) Waiting for 0. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:522) hotplugStatusCallback /local/domain/0/backend/vif/71/0/hotplug-status. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:522) hotplugStatusCallback /local/domain/0/backend/vif/71/0/hotplug-status. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:536) hotplugStatusCallback 1. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices usb. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices vbd. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:153) Waiting for 51712. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:522) hotplugStatusCallback /local/domain/0/backend/vbd/71/51712/hotplug-status. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:522) hotplugStatusCallback /local/domain/0/backend/vbd/71/51712/hotplug-status. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:536) hotplugStatusCallback 1. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices irq. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices vkbd. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices vfb. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices pci. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices ioports. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices tap. [2007-03-07 07:11:13 xend 30702] DEBUG (DevController:148) Waiting for devices vtpm. [2007-03-07 07:11:17 xend.XendDomainInfo 30702] WARNING (XendDomainInfo:950) Domain has crashed: name=fc7test2 id=71. [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '419357', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '71', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '419358', 'store/port': '1'} [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '419357', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '71', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '419358', 'store/port': '1'} [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1495) XendDomainInfo.destroyDomain(71) [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:94) XendDomainInfo.create(['domain', ['domid', 71], ['on_crash', 'restart'], ['memory', 350], ['uuid', 'ff828d32-70b2-53eb-4566-d08683974052'], ['bootloader_args', ''], ['name', 'fc7test2'], ['maxmem', 350], ['on_reboot', 'restart'], ['on_poweroff', 'destroy'], ['localtime', 0], ['vcpus', 1], ['bootloader', '/usr/bin/pygrub'], ['shadow_memory', 0], ['vcpu_avail', 1], ['cpu_weight', 256], ['cpu_cap', 0], ['features', ''], ['on_xend_start', 'ignore'], ['on_xend_stop', 'ignore'], ['start_time', 1173219073.1766889], ['cpu_time', 0.14879309900000001], ['online_vcpus', 1], ['image', ['linux', ['kernel', '/var/run/xend/boot/boot_kernel.EMjGRe'], ['ramdisk', '/var/run/xend/boot/boot_ramdisk.tAzsxc'], ['args', 'ro root=/dev/VolGroup00/LogVol00 rhgb quiet']]], ['status', 0], ['memory_dynamic_min', 350], ['memory_dynamic_max', 350], ['state', '----c-'], ['store_mfn', 419358], ['console_mfn', 419357], ['device', ['vif', ['bridge', 'xenbr0'], ['mac', '00:16:3e:08:28:23'], ['script', 'vif-bridge'], ['uuid', '8df737da-edfa-83e9-614b-61c7ba127165'], ['backend', 0]]], ['device', ['vbd', ['uname', 'phy:/dev/sda13'], ['uuid', 'd04e0343-9479-2279-4b51-0b284bdd7f4c'], ['mode', 'w'], ['dev', 'xvda:disk'], ['backend', 0]]]]) [2007-03-07 07:11:17 xend.XendConfig 30702] WARNING (XendConfig:607) Unconverted key: cpus [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1288) XendDomainInfo.constructDomain [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1334) XendDomainInfo.initDomain: 72 256 [2007-03-07 07:11:17 xend 19768] DEBUG (XendBootloader:64) Launching bootloader as ['/usr/bin/pygrub', '-q', '--output=/var/run/xend/boot/xenbl.1059', '/dev/sda13']. [2007-03-07 07:11:17 xend 30702] DEBUG (balloon:127) Balloon: 447020 KiB free; need 358400; done. [2007-03-07 07:11:17 xend 30702] INFO (image:125) buildDomain os=linux dom=72 vcpus=1 [2007-03-07 07:11:17 xend 30702] DEBUG (image:194) domid = 72 [2007-03-07 07:11:17 xend 30702] DEBUG (image:195) memsize = 350 [2007-03-07 07:11:17 xend 30702] DEBUG (image:196) image = /var/run/xend/boot/boot_kernel.yBt3-v [2007-03-07 07:11:17 xend 30702] DEBUG (image:197) store_evtchn = 1 [2007-03-07 07:11:17 xend 30702] DEBUG (image:198) console_evtchn = 2 [2007-03-07 07:11:17 xend 30702] DEBUG (image:199) cmdline = ro root=/dev/VolGroup00/LogVol00 rhgb quiet [2007-03-07 07:11:17 xend 30702] DEBUG (image:200) ramdisk = /var/run/xend/boot/boot_ramdisk.JK64t5 [2007-03-07 07:11:17 xend 30702] DEBUG (image:201) vcpus = 1 [2007-03-07 07:11:17 xend 30702] DEBUG (image:202) features = [2007-03-07 07:11:17 xend.XendDomainInfo 30702] INFO (XendDomainInfo:1198) createDevice: vif : {'bridge': 'xenbr0', 'mac': '00:16:3e:08:28:23', 'script': 'vif-bridge', 'uuid': '8df737da-edfa-83e9-614b-61c7ba127165', 'backend': 0} [2007-03-07 07:11:17 xend 30702] DEBUG (DevController:115) DevController: writing {'backend-id': '0', 'mac': '00:16:3e:08:28:23', 'handle': '0', 'state': '1', 'backend': '/local/domain/0/backend/vif/72/0'} to /local/domain/72/device/vif/0. [2007-03-07 07:11:17 xend 30702] DEBUG (DevController:117) DevController: writing {'bridge': 'xenbr0', 'domain': 'fc7test2', 'handle': '0', 'uuid': '8df737da-edfa-83e9-614b-61c7ba127165', 'script': '/etc/xen/scripts/vif-bridge', 'state': '1', 'frontend': '/local/domain/72/device/vif/0', 'mac': '00:16:3e:08:28:23', 'online': '1', 'frontend-id': '72'} to /local/domain/0/backend/vif/72/0. [2007-03-07 07:11:17 xend.XendDomainInfo 30702] INFO (XendDomainInfo:1198) createDevice: vbd : {'uuid': 'd04e0343-9479-2279-4b51-0b284bdd7f4c', 'driver': 'paravirtualised', 'dev': 'xvda:disk', 'uname': 'phy:/dev/sda13', 'mode': 'w', 'backend': 0} [2007-03-07 07:11:17 xend 30702] DEBUG (DevController:115) DevController: writing {'backend-id': '0', 'virtual-device': '51712', 'device-type': 'disk', 'state': '1', 'backend': '/local/domain/0/backend/vbd/72/51712'} to /local/domain/72/device/vbd/51712. [2007-03-07 07:11:17 xend 30702] DEBUG (DevController:117) DevController: writing {'domain': 'fc7test2', 'frontend': '/local/domain/72/device/vbd/51712', 'uuid': 'd04e0343-9479-2279-4b51-0b284bdd7f4c', 'dev': 'xvda', 'state': '1', 'params': '/dev/sda13', 'mode': 'w', 'online': '1', 'frontend-id': '72', 'type': 'phy'} to /local/domain/0/backend/vbd/72/51712. [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1719) Storing VM details: {'on_xend_stop': 'ignore', 'shadow_memory': '0', 'uuid': 'ff828d32-70b2-53eb-4566-d08683974052', 'name': 'fc7test2', 'on_reboot': 'restart', 'start_time': '1173219077.8', 'on_poweroff': 'destroy', 'on_xend_start': 'ignore', 'on_crash': 'restart', 'vcpus': '1', 'vcpu_avail': '1', 'memory': '350', 'image': "(linux (kernel /var/run/xend/boot/boot_kernel.yBt3-v) (ramdisk /var/run/xend/boot/boot_ramdisk.JK64t5) (args 'ro root=/dev/VolGroup00/LogVol00 rhgb quiet'))", 'maxmem': '350'} [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '467281', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '72', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '467282', 'store/port': '1'} [2007-03-07 07:11:17 xend 30702] DEBUG (XendDomain:428) Adding Domain: 72 [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '467281', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '72', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '467282', 'store/port': '1'} [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:798) XendDomainInfo.handleShutdownWatch [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '467281', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '72', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '467282', 'store/port': '1'} [2007-03-07 07:11:17 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '467281', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '72', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '467282', 'store/port': '1'} [2007-03-07 07:11:21 xend.XendDomainInfo 30702] WARNING (XendDomainInfo:950) Domain has crashed: name=fc7test2 id=72. [2007-03-07 07:11:21 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:731) Storing domain details: {'console/ring-ref': '467281', 'console/port': '2', 'name': 'fc7test2', 'console/limit': '1048576', 'vm': '/vm/ff828d32-70b2-53eb-4566-d08683974052', 'domid': '72', 'cpu/0/availability': 'online', 'memory/target': '358400', 'store/ring-ref': '467282', 'store/port': '1'} [2007-03-07 07:11:21 xend.XendDomainInfo 30702] ERROR (XendDomainInfo:1079) VM fc7test2 restarting too fast (4.709960 seconds since the last restart). Refusing to restart to avoid loops. [2007-03-07 07:11:21 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1487) XendDomainInfo.destroy: domid=72 [2007-03-07 07:11:21 xend.XendDomainInfo 30702] DEBUG (XendDomainInfo:1495) XendDomainInfo.destroyDomain(72)

1 0

Re: [Libvir] [PATCH][RFC] Add --keymap option to virt-install
by Takahashi Tomohiro 07 Mar '07

07 Mar '07

Hi, Dan Thank you for committing a patch. I confirmed that I can use jp106 keyboard on HVM domain, and the keymap that is configured in the XML. when I used latest patch(revision 1.435). Thanks, Tomohiro Takahashi. > On Tue, Mar 06, 2007 at 03:21:16PM +0000, Daniel P. Berrange wrote: >> On Tue, Mar 06, 2007 at 10:00:08PM +0900, Takahashi Tomohiro wrote: >> > I would like to add --keymap option to virt-install in order to set up >> > jp106 keymap. Because I can't use jp106 keyboard. So, I made a patch >> > (notes:It relates python-virtinst) >> > >> > Usage: virt-install --keymap=ja >> > >> > I confirmed that I can use jp106 keyboard on HVM domain. >> > But didn't confirm PV domain. >> > >> > Please give me an advice, if you have it. >> >> I've been expecting someone to send this patch for quite a while :-) >> >> It all looks good to me, although all my keyboards are US english >> so my own testing will be limited to making sure the keymap gets >> passed through to the QEMU daemon correctly. For paravirt, I think >> you need to have Xen 3.0.5 to use keymap, but I'll double check >> that and then apply this. >> >> > @@ -1903,6 +1907,8 @@ virConfPtr xenXMParseXMLToConfig(virConn >> > len += 11 + strlen((const char*)vnclisten); >> > if (vncpasswd) >> > len += 11 + strlen((const char*)vncpasswd); >> > + if (keymap) >> > + len += 11 + strlen((const char*)keymap); >> > if ((val = malloc(len)) != NULL) { >> > strcpy(val, "type=vnc"); >> > if (vncunused) { >> >> A minor bug - the length is only 8, not 11, but I'll fix that when I >> commit, so don't worry about sending an updated patch. > > Ok, this is now committed - I also extended the XML generation code so > that it will report back the keymap that is configured in the XML > dump, as well as updating the test suite to check the handling. > > Dan. > -- > |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 > 2496 -=| > |=- Perl modules: > .cpan.org/~danberr/ -=| > |=- Projects: > at.net/~danielpb/ -=| > |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B > 505 -=| >

1 0

[Libvir] [PATCH] lots of warnings removed - libvirt can now compile with -Werror
by Richard W.M. Jones 06 Mar '07

06 Mar '07

For a completely clean build you need to also apply the previous patch[1]. Rich. [1] https://www.redhat.com/archives/libvir-list/2007-March/msg00030.html and see also Mark's reply. -- 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 3

[Libvir] PATCH: Process QEMU monitor at startup
by Daniel P. Berrange 06 Mar '07

06 Mar '07

With the current QEMU driver we simply spawn the QEMU process and return to the caller immediately. If the QEMU process dies immediately for some reason the user will never no - their domain will simply never appear. To address this, the attached patch will spawn the QEMU process and then immeditely process stderr to look for the monitor PTY - or EOF indicating failure. If it finds the monitor it will also try to connect to it - if this fails in any way then the domain is terminated with extreme prejudice - we absolutely need the monitor connection for other operations to work. This should at least cause a 'Domain startup failed' message to be returned to the user although more work is needed to try and extract a useful error message from the stuff written to stderr. Also in this patch I have reversed the order in which file descriptors are added to the poll array. Currently they are added server, then client, then VMs. The trouble with this is that when processing the server event, if a new client is added to the daemon then processing of subsequent FDs is out of sync. Likewise if a client message causes a new VM to startup then processing of subsquent VM FDs is out of sync. Reversing the order trivially solves it, because VM FDs s are now processed before client FDs, and thus any new VMs started by a client don't mess things up. Likewise client FDs are processed before server FDs. A more robust long term fix would be to carry around some extra metadata instead of relying on ordering when dispatching events. Finally this patch also fixes the 'resume' operation, and allows for the VM state to be reported correctly - ie we can now report 'paused' as well as shutdown/running. 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 9

[Libvir] [PATCH][RFC] Add --keymap option to virt-install
by Takahashi Tomohiro 06 Mar '07

06 Mar '07

Hi, I would like to add --keymap option to virt-install in order to set up jp106 keymap. Because I can't use jp106 keyboard. So, I made a patch (notes:It relates python-virtinst) Usage: virt-install --keymap=ja I confirmed that I can use jp106 keyboard on HVM domain. But didn't confirm PV domain. Please give me an advice, if you have it. Signed-off-by: Tomohiro Takahashi <takatom(a)jp.fujitsu.com> Thanks, Tomohiro Takahashi. ================================================================================== diff -uNrp ./libvirt.orig/src/xml.c ./libvirt/src/xml.c --- ./libvirt.orig/src/xml.c 2007-02-15 01:22:02.000000000 +0900 +++ ./libvirt/src/xml.c 2007-03-06 20:17:38.000000000 +0900 @@ -246,6 +246,7 @@ static int virDomainParseXMLGraphicsDesc xmlChar *vncport = xmlGetProp(node, BAD_CAST "port"); xmlChar *vnclisten = xmlGetProp(node, BAD_CAST "listen"); xmlChar *vncpasswd = xmlGetProp(node, BAD_CAST "passwd"); + xmlChar *keymap = xmlGetProp(node, BAD_CAST "keymap"); if (vncport != NULL) { long port = strtol((const char *)vncport, NULL, 10); if (port == -1) @@ -262,6 +263,10 @@ static int virDomainParseXMLGraphicsDesc virBufferVSprintf(buf, "(vncpasswd %s)", vncpasswd); xmlFree(vncpasswd); } + if (keymap != NULL) { + virBufferVSprintf(buf, "(keymap %s)", keymap); + xmlFree(keymap); + } } } xmlFree(graphics_type); @@ -305,6 +310,7 @@ static int virDomainParseXMLGraphicsDesc xmlChar *vncport = xmlGetProp(node, BAD_CAST "port"); xmlChar *vnclisten = xmlGetProp(node, BAD_CAST "listen"); xmlChar *vncpasswd = xmlGetProp(node, BAD_CAST "passwd"); + xmlChar *keymap = xmlGetProp(node, BAD_CAST "keymap"); if (vncport != NULL) { long port = strtol((const char *)vncport, NULL, 10); if (port == -1) @@ -321,6 +327,10 @@ static int virDomainParseXMLGraphicsDesc virBufferVSprintf(buf, "(vncpasswd %s)", vncpasswd); xmlFree(vncpasswd); } + if (keymap != NULL) { + virBufferVSprintf(buf, "(keymap %s)", keymap); + xmlFree(keymap); + } } virBufferAdd(buf, "))", 2); xmlFree(graphics_type); diff -uNrp ./libvirt.orig/src/xm_internal.c ./libvirt/src/xm_internal.c --- ./libvirt.orig/src/xm_internal.c 2007-02-23 17:51:30.000000000 +0900 +++ ./libvirt/src/xm_internal.c 2007-03-06 20:20:32.000000000 +0900 @@ -1863,6 +1863,9 @@ virConfPtr xenXMParseXMLToConfig(virConn if (xenXMConfigSetStringFromXPath(conn, conf, ctxt, "vncpasswd", "string(/domain/devices/graphics[@type='vnc']/@passwd)", 1, "cannot set the vncpasswd parameter") < 0) goto error; + if (xenXMConfigSetStringFromXPath(conn, conf, ctxt, "keymap", "string(/domain/devices/graphics[@type='vnc']/@keymap)", 1, + "cannot set the vncpasswd parameter") < 0) + goto error; /* XXX vncdisplay */ /* @@ -1894,6 +1897,7 @@ virConfPtr xenXMParseXMLToConfig(virConn xmlChar *vncport = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "port"); xmlChar *vnclisten = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "listen"); xmlChar *vncpasswd = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "passwd"); + xmlChar *keymap = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "keymap"); int vncunused = vncport ? (!strcmp((const char*)vncport, "-1") ? 1 : 0) : 1; if (vncunused) len += 12; @@ -1903,6 +1907,8 @@ virConfPtr xenXMParseXMLToConfig(virConn len += 11 + strlen((const char*)vnclisten); if (vncpasswd) len += 11 + strlen((const char*)vncpasswd); + if (keymap) + len += 11 + strlen((const char*)keymap); if ((val = malloc(len)) != NULL) { strcpy(val, "type=vnc"); if (vncunused) { @@ -1923,6 +1929,11 @@ virConfPtr xenXMParseXMLToConfig(virConn strcat(val, (const char*)vncpasswd); xmlFree(vncpasswd); } + if (keymap) { + strcat(val, ",keymap="); + strcat(val, (const char*)keymap); + xmlFree(keymap); + } } } xmlFree(type);

2 2

[Libvir] [PATCH] add global --readonly flag to virsh
by Richard W.M. Jones 06 Mar '07

06 Mar '07

The current vshInit function in virsh tries some dodgy heuristics to see if it should connect readonly or read/write to the hypervisor. Unfortunately these heuristics fail, eg. when you have a root-owned system-wide qemud, and a user trying to run virsh as non-root. This patch removes the heuristics and replaces them with a simple -r | --readonly flag on the command line. If omitted, we try to connect read/write, otherwise we try to connect readonly. Note that this doesn't affect the "connect" command in the shell, which still has its own --readonly flag that is completely separate from this new global flag. Rich.

2 2

[Libvir] [PATCH] unlink roSockname, not sockname
by Richard W.M. Jones 06 Mar '07

06 Mar '07

Very trivial fix, but necessary because it prevents the qemu proxy from restarting. 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)

2 1

[Libvir] Error when paravirtualization domain starts with virsh.
by Michel Gauthier 06 Mar '07

06 Mar '07

With the RHEL5 RC distribution on our IA64 platform (4 CPUs), when we use virsh to start a paravirtuailzation domain, we've got the following: virsh # list Id Name State ---------------------------------- 0 Domain-0 running virsh # create hndom2 Failed to get devices for domain hndom2 error: Failed to create domain from hndom2 virsh # list Id Name State ---------------------------------- 0 Domain-0 running 24 Domain-24 paused In spite of an error message, a domain named Domain-Id is created instead of the hndom2 domain. The corresponding XML configuration file is the following: <domain type="xen"> <name>hndom2</name> <os> <type>linux</type> <kernel>/boot/efi/efi/redhat/vmlinuz-2.6.18-8.el5xen</kernel> <root>/dev/hda1</root> <initrd>/boot/efi/efi/redhat/initrd-2.6.18-8.el5xenU.img</initrd> <cmdline>console=tty0 nomca 3 ide0=noprobe ide1=noprobe ide2=noprobe ide3=noprobe selinux=0</cmdline> </os> <memory>527360</memory> <currentMemory>393216</currentMemory> <vcpu>3</vcpu> <on_poweroff>restart</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <disk type="block"> <driver name="phy"/> <source dev="/dev/sda5"/> <target dev="/dev/hda1"/> </disk> <interface type="bridge"> <source bridge=""/> </interface> </devices> </domain> If the <currentMemory> tag is suppressed from the XML configuration file, all is OK. This behaviour appears with the libvirt version 0.1.8 released with the RHEL5 RC, and also with the libvirt version 0.1.10. Are you aware of this problem? If you want some complementary infos (xend log), we can send it to you. Regards, Michel Gauthier.

3 3

[Libvir] [RFC] The idea of 'policy manager'
by ASANO Yuzuru 06 Mar '07

06 Mar '07

Hello, I summarized the idea about 'policy manager'. The purpose of 'policy manager' is to manage and to operate 'runtime policy' such as cpu pin/weight/cap. Please refer to the following thread about earlier argument about 'policy manager'. https://www.redhat.com/archives/libvir-list/2007-February/msg00211.html To implement the above mentioned features, I think that 'policy manager' need to be constructed by CLI and API. Is it all right in the following ideas? - About CLI At first, I think the following commands are necessary. ('xxx' means temporary command name) (1) xxx vcpupin <domain> <vcpu> <cpulist> : Same as virsh vcpupin <domain> <vcpu> <cpulist> command (2) xxx schedweight <domain> <weight> : Same as xm sched-credit -d <domain> -w <weight> command (3) xxx schedcap <domain> <cap> : Same as xm sched-credit -d <domain> -c <cap> command (4) xxx cpuoccupy <pcpu> <domains> : The domains specified by <domains> can use the <pcpu> in occupancy, and the other domains can't use it. (*) (5) xxx cpupolicy <domain> : Show the CPU runtime policy of <domain>. (*) When a running domain has vcpu pinned to only single pcpu, the other domains can't occupy the pcpu. In above mentioned (1)-(4), policy informations of not only running domains but also inactive domains are managed in the following API. - About API The main function which is necessary for API are as follows. o When CLI command is executed, the demanded processing is done by calling libvirt from API. o API preserves the specified by CLI command to a specific file. o When start/reboot domain command is executed by libvirt, API is called from libvirt and the domain is set the runtime policy. - TODO list o It is necessary to add new function into libvirt to change scheduler parameters (cpu weight/cap) previously. Any other thoughts from anyone? Regards, Yuzuru Asano.

1 0

[Libvir] [PATCH] qemuOpenConnection readonly parameter is not unused
by Richard W.M. Jones 05 Mar '07

05 Mar '07

2 1

[Libvir] [PATCH] patch for virsh domname <uuid> command error
by Tatsuro Enokura 02 Mar '07

02 Mar '07

Hi, Virsh domname <uuid> command for shut-off domain fails on xen-3.0.4. I think that xm_internal.c shoud be modified. But, it seems that xm_internal's structure isn't for xen-3.0.4, and shut-off domain's information is got from xend. I make a patch for xend_internal.c The attached patch resolve this issue in the following way: 1) If the domain's name can't be pulled out from the running domains list by uuid, request xend by "/xend/domains/<uuid>". 2) If the domain's data can be teken from xend, pull out the domain's name. Signed-off-by: Tatsuro Enokura <fj7716hz(a)aa.jp.fujitsu.com> Thanks, Tatsuro Enokura. Index: src/xend_internal.c (libvirt-0.2.0) =================================================================== --- xend_internal.c 2007-02-15 01:16:16.000000000 +0900 +++ xend_internal.c.new 2007-02-23 21:13:22.000000000 +0900 @@ -2759,6 +2759,8 @@ xenDaemonLookupByUUID(virConnectPtr conn char **tmp; unsigned char ident[VIR_UUID_BUFLEN]; int id = -1; + struct sexpr *root = NULL; + char *domname = NULL; names = xenDaemonListDomainsOld(conn); tmp = names; @@ -2779,6 +2781,26 @@ xenDaemonLookupByUUID(virConnectPtr conn } free(names); + if (name == NULL) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + memset(uuidstr, '\0', VIR_UUID_STRING_BUFLEN); + + snprintf(uuidstr, VIR_UUID_STRING_BUFLEN, + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + uuid[0], uuid[1], uuid[2], uuid[3], + uuid[4], uuid[5], uuid[6], uuid[7], + uuid[8], uuid[9], uuid[10], uuid[11], + uuid[12], uuid[13], uuid[14], uuid[15]); + root = sexpr_get(conn, "/xend/domain/%s?detail=1", uuidstr); + if (root == NULL) + goto error; + domname = (char*)sexpr_node(root, "domain/name"); + if (domname == NULL) + goto error; + name = strdup(domname); + id = -1; + } + if (name == NULL) goto error; @@ -2793,6 +2815,8 @@ xenDaemonLookupByUUID(virConnectPtr conn return (ret); error: + if (root != NULL) + sexpr_free(root); if (name != NULL) free(name); return (NULL); ===================================================================

2 4

[Libvir] [PATCH]Report the error from xend for Domain-0
by Kazuki　Mizushima 02 Mar '07

02 Mar '07

Hi, When I test virsh subcommands, dump save, for Domain-0, It says following normal messages, but the processing is not done. #virsh dump 0 a Domain 0 dumpd to a #echo $? 0 #virsh save 0 a Domain 0 saved to a #echo $? 0 I made a patch which reports the error from xend like this. #virsh dump 0 a libvir: Xen Daemon error : POST operation failed: (xend.err 'Cannot save privileged domain 0') libvir: error : library call virDomainSave failed, possibly not supported error: Failed to save domain 0 to a # echo $? 1 #virsh dump 0 a libvir: Xen Daemon error : POST operation failed: (xend.err 'Cannot dump core for privileged domain 0') libvir: error : library call virDomainCoreDump failed, possibly not supported error: Failed to core dump domain 0 to a # echo $? 1 Signed-off-by: Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> Thanks, Kazuki Mizushima Index: xend_internal.c (libvirt-0.2.0) ---------------------------------------------------------------------- --- ../../libvirt-0.2.0/src/xend_internal.c 2007-02-15 01:16:16.000000000 +0900 +++ xend_internal.c 2007-02-27 22:45:05.000000000 +0900 @@ -507,7 +507,10 @@ xend_post(virConnectPtr xend, const char if ((ret < 0) || (ret >= 300)) { virXendError(xend, VIR_ERR_POST_FAILED, content); - } else if ((ret = 202) && (strstr(content, "failed") != NULL)) { + } else if ((ret == 202) && (strstr(content, "failed") != NULL)) { + virXendError(xend, VIR_ERR_POST_FAILED, content); + ret = -1; + } else if ((ret == 202) && (strcasestr(content, "cannot") != NULL)) { virXendError(xend, VIR_ERR_POST_FAILED, content); ret = -1; } ----------------------------------------------------------------------

4 5

[Libvir] Warnings about GNU make extensions
by Richard W.M. Jones 01 Mar '07

01 Mar '07

I'm seeing the warnings below when compiling on Fedora Rawhide. src/Makefile.am:84: `%'-style pattern rules are a GNU make extension tests/Makefile.am:11: wildcard $(top_builddir: non-POSIX variable name tests/Makefile.am:11: (probably a GNU make extension) tests/confdata/Makefile.am:2: wildcard *.conf: non-POSIX variable name tests/confdata/Makefile.am:2: (probably a GNU make extension) tests/confdata/Makefile.am:2: wildcard *.out: non-POSIX variable name tests/confdata/Makefile.am:2: (probably a GNU make extension) tests/sexpr2xmldata/Makefile.am:2: wildcard *.xml: non-POSIX variable name tests/sexpr2xmldata/Makefile.am:2: (probably a GNU make extension) tests/sexpr2xmldata/Makefile.am:2: wildcard *.sexpr: non-POSIX variable name tests/sexpr2xmldata/Makefile.am:2: (probably a GNU make extension) tests/virshdata/Makefile.am:2: wildcard *.txt: non-POSIX variable name tests/virshdata/Makefile.am:2: (probably a GNU make extension) tests/xmconfigdata/Makefile.am:2: wildcard *.xml: non-POSIX variable name tests/xmconfigdata/Makefile.am:2: (probably a GNU make extension) tests/xmconfigdata/Makefile.am:2: wildcard *.cfg: non-POSIX variable name tests/xmconfigdata/Makefile.am:2: (probably a GNU make extension) tests/xml2sexprdata/Makefile.am:2: wildcard *.xml: non-POSIX variable name tests/xml2sexprdata/Makefile.am:2: (probably a GNU make extension) tests/xml2sexprdata/Makefile.am:2: wildcard *.sexpr: non-POSIX variable name tests/xml2sexprdata/Makefile.am:2: (probably a GNU make extension) Versions: $ make --version GNU Make 3.81 Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. This program built for x86_64-redhat-linux-gnu $ autoconf --version autoconf (GNU Autoconf) 2.61 Copyright (C) 2006 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>. There is NO WARRANTY, to the extent permitted by law. Written by David J. MacKenzie and Akim Demaille. $ automake --version automake (GNU automake) 1.10 Written by Tom Tromey <tromey(a)redhat.com> and Alexandre Duret-Lutz <adl(a)gnu.org>. Copyright 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Rich.

1 0

[Libvir] Patch: driver->open functions return declined or error status
by Richard W.M. Jones 01 Mar '07

01 Mar '07

I want to change the driver->open function so that as well as declining a name (returning -1 as now), it may also indicate that it accepts the name, but there is an error opening the name (-2). virConnectOpen fails in this second case, rather than going on and trying the next driver in sequence. 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)

3 3

[Libvir] ABI compatibility question: static strings returned from some functions
by Richard W.M. Jones 01 Mar '07

01 Mar '07

We have some functions such as virConnectGetType which are defined to return statically allocated strings: /** * virConnectGetType: * @conn: pointer to the hypervisor connection * * Get the name of the Hypervisor software used. * * Returns NULL in case of error, a static zero terminated string otherwise. */ const char * virConnectGetType(virConnectPtr conn) [...] This is all well and good in the typical local case, but when working over a remote connection the string we return is allocated and requires freeing at some point. Unfortunately I don't see a good thing to do in this case except to change the semantics of virConnectGetType, which arguably breaks ABI compatibility. Suggestions from anyone? Rich. garbage.collection++ -- 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 3

[Libvir] Patch: Driver private data
by Richard W.M. Jones 01 Mar '07

01 Mar '07

This patch is more aspirational than currently useful. Only the remote patch would use driver->private, but I think others should be changed to do so too. 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)

3 2

[Libvir] Request for libvirt/ChangeLog
by Atsushi SAKAI 01 Mar '07

01 Mar '07

Hi, Dan I have one request for libvirt/ChangeLog. Please add the submitter Mail address to libvirt/ChangeLog for ease of contribution counting. Or If you have any good Idea to get the contribution statistics, please notice me. If you consider this, I would be appreciate it. Thanks Atsushi SAKAI

3 4

[Libvir] Patch: include <locale.h> for setlocale
by Richard W.M. Jones 28 Feb '07

28 Feb '07

Very trivial, but useful for me because I'm trying to debug the remote stuff without -O, and without -O it turns out that libvirt doesn't compile. Rich. --------------------------------------- Index: proxy/libvirt_proxy.c =================================================================== RCS file: /data/cvs/libvirt/proxy/libvirt_proxy.c,v retrieving revision 1.12 diff -u -r1.12 libvirt_proxy.c --- proxy/libvirt_proxy.c 23 Jan 2007 14:39:45 -0000 1.12 +++ proxy/libvirt_proxy.c 28 Feb 2007 16:08:05 -0000 @@ -17,6 +17,7 @@ #include <sys/poll.h> #include <sys/socket.h> #include <sys/un.h> +#include <locale.h> #include "internal.h" #include "proxy_internal.h" #include "xen_internal.h" --------------------------------------- -- 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 2

[Libvir] Patch: export virConf* symbols
by Richard W.M. Jones 28 Feb '07

28 Feb '07

The standalone parts of libvirt (particularly libvirtd) use the configuration mini-lib. 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)

2 2

[Libvir] Patch: Define SYSCONFDIR symbol
by Richard W.M. Jones 28 Feb '07

28 Feb '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)

2 2

[Libvir] Patch: tabstops
by Richard W.M. Jones 28 Feb '07

28 Feb '07

I've been slowly adding the Emacs & vi tabstop code to the end of files. 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] VCPU mapping into the XML
by ASANO Yuzuru 28 Feb '07

28 Feb '07

Hello, I want to add the info of VCPU mapping into the XML, because we cannot manage VCPU mapping automatically when a domain starts or reboots. But in the following patch, the function written in "TODO" which I wanted has not been accepted. https://www.redhat.com/archives/libvir-list/2006-August/msg00015.html If I provided the patch managing VCPU mapping in the XML, do you accept it? Regards, Yuzuru Asano.

4 6

[Libvir] [PATCH] parsing virsh options is wrong
by Saori Fukuta 27 Feb '07

27 Feb '07

Hi, When I specified -t (or -q) option with virsh command, the result is something wrong. It is likely to be caused by the way to parse the virsh options. (example) I would like to know the node information with timing information. So, I try some cases. 1) virsh with "-t nodeinfo" ran virsh interactive terminal. Hmm, I didn't expect that... # virsh -t nodeinfo Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # 2) virsh with "-t aa nodeinfo" I got the node information with timing information. But what does "aa" option mean?? (Of course no meaning.) # virsh -t aa nodeinfo CPU model: i686 CPU(s): 2 CPU frequency: 1828 MHz CPU socket(s): 1 Core(s) per socket: 2 Thread(s) per core: 1 NUMA cell(s): 1 Memory size: 1037312 kB (Time: 2.821 ms) 3) virsh with "-t tt nodeinfo" ran virsh interactive terminal. What's the difference with "aa"? # virsh -t tt nodeinfo Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # I think the cause is missing a conditional before getopt_long at vshParseArgv and add to check whether "o->has_arg" is 1 or not. After the fix, I can use virsh options normally. (example) 1) virsh with "-t nodeinfo" # ./virsh -t nodeinfo CPU model: i686 CPU(s): 2 CPU frequency: 1828 MHz CPU socket(s): 1 Core(s) per socket: 2 Thread(s) per core: 1 NUMA cell(s): 1 Memory size: 1037312 kB (Time: 2.626 ms) 2) virsh with "-t aa nodeinfo" # ./virsh -t aa nodeinfo error: unknown command: 'aa' 3) virsh with "-t tt nodeinfo" # ./virsh -t tt nodeinfo error: unknown command: 'tt' Signed-off-by: Saori Fukuta <fukuta.saori(a)jp.fujitsu.com> Thanks, Saori Fukuta. Index: virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.55 diff -u -p -r1.55 virsh.c --- virsh.c 23 Feb 2007 10:27:53 -0000 1.55 +++ virsh.c 27 Feb 2007 07:35:28 -0000 @@ -3344,12 +3344,14 @@ vshParseArgv(vshControl * ctl, int argc, int sz = strlen(last); for (o = opt; o->name; o++) { - if (sz == 2 && *(last + 1) == o->val) - /* valid virsh short option */ - valid = TRUE; - else if (sz > 2 && strcmp(o->name, last + 2) == 0) - /* valid virsh long option */ - valid = TRUE; + if (o->has_arg == 1){ + if (sz == 2 && *(last + 1) == o->val) + /* valid virsh short option */ + valid = TRUE; + else if (sz > 2 && strcmp(o->name, last + 2) == 0) + /* valid virsh long option */ + valid = TRUE; + } } } if (!valid) {

2 1

[Libvir] Linker dependancoes [Re: [kvm-devel] QEMU / KVM support in libvirt & virt-manager]
by Daniel P. Berrange 26 Feb '07

26 Feb '07

See this thread on kvm-devel for a question about link time dependancies in libvirt. I'm not sure what the optimal approach is for us to deal with this is - just something we should think about in an idle moment... ----- Forwarded message from Avi Kivity <avi(a)qumranet.com> ----- > Date: Sun, 25 Feb 2007 18:48:44 +0200 > From: Avi Kivity <avi(a)qumranet.com> > To: "Daniel P. Berrange" <berrange(a)redhat.com> > CC: kvm-devel(a)lists.sourceforge.net > Subject: Re: [kvm-devel] QEMU / KVM support in libvirt & virt-manager > > Daniel P. Berrange wrote: > > On Sun, Feb 25, 2007 at 07:32:58AM +0200, Avi Kivity wrote: > > > >> Daniel P. Berrange wrote: > >> > >>> FYI, as of libvirt 0.2.0 and virt-manager 0.3.1 there is now > >>> (experimental!) > >>> support for managing virtual machines running under QEMU or KVM > >>> virtualization > >>> platforms, as well as the existing Xen support. > >>> > >> Great; as I see it hit FC6-updates I'll give it a shot. > >> > >> One thing I saw is that it pulls in Xen as part of the dependencies; > >> perhaps a libvirt-xen and libvirt-kvm subpackage split is called for? > > > > Yeah, we've not figured out exactly how to address that dependancy > > issue yet - the libvirt.so has to link to libxenstore as part of the > > Xen driver, so even if you only want to manage QEMU instances we still > > end up pulling in Xen. We're certainly going to make it possible to > > turn off the Xen stuff at compile time. Not clear how we'd address the > > RPM dep issue though because the Fedora builds of libvirt will include > > both Xen & QEMU support. Perhaps we'll have to try a dlopen() approach. > > I would suggest a /usr/lib/libvirt/xen.so and a > /usr/lib/libvirt/qemu.so, which are enumerated by reading > /usr/lib/libvirt, and dlopen()ed by libvirt.so. Only > /usr/lib/libvirt/xen.so links to libxenstore. > > That way, a third party can add a backend by dropping a .so into > /usr/lib/libvirt, and libvirt.so itself has no backend-related > dependencies -- it doesn't know anything concrete about the backends, in > fact. ----- End forwarded message ----- 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 3

[Libvir] Remote patch, 2007-02-26
by Richard W.M. Jones 26 Feb '07

26 Feb '07

I was really hoping to have a patch which could be applied out today. This isn't quite that patch, so my apologies. Nevertheless, this demonstrates what can be done, and works on a selection of the important libvirt API calls. http://www.annexia.org/tmp/libvirt-tls-20070226.patch List of things that need to be done: * Audit incoming IP addresses / virConnectOpen names to syslog. * GnuTLS handshake DoS fix (see danpb's email). * GnuTLS client crashing bug (I have a fix, just needs to be applied). * Complete the wrappers for the remaining API calls. * Testing(!) Apart from that list above, I'm hoping that this patch addresses everything that people have raised on list and privately about previous patches. If I've missed anything, let me know. Rich. ----------------------------------------- "screenshot" --- rjones@oirase:~/d/libvirt-remote$ src/virsh -c test://localhost/default nodeinfo proceeding with name = test:///default loading CA file demoCA/cacert.pem loading client cert and key from files 127001cert.pem and 127001key.pem CPU model: i686 CPU(s): 16 CPU frequency: 1400 MHz CPU socket(s): 2 Core(s) per socket: 2 Thread(s) per core: 2 NUMA cell(s): 2 Memory size: 3145728 kB rjones@oirase:~/d/libvirt-remote$ src/virsh -c test://localhost/default create tests/xmconfigdata/test-fullvirt-new-cdrom.xml proceeding with name = test:///default loading CA file demoCA/cacert.pem loading client cert and key from files 127001cert.pem and 127001key.pem Domain XenGuest2 created from tests/xmconfigdata/test-fullvirt-new-cdrom.xml rjones@oirase:~/d/libvirt-remote$ src/libvirtd -d libvir: error : failed to open /home/rjones/local/etc/libvirtd.conf for reading libvirtd: loading CA cert from demoCA/cacert.pem libvirtd: loading cert and key from servercert.pem and serverkey.pem libvirtd: TLS service listening on port 16514 libvirtd: Unix service listening on socket /home/rjones/local/var/run/libvirtd/socket libvirtd: create_mapping: xprt = 0x647680 libvirtd: lookup_connection: xprt = 0x647680 libvirtd: set_connection: xprt = 0x647680 libvirtd: lookup_connection: xprt = 0x647680 libvirtd: lookup_connection: xprt = 0x647680 libvirtd: set_connection: xprt = 0x647680 libvirtd: destroy_mapping: xprt = 0x647680 libvirtd: create_mapping: xprt = 0x647b20 libvirtd: lookup_connection: xprt = 0x647b20 libvirtd: set_connection: xprt = 0x647b20 libvirtd: lookup_connection: xprt = 0x647b20 libvirtd: lookup_connection: xprt = 0x647b20 libvirtd: set_connection: xprt = 0x647b20 libvirtd: destroy_mapping: xprt = 0x647b20 -- 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

Re: [Libvir] [patch 3/3] Use libuuid to generate UUIDs
by Daniel P. Berrange 26 Feb '07

26 Feb '07

On Mon, Feb 26, 2007 at 02:28:30PM +0000, Mark McLoughlin wrote: > If libuuid from e2fsprogs is available, we use that to > generate UUIDs. On the one hand I think its good to re-use existing libraries where they fullfill our needs, but then we need to keep a built-in impl of UUID generator for non-Linux systems which typically won't have a e2fsprogs available. So rather than maintaining two separate impls of the UUID code, which splits the testing coverage, I'd be inclined to just always use the builtin version. Guarenteeing consistent algorithm / semantics for UUID generation across all platforms. 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 2

Re: [Libvir] [patch 1/3] Add UUID generation to qemud
by Richard W.M. Jones 26 Feb '07

26 Feb '07

Mark McLoughlin wrote: > +static int > +qemudGenerateRandomBytes(unsigned char *buf, > + int buflen) > +{ > + int fd; > + > + if ((fd = open("/dev/urandom", O_RDONLY)) < 0) > + return errno; > + > + while (buflen > 0) { > + int n; > + > + if ((n = read(fd, buf, buflen)) <= 0) { > + if (errno == EINTR) > + continue; > + close(fd); > + return n < 0 ? errno : ENODATA; > + } > + > + buf += n; > + buflen -= n; > + } > + > + close(fd); > + > + return 0; > +} This function would actually be quite useful as a generally available function. In the remote patch I have added the following to configure.in: dnl /dev/urandom AC_CHECK_FILES([/dev/urandom]) and then in C code I can write: #if HAVE__DEV_URANDOM /* NB double underscore */ // random blah blah #else // pseudorandom blah blah #endif 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

Re: [Libvir] [patch 0/3] Automatically generate UUIDs in qemud
by Richard W.M. Jones 26 Feb '07

26 Feb '07

Mark McLoughlin wrote: > Hey, > We currently require guests and networks to have a > UUID defined. This patch automatically generates a UUID > if one isn't supplied. > > This is needed because the default network we install > won't have a UUID assigned, since we'll want the UUID to be > different on different hosts. Good one. The remote patch makes some assumptions that UUID is always defined too. 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 3/3] Use libuuid to generate UUIDs
by Mark McLoughlin 26 Feb '07

26 Feb '07

If libuuid from e2fsprogs is available, we use that to generate UUIDs. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/configure.in =================================================================== --- libvirt.orig/configure.in +++ libvirt/configure.in @@ -189,6 +189,22 @@ dnl AC_CHECK_HEADERS(linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h,, AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt])) +dnl +dnl check for libuuid +dnl +AC_ARG_ENABLE(libuuid, + AC_HELP_STRING([--disable-libuuid], + [disable support for generating UUIDs using e2fsprogs libuuid [default=no]]),, + enable_libuuid=yes) + +if test "x$enable_libuuid" == "xyes" ; then + AC_CHECK_LIB(uuid, uuid_generate, + [AC_CHECK_HEADER(uuid/uuid.h, + AC_DEFINE(ENABLE_LIBUUID,, [enable generating UUIDs using libuuid]) + UUID_LIBS="-luuid" AC_SUBST(UUID_LIBS), + AC_MSG_ERROR([You must install libuuid in order to compile libvirt]))]) +fi + dnl ========================================================================== dnl find libxml2 library, borrowed from xmlsec dnl ========================================================================== Index: libvirt/qemud/Makefile.am =================================================================== --- libvirt.orig/qemud/Makefile.am +++ libvirt/qemud/Makefile.am @@ -16,7 +16,7 @@ libvirt_qemud_CFLAGS = \ -I$(top_srcdir)/include -I$(top_builddir)/include $(LIBXML_CFLAGS) \ -Wall -Wextra -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ -DSYSCONF_DIR="\"$(sysconfdir)\"" -libvirt_qemud_LDFLAGS = $(LIBXML_LIBS) $(SYSFS_LIBS) +libvirt_qemud_LDFLAGS = $(LIBXML_LIBS) $(SYSFS_LIBS) $(UUID_LIBS) libvirt_qemud_DEPENDENCIES = libvirt_qemud_LDADD = Index: libvirt/qemud/uuid.c =================================================================== --- libvirt.orig/qemud/uuid.c +++ libvirt/qemud/uuid.c @@ -23,6 +23,9 @@ #include "uuid.h" +#ifdef ENABLE_LIBUUID +#include <uuid/uuid.h> +#else #include <errno.h> #include <fcntl.h> #include <stdlib.h> @@ -34,6 +37,18 @@ #include "protocol.h" #include "internal.h" +#endif + +#ifdef ENABLE_LIBUUID + +int +qemudGenerateUUID(unsigned char *uuid) +{ + uuid_generate(uuid); + return 0; +} + +#else /* ENABLE_LIBUUID */ static int qemudGenerateRandomBytes(unsigned char *buf, @@ -89,6 +104,8 @@ qemudGenerateUUID(unsigned char *uuid) return qemudGeneratePseudoRandomBytes(uuid, QEMUD_UUID_RAW_LEN); } +#endif /* ENABLE_LIBUUID */ + int qemudParseUUID(const char *uuid, unsigned char *rawuuid) { const char *cur; --

1 0

[Libvir] [patch 2/3] Move qemudParseUUID() to uuid.
by Mark McLoughlin 26 Feb '07

26 Feb '07

Seems like the obvious place for it now ... Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -47,54 +47,6 @@ #include "iptables.h" #include "uuid.h" -static int qemudParseUUID(const char *uuid, - unsigned char *rawuuid) { - const char *cur; - int i; - - /* - * do a liberal scan allowing '-' and ' ' anywhere between character - * pairs as long as there is 32 of them in the end. - */ - cur = uuid; - for (i = 0;i < 16;) { - rawuuid[i] = 0; - if (*cur == 0) - goto error; - if ((*cur == '-') || (*cur == ' ')) { - cur++; - continue; - } - if ((*cur >= '0') && (*cur <= '9')) - rawuuid[i] = *cur - '0'; - else if ((*cur >= 'a') && (*cur <= 'f')) - rawuuid[i] = *cur - 'a' + 10; - else if ((*cur >= 'A') && (*cur <= 'F')) - rawuuid[i] = *cur - 'A' + 10; - else - goto error; - rawuuid[i] *= 16; - cur++; - if (*cur == 0) - goto error; - if ((*cur >= '0') && (*cur <= '9')) - rawuuid[i] += *cur - '0'; - else if ((*cur >= 'a') && (*cur <= 'f')) - rawuuid[i] += *cur - 'a' + 10; - else if ((*cur >= 'A') && (*cur <= 'F')) - rawuuid[i] += *cur - 'A' + 10; - else - goto error; - i++; - cur++; - } - - return 0; - - error: - return -1; -} - /* Free all memory associated with a struct qemud_vm object */ void qemudFreeVMDef(struct qemud_vm_def *def) { struct qemud_vm_disk_def *disk = def->disks; Index: libvirt/qemud/uuid.c =================================================================== --- libvirt.orig/qemud/uuid.c +++ libvirt/qemud/uuid.c @@ -89,6 +89,54 @@ qemudGenerateUUID(unsigned char *uuid) return qemudGeneratePseudoRandomBytes(uuid, QEMUD_UUID_RAW_LEN); } +int +qemudParseUUID(const char *uuid, unsigned char *rawuuid) { + const char *cur; + int i; + + /* + * do a liberal scan allowing '-' and ' ' anywhere between character + * pairs as long as there is 32 of them in the end. + */ + cur = uuid; + for (i = 0;i < 16;) { + rawuuid[i] = 0; + if (*cur == 0) + goto error; + if ((*cur == '-') || (*cur == ' ')) { + cur++; + continue; + } + if ((*cur >= '0') && (*cur <= '9')) + rawuuid[i] = *cur - '0'; + else if ((*cur >= 'a') && (*cur <= 'f')) + rawuuid[i] = *cur - 'a' + 10; + else if ((*cur >= 'A') && (*cur <= 'F')) + rawuuid[i] = *cur - 'A' + 10; + else + goto error; + rawuuid[i] *= 16; + cur++; + if (*cur == 0) + goto error; + if ((*cur >= '0') && (*cur <= '9')) + rawuuid[i] += *cur - '0'; + else if ((*cur >= 'a') && (*cur <= 'f')) + rawuuid[i] += *cur - 'a' + 10; + else if ((*cur >= 'A') && (*cur <= 'F')) + rawuuid[i] += *cur - 'A' + 10; + else + goto error; + i++; + cur++; + } + + return 0; + + error: + return -1; +} + /* * Local variables: * indent-tabs-mode: nil Index: libvirt/qemud/uuid.h =================================================================== --- libvirt.orig/qemud/uuid.h +++ libvirt/qemud/uuid.h @@ -24,4 +24,7 @@ int qemudGenerateUUID(unsigned char *uuid); +int qemudParseUUID (const char *uuid, + unsigned char *rawuuid); + #endif /* __QEMUD_UUID_H__ */ --

1 0

[Libvir] [patch 1/3] Add UUID generation to qemud
by Mark McLoughlin 26 Feb '07

26 Feb '07

If a guest or network does not have a UUID assigned to it, we generate a random UUID preferably using /dev/urandom, but falling back to pseudo-random number generation if that fails. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/Makefile.am =================================================================== --- libvirt.orig/qemud/Makefile.am +++ libvirt/qemud/Makefile.am @@ -9,7 +9,8 @@ libvirt_qemud_SOURCES = qemud.c internal dispatch.c dispatch.h \ conf.c conf.h \ bridge.c bridge.h \ - iptables.c iptables.h + iptables.c iptables.h \ + uuid.c uuid.h #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirt_qemud_CFLAGS = \ -I$(top_srcdir)/include -I$(top_builddir)/include $(LIBXML_CFLAGS) \ Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -45,6 +45,7 @@ #include "conf.h" #include "driver.h" #include "iptables.h" +#include "uuid.h" static int qemudParseUUID(const char *uuid, unsigned char *rawuuid) { @@ -689,11 +690,13 @@ static struct qemud_vm_def *qemudParseXM obj = xmlXPathEval(BAD_CAST "string(/domain/uuid[1])", ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - /* XXX auto-generate a UUID */ - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "missing uuid element"); - goto error; - } - if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { + int err; + if ((err = qemudGenerateUUID(def->uuid))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to generate UUID: %s", strerror(err)); + goto error; + } + } else if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "malformed uuid element"); goto error; } @@ -1650,11 +1653,13 @@ static struct qemud_network_def *qemudPa obj = xmlXPathEval(BAD_CAST "string(/network/uuid[1])", ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - /* XXX auto-generate a UUID */ - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "missing uuid element"); - goto error; - } - if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { + int err; + if ((err = qemudGenerateUUID(def->uuid))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to generate UUID: %s", strerror(err)); + goto error; + } + } else if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "malformed uuid element"); goto error; } Index: libvirt/qemud/uuid.c =================================================================== --- /dev/null +++ libvirt/qemud/uuid.c @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Mark McLoughlin <markmc(a)redhat.com> + */ + +#include "config.h" + +#include "uuid.h" + +#include <errno.h> +#include <fcntl.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +#include "protocol.h" +#include "internal.h" + +static int +qemudGenerateRandomBytes(unsigned char *buf, + int buflen) +{ + int fd; + + if ((fd = open("/dev/urandom", O_RDONLY)) < 0) + return errno; + + while (buflen > 0) { + int n; + + if ((n = read(fd, buf, buflen)) <= 0) { + if (errno == EINTR) + continue; + close(fd); + return n < 0 ? errno : ENODATA; + } + + buf += n; + buflen -= n; + } + + close(fd); + + return 0; +} + +static int +qemudGeneratePseudoRandomBytes(unsigned char *buf, + int buflen) +{ + srand(time(NULL)); + while (buflen > 0) { + *buf = (int) (255.0 * (rand() / (double) RAND_MAX)); + buflen--; + } + + return 0; +} + +int +qemudGenerateUUID(unsigned char *uuid) +{ + int err; + + if ((err = qemudGenerateRandomBytes(uuid, QEMUD_UUID_RAW_LEN))) + qemudLog(QEMUD_WARN, + "Falling back to pseudorandom UUID, " + "failed to generate random bytes: %s", strerror(err)); + + return qemudGeneratePseudoRandomBytes(uuid, QEMUD_UUID_RAW_LEN); +} + +/* + * Local variables: + * indent-tabs-mode: nil + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ + Index: libvirt/qemud/uuid.h =================================================================== --- /dev/null +++ libvirt/qemud/uuid.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Mark McLoughlin <markmc(a)redhat.com> + */ + +#ifndef __QEMUD_UUID_H__ +#define __QEMUD_UUID_H__ + +int qemudGenerateUUID(unsigned char *uuid); + +#endif /* __QEMUD_UUID_H__ */ --

1 0