- Devel - libvirt List Archives

[libvirt] [RFC PATCH 0/5] Qemu Monitor Passthrough
by Chris Lalancette 19 Apr '10

19 Apr '10

Hello, As we discussed on the list, here are RFC patches that allow both qemu monitor passthrough and the ability to specify extra arguments to be passed on the qemu command-line. I've specifically not done the more complicated regex command-line editing for now, since we don't have consensus on it. There are a few outstanding issues with these patches: 1) Should we have a separate structure for the per-driver qemuMonitorCommand entry point? 2) Due to the way that virsh parses command-line arguments, it's not possible to pass it an argument that has spaces (even if you properly quote it). Therefore I have a hack in place that will convert ^ to space before passing it along, which is pretty crappy. How should we go about fixing this? Fix virsh argument parsing, or go about it a different way? Questions or comments about the patch series are welcome. Chris Lalancette

2 14

[libvirt] That the Linux bridge configuration does not work afer I upgraded the kernel to 2.6.33.2.
by Frank Peng 19 Apr '10

19 Apr '10

Hello, When I use a standard Redhat kernel, it's ok. Everything's working right. That the Linux bridge configuration does not work afer I upgraded the kernel to 2.6.33.2. Why? [root@node78 ~]# cat /etc/issue Red Hat Enterprise Linux Server release 5.5 (Tikanga) Kernel \r on an \m [root@node78 ~]# uname -a Linux node78 2.6.33.2 #1 SMP Wed Apr 14 10:10:29 CST 2010 x86_64 x86_64 x86_64 GNU/Linux [root@node78 ~]# cat /etc/sysconfig/selinux # This file controls the state of SELinux on the system. # SELINUX= can take one of these three values: # enforcing - SELinux security policy is enforced. # permissive - SELinux prints warnings instead of enforcing. # disabled - SELinux is fully disabled. SELINUX=disabled # SELINUXTYPE= type of policy in use. Possible values are: # targeted - Only targeted network daemons are protected. # strict - Full SELinux protection. SELINUXTYPE=targeted [root@node78 ~]# iptables -L Chain INPUT (policy ACCEPT) target prot opt source destination Chain FORWARD (policy ACCEPT) target prot opt source destination Chain OUTPUT (policy ACCEPT) target prot opt source destination [root@node78 ~]# cat /etc/sysconfig/network-scripts/ifcfg-eth0 # Intel Corporation 80003ES2LAN Gigabit Ethernet Controller (Copper) DEVICE=eth0 HWADDR=00:15:17:11:16:18 BRIDGE=br0 NM_CONTROLLED=no ONBOOT=yes [root@node78 ~]# cat /etc/sysconfig/network-scripts/ifcfg-br0 DEVICE=br0 TYPE=Bridge BOOTPROTO=static BROADCAST=192.168.0.255 IPADDR=192.168.0.78 NETMASK=255.255.255.0 NETWORK=192.168.0.0 DELAY=0 NM_CONTROLLED=no ONBOOT=yes [root@node78 ~]#cd /usr/src/ [root@node78 ~]#tar jxf linux-2.6.33.2.tar.bz2 [root@node78 ~]#ln -s linux-2.6.33.2 linux [root@node78 ~]#cd linux [root@node78 ~]#cp /boot/config-2.6.18-164.el5 /usr/src/linux-2.6.33.2/.config [root@node78 ~]#make menuconfig (add the option "enable deprecated sysfs feathures to support old userspace tools") [root@node78 ~]#make && make modules && make modules_install && make install [root@node78 ~]# ifconfig br0 Link encap:Ethernet HWaddr 00:15:17:11:16:18 inet addr:192.168.0.78 Bcast:192.168.0.255 Mask:255.255.255.0 inet6 addr: fe80::215:17ff:fe11:1618/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:7217 errors:0 dropped:0 overruns:0 frame:0 TX packets:273 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:738606 (721.2 KiB) TX bytes:36168 (35.3 KiB) eth0 Link encap:Ethernet HWaddr 00:15:17:11:16:18 inet6 addr: fe80::215:17ff:fe11:1618/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:7490 errors:0 dropped:0 overruns:0 frame:0 TX packets:304 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:100 RX bytes:866112 (845.8 KiB) TX bytes:42312 (41.3 KiB) Memory:b8820000-b8840000 eth1 Link encap:Ethernet HWaddr 00:15:17:11:16:19 inet addr:10.0.7.78 Bcast:10.255.255.255 Mask:255.0.0.0 inet6 addr: fe80::215:17ff:fe11:1619/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:4 errors:0 dropped:0 overruns:0 frame:0 TX packets:59 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:1056 (1.0 KiB) TX bytes:10982 (10.7 KiB) Memory:b8800000-b8820000 lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:16436 Metric:1 RX packets:1831 errors:0 dropped:0 overruns:0 frame:0 TX packets:1831 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:3576260 (3.4 MiB) TX bytes:3576260 (3.4 MiB) [root@node78 ~]# ifconfig vmbr0 vmbr0: error fetching interface information: Device not found Best Regards, Frank

1 0

[libvirt] [PATCH] nwfilter: Free nwfilter hash of virConnectPtr
by Matthias Bolte 18 Apr '10

18 Apr '10

