- Devel - libvirt List Archives

[libvirt] [PATCH] libxl: don't hardcode scheduler weight
by Jim Fehlig 21 Mar '18

21 Mar '18

Long ago in commit dfa1e1dd53 the scheduler weight was accidentally hardcoded to 1000. Weight is a setting with no unit since it is relative to the weight of other domains. If no weight is specified, libxl defaults to 256. Instead of hardcoding the weight to 1000, honor any <shares> specified in <cputune>. libvirt's notion of shares is synonomous to libxl's scheduler weight setting. If shares is unspecified, defer default weight setting to libxl. Removing the hardcoded weight required some test fixup. While at it, add an explicit test for <shares> conversion to scheduler weight. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Honoring <shares> specified by the user is certainly desirable, but I'm not sure about changing the default weight. One problematic scenario that came to mind: Several domains started by pre-patch libvirtd with weight=1000, update libvirtd with patch, start more domains with weight=256. The pre-patch domains unknowingly have a weight nearly 4 times that of post-patch domains. src/libxl/libxl_conf.c | 4 +- tests/libxlxml2domconfigdata/basic-hvm.json | 2 +- tests/libxlxml2domconfigdata/basic-pv.json | 2 +- tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 89 ++++++++++++++++++++++ tests/libxlxml2domconfigdata/cpu-shares-hvm.xml | 39 ++++++++++ tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +- tests/libxlxml2domconfigdata/multiple-ip.json | 2 +- .../libxlxml2domconfigdata/variable-clock-hvm.json | 2 +- tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +- tests/libxlxml2domconfigtest.c | 1 + 10 files changed, 138 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index dcd46873c..e40145cfa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -366,7 +366,9 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } } - b_info->sched_params.weight = 1000; + if (def->cputune.sharesSpecified) + b_info->sched_params.weight = def->cputune.shares; + b_info->max_memkb = virDomainDefGetMemoryInitial(def); b_info->target_memkb = def->mem.cur_balloon; if (hvm) { diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json index 6fa41f34f..ccd585385 100644 --- a/tests/libxlxml2domconfigdata/basic-hvm.json +++ b/tests/libxlxml2domconfigdata/basic-hvm.json @@ -19,7 +19,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json index 7e1abd3d6..0f846daab 100644 --- a/tests/libxlxml2domconfigdata/basic-pv.json +++ b/tests/libxlxml2domconfigdata/basic-pv.json @@ -15,7 +15,7 @@ "max_memkb": 524288, "target_memkb": 524288, "sched_params": { - "weight": 1000 + }, "type.pv": { "bootloader": "pygrub" diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json new file mode 100644 index 000000000..2e647eada --- /dev/null +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json @@ -0,0 +1,89 @@ +{ + "c_info": { + "type": "hvm", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, + "shadow_memkb": 12288, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { + "weight": 1500 + }, + "type.hvm": { + "pae": "True", + "apic": "True", + "acpi": "True", + "vga": { + "kind": "cirrus" + }, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "boot": "c", + "rdm": { + + } + }, + "arch_arm": { + + } + }, + "disks": [ + { + "pdev_path": "/var/lib/xen/images/test-hvm.img", + "vdev": "hda", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "readwrite": 1 + } + ], + "nics": [ + { + "devid": 0, + "mac": "00:16:3e:66:12:b4", + "bridge": "br0", + "script": "/etc/xen/scripts/vif-bridge", + "nictype": "vif_ioemu" + } + ], + "vfbs": [ + { + "devid": -1, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + } + } + ], + "vkbs": [ + { + "devid": -1 + } + ], + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml b/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml new file mode 100644 index 000000000..49085b4b7 --- /dev/null +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml @@ -0,0 +1,39 @@ +<domain type='xen'> + <name>test-hvm</name> + <description>None</description> + <uuid>2147d599-9cc6-c0dc-92ab-4064b5446e9b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>4</vcpu> + <cputune> + <shares>1500</shares> + </cputune> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <clock offset='utc'/> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <apic/> + <acpi/> + <pae/> + </features> + <devices> + <emulator>/bin/true</emulator> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/var/lib/xen/images/test-hvm.img'/> + <target dev='hda'/> + </disk> + <interface type='bridge'> + <source bridge='br0'/> + <mac address='00:16:3e:66:12:b4'/> + <script path='/etc/xen/scripts/vif-bridge'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> + </devices> +</domain> diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json index 8f861f34e..7bfd68bd6 100644 --- a/tests/libxlxml2domconfigdata/moredevs-hvm.json +++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json @@ -21,7 +21,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json index 4aff61d4b..80dca8261 100644 --- a/tests/libxlxml2domconfigdata/multiple-ip.json +++ b/tests/libxlxml2domconfigdata/multiple-ip.json @@ -15,7 +15,7 @@ "max_memkb": 524288, "target_memkb": 524288, "sched_params": { - "weight": 1000 + }, "type.pv": { "bootloader": "pygrub" diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json index 49d0a4330..69be9c64c 100644 --- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json +++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json @@ -21,7 +21,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json index 3a5071e14..3b2fc5f40 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm.json +++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json @@ -107,7 +107,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index ea3d2884e..6eec4c752 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -192,6 +192,7 @@ mymain(void) DO_TEST("basic-pv"); DO_TEST("basic-hvm"); + DO_TEST("cpu-shares-hvm"); DO_TEST("variable-clock-hvm"); DO_TEST("moredevs-hvm"); DO_TEST("vnuma-hvm"); -- 2.16.1

2 2

[libvirt] [PATCH v3 0/5] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - Set(Memory|Input)Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) *Updates since v2* - Restore(Memory|Input)Label: drop secdef/relabel check - Set(Memory|Input)Label: check more pointers to be valid before using them Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 94 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 +++++++ tests/virt-aa-helper-test | 88 ++++++++++++++++++++++--------------- 3 files changed, 164 insertions(+), 34 deletions(-) -- 2.7.4

