- Devel - libvirt List Archives

[libvirt] [PATCH] Explicitly set virStoragePoolTypeInfo FS and NETFS defaults
by Matthias Bolte 20 Apr '10

20 Apr '10

No semantic change, the now explicitly set default are all zero and that's what GCC sets unspecified struct members to. --- src/conf/storage_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 620744f..6467c73 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -151,6 +151,7 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { { .poolType = VIR_STORAGE_POOL_FS, .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_DEVICE), + .defaultFormat = VIR_STORAGE_POOL_FS_AUTO, .formatFromString = virStoragePoolFormatFileSystemTypeFromString, .formatToString = virStoragePoolFormatFileSystemTypeToString, }, @@ -164,7 +165,7 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_HOST | VIR_STORAGE_POOL_SOURCE_DIR), - .defaultFormat = VIR_STORAGE_POOL_FS_AUTO, + .defaultFormat = VIR_STORAGE_POOL_NETFS_AUTO, .formatFromString = virStoragePoolFormatFileSystemNetTypeFromString, .formatToString = virStoragePoolFormatFileSystemNetTypeToString, }, -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Add support for the VMXNET 2 (Enhanced) NIC model
by Matthias Bolte 20 Apr '10

20 Apr '10

Add a test case and document it. --- docs/drvesx.html.in | 5 +- src/esx/esx_vmx.c | 60 +++++++++++++++++------- tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx | 9 ++++ tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml | 20 ++++++++ tests/vmx2xmltest.c | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx | 14 ++++++ tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml | 15 ++++++ tests/xml2vmxtest.c | 1 + 8 files changed, 106 insertions(+), 19 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 422a7f0..d454904 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -307,10 +307,11 @@ ethernet0.checkMACAddress = "false" <dd> AMD PCnet32 network card for older guests. </dd> - <dt><code>vmxnet</code>, <code>vmxnet3</code></dt> + <dt><code>vmxnet</code>, <code>vmxnet2</code>, <code>vmxnet3</code></dt> <dd> Special VMware VMXnet network card, requires VMware tools inside - the guest. + the guest. See <a href="http://kb.vmware.com/kb/1001805">VMware KB1001805</a> + for details. </dd> <dt><code>e1000</code></dt> <dd> diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c2e9be6..52c97e5 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -265,6 +265,7 @@ def->disks[0]... def->nets[0]... ->model = <model> <=> ethernet0.virtualDev = "<model>" # default depends on guestOS value + ethernet0.features = "15" # if present and virtualDev is "vmxnet" => vmxnet2 (enhanced) ethernet0.addressType = "generated" # default to "generated" @@ -1705,6 +1706,9 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) char virtualDev_name[48] = ""; char *virtualDev = NULL; + char features_name[48] = ""; + long long features = 0; + char vnet_name[48] = ""; char *vnet = NULL; @@ -1737,6 +1741,7 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) ESX_BUILD_VMX_NAME(generatedAddress); ESX_BUILD_VMX_NAME(address); ESX_BUILD_VMX_NAME(virtualDev); + ESX_BUILD_VMX_NAME(features); ESX_BUILD_VMX_NAME(networkName); ESX_BUILD_VMX_NAME(vnet); @@ -1797,21 +1802,34 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) goto failure; } - /* vmx:virtualDev -> def:model */ - if (esxUtil_GetConfigString(conf, virtualDev_name, &virtualDev, 1) < 0) { + /* vmx:virtualDev, vmx:features -> def:model */ + if (esxUtil_GetConfigString(conf, virtualDev_name, &virtualDev, 1) < 0 || + esxUtil_GetConfigLong(conf, features_name, &features, 0, 1) < 0) { goto failure; } - if (virtualDev != NULL && - STRCASENEQ(virtualDev, "vlance") && - STRCASENEQ(virtualDev, "vmxnet") && - STRCASENEQ(virtualDev, "vmxnet3") && - STRCASENEQ(virtualDev, "e1000")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, - virtualDev); - goto failure; + if (virtualDev != NULL) { + if (STRCASENEQ(virtualDev, "vlance") && + STRCASENEQ(virtualDev, "vmxnet") && + STRCASENEQ(virtualDev, "vmxnet3") && + STRCASENEQ(virtualDev, "e1000")) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " + "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, + virtualDev); + goto failure; + } + + if (STRCASEEQ(virtualDev, "vmxnet") && features == 15) { + VIR_FREE(virtualDev); + + virtualDev = strdup("vmxnet2"); + + if (virtualDev == NULL) { + virReportOOMError(); + goto failure; + } + } } /* vmx:networkName -> def:data.bridge.brname */ @@ -2744,21 +2762,29 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, virBufferVSprintf(buffer, "ethernet%d.present = \"true\"\n", controller); - /* def:model -> vmx:virtualDev */ + /* def:model -> vmx:virtualDev, vmx:features */ if (def->model != NULL) { if (STRCASENEQ(def->model, "vlance") && STRCASENEQ(def->model, "vmxnet") && + STRCASENEQ(def->model, "vmxnet2") && STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting domain XML entry 'devices/interfase/model' " - "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' " - "but found '%s'"), def->model); + "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' " + "or 'e1000' but found '%s'"), def->model); return -1; } - virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", - controller, def->model); + if (STRCASEEQ(def->model, "vmxnet2")) { + virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"vmxnet\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.features = \"15\"\n", + controller); + } else { + virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", + controller, def->model); + } } /* def:type, def:ifname -> vmx:connectionType */ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx new file mode 100644 index 0000000..1c3f063 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx @@ -0,0 +1,9 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.virtualDev = "vmxnet" +ethernet0.features = "15" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml new file mode 100644 index 0000000..090f7ce --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml @@ -0,0 +1,20 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + <model type='vmxnet2'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index f3b3b5e..b26a703 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -145,6 +145,7 @@ mymain(int argc, char **argv) DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2", esxVI_APIVersion_25); DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx new file mode 100644 index 0000000..50709e2 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx @@ -0,0 +1,14 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-vmxnet2" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.virtualDev = "vmxnet" +ethernet0.features = "15" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml new file mode 100644 index 0000000..7d6d0e5 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml @@ -0,0 +1,15 @@ +<domain type='vmware'> + <name>ethernet-vmxnet2</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + <model type='vmxnet2'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f9c4730..40386eb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -190,6 +190,7 @@ mymain(int argc, char **argv) DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2", esxVI_APIVersion_25); DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); -- 1.6.3.3