And close the driver on connection close. --- src/datatypes.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index ebcd538..25962a6 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -129,6 +129,20 @@ virSecretFreeName(void *secret_, const char *name ATTRIBUTE_UNUSED) } /** + * virNWFilterPoolFreeName: + * @pool: a nwfilter pool object + * + * Destroy the nwfilter pool object, this is just used by the nwfilter pool hash callback. + * + * Returns 0 in case of success and -1 in case of failure. + */ +static int +virNWFilterPoolFreeName(virNWFilterPtr pool, const char *name ATTRIBUTE_UNUSED) +{ + return (virUnrefNWFilter(pool)); +} + +/** * virDomainSnapshotFreeName: * @snapshot: a domain snapshotobject * @@ -212,6 +226,8 @@ failed: virHashFree(ret->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (ret->secrets != NULL) virHashFree(ret->secrets, virSecretFreeName); + if (ret->nwfilterPools != NULL) + virHashFree(ret->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); virMutexDestroy(&ret->lock); VIR_FREE(ret); @@ -245,6 +261,8 @@ virReleaseConnect(virConnectPtr conn) { virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (conn->secrets != NULL) virHashFree(conn->secrets, virSecretFreeName); + if (conn->nwfilterPools != NULL) + virHashFree(conn->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); virResetError(&conn->err); @@ -292,6 +310,8 @@ virUnrefConnect(virConnectPtr conn) { conn->deviceMonitor->close (conn); if (conn->secretDriver) conn->secretDriver->close (conn); + if (conn->nwfilterDriver) + conn->nwfilterDriver->close (conn); if (conn->driver) conn->driver->close (conn); -- 1.6.3.3

2 2

[libvirt] [PATCH 00/30] Cleanup translation marks and remove virConnectPtr from error reporting
by Matthias Bolte 17 Apr '10

17 Apr '10

This set of patches removes translation marks from log messages, adds missing translation marks to error messages and removes the virConnectPtr parameter from all error reporting functions. This series is large, but most of it was done by search and replace. 105 files changed, 3574 insertions(+), 4005 deletions(-) Matthias

6 96

[libvirt] [PATCH] Mark internal.h for translation
by Jiri Denemark 16 Apr '10

16 Apr '10

Patch for virCheckFlags added a message marked for translation into internal.h without including that file in POTFILES.in. I've just pushed the following patch. Jirka >From 39f3fee4a48ef39a2baab25e306d94238d1e1361 Mon Sep 17 00:00:00 2001 Message-Id: <39f3fee4a48ef39a2baab25e306d94238d1e1361.1271439006.git.jdenemar(a)redhat.com> From: Jiri Denemark <jdenemar(a)redhat.com> Date: Fri, 16 Apr 2010 19:21:10 +0200 Subject: [PATCH] Mark internal.h for translation Mail-Followup-To: libvir-list(a)redhat.com --- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 406e4c2..58e7358 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -25,6 +25,7 @@ src/esx/esx_vi_methods.c src/esx/esx_vi_types.c src/esx/esx_vmx.c src/interface/netcf_driver.c +src/internal.h src/libvirt.c src/lxc/lxc_container.c src/lxc/lxc_controller.c -- 1.7.0.4

1 0

[libvirt] unable to set security context (NFSv4 problem?)
by Harald Dunkel 16 Apr '10

16 Apr '10

Hi folks, Since I have moved the image file of a domain to an NFS partition I get an error message at start time: # virsh start mydomain error: Failed to start domain mydomain error: unable to set security context '110:140' on '/storage/mydomain/vda.img': Invalid argument The /storage partition is mounted with these options: # cat /proc/mounts | grep /storage nasl002:/storage/ /storage nfs4 rw,relatime,vers=4,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.19.96.31,addr=172.19.96.213 0 0 If I use a local disk instead, then there is no such problem. libvirt is version 0.7.7-4, as included with Debian. Any helpful comment would be highly appreciated. Regards Harri

4 5

[libvirt] [PATCH] Don't build nwfilter examples when not building libvirtd
by Matthew Booth 16 Apr '10

16 Apr '10

* Makefile.am: Make examples/xml/nwfilter conditional on WITH_LIBVIRTD --- Makefile.am | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd334b5..40352c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,11 @@ GENHTML = genhtml SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ - examples/dominfo examples/domsuspend examples/python examples/apparmor \ - examples/xml/nwfilter + examples/dominfo examples/domsuspend examples/python examples/apparmor + +if WITH_LIBVIRTD + SUBDIRS += examples/xml/nwfilter +endif ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 -- 1.6.6.1

2 1

[libvirt] [PATCH] esx: Add nwfilter driver stub
by Matthias Bolte 16 Apr '10

16 Apr '10

This stops libvirt trying to connect to a non-existing libvirtd on the ESX server. --- src/Makefile.am | 1 + src/esx/esx_driver.c | 4 +- src/esx/esx_nwfilter_driver.c | 86 +++++++++++++++++++++++++++++++++++++++++ src/esx/esx_nwfilter_driver.h | 29 ++++++++++++++ 4 files changed, 119 insertions(+), 1 deletions(-) create mode 100644 src/esx/esx_nwfilter_driver.c create mode 100644 src/esx/esx_nwfilter_driver.h diff --git a/src/Makefile.am b/src/Makefile.am index df577ea..66dc349 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -247,6 +247,7 @@ ESX_DRIVER_SOURCES = \ esx/esx_storage_driver.c esx/esx_storage_driver.h \ esx/esx_device_monitor.c esx/esx_device_monitor.h \ esx/esx_secret_driver.c esx/esx_secret_driver.h \ + esx/esx_nwfilter_driver.c esx/esx_nwfilter_driver.h \ esx/esx_util.c esx/esx_util.h \ esx/esx_vi.c esx/esx_vi.h \ esx/esx_vi_methods.c esx/esx_vi_methods.h \ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e3340c9..a2fc85c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -39,6 +39,7 @@ #include "esx_storage_driver.h" #include "esx_device_monitor.h" #include "esx_secret_driver.h" +#include "esx_nwfilter_driver.h" #include "esx_private.h" #include "esx_vi.h" #include "esx_vi_methods.h" @@ -3834,7 +3835,8 @@ esxRegister(void) esxNetworkRegister() < 0 || esxStorageRegister() < 0 || esxDeviceRegister() < 0 || - esxSecretRegister() < 0) { + esxSecretRegister() < 0 || + esxNWFilterRegister() < 0) { return -1; } diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c new file mode 100644 index 0000000..71d7aca --- /dev/null +++ b/src/esx/esx_nwfilter_driver.c @@ -0,0 +1,86 @@ + +/* + * esx_nwfilter_driver.c: nwfilter driver functions for managing VMware ESX + * firewall rules + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#include <config.h> + +#include "internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_private.h" +#include "esx_nwfilter_driver.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + + + +static virDrvOpenStatus +esxNWFilterOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->nwfilterPrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxNWFilterClose(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + return 0; +} + + + +static virNWFilterDriver esxNWFilterDriver = { + "ESX", /* name */ + esxNWFilterOpen, /* open */ + esxNWFilterClose, /* close */ + NULL, /* numOfNWFilters */ + NULL, /* listNWFilters */ + NULL, /* nwfilterLookupByName */ + NULL, /* nwfilterLookupByUUID */ + NULL, /* defineXML */ + NULL, /* undefine */ + NULL, /* getXMLDesc */ +}; + + + +int +esxNWFilterRegister(void) +{ + return virRegisterNWFilterDriver(&esxNWFilterDriver); +} diff --git a/src/esx/esx_nwfilter_driver.h b/src/esx/esx_nwfilter_driver.h new file mode 100644 index 0000000..64cceab --- /dev/null +++ b/src/esx/esx_nwfilter_driver.h @@ -0,0 +1,29 @@ + +/* + * esx_nwfilter_driver.h: nwfilter driver functions for managing VMware ESX + * firewall rules + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#ifndef __ESX_NWFILTER_DRIVER_H__ +# define __ESX_NWFILTER_DRIVER_H__ + +int esxNWFilterRegister(void); + +#endif /* __ESX_NWFILTER_DRIVER_H__ */ -- 1.6.3.3

3 3

[libvirt] [PATCH v2 0/2] Enhance checking of supported flags in drivers
by Jiri Denemark 16 Apr '10

16 Apr '10

I think we need a simple and consistent way of checking whether flags passed to API entry points in drivers are valid/supported or not. So far some entry points don't check flags at all and some checks for 0 when no flags are expected/supported. The first patch introduces a macro which can be called with a whitelist of supported flags (more info about it inside the patch). The second patch changes all API calls introduced in 0.8.0 release to use the macro for checking valid flags. I'm not sure if we can change existing API calls to do the same as it could break some badly written apps which pass invalid flags. My opinion is that we may often do that as such apps don't use the API in a documented/valid way. Changes in v2: - virCheckFlags moved from checks.h to existing internal.h Jirka Jiri Denemark (2): Introduce virCheckFlags for consistent flags checking Use virCheckFlags for APIs added in 0.8.0 src/esx/esx_driver.c | 43 ++++++++++++------------- src/internal.h | 23 +++++++++++++ src/nwfilter/nwfilter_driver.c | 4 ++- src/qemu/qemu_driver.c | 68 +++++++++++++++++++--------------------- src/storage/storage_driver.c | 6 +--- src/vbox/vbox_tmpl.c | 41 ++++++++++++++++------- src/xen/xend_internal.c | 4 ++ 7 files changed, 111 insertions(+), 78 deletions(-)

3 7

[libvirt] [PATCH] nwfilter: Clear all state tracking from a drop rule
by Stefan Berger 16 Apr '10

16 Apr '10