2 11

[libvirt] [PATCH] travis: skip builds on -maint branches
by Daniel P. Berrangé 21 Mar '18

21 Mar '18

For patches pushed upstream we want builds run on master branch, but don't want them run on the -maint branches, as we are not keeping the .travis.yml file on stable branches updated wrt latest needs of travis CI platforms. We can't just whitelist 'master' though, because that will prevent developers triggering their own private travis builds. So we just blacklist *-maint, since developers will typically use named feature branches for any work. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 01dffaa602..d3f72d46f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: false language: c cache: ccache +branches: + except: + - /^.*-maint$/ + matrix: include: - compiler: gcc -- 2.14.3

2 1

[libvirt] [snmp PATCH 2/2] Replace placeholder org OID with libvirt OID
by Michael Corcoran 21 Mar '18

21 Mar '18

An OID of 36957 was assigned to libvirt by IANA, but the placeholder OID of 12345 was never replaced. IANA lists the libvirt registration as: 36957 libvirt Daniel Veillard daniel&veillard.com https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers Signed-off-by: Michael Corcoran <tracer(a)outlook.co.nz> --- src/LIBVIRT-MIB.txt | 7 ++++--- src/libvirtGuestTable-README-libvirtGuestTable.txt | 18 +++++++++--------- src/libvirtGuestTable.h | 2 +- src/libvirtGuestTable_data_access.c | 4 ++-- src/libvirtGuestTable_data_access.h | 2 +- src/libvirtGuestTable_data_get.c | 16 ++++++++-------- src/libvirtGuestTable_data_get.h | 2 +- src/libvirtGuestTable_data_set.c | 6 +++--- src/libvirtGuestTable_data_set.h | 2 +- src/libvirtGuestTable_interface.c | 2 +- src/libvirtGuestTable_oids.h | 2 +- src/libvirtNotifications.c | 10 +++++----- 12 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/LIBVIRT-MIB.txt b/src/LIBVIRT-MIB.txt index a8195ff..1fd2074 100644 --- a/src/LIBVIRT-MIB.txt +++ b/src/LIBVIRT-MIB.txt @@ -14,7 +14,7 @@ IMPORTS libvirtMIB MODULE-IDENTITY - LAST-UPDATED "201012020000Z" + LAST-UPDATED "201803200000Z" ORGANIZATION "www.libvirt.org" CONTACT-INFO "email: libvirt-users(a)redhat.com @@ -22,10 +22,11 @@ libvirtMIB MODULE-IDENTITY DESCRIPTION "First draft, for experimental purposes only! Not to be used in real deployment!" + REVISION "201803200000Z" + DESCRIPTION "Updated OID" REVISION "201012020000Z" DESCRIPTION "Initial version." - ::= { enterprises 12345 } --- TODO: user real libvirt OID here ^ + ::= { enterprises 36957 } -- structure advised by RFC 4181: diff --git a/src/libvirtGuestTable-README-libvirtGuestTable.txt b/src/libvirtGuestTable-README-libvirtGuestTable.txt index 74e2274..0871568 100644 --- a/src/libvirtGuestTable-README-libvirtGuestTable.txt +++ b/src/libvirtGuestTable-README-libvirtGuestTable.txt @@ -587,14 +587,14 @@ Table / column details /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /*--------------------------------------------------------------------- * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID * libvirtGuestUUID is subid 1 of libvirtGuestEntry. * Its status is Current, and its access level is NoAccess. - * OID: .1.3.6.1.4.1.12345.1.1.1.1 + * OID: .1.3.6.1.4.1.36957.1.1.1.1 * Description: The UUID of the virtual guest. * @@ -620,7 +620,7 @@ The UUID of the virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName * libvirtGuestName is subid 2 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.2 + * OID: .1.3.6.1.4.1.36957.1.1.1.2 * Description: Name of active virtual guest. * @@ -638,7 +638,7 @@ Name of active virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -656,7 +656,7 @@ Current state of the active guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount * libvirtGuestCpuCount is subid 4 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.4 + * OID: .1.3.6.1.4.1.36957.1.1.1.4 * Description: Number of virtual CPUs the virtual guest uses. * @@ -674,7 +674,7 @@ Number of virtual CPUs the virtual guest uses. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent * libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.5 + * OID: .1.3.6.1.4.1.36957.1.1.1.5 * Description: Current amount of memory (in MiB) used by the virtual guest. * @@ -692,7 +692,7 @@ Current amount of memory (in MiB) used by the virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit * libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.6 + * OID: .1.3.6.1.4.1.36957.1.1.1.6 * Description: The maximum amount of memory (in MiB) that can be used by the virtual guest. @@ -711,7 +711,7 @@ The maximum amount of memory (in MiB) that can be used by the virtual * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime * libvirtGuestCpuTime is subid 7 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.7 + * OID: .1.3.6.1.4.1.36957.1.1.1.7 * Description: The CPU time used by the virtual guest, in nanoseconds. * @@ -728,7 +728,7 @@ The CPU time used by the virtual guest, in nanoseconds. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index 6762238..529838b 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -68,7 +68,7 @@ void shutdown_libvirtGuestTable(void); /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* ********************************************************************* * When you register your mib, you get to provide a generic diff --git a/src/libvirtGuestTable_data_access.c b/src/libvirtGuestTable_data_access.c index 2958284..d7de4d5 100644 --- a/src/libvirtGuestTable_data_access.c +++ b/src/libvirtGuestTable_data_access.c @@ -51,7 +51,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /** @@ -291,7 +291,7 @@ libvirtGuestTable_row_prep( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID * libvirtGuestUUID is subid 1 of libvirtGuestEntry. * Its status is Current, and its access level is NoAccess. - * OID: .1.3.6.1.4.1.12345.1.1.1.1 + * OID: .1.3.6.1.4.1.36957.1.1.1.1 * Description: The UUID of the virtual guest. * diff --git a/src/libvirtGuestTable_data_access.h b/src/libvirtGuestTable_data_access.h index 3491aa4..49afb9d 100644 --- a/src/libvirtGuestTable_data_access.h +++ b/src/libvirtGuestTable_data_access.h @@ -45,7 +45,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index 08ddb4a..890ba07 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -50,7 +50,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* --------------------------------------------------------------------- @@ -134,7 +134,7 @@ libvirtGuestTable_indexes_set(libvirtGuestTable_rowreq_ctx *rowreq_ctx, char *li * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName * libvirtGuestName is subid 2 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.2 + * OID: .1.3.6.1.4.1.36957.1.1.1.2 * Description: Name of active virtual guest. * @@ -222,7 +222,7 @@ libvirtGuestName_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, char **libvirtGu * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -274,7 +274,7 @@ libvirtGuestState_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvir * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount * libvirtGuestCpuCount is subid 4 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.4 + * OID: .1.3.6.1.4.1.36957.1.1.1.4 * Description: Number of virtual CPUs the virtual guest uses. * @@ -326,7 +326,7 @@ libvirtGuestCpuCount_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * lib * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent * libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.5 + * OID: .1.3.6.1.4.1.36957.1.1.1.5 * Description: Current amount of memory (in MiB) used by the virtual guest. * @@ -378,7 +378,7 @@ libvirtGuestMemoryCurrent_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit * libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.6 + * OID: .1.3.6.1.4.1.36957.1.1.1.6 * Description: The maximum amount of memory (in MiB) that can be used by the virtual guest. @@ -431,7 +431,7 @@ libvirtGuestMemoryLimit_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime * libvirtGuestCpuTime is subid 7 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.7 + * OID: .1.3.6.1.4.1.36957.1.1.1.7 * Description: The CPU time used by the virtual guest, in nanoseconds. * @@ -479,7 +479,7 @@ libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counte * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 6a0e7ff..616f824 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -44,7 +44,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* * indexes diff --git a/src/libvirtGuestTable_data_set.c b/src/libvirtGuestTable_data_set.c index d67c9d9..7ee8e9f 100644 --- a/src/libvirtGuestTable_data_set.c +++ b/src/libvirtGuestTable_data_set.c @@ -46,7 +46,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* * NOTE: if you update this chart, please update the versions in @@ -407,7 +407,7 @@ libvirtGuestTable_undo_commit( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -586,7 +586,7 @@ libvirtGuestState_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index 873f9f5..28092c5 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -44,7 +44,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index ee48291..14057aa 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -68,7 +68,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ typedef struct libvirtGuestTable_interface_ctx_s { diff --git a/src/libvirtGuestTable_oids.h b/src/libvirtGuestTable_oids.h index 85950f4..67ccd6f 100644 --- a/src/libvirtGuestTable_oids.h +++ b/src/libvirtGuestTable_oids.h @@ -29,7 +29,7 @@ extern "C" { /* column number definitions for table libvirtGuestTable */ -#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,12345,1,1 +#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,36957,1,1 #define COLUMN_LIBVIRTGUESTUUID 1 diff --git a/src/libvirtNotifications.c b/src/libvirtNotifications.c index 52c7ae4..135f177 100644 --- a/src/libvirtNotifications.c +++ b/src/libvirtNotifications.c @@ -34,15 +34,15 @@ int send_libvirtGuestNotif_trap(virDomainPtr dom) { netsnmp_variable_list *var_list = NULL; - const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 12345, 0, 1 }; + const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 36957, 0, 1 }; const oid libvirtGuestName_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 2, 0 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 2, 0 }; const oid libvirtGuestUUID_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 1, 1 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 1 }; const oid libvirtGuestState_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 3, 2 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 2 }; const oid libvirtGuestRowStatus_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 9, 3 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 3 }; const char *domName = virDomainGetName(dom);

