- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Check for virQEMUDriverConfigNew return value
by Michal Privoznik 26 Jan '15

26 Jan '15

The function may return NULL if something went wrong. In some places in the tests we are not checking the return value rather than accessing the pointer directly resulting in SIGSEGV. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/domaincapstest.c | 3 +++ tests/qemuhotplugtest.c | 3 ++- tests/qemuxmlnstest.c | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 70d2ef3..fa931f6 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -212,46 +212,49 @@ static int mymain(void) { int ret = 0; #define DO_TEST(Filename, Emulatorbin, Machine, Arch, Type, ...) \ do { \ struct test_virDomainCapsFormatData data = {.filename = Filename, \ .emulatorbin = Emulatorbin, .machine = Machine, .arch = Arch, \ .type = Type, __VA_ARGS__}; \ if (virtTestRun(Filename, test_virDomainCapsFormat, &data) < 0) \ ret = -1; \ } while (0) DO_TEST("basic", "/bin/emulatorbin", "my-machine-type", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_UML); DO_TEST("full", "/bin/emulatorbin", "my-machine-type", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM, .fillFunc = fillAll); #ifdef WITH_QEMU virQEMUDriverConfigPtr cfg = virQEMUDriverConfigNew(false); + if (!cfg) + return EXIT_FAILURE; + # define DO_TEST_QEMU(Filename, QemuCapsFile, Emulatorbin, Machine, Arch, Type, ...) \ do { \ const char *capsPath = abs_srcdir "/qemucapabilitiesdata/" QemuCapsFile ".caps"; \ virQEMUCapsPtr qemuCaps = qemuTestParseCapabilities(capsPath); \ struct fillQemuCapsData fillData = {.qemuCaps = qemuCaps, .cfg = cfg}; \ struct test_virDomainCapsFormatData data = {.filename = Filename, \ .emulatorbin = Emulatorbin, .machine = Machine, .arch = Arch, \ .type = Type, .fillFunc = fillQemuCaps, .opaque = &fillData}; \ if (!qemuCaps) { \ fprintf(stderr, "Unable to build qemu caps from %s\n", capsPath); \ ret = -1; \ } else if (virtTestRun(Filename, test_virDomainCapsFormat, &data) < 0) \ ret = -1; \ } while (0) DO_TEST_QEMU("qemu_1.6.50-1", "caps_1.6.50-1", "/usr/bin/qemu-system-x86_64", "pc-1.2", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM); virObjectUnref(cfg); #endif /* WITH_QEMU */ return ret; } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 1c18dbb..12a7f71 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -333,165 +333,166 @@ static int mymain(void) { int ret = 0; struct qemuHotplugTestData data = {0}; virSecurityManagerPtr mgr; #if !WITH_YAJL fputs("libvirt not compiled with yajl, skipping this test\n", stderr); return EXIT_AM_SKIP; #endif if (virThreadInitialize() < 0 || !(driver.caps = testQemuCapsInit()) || !(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; virEventRegisterDefaultImpl(); - driver.config = virQEMUDriverConfigNew(false); + if (!(driver.config = virQEMUDriverConfigNew(false))) + return EXIT_FAILURE; VIR_FREE(driver.config->spiceListen); VIR_FREE(driver.config->vncListen); /* some dummy values from 'config file' */ if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) return EXIT_FAILURE; if (!(driver.domainEventState = virObjectEventStateNew())) return EXIT_FAILURE; driver.lockManager = virLockManagerPluginNew("nop", "qemu", driver.config->configBaseDir, 0); if (!driver.lockManager) return EXIT_FAILURE; if (!(mgr = virSecurityManagerNew("none", "qemu", false, false, false))) return EXIT_FAILURE; if (!(driver.securityManager = virSecurityManagerNewStack(mgr))) return EXIT_FAILURE; /* wait only 100ms for DEVICE_DELETED event */ qemuDomainRemoveDeviceWaitTime = 100; #define DO_TEST(file, ACTION, dev, event, fial, kep, ...) \ do { \ const char *my_mon[] = { __VA_ARGS__, NULL}; \ const char *name = file " " #ACTION " " dev; \ data.action = ACTION; \ data.domain_filename = file; \ data.device_filename = dev; \ data.fail = fial; \ data.mon = my_mon; \ data.keep = kep; \ data.deviceDeletedEvent = event; \ if (virtTestRun(name, testQemuHotplug, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_ATTACH(file, dev, fial, kep, ...) \ DO_TEST(file, ATTACH, dev, false, fial, kep, __VA_ARGS__) #define DO_TEST_DETACH(file, dev, fial, kep, ...) \ DO_TEST(file, DETACH, dev, false, fial, kep, __VA_ARGS__) #define DO_TEST_ATTACH_EVENT(file, dev, fial, kep, ...) \ DO_TEST(file, ATTACH, dev, true, fial, kep, __VA_ARGS__) #define DO_TEST_DETACH_EVENT(file, dev, fial, kep, ...) \ DO_TEST(file, DETACH, dev, true, fial, kep, __VA_ARGS__) #define DO_TEST_UPDATE(file, dev, fial, kep, ...) \ DO_TEST(file, UPDATE, dev, false, fial, kep, __VA_ARGS__) #define QMP_OK "{\"return\": {}}" #define HMP(msg) "{\"return\": \"" msg "\"}" #define QMP_DEVICE_DELETED(dev) \ "{" \ " \"timestamp\": {" \ " \"seconds\": 1374137171," \ " \"microseconds\": 2659" \ " }," \ " \"event\": \"DEVICE_DELETED\"," \ " \"data\": {" \ " \"device\": \"" dev "\"," \ " \"path\": \"/machine/peripheral/" dev "\"" \ " }" \ "}\r\n" DO_TEST_UPDATE("graphics-spice", "graphics-spice-nochange", false, false, NULL); DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-nochange", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-password", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice", "graphics-spice-listen", true, false, NULL); DO_TEST_UPDATE("graphics-spice-listen-network", "graphics-spice-listen-network", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); /* Strange huh? Currently, only graphics can be updated :-P */ DO_TEST_UPDATE("disk-cdrom", "disk-cdrom-nochange", true, false, NULL); DO_TEST_ATTACH("console-compat-2", "console-virtio", false, true, "chardev-add", "{\"return\": {\"pty\": \"/dev/pts/26\"}}", "device_add", QMP_OK); DO_TEST_DETACH("console-compat-2", "console-virtio", false, false, "device_del", QMP_OK, "chardev-remove", QMP_OK); DO_TEST_ATTACH("hotplug-base", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-virtio", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-virtio", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("hotplug-base", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-usb", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-usb", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-usb", false, false, "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("hotplug-base", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-scsi", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, "human-monitor-command", HMP("")); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); virObjectUnref(driver.config); return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 947aa9c..4d665da 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -205,62 +205,63 @@ static int mymain(void) { int ret = 0; bool json = false; abs_top_srcdir = getenv("abs_top_srcdir"); if (!abs_top_srcdir) abs_top_srcdir = abs_srcdir "/.."; - driver.config = virQEMUDriverConfigNew(false); + if (!(driver.config = virQEMUDriverConfigNew(false))) + return EXIT_FAILURE; if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; # define DO_TEST_FULL(name, migrateFrom, migrateFd, expectError, ...) \ do { \ struct testInfo info = { \ name, NULL, migrateFrom, migrateFd, json, expectError \ }; \ if (!(info.extraFlags = virQEMUCapsNew())) \ return EXIT_FAILURE; \ virQEMUCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);\ if (virtTestRun("QEMU XML-2-ARGV " name, \ testCompareXMLToArgvHelper, &info) < 0) \ ret = -1; \ virObjectUnref(info.extraFlags); \ } while (0) # define DO_TEST(name, expectError, ...) \ DO_TEST_FULL(name, NULL, -1, expectError, __VA_ARGS__) # define NONE QEMU_CAPS_LAST /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ setenv("PATH", "/bin", 1); setenv("USER", "test", 1); setenv("LOGNAME", "test", 1); setenv("HOME", "/home/test", 1); unsetenv("TMPDIR"); unsetenv("LD_PRELOAD"); unsetenv("LD_LIBRARY_PATH"); unsetenv("QEMU_AUDIO_DRV"); unsetenv("SDL_AUDIODRIVER"); DO_TEST("qemu-ns-domain", false, NONE); DO_TEST("qemu-ns-domain-ns0", false, NONE); DO_TEST("qemu-ns-domain-commandline", false, NONE); DO_TEST("qemu-ns-domain-commandline-ns0", false, NONE); DO_TEST("qemu-ns-commandline", false, NONE); DO_TEST("qemu-ns-commandline-ns0", false, NONE); DO_TEST("qemu-ns-commandline-ns1", false, NONE); virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.0.5

2 2

[libvirt] [PATCH v4 0/2] Allow UEFI paths to be specified at compile time
by Michal Privoznik 26 Jan '15

26 Jan '15

diff to v3: - basically the patch is split into two patches - dropped shell script in to configure.ac Michal Privoznik (2): qemu: Allow UEFI paths to be specified at compile time qemu: Add AAVMF to the list of known UEFIs configure.ac | 12 ++++ src/qemu/qemu.conf | 12 +++- src/qemu/qemu_conf.c | 68 +++++++++++++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 1 + .../domaincaps-qemu_1.6.50-1.xml | 1 + tests/domaincapstest.c | 16 ++--- 6 files changed, 93 insertions(+), 17 deletions(-) -- 2.0.5

2 5

[libvirt] [PATCH] Fix a memory leak in virCgroupGetPercpuStats
by Ján Tomko 26 Jan '15

26 Jan '15

Coverity reports that my commit af1c98e introduced two memory leaks: the cpumap if ncpus == 0 in virCgroupGetPercpuStats and the params array in the test of the function. --- src/util/vircgroup.c | 6 ++++-- tests/vircgrouptest.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e65617a..6957e81 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3061,8 +3061,10 @@ virCgroupGetPercpuStats(virCgroupPtr group, total_cpus = virBitmapSize(cpumap); - if (ncpus == 0) - return total_cpus; + if (ncpus == 0) { + rv = total_cpus; + goto cleanup; + } if (start_cpu >= total_cpus) { virReportError(VIR_ERR_INVALID_ARG, diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index a455a81..cc1825b 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -614,6 +614,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) cleanup: virCgroupFree(&cgroup); + VIR_FREE(params); return ret; } -- 2.0.5

2 1

[libvirt] [PATCH] [Build-breaker : 1.2.12] Suppress compilation without dbus headers
by Prerna Saxena 26 Jan '15

26 Jan '15

Hi, While testing 1.2.12 rc2 on Powerpc, Fedora 21, I hit a bunch of build failures in absence of dbus-devel : src/util/virsystemd.c:284:17: note: in expansion of macro 'STREQ_NULLABLE' if (STREQ_NULLABLE("org.freedesktop.DBus.Error.UnknownMethod", ^ .... src/util/virsystemd.c:288:17: error: implicit declaration of function 'dbus_error_free' [-Werror=implicit-function-declaration] dbus_error_free(&error); Found that this was because commit 318df5a05 needs Dbus libraries for compilation, and configure didnt mark "with_dbus" to be mandatory. In this case, the compilation itself failed in a much uglier fashion on my system where dbus-devel was absent. The following patch introduces a compile error when dbus-devel is absent, so that the build itself proceeds later without cryptic errors. This has also been reported on the list : https://www.redhat.com/archives/libvir-list/2015-January/msg00641.html >From 8c4f583b6bb47ca41866ff884af0cd55487f047d Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Sun, 25 Jan 2015 05:35:23 -0600 Subject: [PATCH] Build: Fix dbus m4 macro to correctly flag it as a required dependency. Commit 318df5a needs dbus headers to compile. However, this package is listed as optional, and so this breaks libvirt compilation on systems that lack the relevant devel files. This patch does not allow ./configure to proceed if dbus-devel is absent. It also tweaks the libvirt spec file to reflect this relationship. --- libvirt.spec.in | 3 --- m4/virt-dbus.m4 | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index ba1cf41..4dfda13 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -627,10 +627,7 @@ BuildRequires: util-linux BuildRequires: nfs-utils %endif -%if %{with_firewalld} -# Communication with the firewall daemon uses DBus BuildRequires: dbus-devel -%endif # Fedora build root suckage BuildRequires: gawk diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index 3f9b306..42359cf 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -19,6 +19,7 @@ dnl AC_DEFUN([LIBVIRT_CHECK_DBUS],[ LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0]) + m4_divert_text([DEFAULTS], [with_dbus=yes]) if test "$with_dbus" = "yes" ; then old_CFLAGS="$CFLAGS" -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [libvirt-test-API][PATCH] Add IPv6 section into network case
by jiahu 26 Jan '15

26 Jan '15

Add IPv6 family related scenarios to virtual network case --- cases/basic_network.conf | 8 ++++++++ repos/network/define.py | 7 ++++++- repos/network/xmls/network.xml | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cases/basic_network.conf b/cases/basic_network.conf index e9abd57..5d1438e 100644 --- a/cases/basic_network.conf +++ b/cases/basic_network.conf @@ -13,6 +13,14 @@ network:define $defaultnetend netmode nat + netip6addr + $netip6addr + netip6prefix + $netip6prefix + netip6start + $netip6start + netip6end + $netip6end network:network_list flags diff --git a/repos/network/define.py b/repos/network/define.py index dd054f7..6e50eb7 100644 --- a/repos/network/define.py +++ b/repos/network/define.py @@ -17,7 +17,12 @@ required_params = ('networkname', 'bridgenetmask', 'netstart', 'netend', - 'netmode',) + 'netmode', + 'netip6addr', + 'netip6prefix', + 'netip6start', + 'netip6end', + ) optional_params = {'xml' : 'xmls/network.xml', } diff --git a/repos/network/xmls/network.xml b/repos/network/xmls/network.xml index 220169b..97e3517 100644 --- a/repos/network/xmls/network.xml +++ b/repos/network/xmls/network.xml @@ -7,4 +7,9 @@ <range start="NETSTART" end="NETEND"/> </dhcp> </ip> + <ip family="ipv6" address="NETIP6ADDR" prefix="NETIP6PREFIX" > + <dhcp> + <range start="NETIP6START" end="NETIP6END" /> + </dhcp> + </ip> </network> -- 1.8.1.4

2 1

[libvirt] [PATCH] conf: Disallow emulatorpin when numatune's in effect
by Michal Privoznik 26 Jan '15

26 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1170492 In one of our previous commits (dc8b7ce7) we've obsoleted <cputune/> in favor of <numatune/> and others. If old element was passed it was basically ignored and interesting settings were copied from the new one. Well with one exception we'd forgotten about: emulatorpin. Imagine that domain is configured as follows: <vcpu placement='static' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> This is perfectly valid as only old style elements are used. However, adding new style elements messes up the XML: <vcpu placement='auto' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> <numatune> <memory mode='strict' placement='auto'/> </numatune> Since <numatune/> is auto, <vcpu/> becomes auto as well. However in that case we can't guarantee that emulator will be pinned onto selected nodes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 12 +++++++- .../qemuxml2argv-cputune-numatune.xml | 35 ++++++++++++++++++++++ .../qemuxml2xmlout-cputune-numatune.xml | 32 ++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8792f5e..0b8af6d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13173,8 +13173,18 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt) < 0) goto error; - if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) + if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) { + /* If numatune is used, it obsoletes some older settings + * like /domain/vcpu/@placement or + * /domain/cputune/emulatorpin. For more info see comment + * a few lines above where emulatorpin is parsed. */ def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; + if (def->cputune.emulatorpin) { + VIR_WARN("Ignore emulatorpin for <numatune> placement is 'auto'"); + virDomainVcpuPinDefFree(def->cputune.emulatorpin); + def->cputune.emulatorpin = NULL; + } + } if ((n = virXPathNodeSet("./resource", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml new file mode 100644 index 0000000..9759b48 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml @@ -0,0 +1,35 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <cputune> + <emulatorpin cpuset='1-3'/> + </cputune> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml new file mode 100644 index 0000000..b33f57f --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml @@ -0,0 +1,32 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4abb303..9ceda58 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -310,6 +310,7 @@ mymain(void) DO_TEST("blkiotune-device"); DO_TEST("cputune"); DO_TEST("cputune-zero-shares"); + DO_TEST_DIFFERENT("cputune-numatune"); DO_TEST("smp"); DO_TEST("iothreads"); -- 2.0.5

2 1

[libvirt] [libvirt-test-API][PATCH] Add global IPv6 default values to network part
by jiahu 26 Jan '15

26 Jan '15

Added below variables into global.cfg. netip6addr/netip6prefix/netip6start/netip6end --- global.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/global.cfg b/global.cfg index db8f71e..56677a5 100644 --- a/global.cfg +++ b/global.cfg @@ -195,6 +195,15 @@ defaultnetstart = 192.168.111.2 # default the ending address ip defaultnetend = 192.168.111.254 +# default bridge ipv6 addr +netip6addr = 2001:db8:ca2:99::1 +# default bridge ipv6 prefix +netip6prefix = 64 +# default the starting ipv6 address +netip6start = 2001:db8:ca2:99::11 +# default the ending ipv6 address +netip6end = 2001:db8:ca2:99::ff + ################################################################ # # host interface -- 1.8.1.4

1 0

[libvirt] Missing libxl_device_nic settings
by Kim Larry 25 Jan '15

25 Jan '15

Hi, I was trying to pass ip address to scripts/vif-bridge by putting <ip address=""/> in guest config xml file, however, I found that libxlMakeNic(which located in libxl/libxl_conf.c:956) doesn't set x_nic->ip. So I patched myself but I'm not so sure about VIR_DOMAIN_NET_TYPE_ETHERNET. It seems like vif-route, correct? Here is my patch: diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0555b91..0effc59 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1047,10 +1047,18 @@ libxlMakeNic(virDomainDefPtr def, if (VIR_STRDUP(x_nic->bridge, virDomainNetGetActualBridgeName(l_nic)) < 0) return -1; - /* fallthrough */ + if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) + return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.bridge.ipaddr) < 0) + return -1; + break; case VIR_DOMAIN_NET_TYPE_ETHERNET: if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.ethernet.ipaddr) < 0) + return -1; + if (VIR_STRDUP(x_nic->gatewaydev, l_nic->data.ethernet.dev) < 0) + return -1; break; case VIR_DOMAIN_NET_TYPE_NETWORK: { Regards, Jihoon

1 0

[libvirt] Entering freeze for libvirt-1.2.12
by Daniel Veillard 24 Jan '15

24 Jan '15

As planned I tagged the release candidate 1 in git and pushed signed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work fine for me, but my testing is limited. Give it a try especially on other architectures or OSes. Plan is to release an rc2 by the dn of the week and the final next Tuesday assuming everythings goes smoothly ! thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] libvirt domXML -> libxl_domain_config conversion testing
by Jim Fehlig 24 Jan '15