Don't use state-matching in a drop rule. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1380,13 +1380,16 @@ _iptablesCreateRuleInstance(int directio return 0; } - if (match) - virBufferVSprintf(&buf, " %s", match); - if (rule->action == VIR_NWFILTER_RULE_ACTION_ACCEPT) target = accept_target; - else + else { target = "DROP"; + match = NULL; + } + + if (match) + virBufferVSprintf(&buf, " %s", match); + virBufferVSprintf(&buf, " -j %s" CMD_DEF_POST CMD_SEPARATOR

2 2

[libvirt] [PATCH] Fix network hotplug to use device_add in QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

The initial boot of VMs uses -device for NICs where available. The corresponding monitor command is device_add, but the network hotplug code was still using device_del by mistake. * src/qemu/qemu_driver.c: Use device_add for NIC hotplug where available --- src/qemu/qemu_driver.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5c15c1d..9e0a353 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7210,17 +7210,29 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, close(tapfd); tapfd = -1; - if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) - goto try_remove; + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + if (!(nicstr = qemuBuildNicDevStr(net, vlan))) + goto try_remove; + } else { + if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) + goto try_remove; + } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorAddPCINetwork(priv->mon, nicstr, - &guestAddr) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto try_remove; + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + if (qemuMonitorAddDevice(priv->mon, nicstr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_remove; + } + } else { + if (qemuMonitorAddPCINetwork(priv->mon, nicstr, + &guestAddr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_remove; + } + net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); } - net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); qemuDomainObjExitMonitorWithDriver(driver, vm); ret = 0; -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix error reporting for getfd + host_net_add in QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

If either of the getfd or host_net_add monitor commands return any text, this indicates an error condition. Don't ignore this! * src/qemu/qemu_monitor_text.c: Report errors for getfd and host_net_add --- src/qemu/qemu_monitor_text.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 48c9a54..6ad07b1 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1666,6 +1666,13 @@ int qemuMonitorTextSendFileHandle(qemuMonitorPtr mon, goto cleanup; } + if (STRNEQ(reply, "")) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to send TAP file handle: %s"), + reply); + goto cleanup; + } + ret = 0; cleanup: @@ -1725,11 +1732,16 @@ int qemuMonitorTextAddHostNetwork(qemuMonitorPtr mon, if (qemuMonitorCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + _("failed to add host net with '%s'"), cmd); goto cleanup; } - /* XXX error messages here ? */ + if (STRNEQ(reply, "")) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to add host net: %s"), + reply); + goto cleanup; + } ret = 0; -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix device_del in JSON mode for QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