2 1

[libvirt] [PATCH v2 0/5] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - (Set|Restore)*Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 88 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 ++++++++ tests/virt-aa-helper-test | 88 ++++++++++++++++++++++++---------------- 3 files changed, 158 insertions(+), 34 deletions(-) -- 2.7.4

2 12

[libvirt] [PATCH 0/3] libxl: misc fixes for migration
by Jim Fehlig 21 Mar '18

21 Mar '18

While working on the {Begin,End}API improvements I noticed a few problems in the migration code. The first two are trival, but the third describes a problem I encountered while testing, and provides a potential fix. See the patch for more details. Jim Fehlig (3): libxl: dont dereference NULL libxlDomainObjPrivatePtr libxl: remove needless 'else' in libxlDomainMigrationPrepare util: introduce virSocketAddrParseQuiet src/libvirt_private.syms | 1 + src/libxl/libxl_migration.c | 10 ++++---- src/rpc/virnetsocket.c | 2 +- src/util/virsocketaddr.c | 60 +++++++++++++++++++++++++++++++++------------ src/util/virsocketaddr.h | 4 +++ 5 files changed, 55 insertions(+), 22 deletions(-) -- 2.16.2

3 8

[libvirt] [PATCH 0/8] Add optional pSeries features (HTM)
by Andrea Bolognani 21 Mar '18