2 2

[libvirt] compiler warning about unused in_open parameter
by Gustavo Morozowski 20 Apr '10

20 Apr '10

Hi, I am trying to build 0.8.0 for windows using Fedora 12 [1], the compile is breaking with the message - make[3]: Entering directory `/home/gustavo/Devel/libvirt-0.8.0/src' CC libvirt_driver_remote_la-remote_driver.lo cc1: warnings being treated as errors remote/remote_driver.c: In function 'remoteAuthenticate': remote/remote_driver.c:6478: error: unused parameter 'in_open' [-Wunused-parameter] It seems 'in_open' is not used when both SASL and POLKIT are disabled. Gustavo [1] https://www.redhat.com/archives/libvir-list/2010-March/msg00612.html

3 2

[libvirt] [PATCH] logrotate: don't rotate zero-length logfiles only
by Anton Protopopov 20 Apr '10

20 Apr '10

Hi. In logrotate configuration files used by libvirt, there is an option 'minsize 100k', which prevents logrotate from rotating small (< 100k) files into an archive. But the target goal of the http://www.mail-archive.com/libvir-list@redhat.com/msg17443.html patch was to prevent logrotate from packing _empty_ files. This indeed could be done more accurately with the 'notifempty' option, see attached patch.

2 1

[libvirt] [PATCH] Don't ship generated python/libvirt.? files.
by Philipp Hahn 20 Apr '10

20 Apr '10

libvirt.c and libvirt.h are auto-generated files. Mentioning their names in *_SOURCES includes them in the distribution. During an out-of-tree build these shipped files are included instead of the auto-generated version, potentially breaking the build (as it happend in 0.8.0, because the shipped libvirt.h was missing the declaration for 'libvirt_virDomainUpdateDeviceFlags') Use the nodist_*_SOURCES automake variable instead. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- python/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

3 2

[libvirt] [PATCH] Support for faking emulator in qemuxml2argv tests
by Jiri Denemark 20 Apr '10

20 Apr '10

Hi, I thought I'd need it but turned out I didn't. In case someone else finds a good use for that, here's the patch. The idea was to provide a way to fake qemu responses on -M ?, -cpu ?, and the like. Jirka >From d1fa129d1018cd66d2bbdadc68a5f72e91bc6b0c Mon Sep 17 00:00:00 2001 Message-Id: <d1fa129d1018cd66d2bbdadc68a5f72e91bc6b0c.1271681198.git.jdenemar(a)redhat.com> From: Jiri Denemark <jdenemar(a)redhat.com> Date: Fri, 16 Apr 2010 08:20:33 +0200 Subject: [PATCH] Support for faking emulator in qemuxml2argv tests Mail-Followup-To: libvir-list(a)redhat.com This patch allows for using custom scripts instead of /usr/bin/qemu emulator in domain XML. To do so, one can specify relative path to the custom script in <emulator/>. The path needs to be relative to qemuxml2argvdata directory and it will be transparently made absolute in runtime. The expected command line needs to contain the exact relative path as was used in domain XML. --- tests/qemuxml2argvtest.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index beb5dcd..da28c93 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -38,6 +38,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virDomainDefPtr vmdef = NULL; virDomainChrDef monitor_chr; virConnectPtr conn; + char *emulator = NULL; if (!(conn = virGetConnect())) goto fail; @@ -49,6 +50,17 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_DOMAIN_XML_INACTIVE))) goto fail; + if (vmdef->emulator && *vmdef->emulator != '/') { + emulator = vmdef->emulator; + vmdef->emulator = NULL; + if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s", + abs_srcdir, emulator) < 0) { + vmdef->emulator = emulator; + emulator = NULL; + goto fail; + } + } + if (extraFlags & QEMUD_CMD_FLAG_DOMID) vmdef->id = 6; else @@ -86,6 +98,12 @@ static int testCompareXMLToArgvFiles(const char *xml, NULL, NULL, migrateFrom, NULL) < 0) goto fail; + if (emulator && *argv) { + free(*(char**) argv); + *argv = emulator; + emulator = NULL; + } + len = 1; /* for trailing newline */ tmp = qenv; while (*tmp) { @@ -125,6 +143,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; fail: + free(emulator); free(actualargv); if (argv) { tmp = argv; -- 1.7.0.4

1 1

[libvirt] [PATCH 0/6] CPU selection fixes and tests
by Jiri Denemark 20 Apr '10

20 Apr '10

4 out of the 8 tests added by patch 2/6 fail with current libvirt. After 5/6 some of them pass and some of them fail in a different way. After 6/6 all of them pass. Jirka Jiri Denemark (6): Fake host CPU for qemu tests Tests for CPU selection in qemu driver Deal with CPU models in [] Move MIN macro to util.h so that others can use it Support removing features when converting data to CPU Use configured CPU model if possible src/cpu/cpu.c | 8 +- src/cpu/cpu.h | 6 +- src/cpu/cpu_x86.c | 82 +++++++++++++++----- src/qemu/qemu_conf.c | 39 ++++++++-- src/util/util.c | 4 - src/util/util.h | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 28 +++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 35 ++++++++ .../qemuxml2argv-cpu-minimum1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml | 21 +++++ .../qemuxml2argv-cpu-minimum2.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 25 ++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 38 +++++++++ .../qemuxml2argv-cpu-topology1.args | 1 + .../qemuxml2argv-cpu-topology1.xml | 21 +++++ .../qemuxml2argv-cpu-topology2.args | 1 + .../qemuxml2argv-cpu-topology2.xml | 22 +++++ .../qemuxml2argv-cpu-topology3.args | 1 + .../qemuxml2argv-cpu-topology3.xml | 21 +++++ tests/qemuxml2argvtest.c | 9 ++ tests/testutilsqemu.c | 30 +++++++- 24 files changed, 362 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml

2 16

[libvirt] [PATCH] Fixup python binding for virDomainSnapshot APIs
by Daniel P. Berrange 20 Apr '10

20 Apr '10

The generator code was totally wrong for the virDomainSnapshot APIs, not generating the wrapper class, and giving methods the wrong names * generator.py: Set metadata for virDomainSnapshot type & APIs * libvirt-override-api.xml, libvirt-override.c: Hand-code the virDomainSnapshotListNames glue layer --- python/generator.py | 27 ++++++++++++++++++++++- python/libvirt-override-api.xml | 6 +++++ python/libvirt-override.c | 46 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletions(-) diff --git a/python/generator.py b/python/generator.py index cb9f3d9..6f082e8 100755 --- a/python/generator.py +++ b/python/generator.py @@ -243,6 +243,9 @@ py_types = { 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'const virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'const virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), } py_return_types = { @@ -277,6 +280,7 @@ skip_impl = ( 'virConnectListDefinedStorageVols', 'virConnectListDefinedInterfaces', 'virConnectListNWFilters', + 'virDomainSnapshotListNames', 'virConnGetLastError', 'virGetLastError', 'virDomainGetInfo', @@ -643,6 +647,8 @@ classes_type = { "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), "virConnect *": ("._o", "virConnect(_obj=%s)", "virConnect"), + "virDomainSnapshotPtr": ("._o", "virDomainSnapshot(self,_obj=%s)", "virDomainSnapshot"), + "virDomainSnapshot *": ("._o", "virDomainSnapshot(self, _obj=%s)", "virDomainSnapshot"), } converter_type = { @@ -651,7 +657,7 @@ converter_type = { primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", - "virStream"] + "virStream", "virDomainSnapshot"] classes_ancestor = { } @@ -663,6 +669,7 @@ classes_destructors = { "virStorageVol": "virStorageVolFree", "virNodeDevice" : "virNodeDeviceFree", "virSecret": "virSecretFree", + "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", } @@ -767,6 +774,24 @@ def nameFixup(name, classe, type, file): elif name[0:12] == "virDomainGet": func = name[12:] func = string.lower(func[0:1]) + func[1:] + elif name[0:29] == "virDomainSnapshotLookupByName": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:26] == "virDomainSnapshotListNames": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:20] == "virDomainSnapshotNum": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:26] == "virDomainSnapshotCreateXML": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:24] == "virDomainSnapshotCurrent": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:17] == "virDomainSnapshot": + func = name[17:] + func = string.lower(func[0:1]) + func[1:] elif name[0:9] == "virDomain": func = name[9:] func = string.lower(func[0:1]) + func[1:] diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index e95c46a..6f1bc04 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -243,5 +243,11 @@ <arg name='xmlCPUs' type='const char **' info='array of XML descriptions of host CPUs'/> <arg name='flags' type='unsigned int' info='fine-tuning flags, currently unused, pass 0.'/> </function> + <function name='virDomainSnapshotListNames' file='python'> + <info>collect the list of snapshots for the given domain</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='flags, curently unused'/> + <return type='str *' info='the list of Names of None in case of error'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 02bc313..ce21f60 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -943,6 +943,51 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char **names = NULL; + int c_retval, i; + virDomainPtr dom; + PyObject *pyobj_dom; + int flags; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainSnapshotListNames", &pyobj_dom, &flags)) + return(NULL); + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainSnapshotNum(dom, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + + if (c_retval) { + names = malloc(sizeof(*names) * c_retval); + if (!names) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainSnapshotListNames(dom, names, c_retval, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { + free(names); + return VIR_PY_NONE; + } + } + py_retval = PyList_New(c_retval); + + if (names) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); + free(names[i]); + } + free(names); + } + + return(py_retval); +} + +static PyObject * libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; int c_retval; @@ -3275,6 +3320,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectBaselineCPU", libvirt_virConnectBaselineCPU, METH_VARARGS, NULL}, {(char *) "virDomainGetJobInfo", libvirt_virDomainGetJobInfo, METH_VARARGS, NULL}, + {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- 1.6.6.1

3 3

[libvirt] KVM Forum 2010: Call for Papers
by KVM Forum 2010 Program Committee 20 Apr '10

20 Apr '10

================================================================= CALL FOR PAPERS KVM Forum 2010 ================================================================= DESCRIPTION The KVM Forum is back! After a break last year we're proud to present this year's gathering around KVM again. The idea is to have everyone involved with KVM development come together to talk about the future and current state of KVM, teaching everyone some pieces of the puzzle they might be missing without. So if you're a KVM developer, mark the dates in your calendar! If possible, also submit a talk -- we're interested in a wide variety of KVM topics, so don't hesitate to propose a talk on your work. If you're not a KVM developer, please read on nevertheless (or jump to END USER COLLABORATION). DATES / LOCATION Conference: August 9 - 10, 2010 Location: Renaissance Boston Waterfront in Boston, MA Abstracts due: May 14th, 2010 Notification: May 28th, 2010 Yes, we're colocated with LinuxCon. Tickets for the KVM Forum also count for LinuxCon. http://events.linuxfoundation.org/component/registrationpro/?func=details&d… PROCESS At first check if it's before May 14th. If you're past that date, you're out of luck. Now try to think hard and come up with a great idea that you could talk about. Once you have that set, we need you to write up a short abstract (~150 words) on it. In your submission please note how long your talk will take. Slots vary in length up to one hour. Also include in your proposal the proposal type -- one of: technical talk, breakout session, or end-user talk. Add that information to the abstract and submit it at the following URL: http://events.linuxfoundation.org/cfp/cfp-add Now, wait until May 24th. You will receive a notification on whether your talk was accepted or not. SCOPE OF TALKS We have a list of suggested presentation topics below. These suggestions are just for guidance, please feel free to submit a proposal on any of these or related topics. In general, the more it's about backend infrastructure, the better. KVM - Scaling and performance - Nested virtualization - I/O improvements - Driver domains - Time keeping - Memory management (page sharing, swapping, huge pages, etc) - Fault tolerance - VEPA, vswitch Embedded KVM - KVM on ARM, PPC, MIPS, ...? - Real-time requirements host/guest - Device pass-through w/o iommu - Custom device/platform models QEMU - Device model improvements - New devices - Security model - Scaling and performance - Desktop virtualization - Increasing robustness - Management interfaces - QMP protocol and implementation - Live migration Virtio - Speeding up existing devices - Vhost - Alternatives - Using virtio in non-kvm environments - Virtio on non-Linux Management infrastructure - Libvirt - Kvm autotest - Easy networking - Qemud BREAKOUT SESSION We will reserve some time each day to break out for working sessions. These sessions will be less formal than a presentation and more focused on developing a solution to some real development issue. If you are interested in getting developers together to hack on some code, submit your proposal and just make it clear it's a breakout session proposal. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. To solve this issue at least a little, there will be a few slots reserved for end users talking about their deployments, problems and achievements. So if you have a KVM based deployment running in production or are about to roll out one, please also submit a talk (see PROCESS), and simply mark it asn an end-user collaboration proposal. We would love to have an open discussion of fields where KVM/Qemu can still improve and you would have the unique chance to steer that process! Keep in mind that most of the Forum will be focused on development though, so we suggest you also come with a good portion of technical interest :-). And of course, no product marketing please! The purpose is to engage with KVM developers. LIGHTNING TALKS In addition to submitted talks we will also have some room for lightning talks. So if you have something you think might be done until the KVM Forum, but you're not sure you could fill 15 minutes with it. Or if you don't know if you'll make it until there, just keep in mind that you will still get the chance to talk about it. Lightning talk submissions and scheduling will be handled on-site at KVM Forum. Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2010 in August! Now, start thinking about that talk you want to give. Thanks, your KVM Forum 2010 Program Commitee Alexander Graf, Novell Anthony Liguori, IBM Avi Kivity, Red Hat Chris Wright, Red Hat Dor Laor, Red Hat Jan Kiszka, Siemens Please contact us with any questions or comments. KVM-Forum-2010-PC(a)redhat.com

1 0

[libvirt] [PATCH] Fix crash in nwfilter driver check
by Daniel P. Berrange 19 Apr '10

19 Apr '10

The nwfilterDriverActive() could de-reference a NULL pointer if it hadn't be started at the point it was called. It was also not thread safe, since it lacked locking around data accesses. * src/nwfilter/nwfilter_driver.c: Fix locking & NULL checks in nwfilterDriverActive() --- src/nwfilter/nwfilter_driver.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 58df4e1..412c5b8 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -153,9 +153,16 @@ nwfilterDriverReload(void) { */ static int nwfilterDriverActive(void) { - if (!driverState->pools.count) + int ret; + + if (!driverState) return 0; - return 1; + + nwfilterDriverLock(driverState); + ret = driverState->pools.count ? 1 : 0; + nwfilterDriverUnlock(driverState); + + return ret; } /** -- 1.6.6.1

2 1