The 'device_del' command expects a parameter called 'id' but we were passing 'config'. * src/qemu/qemu_monitor_json.c: Fix device_del command parameter --- src/qemu/qemu_monitor_json.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 001b32b..c3ed47c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2021,7 +2021,7 @@ int qemuMonitorJSONDelDevice(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; cmd = qemuMonitorJSONMakeCommand("device_del", - "s:config", devalias, + "s:id", devalias, NULL); if (!cmd) return -1; -- 1.6.6.1

2 1

[libvirt] [PATCH] Install nwfilter xml files from source directory.
by Philipp Hahn 16 Apr '10

16 Apr '10

During an out-of-tree build, the current working directory is the build directory. Since the FILTERS are static and not modified or auto-generated during the build process, they need to be explicitly fetched from the source directory during install. Prefix the files with $(srcdir), which gets expanded to the absolute or relative path to the source directory, even when duing out-of-tree builds. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- examples/xml/nwfilter/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

[libvirt] Execute a command in a Guest Domain using libvirt.
by Kumar L Srikanth-B22348 16 Apr '10

16 Apr '10

Hi, I created a Domain using libvirt virsh console. Can I execute a command [like 'ifconfig'] in Guest Domain and get the output using libvirt? Please let me know other ways to do that. Regards, Srikanth.

2 1

[libvirt] [TCK PATCH] default.cfg: fix typos
by Eric Blake 15 Apr '10

15 Apr '10

* conf/default.cfg: Improve spelling. --- Pushing as obvious. conf/default.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/default.cfg b/conf/default.cfg index 288540f..01f438c 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -13,12 +13,12 @@ # Defaults to /var/cache/libvirt-tck for root, or `pwd`/libvirt-tck for non-root #scratch_dir = /var/cache/libvirt-tck -# To avoid filling the filessytem, the test suite will +# To avoid filling the filesystem, the test suite will # automatically set a usage limit of # # freespace(scratch_dir) - 500 MB # -# The test suite will abort if it things it will exceed +# The test suite will abort if it thinks it will exceed # the limit. # # If you want to set a artificially lower usage limit... -- 1.6.6.1

1 0

[libvirt] [TCK PATCH] maint: add copyright notices
by Eric Blake 15 Apr '10

15 Apr '10

The only non-trivial file (>15 lines, and not a simple listing of other file names) that remains without a copyright notice is the README. * Build.PL: Add copyright. * docs/intro.pod: Likewise. * lib/Sys/Virt/TCK.pm: Likewise. * lib/Sys/Virt/TCK/Capabilities.pm: Likewise. * lib/Sys/Virt/TCK/DomainBuilder.pm: Likewise. * lib/Sys/Virt/TCK/NetworkBuilder.pm: Likewise. * lib/Sys/Virt/TCK/StoragePoolBuilder.pm: Likewise. * lib/Sys/Virt/TCK/StorageVolBuilder.pm: Likewise. * lib/Sys/Virt/TCK/TAP/XMLFormatter.pm: Likewise. * lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm: Likewise. * t/050-capabilities.t: Likewise. * t/070-domain-builder.t: Likewise. * t/080-network-builder.t: Likewise. * t/090-storage-pool-builder.t: Likewise. * t/100-storage-vol-builder.t: Likewise. --- Build.PL | 12 ++++++++++++ autobuild.sh | 12 ++++++++++++ docs/intro.pod | 17 +++++++++++++++-- lib/Sys/Virt/TCK.pm | 12 ++++++++++++ lib/Sys/Virt/TCK/Capabilities.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/DomainBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/NetworkBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/StoragePoolBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/StorageVolBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/TAP/XMLFormatter.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm | 13 +++++++++++++ t/050-capabilities.t | 12 ++++++++++++ t/070-domain-builder.t | 12 ++++++++++++ t/080-network-builder.t | 12 ++++++++++++ t/090-storage-pool-builder.t | 12 ++++++++++++ t/100-storage-vol-builder.t | 12 ++++++++++++ 16 files changed, 202 insertions(+), 2 deletions(-) diff --git a/Build.PL b/Build.PL index c85a072..ce30f36 100644 --- a/Build.PL +++ b/Build.PL @@ -1,4 +1,16 @@ #!/usr/bin/perl +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Module::Build; diff --git a/autobuild.sh b/autobuild.sh index 8d1ad53..f195602 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -2,6 +2,18 @@ # # This script is used to Test::AutoBuild (http://www.autobuild.org) # to perform automated builds of the Sys-Virt module +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# NAME=Sys-Virt-TCK diff --git a/docs/intro.pod b/docs/intro.pod index 592e145..5943f3b 100644 --- a/docs/intro.pod +++ b/docs/intro.pod @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + =pod =head1 libvirt TCK: Technology Compatability Kit @@ -166,7 +179,7 @@ the libvirt TCK, there is a small program Given no arguments, this will connect using the default hypervisor URI and a previously obtained kernel+initrd and run all the tests currently available for the libvirt TCK, and report on failures. -It comes witha number of options to alter the output format or +It comes with a number of options to alter the output format or choose different configurations. 'man 1 libvirt-tck' will produce details @@ -309,7 +322,7 @@ up some pre-requisite pieces. Specifically it would =item * -Build an bootable ISO image using the kernel+initrd +Build a bootable ISO image using the kernel+initrd =item * diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index d32b03d..ea2b1d2 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -1,3 +1,15 @@ +# +# Copyright (C) 2009-2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# package Sys::Virt::TCK; diff --git a/lib/Sys/Virt/TCK/Capabilities.pm b/lib/Sys/Virt/TCK/Capabilities.pm index b15e195..8b79db4 100644 --- a/lib/Sys/Virt/TCK/Capabilities.pm +++ b/lib/Sys/Virt/TCK/Capabilities.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::Capabilities; use strict; diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBuilder.pm index 199884b..3bf5976 100644 --- a/lib/Sys/Virt/TCK/DomainBuilder.pm +++ b/lib/Sys/Virt/TCK/DomainBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009-2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::DomainBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/NetworkBuilder.pm b/lib/Sys/Virt/TCK/NetworkBuilder.pm index e62b3e2..00b75d2 100644 --- a/lib/Sys/Virt/TCK/NetworkBuilder.pm +++ b/lib/Sys/Virt/TCK/NetworkBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::NetworkBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/StoragePoolBuilder.pm b/lib/Sys/Virt/TCK/StoragePoolBuilder.pm index c9ef2dd..c33f43b 100644 --- a/lib/Sys/Virt/TCK/StoragePoolBuilder.pm +++ b/lib/Sys/Virt/TCK/StoragePoolBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::StoragePoolBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/StorageVolBuilder.pm b/lib/Sys/Virt/TCK/StorageVolBuilder.pm index 940d70e..00680ed 100644 --- a/lib/Sys/Virt/TCK/StorageVolBuilder.pm +++ b/lib/Sys/Virt/TCK/StorageVolBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::StorageVolBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm b/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm index e601744..b4514fd 100644 --- a/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm +++ b/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::TAP::XMLFormatter; use strict; diff --git a/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm b/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm index b403140..ca2a298 100644 --- a/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm +++ b/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::TAP::XMLFormatterSession; use strict; diff --git a/t/050-capabilities.t b/t/050-capabilities.t index 9f65ef7..691b9d5 100644 --- a/t/050-capabilities.t +++ b/t/050-capabilities.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 77; diff --git a/t/070-domain-builder.t b/t/070-domain-builder.t index ff0eb78..c460448 100644 --- a/t/070-domain-builder.t +++ b/t/070-domain-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 2; diff --git a/t/080-network-builder.t b/t/080-network-builder.t index 4804e32..ec2b70c 100644 --- a/t/080-network-builder.t +++ b/t/080-network-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 2; diff --git a/t/090-storage-pool-builder.t b/t/090-storage-pool-builder.t index 67e800d..b31204a 100644 --- a/t/090-storage-pool-builder.t +++ b/t/090-storage-pool-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 8; use strict; diff --git a/t/100-storage-vol-builder.t b/t/100-storage-vol-builder.t index 017301e..d168ecd 100644 --- a/t/100-storage-vol-builder.t +++ b/t/100-storage-vol-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 2; -- 1.6.6.1

2 1

[libvirt] [PATCH] esx: Replace scanf with STRSKIP and strtok_r
by Matthias Bolte 15 Apr '10

15 Apr '10

This also fixes a portability problem with the %a format modifier. %a is not portable and made esxDomainDumpXML fail at runtime in MinGW builds. Pull in strtok_r from gnulib, because MinGW lacks it. --- bootstrap.conf | 1 + src/esx/esx_driver.c | 19 +++-------------- src/esx/esx_util.c | 53 +++++++++++++++++++++++++------------------------ src/esx/esx_vi.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi.h | 12 +++++++++++ src/esx/esx_vmx.c | 16 +++++++++++--- 6 files changed, 106 insertions(+), 45 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index d807e40..785489b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -54,6 +54,7 @@ strndup strerror strptime strsep +strtok_r sys_stat time_r timegm diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a2fc85c..f22634e 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -60,8 +60,8 @@ esxSupportsLongMode(esxPrivate *priv) esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_HostCpuIdInfo *hostCpuIdInfoList = NULL; esxVI_HostCpuIdInfo *hostCpuIdInfo = NULL; + esxVI_ParsedHostCpuIdInfo parsedHostCpuIdInfo; char edxLongModeBit = '?'; - char edxFirstBit = '?'; if (priv->supportsLongMode != esxVI_Boolean_Undefined) { return priv->supportsLongMode; @@ -96,23 +96,12 @@ esxSupportsLongMode(esxPrivate *priv) for (hostCpuIdInfo = hostCpuIdInfoList; hostCpuIdInfo != NULL; hostCpuIdInfo = hostCpuIdInfo->_next) { if (hostCpuIdInfo->level->value == -2147483647) { /* 0x80000001 */ -#define _SKIP4 "%*c%*c%*c%*c" -#define _SKIP12 _SKIP4":"_SKIP4":"_SKIP4 - - /* Expected format: "--X-:----:----:----:----:----:----:----" */ - if (sscanf(hostCpuIdInfo->edx, - "%*c%*c%c%*c:"_SKIP12":"_SKIP12":%*c%*c%*c%c", - &edxLongModeBit, &edxFirstBit) != 2) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("HostSystem property 'hardware.cpuFeature[].edx' " - "with value '%s' doesn't have expected format " - "'----:----:----:----:----:----:----:----'"), - hostCpuIdInfo->edx); + if (esxVI_ParseHostCpuIdInfo(&parsedHostCpuIdInfo, + hostCpuIdInfo) < 0) { goto failure; } -#undef _SKIP4 -#undef _SKIP12 + edxLongModeBit = parsedHostCpuIdInfo.edx[29]; if (edxLongModeBit == '1') { priv->supportsLongMode = esxVI_Boolean_True; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 963f52e..91d19e9 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -203,6 +203,10 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, char **directoryName, char **fileName) { int result = 0; + char *copyOfDatastoreRelatedPath = NULL; + char *tmp = NULL; + char *saveptr = NULL; + char *preliminaryDatastoreName = NULL; char *directoryAndFileName = NULL; char *separator = NULL; @@ -213,37 +217,34 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, return -1; } - /* - * Parse string as '[<datastore>] <path>'. '%as' is similar to '%s', but - * sscanf() will allocate the memory for the string, so the caller doesn't - * need to preallocate a buffer that's large enough. - * - * The s in '%as' can be replaced with a character set, e.g. [a-z]. - * - * '%a[^]%]' matches <datastore>. '[^]%]' excludes ']' from the accepted - * characters, otherwise sscanf() wont match what it should. - * - * '%a[^\n]' matches <path>. '[^\n]' excludes '\n' from the accepted - * characters, otherwise sscanf() would only match up to the first space, - * but spaces are valid in <path>. - */ - if (sscanf(datastoreRelatedPath, "[%a[^]%]] %a[^\n]", datastoreName, - &directoryAndFileName) != 2) { + if (esxVI_String_DeepCopyValue(&copyOfDatastoreRelatedPath, + datastoreRelatedPath) < 0) { + goto failure; + } + + /* Expected format: '[<datastore>] <path>' */ + if ((tmp = STRSKIP(copyOfDatastoreRelatedPath, "[")) == NULL || + (preliminaryDatastoreName = strtok_r(tmp, "]", &saveptr)) == NULL || + (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Datastore related path '%s' doesn't have expected format " "'[<datastore>] <path>'"), datastoreRelatedPath); goto failure; } + if (esxVI_String_DeepCopyValue(datastoreName, + preliminaryDatastoreName) < 0) { + goto failure; + } + + directoryAndFileName += strspn(directoryAndFileName, " "); + /* Split <path> into <directory>/<file>, where <directory> is optional */ separator = strrchr(directoryAndFileName, '/'); if (separator != NULL) { *separator++ = '\0'; - *directoryName = directoryAndFileName; - directoryAndFileName = NULL; - if (*separator == '\0') { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Datastore related path '%s' doesn't reference a file"), @@ -251,19 +252,19 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, goto failure; } - *fileName = strdup(separator); - - if (*fileName == NULL) { - virReportOOMError(); + if (esxVI_String_DeepCopyValue(directoryName, + directoryAndFileName) < 0 || + esxVI_String_DeepCopyValue(fileName, separator) < 0) { goto failure; } } else { - *fileName = directoryAndFileName; - directoryAndFileName = NULL; + if (esxVI_String_DeepCopyValue(fileName, directoryAndFileName) < 0) { + goto failure; + } } cleanup: - VIR_FREE(directoryAndFileName); + VIR_FREE(copyOfDatastoreRelatedPath); return result; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 4318ff1..db8c927 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2886,3 +2886,53 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, goto cleanup; } + + + +int +esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedhostCpuIdInfo, + esxVI_HostCpuIdInfo *hostCpuIdInfo) +{ + int expectedLength = 39; /* = strlen("----:----:----:----:----:----:----:----"); */ + char *input[4] = { hostCpuIdInfo->eax, hostCpuIdInfo->ebx, + hostCpuIdInfo->ecx, hostCpuIdInfo->edx }; + char *output[4] = { parsedhostCpuIdInfo->eax, parsedhostCpuIdInfo->ebx, + parsedhostCpuIdInfo->ecx, parsedhostCpuIdInfo->edx }; + const char *name[4] = { "eax", "ebx", "ecx", "edx" }; + int r, i, o; + + memset(parsedhostCpuIdInfo, 0, sizeof (esxVI_ParsedHostCpuIdInfo)); + + parsedhostCpuIdInfo->level = hostCpuIdInfo->level->value; + + for (r = 0; r < 4; ++r) { + if (strlen(input[r]) != expectedLength) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HostCpuIdInfo register '%s' has an unexpected length"), + name[r]); + goto failure; + } + + /* Strip the ':' and invert the "bit" order from 31..0 to 0..31 */ + for (i = 0, o = 31; i < expectedLength; i += 5, o -= 4) { + output[r][o] = input[r][i]; + output[r][o - 1] = input[r][i + 1]; + output[r][o - 2] = input[r][i + 2]; + output[r][o - 3] = input[r][i + 3]; + + if (i + 4 < expectedLength && input[r][i + 4] != ':') { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HostCpuIdInfo register '%s' has an unexpected format"), + name[r]); + goto failure; + } + } + } + + return 0; + + failure: + memset(parsedhostCpuIdInfo, 0, sizeof (esxVI_ParsedHostCpuIdInfo)); + + return -1; +} diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a8d4cc3..45b83f5 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -43,6 +43,7 @@ typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; +typedef struct _esxVI_ParsedHostCpuIdInfo esxVI_ParsedHostCpuIdInfo; typedef struct _esxVI_Context esxVI_Context; typedef struct _esxVI_Response esxVI_Response; typedef struct _esxVI_Enumeration esxVI_Enumeration; @@ -76,6 +77,14 @@ enum _esxVI_Occurrence { esxVI_Occurrence_None }; +struct _esxVI_ParsedHostCpuIdInfo { + int level; + char eax[32]; + char ebx[32]; + char ecx[32]; + char edx[32]; +}; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -313,4 +322,7 @@ int esxVI_WaitForTaskCompletion(esxVI_Context *ctx, esxVI_Boolean autoAnswer, esxVI_TaskInfoState *finalState); +int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedhostCpuIdInfo, + esxVI_HostCpuIdInfo *hostCpuIdInfo); + #endif /* __ESX_VI_H__ */ diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c965e00..c2e9be6 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -589,6 +589,9 @@ char * esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, const char *absolutePath) { + char *copyOfAbsolutePath = NULL; + char *tmp = NULL; + char *saveptr = NULL; char *datastoreRelatedPath = NULL; char *preliminaryDatastoreName = NULL; char *directoryAndFileName = NULL; @@ -596,8 +599,14 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, esxVI_ObjectContent *datastore = NULL; const char *datastoreName = NULL; - if (sscanf(absolutePath, "/vmfs/volumes/%a[^/]/%a[^\n]", - &preliminaryDatastoreName, &directoryAndFileName) != 2) { + if (esxVI_String_DeepCopyValue(&copyOfAbsolutePath, absolutePath) < 0) { + goto failure; + } + + /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ + if ((tmp = STRSKIP(copyOfAbsolutePath, "/vmfs/volumes/")) == NULL || + (preliminaryDatastoreName = strtok_r(tmp, "/", &saveptr)) == NULL || + (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Absolute path '%s' doesn't have expected format " "'/vmfs/volumes/<datastore>/<path>'"), absolutePath); @@ -652,8 +661,7 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, /* FIXME: Check if referenced path/file really exists */ cleanup: - VIR_FREE(preliminaryDatastoreName); - VIR_FREE(directoryAndFileName); + VIR_FREE(copyOfAbsolutePath); esxVI_ObjectContent_Free(&datastore); return datastoreRelatedPath; -- 1.6.3.3

2 2

[libvirt] [PATCH] Update to latest gnulib to get strtok_r relaxed to LGPLv2+
by Matthias Bolte 15 Apr '10

15 Apr '10

strtok_r will be used in the ESX driver to replace scanf-based code. MinGW lacks strtok_r, so we need gnulib to provide it, but until now strtok_r was licensed LGPL3. --- .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 097c9ce..7c1b995 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 097c9ce08a79899ff942b9b6ee811e613605499f +Subproject commit 7c1b995a7041ea366acafeb8632e1080f349f03f -- 1.6.3.3

2 2

[libvirt] [PATCH 0/2] rebase of earlier coverity patch
by Eric Blake 15 Apr '10

15 Apr '10

A while ago, I submitted a patch to plug a hole found by coverity, but there were concerns, I revised it, and the rewrite was never reviewed: https://www.redhat.com/archives/libvir-list/2010-March/msg00443.html I've rebased the series now that 0.8.0 is out.

2 6

[libvirt] [PATCH] maint: another preprocessor fix
by Eric Blake 15 Apr '10

15 Apr '10

Regression introduced in commit 62170b995. * src/util/memory.h: Placate cppi, and fit 80 columns. --- Pushing this as obvious, for 'make syntax-check'. src/util/memory.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/memory.h b/src/util/memory.h index ad458a6..60e2be6 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -1,6 +1,7 @@ /* * memory.c: safer memory allocation * + * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -102,7 +103,7 @@ void virFree(void *ptrptr); * arithmetic overflow in the allocation size. The check is * essentially the same as that in gnulib's xalloc_oversized. */ -#define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) +# define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) /** * VIR_ALLOC_VAR: @@ -121,7 +122,8 @@ void virFree(void *ptrptr); * Returns -1 on failure, 0 on success */ -#define VIR_ALLOC_VAR(ptr, type, count) virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count)) +# define VIR_ALLOC_VAR(ptr, type, count) \ + virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count)) /** * VIR_FREE: -- 1.6.6.1

1 0

[libvirt] [TCK PATCH] maint: remove duplicate file
by Eric Blake 15 Apr '10

15 Apr '10

File is a duplicate of 14f3792:lib/Sys/Virt/TCK.pm. Besides, it is already exluded by MANIFEST.SKIP. * lib/Sys/Virt/TCK.pm.orig: Delete. * .gitignore: Sort. Add *.orig. --- .gitignore | 25 +- lib/Sys/Virt/TCK.pm.orig | 766 ---------------------------------------------- 2 files changed, 13 insertions(+), 778 deletions(-) delete mode 100644 lib/Sys/Virt/TCK.pm.orig diff --git a/.gitignore b/.gitignore index 2c7ac91..cc1470e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,19 @@ +#.*# +*.bak +*.orig *~ -pm_to_blib +Build +MANIFEST +META.yml Makefile +Makefile.PL Makefile.old -#.*# -blib/ Sys-Virt-TCK-* -MANIFEST -*.bak -results/ -data/ -META.yml -cover_db/ _build/ -perl-Sys-Virt-TCK.spec -Build -Makefile.PL +blib/ +cover_db/ +data/ libvirt-tck +perl-Sys-Virt-TCK.spec +pm_to_blib +results/ diff --git a/lib/Sys/Virt/TCK.pm.orig b/lib/Sys/Virt/TCK.pm.orig deleted file mode 100644 index 909ddd8..0000000 --- a/lib/Sys/Virt/TCK.pm.orig +++ /dev/null @@ -1,766 +0,0 @@ - -package Sys::Virt::TCK; - -use strict; -use warnings; - -use Sys::Virt; -use Sys::Virt::TCK::DomainBuilder; -use Sys::Virt::TCK::NetworkBuilder; -use Sys::Virt::TCK::StoragePoolBuilder; -use Sys::Virt::TCK::StorageVolBuilder; -use Sys::Virt::TCK::Capabilities; - -use Config::Record; -use File::Copy qw(copy); -use File::Path qw(mkpath); -use File::Spec::Functions qw(catfile catdir rootdir); -use Cwd qw(cwd); -use LWP::UserAgent; -use IO::Uncompress::Gunzip qw(gunzip); -use IO::Uncompress::Bunzip2 qw(bunzip2); -use XML::XPath; -use Carp qw(cluck carp); - -use Test::Builder; -use Sub::Uplevel qw(uplevel); -use base qw(Exporter); - -our @EXPORT = qw(ok_error ok_domain ok_pool ok_volume xpath err_not_implemented); - -our $VERSION = '0.1.0'; - -sub new { - my $proto = shift; - my $class = ref($proto) || $proto; - my $self = {}; - my %params = @_; - - $self->{config} = $params{config} ? $params{config} : - Config::Record->new(file => ($ENV{LIBVIRT_TCK_CONFIG} || "/etc/tck.conf")); - - $self->{autoclean} = $params{autoclean} ? $params{autoclean} : - ($ENV{LIBVIRT_TCK_AUTOCLEAN} || 0); - - if ($ENV{LIBVIRT_TCK_DEBUG}) { - $SIG{__WARN__} = sub { Carp::cluck $_[0]; }; - $SIG{__DIE__} = sub { Carp::confess $_[0]; }; - } - - bless $self, $class; - - return $self; -} - - -sub setup { - my $self = shift; - - my $uri = $self->config("uri", undef); - $self->{conn} = Sys::Virt->new(address => $uri); - my $type = $self->{conn}->get_type(); - $self->{type} = lc $type; - - $self->reset if $self->{autoclean}; - - $self->sanity_check; - - return $self->{conn}; -} - - -sub sanity_check { - my $self = shift; - - my @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_domains; - if (@doms) { - die "there is/are " . int(@doms) . " pre-existing active domain(s) in this driver"; - } - - @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_domains; - if (@doms) { - die "there is/are " . int(@doms) . " pre-existing inactive domain(s) in this driver"; - } - - my @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_storage_pools; - if (@pools) { - die "there is/are " . int(@pools) . " pre-existing active storage_pool(s) in this driver"; - } - - @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_storage_pools; - if (@pools) { - die "there is/are " . int(@pools) . " pre-existing inactive storage_pool(s) in this driver"; - } -} - -sub reset { - my $self = shift; - - my @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_domains; - foreach my $dom (@doms) { - if ($dom->get_id != 0) { - $dom->destroy; - } - } - - @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_domains(); - foreach my $dom (@doms) { - $dom->undefine; - } - - my @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_storage_pools; - foreach my $pool (@pools) { - my @vols = $pool->list_volumes; - foreach my $vol (@vols) { - eval { $vol->delete(0) }; - } - $pool->destroy; - } - - @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_storage_pools(); - foreach my $pool (@pools) { - eval { - $pool->delete(0); - }; - $pool->undefine; - } -} - -sub cleanup { - my $self = shift; - - $self->reset(); - - delete $self->{conn}; -} - -sub config { - my $self = shift; - my $key = shift; - if (@_) { - my $default = shift; - return $self->{config}->get($key, $default); - } else { - return $self->{config}->get($key); - } -} - - -sub conn { - my $self = shift; - return $self->{conn}; -} - - -sub scratch_dir { - my $self = shift; - - my $scratch = $self->config("scratch_dir", $< > 0 ? - catdir(cwd(), "libvirt-tck") : - catdir(rootdir(), "var", "cache", "libvirt-tck")); - - mkpath($scratch) unless -e $scratch; - - return $scratch; -} - -sub bucket_dir { - my $self = shift; - my $name = shift; - - my $scratch = $self->scratch_dir; - - my $bucket = catdir($scratch, $name); - mkpath($bucket) unless -e $bucket; - - return $bucket; -} - -sub get_scratch_resource { - my $self = shift; - my $source = shift; - my $bucket = shift; - my $name = shift; - - my $dir = $self->bucket_dir($bucket); - my $target = catfile($dir, $name); - - return $target if -e $target; - - my $uncompress = undef; - if (ref($source)) { - $uncompress = $source->{uncompress}; - $source = $source->{source}; - } - - if ($source =~ m,^/,) { - $self->copy_scratch($source, $target, $uncompress); - } else { - $self->download_scratch($source, $target, $uncompress); - } - - return $target; -} - - -sub download_scratch { - my $self = shift; - my $source = shift; - my $target = shift; - my $uncompress = shift; - - my $ua = LWP::UserAgent->new; - $ua->timeout(10); - $ua->env_proxy; - - my $response = $ua->get($source); - - if ($response->is_success) { - open TGT, ">$target" or die "cannot create $target: $!"; - if (defined $uncompress) { - my $data = $response->content; - if ($uncompress eq "gzip") { - gunzip \$data => \*TGT; - } elsif ($uncompress eq "bzip2") { - bunzip2 \$data => \*TGT; - } else { - die "unknown compression method '$uncompress'"; - } - } else { - print TGT $response->content or die "cannot write $target: $!"; - } - close TGT or die "cannot save $target: $!"; - } else { - die "cannot download $source: " . $response->status_line; - } - -} - -sub copy_scratch { - my $self = shift; - my $source = shift; - my $target = shift; - my $uncompress = shift; - - if (defined $uncompress) { - if ($uncompress eq "gzip") { - gunzip $source => $target; - } elsif ($uncompress eq "bzip2") { - bunzip2 $source => $target; - } else { - die "unknown compression method '$uncompress'"; - } - } else { - copy ($source, $target) or die "cannot copy $source to $target: $!"; - } -} - - -sub create_sparse_disk { - my $self = shift; - my $bucket = shift; - my $name = shift; - my $size = shift; - - my $dir = $self->bucket_dir($bucket); - - my $target = catfile($dir, $name); - - open DISK, ">$target" or die "cannot create $target: $!"; - - truncate DISK, ($size * 1024 * 1024); - - close DISK or die "cannot save $target: $!"; - - return $target; -} - - -sub create_minimal_vroot { - my $self = shift; - my $bucket = shift; - my $name = shift; - - my $dir = $self->bucket_dir($bucket); - my $target = catdir($dir, $name); - - mkpath($target) unless -e $target; - - my $busybox = $self->config("busybox", "/sbin/busybox"); - - die "$busybox does not exist" unless $busybox; - - my $type = `file $busybox 2>&1`; - - die "$busybox is not statically linked" unless $type =~ /statically/; - - my @dirs = qw(sbin bin dev proc sys tmp); - - foreach my $dir (@dirs) { - my $fulldir = catdir($target, $dir); - next if -e $fulldir; - mkpath($fulldir); - } - - my $dst = catfile($target, "sbin", "busybox"); - copy ($busybox, $dst) or die "cannot copy $busybox to $dst: $!"; - chmod 0755, $dst or die "cannot make $dst executable: $!"; - - my @links = qw( - ed kill ping6 svlogd - egrep killall pipe_progress swapoff -addgroup eject killall5 pivot_root swapon -adduser env klogd pkill switch_root -adjtimex envdir last poweroff sync -ar envuidgid length printenv sysctl -arp expand less printf syslogd -arping expr linux32 ps tail -ash fakeidentd linux64 pscan tar -awk false linuxrc pwd tcpsvd -basename fbset ln raidautorun tee -bunzip2 fdformat loadfont rdate telnet -busybox fdisk loadkmap readahead telnetd -bzcat fgrep logger readlink test -bzip2 find login readprofile tftp -cal fold logname realpath time -cat free logread reboot top -catv freeramdisk losetup renice touch -chattr fsck ls reset tr -chgrp fsck.minix lsattr resize traceroute -chmod ftpget lsmod rm true -chown ftpput lzmacat rmdir tty -chpasswd fuser makedevs rmmod ttysize -chpst getopt md5sum route udhcpc -chroot getty mdev rpm udhcpd -chrt grep mesg rpm2cpio udpsvd -chvt gunzip microcom runlevel umount -cksum gzip mkdir run-parts uname -clear halt mkfifo runsv uncompress -cmp hdparm mkfs.minix runsvdir unexpand -comm head mknod rx uniq -cp hexdump mkswap sed unix2dos -cpio hostid mktemp seq unlzma -crond hostname modprobe setarch unzip -crontab httpd more setconsole uptime -cryptpw hwclock mount setkeycodes usleep -cut id mountpoint setlogcons uudecode -date ifconfig msh setsid uuencode -dc ifdown mt setuidgid vconfig -dd ifup mv sh vi -deallocvt inetd nameif sha1sum vlock -delgroup init nc slattach watch -deluser insmod netstat sleep watchdog -df install nice softlimit wc -dhcprelay ip nmeter sort wget -diff ipaddr nohup split which -dirname ipcalc nslookup start-stop-daemon who -dmesg ipcrm od stat whoami -dnsd ipcs openvt strings xargs -dos2unix iplink passwd stty yes -du iproute patch su zcat -dumpkmap iprule pgrep sulogin zcip -dumpleases iptunnel pidof sum -echo kbd_mode ping sv); - - foreach my $file (@links) { - my $fullfile = catfile($target, "bin", $file); - next if -e $fullfile; - symlink "../sbin/busybox", $fullfile - or die "cannot symlink $fullfile to ../sbin/busybox: $!"; - } - - my $init = catfile($target, "sbin", "init"); - open INIT, ">$init" or die "cannot create $init: $!"; - - print INIT <<EOF; -#!/sbin/busybox - -sh -EOF - - close INIT or die "cannot save $init: $!"; - chmod 0755, $init or die "cannot make $init executable: $!"; - - return ($target, catfile(rootdir, "sbin", "init")); -} - -sub match_kernel { - my $self = shift; - my $caps = shift; - my $arch = shift; - my $ostype = shift; - - for (my $i = 0 ; $i < $caps->num_guests ; $i++) { - if ($caps->guest_os_type($i) eq $ostype && - $caps->guest_arch_name($i) eq $arch) { - - my @domains = $caps->guest_domain_types($i); - next unless int(@domains); - - return ($domains[0], - $caps->guest_domain_emulator($i, $domains[0]), - $caps->guest_domain_loader($i, $domains[0])); - } - } - - return (); -} - - -sub best_kernel { - my $self = shift; - my $caps = shift; - - my $kernels = $self->config("kernels", []); - - for (my $i = 0 ; $i <= $#{$kernels} ; $i++) { - my $arch = $kernels->[$i]->{arch}; - my $ostype = $kernels->[$i]->{ostype}; - my @ostype = ref($ostype) ? @{$ostype} : ($ostype); - - foreach $ostype (@ostype) { - my ($domain, $emulator, $loader) = - $self->match_kernel($caps, $arch, $ostype); - - if (defined $domain) { - return ($i, $domain, $arch, $ostype, $emulator, $loader) - } - } - } - - return (); -} - -sub get_kernel { - my $self = shift; - my $caps = shift; - - my ($cfgindex, $domain, $arch, $ostype, $emulator, $loader) = - $self->best_kernel($caps); - - if (!defined $cfgindex) { - die "cannot find any supported kernel configuration"; - } - - my $kernels = $self->config("kernels", []); - - my $kernel = $kernels->[$cfgindex]->{kernel}; - my $initrd = $kernels->[$cfgindex]->{initrd}; - my $disk = $kernels->[$cfgindex]->{disk}; - - my $bucket = "os-$arch-$ostype"; - - my $kfile = $self->get_scratch_resource($kernel, $bucket, "vmlinuz"); - my $ifile = $initrd ? $self->get_scratch_resource($initrd, $bucket, "initrd") : undef; - my $dfile = $disk ? $self->get_scratch_resource($disk, $bucket, "disk.img") : undef; - - unless (defined $dfile) { - $dfile = $self->create_sparse_disk($bucket, "disk.img", 100); - } - - chmod 0755, $kfile; - - my $dev; - if ($ostype eq "xen") { - $dev = "xvda"; - } elsif ($ostype eq "uml") { - $dev = "ubda"; - } elsif ($ostype eq "hvm") { - if ($domain eq "kvm" || - $domain eq "qemu" || - $domain eq "kqemu") { - $dev = "vda"; - } else { - $dev = "hda"; - } - } - - return ( - domain => $domain, - arch => $arch, - ostype => $ostype, - emulator => $emulator, - loader => $loader, - kernel => $kfile, - initrd => $ifile, - root => $dfile, - dev => $dev, - ); -} - - - -sub generic_machine_domain { - my $self = shift; - my $name = shift; - my $caps = shift; - - my %config = $self->get_kernel($caps); - - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->{conn}, - name => $name, - domain => $config{domain}, - ostype => $config{ostype}); - $b->memory(64 * 1024); - $b->with_acpi(); - $b->with_apic(); - - # XXX boot CDROM or vroot for other HVs - $b->boot_kernel($config{kernel}, $config{initrd}); - - $b->disk(src => $config{root}, - dst => $config{dev}, - type => "file"); - - return $b; -} - - -sub best_container_domain { - my $self = shift; - my $caps = shift; - - for (my $i = 0 ; $i < $caps->num_guests ; $i++) { - if ($caps->guest_os_type($i) eq "exe") { - my @domains = $caps->guest_domain_types($i); - next unless int(@domains); - - return $domains[0]; - } - } - - return undef; - -} - -sub generic_container_domain { - my $self = shift; - my $name = shift; - my $caps = shift; - my $domain = shift; - - my $bucket = "os-exe"; - - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->{conn}, - name => $name, - domain => $domain, - ostype => "exe"); - $b->memory(64 * 1024); - - my ($root, $init) = $self->create_minimal_vroot($bucket, $name); - - $b->boot_init($init); - - $b->filesystem(src => $root, - dst => "/", - type => "mount"); - - return $b; -} - - -sub generic_domain { - my $self = shift; - my $name = @_ ? shift : "tck"; - - my $caps = Sys::Virt::TCK::Capabilities->new(xml => $self->conn->get_capabilities); - - my $container = $self->best_container_domain($caps); - - if ($container) { - return $self->generic_container_domain($name, $caps, $container); - } else { - return $self->generic_machine_domain($name, $caps); - } -} - -sub generic_pool { - my $self = shift; - my $type = shift; - my $name = @_ ? shift : "tck"; - - my $bucket = $self->bucket_dir("storage-fs"); - - my $b = Sys::Virt::TCK::StoragePoolBuilder->new(name => $name, - type => $type); - - $b->target(catdir($bucket, $name)); - - return $b; -} - - -sub generic_volume { - my $self = shift; - my $name = @_ ? shift : "tck"; - my $format = @_ ? shift :undef; - my $capacity = @_ ? shift : 1024*1024*50; - - my $b = Sys::Virt::TCK::StorageVolBuilder->new(name => $name); - $b->format($format) if $format; - $b->capacity($capacity); - - return $b; -} - -# Borrowed from Test::Exception - -sub _quiet_caller (;$) { ## no critic Prototypes - my $height = $_[0]; - $height++; - if( wantarray and !@_ ) { - return (CORE::caller($height))[0..2]; - } - else { - return CORE::caller($height); - } - } - -sub _try_as_caller { - my $coderef = shift; - - # local works here because Sub::Uplevel has already overridden caller - local *CORE::GLOBAL::caller; - { no warnings 'redefine'; *CORE::GLOBAL::caller = \&_quiet_caller; } - - my $ret = eval { uplevel 3, $coderef }; - return ($ret, $@); -}; - - -my $Tester = Test::Builder->new; - -sub ok_domain(&$;$) { - my $coderef = shift; - my $description = shift; - my $name = shift; - - die "must pass coderef, description and (optional) expected name" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = "$exception" eq "" && - $ret && ref($ret) && $ret->isa("Sys::Virt::Domain") && - (!defined $name || ($ret->get_name() eq $name)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expected Sys::Virt::Domain object" . ($name ? " with name $name" : "")); - if ($exception) { - $Tester->diag("found '$exception'"); - } else { - if ($ret && ref($ret) && $ret->isa("Sys::Virt::Domain")) { - $Tester->diag("found Sys::Virt::Domain object with name " . $ret->get_name); - } else { - $Tester->diag("found '$ret'"); - } - } - } -} - -sub ok_pool(&$;$) { - my $coderef = shift; - my $description = shift; - my $name = shift; - - die "must pass coderef, description and (optional) expected name" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = "$exception" eq "" && - $ret && ref($ret) && $ret->isa("Sys::Virt::StoragePool") && - (!defined $name || ($ret->get_name() eq $name)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expected Sys::Virt::StoragePool object" . ($name ? " with name $name" : "")); - if ($exception) { - $Tester->diag("found '$exception'"); - } else { - if ($ret && ref($ret) && $ret->isa("Sys::Virt::StoragePool")) { - $Tester->diag("found Sys::Virt::StoragePool object with name " . $ret->get_name); - } else { - $Tester->diag("found '$ret'"); - } - } - } -} - -sub ok_volume(&$;$) { - my $coderef = shift; - my $description = shift; - my $name = shift; - - die "must pass coderef, description and (optional) expected name" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = "$exception" eq "" && - $ret && ref($ret) && $ret->isa("Sys::Virt::StorageVol") && - (!defined $name || ($ret->get_name() eq $name)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expected Sys::Virt::StorageVol object" . ($name ? " with name $name" : "")); - if ($exception) { - $Tester->diag("found '$exception'"); - } else { - if ($ret && ref($ret) && $ret->isa("Sys::Virt::StorageVol")) { - $Tester->diag("found Sys::Virt::StorageVol object with name " . $ret->get_name); - } else { - $Tester->diag("found '$ret'"); - } - } - } -} - -sub ok_error(&$;$) { - my $coderef = shift; - my $description = shift; - my $code = shift; - - die "must pass coderef, description and (optional) expected error code" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = ref($exception) && $exception->isa("Sys::Virt::Error") && - (!defined $code || ($exception->code() == $code)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expecting Sys::Virt::Error object" . ($code ? " with code $code" : "")); - $Tester->diag("found '$exception'"); - } - $@ = $exception; - return $ok; -} - - -sub err_not_implemented { - my $exception = shift; - - if ($exception && - ref($exception) && - $exception->isa("Sys::Virt::Error") && - $exception->code() == 3) { - return 1; - } - return 0; -} - -sub xpath { - my $object = shift; - my $path = shift; - - my $xml = $object->get_xml_description; - - my $xp = XML::XPath->new(xml => $xml); - - return $xp->find($path); -} - -1; -- 1.6.6.1

2 2

[libvirt] BUG: attaching - detaching network device only works 7 times
by Stefan Berger 15 Apr '10

15 Apr '10

With the current tip: While extending a test case I found that attaching and detaching the following network device works only 7 times with the below script: <interface type='bridge'> <source bridge='static'/> <mac address='52:54:00:4d:a2:58'/> <target dev='attach0'/> </interface> let c=1; while test 1; do virsh attach-device acl attach.xml ; virsh detach-device acl attach.xml; echo ${c}; let c=c+1; done Then the following error occurs: error: Failed to attach device from attach.xml error: operation failed: parsing pci_add reply failed: Too Many NICs failed to add macaddr=52:54:00:4d:a2:58,vlan=1,name=net1 It looks like the detachment of the device is not done by qemu? Regards, Stefan

2 8

[libvirt] [PATCH 0/4] Misc fixes + enhancements to the QEMU JSON mode monitor
by Daniel P. Berrange 15 Apr '10

15 Apr '10

This series is the latest update to the JSON mode monitor code, based on current QEMU state of development. This work is still ongoing, at the very least QEMU is still lacking support for device_del, drive_add netdev_add and delvm/loadvm/savedvm commands that libvirt needs.

2 8

[libvirt] Build failure on Ubuntu 9.10
by Chris Lalancette 15 Apr '10

15 Apr '10

Hey Jamie, I've starting doing some automated builds of libvirt, and I've run into this build failure on Ubuntu 9.10 (both for i386 and x86_64): Git head revision: cffe619bdf9943282cc9f6a0cf815ad9f0fe7fd7 make all-recursive make[1]: Entering directory `/root/libvirt' Making all in gnulib/lib make[2]: Entering directory `/root/libvirt/gnulib/lib' ... make all-am make[3]: Entering directory `/root/libvirt/src' ... CC libvirt_lxc-capabilities.o CC libvirt_lxc-domain_conf.o CC libvirt_lxc-cpu_conf.o CC libvirt_lxc-nwfilter_params.o CC virt_aa_helper-virt-aa-helper.o make[3]: *** No rule to make target `../src/libvirt_conf.la', needed by `virt-aa-helper'. Stop. make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory `/root/libvirt/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/root/libvirt/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/root/libvirt' make: *** [all] Error 2 (if you want the full build log, or build with V=1, let me know). Any thoughts? -- Chris Lalancette

2 1