21 Mar '18

Applies cleanly on top of 90d7262552e8de3b067239b215903144a285723d. Patch 2/8 is fairly big because of all the capabilities data being added: I'm sending a redacted version to the list, the rest of the code can be grabbed from https://github.com/andreabolognani/libvirt/tree/pseries-caps Changes from [RFC v3]: * can be considered for merging, since the QEMU part already has; * fix compatibility issues with QEMU <2.12 spotted by Shivaprasad; * drop all features except for HTM, at least for the time being; * add documentation. Changes from [RFC v2]: * use qom-list-properties to probe availability; * test all features with a single XML file. Changes from [RFC v1]: * don't nest features inside a <pseries/> element; * implement all optional features. [RFC v3] https://www.redhat.com/archives/libvir-list/2018-March/msg00042.html [RFC v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00310.html [RFC v1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (8): tests: Rename pseries-features-hpt test tests: Add capabilities data for QEMU 2.12 qemu: Add capability for qom-list-properties qemu: Rename virQEMUCapsObjectProps* -> virQEMUCapsDeviceProps* qemu: Extract generic part from qemuMonitorJSONGetDeviceProps() qemu: Add capability for the HTM pSeries feature qemu: Implement the HTM pSeries feature news: Update for the HTM pSeries feature docs/formatdomain.html.in | 7 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 19 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 281 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 149 + src/qemu/qemu_domain.c | 13 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 40 +- src/qemu/qemu_monitor_json.h | 5 + .../caps_2.12.0-gicv2.aarch64.replies | 17153 +++++++++++++++ .../caps_2.12.0-gicv2.aarch64.xml | 319 + .../caps_2.12.0-gicv3.aarch64.replies | 17153 +++++++++++++++ .../caps_2.12.0-gicv3.aarch64.xml | 319 + .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 21247 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1095 + .../caps_2.12.0.x86_64.replies | 19121 +++++++++++++++++ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1271 ++ tests/qemucapabilitiestest.c | 4 + .../pseries-features-invalid-machine.xml | 1 + ...ies-features-hpt.args => pseries-features.args} | 2 +- ...eries-features-hpt.xml => pseries-features.xml} | 1 + tests/qemuxml2argvtest.c | 5 +- tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 - tests/qemuxml2xmloutdata/pseries-features.xml | 1 + tests/qemuxml2xmltest.c | 3 +- 29 files changed, 78113 insertions(+), 130 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml rename tests/qemuxml2argvdata/{pseries-features-hpt.args => pseries-features.args} (87%) rename tests/qemuxml2argvdata/{pseries-features-hpt.xml => pseries-features.xml} (97%) delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml -- 2.14.3