24 Jan '15

Hi All, I've been attempting to revive the libvirt domXML -> libxl_domain_config tests originally started by Daniel all the way back in May! https://www.redhat.com/archives/libvir-list/2014-May/msg01102.html In a reply to patch5 of the series, Ian Campbell noted that the doc produced by libxl_domain_config_to_json() may change as new config is added, defaults changed, etc. Some suggestions for coping with this included 1. json template files per libxl version 2. a new API in libvirt's json toolbox to compare json docs (with ability to control the comparison, e.g. ignore certain content) 3. make use of new functionality in Xen 4.5 such as libxl_domain_config_from_json() and libxl_domain_config_compare() Option 1 is simple-minded. Option 2 is an improvement, but a growing list of content must be ignored as additions/changes are made to the libxl_domain_config object. (Example of ignored content in this discussion - https://www.redhat.com/archives/libvir-list/2014-September/msg00627.html) In some cases, we might actually want to test some of the new content instead of ignoring it. Option 3 is promising, but doesn't help with Xen versions 4.2-4.4. Also, 4.5 is missing libxl_domain_config_compare(). After a bit of hacking on a combination of 2 and 3, I'm reconsidering 1 :-). At least for Xen 4.2-4.5. It's a simple solution that doesn't prevent testing new content in the libxl_domain_config object. Going forward, I could work on libxl_domain_config_compare() for xen-unstable/4.6, and then use option 3 to stop the template bloom. Any thoughts on this approach? Smarter options? Regards, Jim

1 0