3 22

[libvirt] [PATCH] rpm: fix incorrect expansion of %systemd_preun macro
by Daniel P. Berrangé 21 Mar '18

21 Mar '18

Macros in RPMs are expanded before line continuations, so when we write %systemd_preun foo \ bar What happens is that it expands to if [ $1 -eq 0 ] ; then # Package removal, not upgrade systemctl --no-reload disable --now foo \ > /dev/null 2>&1 || : fi bar which is obviously complete garbage and not what we expected. It is simply not safe to ever use line continuations in combination with macros. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index bc8257f34b..6bf8368476 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1512,9 +1512,9 @@ exit 0 %if %{with_systemd} %if %{with_systemd_macros} - %systemd_post virtlockd.socket virtlockd-admin.socket \ - virtlogd.socket virtlogd-admin.socket \ - libvirtd.service + %systemd_post virtlockd.socket virtlockd-admin.socket + %systemd_post virtlogd.socket virtlogd-admin.socket + %systemd_post libvirtd.service %else if [ $1 -eq 1 ] ; then # Initial installation @@ -1549,9 +1549,9 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun libvirtd.service \ - virtlogd.socket virtlogd-admin.socket virtlogd.service \ - virtlockd.socket virtlockd-admin.socket virtlockd.service + %systemd_preun libvirtd.service + %systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service + %systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade -- 2.14.3

3 9

[libvirt] Libvirt-4.1.0 build fails at the 'make install' linking stage with 4.0.0 installed
by Predrag Ivanović 21 Mar '18

21 Mar '18

Hi. When I try to build Libvirt-4.1.0 on a system that has 4.0.0 installed, the build fails at the 'make install' linking stage with the error below. Same thing happened with git master I tried (commit 43523d7421, haven't tried with the latest one yet) and rebuilding 4.0.0 works fine. 4.1.0 builds on a system without 4.0.0, though, with no changes to configure switches or anything else. Is something broken on my system and/or the way I built 4.0.0 , so 4.1.0 picks up on that? 'make check' passes without errors for both. qemu-2.11.1 ------- ibtool: warning: relinking 'libvirt_driver_qemu.la' libtool: install: (cd /usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src; /bin/sh "/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/libtool" --silent --tag CC --mode=relink gcc -I/usr/include/libxml2 -fno-common -W -Waddress -Waggressive-loop-optimizations -Wall -Wattributes -Wbad-function-cast -Wbool-compare -Wbuiltin-macro-redefined -Wcast-align -Wchar-subscripts -Wchkp -Wclobbered -Wcomment -Wcomments -Wcoverage-mismatch -Wcpp -Wdate-time -Wdeprecated-declarations -Wdesignated-init -Wdiscarded-array-qualifiers -Wdiscarded-qualifiers -Wdiv-by-zero -Wdouble-promotion -Wduplicated-cond -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul -Wformat-extra-args -Wformat-security -Wformat-y2k -Wformat-zero-length -Wframe-address -Wfree-nonheap-object -Whsa -Wignored-attributes -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wincompatible-pointer-types -Winit-self -Winline -Wint-conversion -Wint-to-pointer-cast -Winvalid-memory-model -Winvalid-pch -Wjump-misses- init -Wlogical-not-parentheses -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmemset-transposed-args -Wmisleading-indentation -Wmissing-braces -Wmissing-declarations -Wmissing-field-initializers -Wmissing-include-dirs -Wmissing-parameter-type -Wmissing-prototypes -Wmultichar -Wnarrowing -Wnested-externs -Wnonnull -Wnonnull-compare -Wnull-dereference -Wodr -Wold-style-declaration -Wold-style-definition -Wopenmp-simd -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas -Wpsabi -Wreturn-local-addr -Wreturn-type -Wscalar-storage-order -Wsequence-point -Wshadow -Wshift-count-negative -Wshift-count-overflow -Wshift-negative-value -Wsizeof-array-argument -Wsizeof-pointer-memaccess -Wstrict-aliasing -Wstrict-prototypes -Wsuggest-attribute=const -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wsuggest-final-methods -Wsuggest-final-types -Wswitch -Wswitch-bool -Wsync-nand -Wtautological- compare -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized -Wunknown-pragmas -Wunused -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function -Wunused-label -Wunused-local-typedefs -Wunused-parameter -Wunused-result -Wunused-value -Wunused-variable -Wvarargs -Wvariadic-macros -Wvector-operation-performance -Wvolatile-register-var -Wwrite-strings -Warray-bounds=2 -Wnormalized=nfc -Wshift-overflow=2 -Wunused-const-variable=2 -Wno-sign-compare -Wjump-misses-init -Wswitch-enum -Wno-format-nonliteral -fstack-protector-strong -fexceptions -fasynchronous-unwind-tables -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wframe-larger-than=4096 -O2 -march=x86-64 -pipe -DLIBXL_API_VERSION=0x040400 -module -avoid-version -export-dynamic -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--no-copy-dt-needed-entries -Wl,-z -Wl,defs -lX11 -o libvirt_driver_qemu.la -rpath /usr/lib/libvirt/connection-driver libvirt_driver_qemu_impl.la libvirt.la ../gnulib/lib/libgnu.la - ldl -inst-prefix-dir /usr/pkgmk/build/libvirt/pkg) ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessGetVolumeQcowPassphrase': qemu_process.c:(.text+0x1e98): undefined reference to `virGetConnectSecret' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessSetupVcpu': qemu_process.c:(.text+0x4a65): undefined reference to `virResctrlAllocAddPID' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessPrepareDomain': qemu_process.c:(.text+0x4d32): undefined reference to `virGetConnectNetwork' qemu_process.c:(.text+0x52d7): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessPrepareHost': qemu_process.c:(.text+0x5bd5): undefined reference to `virDomainNetAllocateActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessLaunch': qemu_process.c:(.text+0x7ab1): undefined reference to `virResctrlAllocCreate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessStop': qemu_process.c:(.text+0x8ce3): undefined reference to `virDomainNetReleaseActualDevice' qemu_process.c:(.text+0x8dd4): undefined reference to `virResctrlAllocRemove' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessReconnect': qemu_process.c:(.text+0xa9a8): undefined reference to `virDomainDiskTranslateSourcePool' qemu_process.c:(.text+0xadbb): undefined reference to `virDomainNetNotifyActualDevice' qemu_process.c:(.text+0xb6ec): undefined reference to `virResctrlAllocDeterminePath' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStateCleanup': qemu_driver.c:(.text+0x476): undefined reference to `virPortAllocatorRangeFree' qemu_driver.c:(.text+0x489): undefined reference to `virPortAllocatorRangeFree' qemu_driver.c:(.text+0x49c): undefined reference to `virPortAllocatorRangeFree' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStateInitialize': qemu_driver.c:(.text+0x187e): undefined reference to `virPortAllocatorRangeNew' qemu_driver.c:(.text+0x18af): undefined reference to `virPortAllocatorRangeNew' qemu_driver.c:(.text+0x18e0): undefined reference to `virPortAllocatorRangeNew' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotUpdateDiskSources': qemu_driver.c:(.text+0x4174): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotDiskDataFree': qemu_driver.c:(.text+0x912e): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainBlockCopyCommon': qemu_driver.c:(.text+0x937a): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x956c): undefined reference to `virStorageFileAccess' qemu_driver.c:(.text+0x958c): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x96bb): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x97ce): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x97fb): undefined reference to `virStorageFileUnlink' qemu_driver.c:(.text+0x984f): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x98a1): undefined reference to `virStorageFileUnlink' qemu_driver.c:(.text+0x98b7): undefined reference to `virStorageFileCreate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainBlockPeek': qemu_driver.c:(.text+0x10823): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x108a7): undefined reference to `virStorageFileRead' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSetInterfaceParameters': qemu_driver.c:(.text+0x1156a): undefined reference to `virDomainNetBandwidthChangeAllowed' qemu_driver.c:(.text+0x115b3): undefined reference to `virDomainNetBandwidthUpdate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuSecurityChownCallback': qemu_driver.c:(.text+0x1c97c): undefined reference to `virStorageFileSupportsSecurityDriver' qemu_driver.c:(.text+0x1ca09): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x1ca50): undefined reference to `virStorageFileInit' qemu_driver.c:(.text+0x1ca62): undefined reference to `virStorageFileChown' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainStorageOpenStat.isra.15': qemu_driver.c:(.text+0x1d19b): undefined reference to `virStorageFileInitAs' qemu_driver.c:(.text+0x1d1ac): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x1d1b8): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStorageLimitsRefresh': qemu_driver.c:(.text+0x1d2f6): undefined reference to `virStorageFileRead' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainUpdateDeviceFlags': qemu_driver.c:(.text+0x24e17): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainAttachDeviceFlags': qemu_driver.c:(.text+0x25a67): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotCreateXML': qemu_driver.c:(.text+0x28f91): undefined reference to `virDomainDiskTranslateSourcePool' qemu_driver.c:(.text+0x2901b): undefined reference to `virStorageFileInit' qemu_driver.c:(.text+0x29031): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x2906b): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x2943d): undefined reference to `virStorageFileGetBackingStoreStr' qemu_driver.c:(.text+0x2976f): undefined reference to `virDomainDiskTranslateSourcePool' qemu_driver.c:(.text+0x29af7): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x29b9c): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x29db4): undefined reference to `virStorageFileCreate' qemu_driver.c:(.text+0x2a179): undefined reference to `virStorageFileUnlink' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainStorageCloseStat': qemu_driver.c:(.text+0x244f): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_alias.o): In function `qemuAssignDeviceNetAlias': qemu_alias.c:(.text+0x6f8): undefined reference to `virDomainNetResolveActualType' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainSecretInfoNew': qemu_domain.c:(.text+0x471f): undefined reference to `virGetConnectSecret' qemu_domain.c:(.text+0x48e1): undefined reference to `virGetConnectSecret' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainStorageFileInit': qemu_domain.c:(.text+0x89ff): undefined reference to `virStorageFileInitAs' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainDetermineDiskChain': qemu_domain.c:(.text+0x8ba2): undefined reference to `virStorageFileReportBrokenChain' qemu_domain.c:(.text+0x8bb4): undefined reference to `virStorageFileSupportsAccess' qemu_domain.c:(.text+0x8bd8): undefined reference to `virStorageFileAccess' qemu_domain.c:(.text+0x8be8): undefined reference to `virStorageFileDeinit' qemu_domain.c:(.text+0x8c9f): undefined reference to `virStorageFileGetMetadata' qemu_domain.c:(.text+0x8d14): undefined reference to `virStorageFileReportBrokenChain' qemu_domain.c:(.text+0x8d1c): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainDefValidate': qemu_domain.c:(.text+0xb35d): undefined reference to `virDomainFeatureTypeToString' qemu_domain.c:(.text+0xb379): undefined reference to `virDomainFeatureTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain_address.o): In function `qemuDomainFindSCSIControllerModel': qemu_domain_address.c:(.text+0x2505): undefined reference to `virDomainDeviceFindSCSIController' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain_address.o): In function `qemuDomainFillDeviceIsolationGroup': qemu_domain_address.c:(.text+0x2621): undefined reference to `virDomainNetResolveActualType' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainRemoveHostDevice': qemu_hotplug.c:(.text+0xa41): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainRemoveNetDevice': qemu_hotplug.c:(.text+0x191e): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainAttachDeviceDiskLive': qemu_hotplug.c:(.text+0x3b4e): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainAttachNetDevice': qemu_hotplug.c:(.text+0x7093): undefined reference to `virDomainNetAllocateActualDevice' qemu_hotplug.c:(.text+0x716c): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainChangeNet': qemu_hotplug.c:(.text+0x93da): undefined reference to `virDomainNetReleaseActualDevice' qemu_hotplug.c:(.text+0x9549): undefined reference to `virDomainNetAllocateActualDevice' qemu_hotplug.c:(.text+0x977c): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainDetachChrDevice': qemu_hotplug.c:(.text+0xbb12): undefined reference to `virDomainChrDeviceTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainDetachMemoryDevice': qemu_hotplug.c:(.text+0xbdd6): undefined reference to `virDomainMemoryModelTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_migration.o): In function `qemuMigrationDstPrepareAny': qemu_migration.c:(.text+0x6ce1): undefined reference to `virGetConnectStorage' qemu_migration.c:(.text+0x6fc5): undefined reference to `virStoragePoolLookupByTargetPath' collect2: error: ld returned 1 exit status libtool: error: error: relink 'libvirt_driver_qemu.la' with the above command before installing it make[3]: *** [Makefile:6292: install-modLTLIBRARIES] Error 1 make[3]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make[2]: *** [Makefile:12096: install-am] Error 2 make[2]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make[1]: *** [Makefile:12090: install] Error 2 make[1]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make: *** [Makefile:2127: install-recursive] Error 1 =======> ERROR: Building '/usr/pkgmk/package/libvirt#4.1.0-1.pkg.tar.gz' failed. ------ Pedja

1 0

[libvirt] [PATCH] libvirt: Fix comments for two public APIs.
by Han Han 21 Mar '18

21 Mar '18

Fix comments for virConnectListAllNodeDevices and virConnectListAllSecrets. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/libvirt-nodedev.c | 2 +- src/libvirt-secret.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 493b21f56..563ce889b 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -72,7 +72,7 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) * @devices: Pointer to a variable to store the array containing the node * device objects or NULL if the list is not required (just returns * number of node devices). - * @flags: bitwise-OR of virConnectListAllNodeDevices. + * @flags: bitwise-OR of virConnectListAllNodeDeviceFlags. * * Collect the list of node devices, and allocate an array to store those * objects. diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index 447d93f33..1e1cd4e65 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -90,7 +90,7 @@ virConnectNumOfSecrets(virConnectPtr conn) * @secrets: Pointer to a variable to store the array containing the secret * objects or NULL if the list is not required (just returns the * number of secrets). - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virConnectListAllSecretsFlags. * * Collect the list of secrets, and allocate an array to store those * objects. -- 2.16.2

2 1