- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/3] conf: Move stuff out of domain_addr
by Andrea Bolognani 05 Sep '18

05 Sep '18

$ mv blurb here/ Andrea Bolognani (3): conf: Move virDomainPCIAddressAsString() to util/virpci conf: Rename virDomainPCIAddressAsString() util: Drop virPCIGetAddrString() src/conf/domain_addr.c | 20 +++----------------- src/conf/domain_addr.h | 4 ---- src/libvirt_private.syms | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain_address.c | 6 +++--- src/util/virnetdev.c | 6 +----- src/util/virpci.c | 21 +++++++++------------ src/util/virpci.h | 8 ++------ 8 files changed, 20 insertions(+), 49 deletions(-) -- 2.17.1

2 7

[libvirt] [jenkins-ci PATCH] lcitool: Don't encrypt password manually
by Martin Kletzander 05 Sep '18

05 Sep '18

Since version 1.9 ansible supports password_hash filter that can do that for us. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- guests/lcitool | 29 +------------------------ guests/playbooks/update/tasks/users.yml | 2 +- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 2901a92c507b..ad1eee288620 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -151,34 +151,7 @@ class Config: return vault_pass_file def get_root_password_file(self): - root_pass_file = self._get_config_file("root-password") - root_hash_file = self._get_config_file(".root-password.hash") - - try: - with open(root_pass_file, "r") as infile: - root_pass = infile.readline().strip() - except Exception: - raise Error( - "Missing or invalid root password file ({})".format( - root_pass_file, - ) - ) - - # The hash will be different every time we run, but that doesn't - # matter - it will still validate the correct root password - root_hash = crypt.crypt(root_pass, Util.mksalt()) - - try: - with open(root_hash_file, "w") as infile: - infile.write("{}\n".format(root_hash)) - except Exception: - raise Error( - "Can't write hashed root password file ({})".format( - root_hash_file, - ) - ) - - return root_hash_file + return self._get_config_file("root-password") class Inventory: diff --git a/guests/playbooks/update/tasks/users.yml b/guests/playbooks/update/tasks/users.yml index ec7f798a9c00..0a930d6c382c 100644 --- a/guests/playbooks/update/tasks/users.yml +++ b/guests/playbooks/update/tasks/users.yml @@ -2,7 +2,7 @@ - name: 'root: Set password' user: name: root - password: '{{ lookup("file", root_password_file) }}' + password: '{{ lookup("file", root_password_file)|password_hash("sha512") }}' shell: '{{ bash }}' - name: 'root: Configure ssh access' -- 2.18.0

2 3

[libvirt] [libvirt-snmp][PATCH 0/2] Couple of spec file improvements
by Michal Privoznik 05 Sep '18

05 Sep '18

While trying to build libvirt-snmp on minimalistic RHEL installation I've noticed couple of problems. These two are pushed under trivial rule. Michal Privoznik (2): spec: Require git and gcc for the build spec: Modernize the spec file libvirt-snmp.spec.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.16.4

2 3

[libvirt] [PATCH v4 0/4] Add .domainGetHostname() support for QEMU driver.
by Julio Faracco 05 Sep '18

05 Sep '18

This serie adds a new function into QEMU Guest Agent handler to use the QEMU command 'guest-get-host-name' to retrieve the domain hostname. This approach requires QEMU-GA running inside the guest, but it is the fastest and easiest way to get this info. This serie has some suggestion made by John Ferlan for v3. Specially, some improvements to error handling. Julio Faracco (4): qemu: implementing qemuAgentGetHostname() function. qemu: adding domainGetHostname support for QEMU docs: Add QEMU-GA get hostname feature into news.xml qemu: unlink the error report from VIR_STRDUP. docs/news.xml | 9 ++++++ src/qemu/qemu_agent.c | 66 ++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_agent.h | 4 +++ src/qemu/qemu_driver.c | 42 +++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 6 deletions(-) -- 2.17.1

2 5

[libvirt] Virsh reference is out of date, should it be updated from the man page?
by Povilas Kanapickas 04 Sep '18

04 Sep '18

Hi! The online virsh command reference at [1] seems to be very out of date according to [2]. There's much more recent documentation at tools/virsh.pod in the main libvirt repository. I believe it would be great to update the web docs as they are much more accessible and convenient to use (especially the one-command-per-page version). What would be the best way to approach that? I suppose we could look into automatically converting the current manpages into docbook and using that to update the website? What do you think? Regards, Povilas [1] - https://libvirt.org/virshcmdref.html [2] - https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary

4 4

[libvirt] [PATCH v3 00/28] Introduce metadata locking
by Michal Privoznik 04 Sep '18

04 Sep '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-August/msg00814.html What has changed since v2? A lot. - The lock manager was moved into security manager (which requires a lot of preparation which is done in first 8 or so patches). - The VIR_LOCK_SPACE_ACQUIRE_WAIT flag (2/7 in v2) is dropped as it turned out to be harmful. virlockd can't block under any circumstances. And we can not introduce a thread pool for it. - While going through the code I've found couple of bugs which I'm fixing in first few patches. As usual, you can find all the patches at: https://github.com/zippy2/libvirt/tree/disk_metadata_lock_v3 Michal Prívozník (28): virSecurityManagerNewDriver: Fix code pattern virSecurityManagerNewStack: Don't ignore virSecurityStackAddNested retval lock_daemon: Fix some memleaks lock_driver_lockd: Don't leak lockspace dirs virLockManagerLockDaemonAcquire: Drop useless check virLockManagerSanlockAddResource: Do not ignore unknown resource types locking: Don't leak private data in virLockManagerLockDaemonNew virLockManagerLockDaemonAddResource: Switch to cleanup label rather than error virlockspace: Allow caller to specify start and length offset in virLockSpaceAcquireResource lock_driver_lockd: Introduce VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_METADATA flag lock_driver: Introduce new VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON _virLockManagerLockDaemonPrivate: Move @hasRWDisks into dom union lock_driver: Introduce VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA lock_daemon_dispatch: Check for ownerPid rather than ownerId locking: Introduce virLockManagerClearResources lock_driver: Introduce KEEP_OPEN flags lock_manager: Introduce virLockManagerCloseConn lock_manager: Allow disabling configFile for virLockManagerPluginNew qemu_conf: Introduce metadata_lock_manager security_manager: Load lock plugin on init security_manager: Introduce virSecurityManagerLockCloseConn security_manager: Introduce metadata locking APIs security_dac: Pass virSecurityManagerPtr to virSecurityDACSetOwnership security_dac: Pass virSecurityManagerPtr to virSecurityDACRestoreFileLabelInternal security_dac: Fix info messages when chown()-ing security_dac: Fix const correctness security_dac: Move transaction handling up one level security_dac: Lock domain metadata cfg.mk | 4 +- src/libvirt_private.syms | 2 + src/locking/lock_daemon.c | 3 + src/locking/lock_daemon_dispatch.c | 25 +- src/locking/lock_driver.h | 38 +++ src/locking/lock_driver_lockd.c | 520 ++++++++++++++++++++++++++----------- src/locking/lock_driver_lockd.h | 1 + src/locking/lock_driver_nop.c | 14 + src/locking/lock_driver_sanlock.c | 50 ++-- src/locking/lock_manager.c | 31 ++- src/locking/lock_manager.h | 7 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 + src/qemu/qemu_conf.c | 13 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 12 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/security_dac.c | 213 +++++++++------ src/security/security_manager.c | 366 +++++++++++++++++++++++++- src/security/security_manager.h | 17 +- src/util/virlockspace.c | 15 +- src/util/virlockspace.h | 4 + tests/testutilsqemu.c | 2 +- tests/virlockspacetest.c | 29 ++- 24 files changed, 1096 insertions(+), 279 deletions(-) -- 2.16.4

4 71

[libvirt] [PATCH 0/2] qemu: Unify generation of command line for virtio devices
by Andrea Bolognani 04 Sep '18

04 Sep '18

-device virtio-blurb-pci Andrea Bolognani (2): tests: Fix use of virtio-serial for aarch64/virt qemu: Unify generation of command line for virtio devices src/qemu/qemu_command.c | 299 ++++++++++-------- .../mach-virt-console-virtio.args | 2 +- tests/qemuxml2argvtest.c | 3 +- .../mach-virt-console-virtio.xml | 4 +- tests/qemuxml2xmltest.c | 6 +- 5 files changed, 173 insertions(+), 141 deletions(-) -- 2.17.1

2 6

[libvirt] [libvirt-snmp][PATCH] rpm: simplify applying of patches
by Michal Privoznik 04 Sep '18

04 Sep '18

The distros we support for RPM builds all have %autosetup support. Use that instead of what we currently have (nothing). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule and also 'who cares about snmp' rules ;-) libvirt-snmp.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-snmp.spec.in b/libvirt-snmp.spec.in index c5a1a41..21a9885 100644 --- a/libvirt-snmp.spec.in +++ b/libvirt-snmp.spec.in @@ -15,7 +15,7 @@ BuildRequires: net-snmp-perl net-snmp net-snmp-utils net-snmp-devel libvirt-deve Provides a way to control libvirt through SNMP protocol. %prep -%setup -q +%autosetup -S git_am %build -- 2.16.4

1 0

[libvirt] [jenkins-ci PATCH] guests: Special-case fedora-gpg-keys updates on Rawhide
by Andrea Bolognani 04 Sep '18

04 Sep '18

During each Rawhide development cycle there is a point at which packages start being signed with new keys, which causes updates to fail. To work around the problem, make sure fedora-gpg-keys is updated before attempting to update all other packages; updating fedora-gpg-keys itself requires gpg signature checking to be disabled. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- I am actually not 100% sure we need to disable gpg signature checking in order to update fedora-gpg-keys: it would make sense for that one package to be signed with the old key to make the update possible without breaking trust at any point in time. Unfortunately I updated my Rawhide guest without taking a snapshot first, and I can't figure out a way to get it back to a state suitable for checking whether the above makes sense :( Perhaps someone with deeper understanding of the Fedora release process will confirm or deny. guests/lcitool | 24 +++++++++++++++++------- guests/playbooks/update/tasks/base.yml | 9 +++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 821cafc..ddeee6a 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -511,7 +511,8 @@ class Application: facts = self._inventory.get_facts(host) package_format = facts["package_format"] os_name = facts["os_name"] - os_full = os_name + str(facts["os_version"]) + os_version = str(facts["os_version"]) + os_full = os_name + os_version if package_format not in ["deb", "rpm"]: raise Error("Host {} doesn't support Dockerfiles".format(host)) @@ -560,12 +561,21 @@ class Application: apt-get autoclean -y """)) elif package_format == "rpm": - sys.stdout.write(textwrap.dedent(""" - RUN yum update -y && \\ - yum install -y ${PACKAGES} && \\ - yum autoremove -y && \\ - yum clean all -y - """)) + if os_name == "Fedora" and os_version == "Rawhide": + sys.stdout.write(textwrap.dedent(""" + RUN yum update -y --nogpgcheck fedora-gpg-keys && \\ + yum update -y && \\ + yum install -y ${PACKAGES} && \\ + yum autoremove -y && \\ + yum clean all -y + """)) + else: + sys.stdout.write(textwrap.dedent(""" + RUN yum update -y && \\ + yum install -y ${PACKAGES} && \\ + yum autoremove -y && \\ + yum clean all -y + """)) def run(self): cmdline = self._parser.parse_args() diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index 11f600f..cc16eb0 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -64,6 +64,15 @@ - not ( os_name == 'Fedora' and os_version == 'Rawhide' ) +- name: Update installed packages + package: + name: fedora-gpg-keys + state: latest + disable_gpg_check: yes + when: + - os_name == 'Fedora' + - os_version == 'Rawhide' + - name: Update installed packages command: dnf update --refresh --exclude 'kernel*' -y args: -- 2.17.1

2 1

[libvirt] [PATCH] tests: skip some unicode tests if expected output won't match
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

The expected output strings from the vshtabletest.c are created on a modern Linux host where unicode printing support is very good. On older Linux platforms, or non-Linux platforms, some unicode characters will not be considered printable. While the vsh table alignment code will stil do the right thing with escaping & aligning in this case, the result will not match the test's expected output. Since we know the code is working correctly, do a check with iswprint() to validate the platform's quality and skip the test if it fails. This fixes the test on FreeBSD platforms. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix tests/vshtabletest.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 9e9c045226..1138e34161 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <stdio.h> #include <locale.h> +#include <wctype.h> #include "internal.h" #include "testutils.h" @@ -158,6 +159,15 @@ testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED) " 1 ﻉﺪﻴﻟ ﺎﻠﺜﻘﻴﻟ ﻕﺎﻣ ﻊﻧ, ٣٠ ﻎﻴﻨﻳﺍ ﻮﺘﻧﺎﻤﺗ ﺎﻠﺛﺎﻠﺛ، ﺄﺳﺭ, ﺩﻮﻟ ﺩﻮﻟ. ﺄﻣﺎﻣ ﺍ ﺎﻧ ﻲﻜﻧ \n" " ﺺﻔﺣﺓ ﺖﻜﺘﻴﻛﺍً ﻊﻟ, ﺎﻠﺠﻧﻭﺩ ﻭﺎﻠﻌﺗﺍﺩ ﺵﺭ \n"; vshTablePtr table; + wchar_t wc; + + /* If this char is not classed as printable, the actual + * output won't match what this test expects. The code + * is still operating correctly, but we have different + * layout */ + mbrtowc(&wc, "،", MB_CUR_MAX, NULL); + if (!iswprint(wc)) + return EXIT_AM_SKIP; table = vshTableNew("ﻡﺍ ﻢﻣﺍ ﻕﺎﺌﻣﺓ", "ﺓ ﺎﻠﺼﻋ", "ﺍﻸﺜﻧﺎﻧ", NULL); if (!table) @@ -192,6 +202,15 @@ testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_UNUSED) " 1\u200B fedora28 run\u200Bning \n" " 2 rhel7.5 running \n"; char *act = NULL; + wchar_t wc; + + /* If this char is not classed as printable, the actual + * output won't match what this test expects. The code + * is still operating correctly, but we have different + * layout */ + mbrtowc(&wc, "\u200B", MB_CUR_MAX, NULL); + if (!iswprint(wc)) + return EXIT_AM_SKIP; table = vshTableNew("I\u200Bd", "Name", "\u200BStatus", NULL); if (!table) -- 2.17.1

2 2

[libvirt] [snmp PATCH] Fix wrong object OIDs sent by libvirtMib_subagent
by Miguel Martin 04 Sep '18

04 Sep '18

The objects OIDs sent by the guest agent are: libvirtGuestName.0 libvirtGuestUUID.1 libvirtGuestState.2 libvirtGuestRowStatus.3 The expected libvirtGuestNotif objects OID would be: libvirtGuestName.0 libvirtGuestUUID.0 libvirtGuestState.0 libvirtGuestRowStatus.0 Signed-off-by: Miguel Martin <mmartinv(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1624839 --- src/libvirtNotifications.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirtNotifications.c b/src/libvirtNotifications.c index 135f177..0522d54 100644 --- a/src/libvirtNotifications.c +++ b/src/libvirtNotifications.c @@ -38,11 +38,11 @@ send_libvirtGuestNotif_trap(virDomainPtr dom) const oid libvirtGuestName_oid[] = { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 2, 0 }; const oid libvirtGuestUUID_oid[] = - { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 1 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 0 }; const oid libvirtGuestState_oid[] = - { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 2 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 0 }; const oid libvirtGuestRowStatus_oid[] = - { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 3 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 0 }; const char *domName = virDomainGetName(dom); -- 2.17.1

2 1

[libvirt] [go PATCH] Avoid clashing path with default storage pool
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

The test driver provides a default storage pool at /default-pool. Libvirt now enforces source path uniqueness, so we must pick a different path for our test pools. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix connect_test.go | 6 +++--- storage_pool_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connect_test.go b/connect_test.go index 29c274d..da24448 100644 --- a/connect_test.go +++ b/connect_test.go @@ -789,7 +789,7 @@ func TestStoragePoolDefineXML(t *testing.T) { }() defName := "default-pool-test-0" xml := `<pool type='dir'><name>default-pool-test-0</name><target> - <path>/default-pool</path></target></pool>` + <path>/default-pool-test-0</path></target></pool>` pool, err := conn.StoragePoolDefineXML(xml, 0) if err != nil { t.Fatal(err) @@ -900,7 +900,7 @@ func TestLookupStorageVolByKey(t *testing.T) { return } defer pool.Destroy() - defPoolPath := "default-pool" + defPoolPath := "default-pool-test-1" defVolName := time.Now().String() defVolKey := "/" + defPoolPath + "/" + defVolName vol, err := pool.StorageVolCreateXML(testStorageVolXML(defVolName, defPoolPath), 0) @@ -942,7 +942,7 @@ func TestLookupStorageVolByPath(t *testing.T) { return } defer pool.Destroy() - defPoolPath := "default-pool" + defPoolPath := "default-pool-test-1" defVolName := time.Now().String() defVolPath := "/" + defPoolPath + "/" + defVolName vol, err := pool.StorageVolCreateXML(testStorageVolXML(defVolName, defPoolPath), 0) diff --git a/storage_pool_test.go b/storage_pool_test.go index 18cdb3a..7e93b17 100644 --- a/storage_pool_test.go +++ b/storage_pool_test.go @@ -42,7 +42,7 @@ func buildTestStoragePool(poolName string) (*StoragePool, *Connect) { pool, err := conn.StoragePoolDefineXML(`<pool type='dir'> <name>`+name+`</name> <target> - <path>/default-pool</path> + <path>/default-pool-test-1</path> </target> </pool>`, 0) if err != nil { -- 2.17.1

1 0

[libvirt] [perl PATCH] Avoid using /default-pool for test storage pool
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

The path /default-pool is used by a predefined storage pool in the test driver, and libvirt now enforces pool source uniqueness. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix t/400-storage-pools.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/400-storage-pools.t b/t/400-storage-pools.t index 319a21e..c78507d 100644 --- a/t/400-storage-pools.t +++ b/t/400-storage-pools.t @@ -60,7 +60,7 @@ my $xml = "<pool type='dir'> <name>wibble</name> <uuid>12341234-5678-5678-5678-123412341234</uuid> <target> - <path>/default-pool</path> + <path>/wibble</path> </target> </pool>"; -- 2.17.1

1 0

[libvirt] [PATCH] tests: skip qemublocktest if building without YAJL
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

If no JSON parser is available qemublocktest fails, so skip its execution. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for platforms without JSON parser installed tests/qemublocktest.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 0c335abc5b..8e8773e6a8 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -19,17 +19,19 @@ #include <stdlib.h> #include "testutils.h" -#include "testutilsqemu.h" -#include "testutilsqemuschema.h" -#include "virstoragefile.h" -#include "virstring.h" -#include "virlog.h" -#include "qemu/qemu_block.h" -#include "qemu/qemu_qapi.h" -#include "qemu/qemu_command.h" +#if WITH_YAJL +# include "testutilsqemu.h" +# include "testutilsqemuschema.h" +# include "virstoragefile.h" +# include "virstring.h" +# include "virlog.h" +# include "qemu/qemu_block.h" +# include "qemu/qemu_qapi.h" -#define VIR_FROM_THIS VIR_FROM_NONE +# include "qemu/qemu_command.h" + +# define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("tests.storagetest"); @@ -355,7 +357,7 @@ mymain(void) virTestCounterReset("qemu storage source xml->json->xml "); -#define TEST_JSON_FORMAT(tpe, xmlstr) \ +# define TEST_JSON_FORMAT(tpe, xmlstr) \ do { \ xmljsonxmldata.type = tpe; \ xmljsonxmldata.xml = xmlstr; \ @@ -364,7 +366,7 @@ mymain(void) ret = -1; \ } while (0) -#define TEST_JSON_FORMAT_NET(xmlstr)\ +# define TEST_JSON_FORMAT_NET(xmlstr) \ TEST_JSON_FORMAT(VIR_STORAGE_TYPE_NETWORK, xmlstr) TEST_JSON_FORMAT(VIR_STORAGE_TYPE_FILE, "<source file='/path/to/file'/>\n"); @@ -417,7 +419,7 @@ mymain(void) " <host name='example.com' port='9999'/>\n" "</source>\n"); -#define TEST_DISK_TO_JSON_FULL(nme, fl) \ +# define TEST_DISK_TO_JSON_FULL(nme, fl) \ do { \ diskxmljsondata.name = nme; \ diskxmljsondata.props = NULL; \ @@ -435,7 +437,7 @@ mymain(void) testQemuDiskXMLToPropsClear(&diskxmljsondata); \ } while (0) -#define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false) +# define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false) if (!(diskxmljsondata.schema = testQEMUSchemaLoad())) { ret = -1; @@ -500,4 +502,12 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } +#else +static int +mymain(void) +{ + return EXIT_AM_SKIP; +} +#endif + VIR_TEST_MAIN(mymain) -- 2.17.1

3 5

[libvirt] [PATCH] qemu: clear seccomp capability if TSYNC is not supported by host
by marcandre.lureau＠redhat.com 04 Sep '18

04 Sep '18

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> With qemu <= 3.0, when using "-seccomp on", the seccomp policy is only applied to the main thread, the vcpu worker thread and other worker threads created after seccomp policy is applied; the seccomp policy is not applied to e.g. the RCU thread because it is created before the seccomp policy is applied. Since qemu commit 70dfabeaa79ba4d7a3b699abe1a047c8012db114 "seccomp: set the seccomp filter to all threads", qemu will require seccomp TSYNC flag, and will fail to start if the flag isn't available. Without it, sandboxing is flawed. Disable seccomp capability if the host is not capable of using seccomp TSYNC. Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- configure.ac | 2 +- src/qemu/qemu_capabilities.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index da940e34df..c206de1cad 100644 --- a/configure.ac +++ b/configure.ac @@ -330,7 +330,7 @@ AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \ - sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ + sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h linux/seccomp.h \ sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ libtasn1.h sys/ucred.h sys/mount.h stdarg.h]) dnl Check whether endian provides handy macros. diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a075677421..dd62246eb4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -54,6 +54,10 @@ #include <sys/wait.h> #include <stdarg.h> #include <sys/utsname.h> +#if defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_SYSCALL_H) +#include <linux/seccomp.h> +#include <sys/syscall.h> +#endif #define VIR_FROM_THIS VIR_FROM_QEMU @@ -4615,6 +4619,15 @@ virQEMUCapsLogProbeFailure(const char *binary) } +#if defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_SYSCALL_H) +static int +virSeccomp(unsigned int op, unsigned int flags, void *args) +{ + errno = 0; + return syscall(__NR_seccomp, op, flags, args); +} +#endif + virQEMUCapsPtr virQEMUCapsNewForBinaryInternal(virArch hostArch, const char *binary, @@ -4679,6 +4692,20 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, goto error; } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) { + bool have_seccomp = false; +#if defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_SYSCALL_H) + /* check the TSYNC flag - it returns errno == ENOSYS if unavailable */ + if (virSeccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC, NULL) < 0 && + errno == EFAULT) { + have_seccomp = true; + } +#endif + if (!have_seccomp) { + virQEMUCapsClear(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); + } + } + cleanup: VIR_FREE(qmperr); return qemuCaps; -- 2.19.0.rc0.48.gb9dfa238d5

5 5

[libvirt] [jenkins-ci PATCH 0/8] lcitool: Support building arbitrary branches
by Andrea Bolognani 04 Sep '18

04 Sep '18

Better (hopefully :) implementation of the feature scrapped from the initial "build support" series. Andrea Bolognani (8): lcitool: Add "-r REVISION" argument for build Don't use "branch" in paths and job names jobs: Hardcode "master" branch guests: Use "git_branch" when building Drop "branch" variable Add "git_urls" dictionary to defaults guests: Use "git_remote" when building guests: Update documentation guests/README.markdown | 8 ++++- guests/lcitool | 36 +++++++++++++------ .../build/jobs/autotools-build-job.yml | 4 +-- .../build/jobs/autotools-check-job.yml | 4 +-- .../build/jobs/autotools-rpm-job.yml | 4 +-- .../build/jobs/autotools-syntax-check-job.yml | 4 +-- guests/playbooks/build/jobs/defaults.yml | 32 ++++++++++++++++- .../build/jobs/generic-build-job.yml | 4 +-- .../build/jobs/generic-check-job.yml | 4 +-- .../playbooks/build/jobs/generic-rpm-job.yml | 4 +-- .../build/jobs/generic-syntax-check-job.yml | 4 +-- guests/playbooks/build/jobs/go-build-job.yml | 4 +-- guests/playbooks/build/jobs/go-check-job.yml | 4 +-- .../build/jobs/perl-modulebuild-build-job.yml | 4 +-- .../build/jobs/perl-modulebuild-check-job.yml | 4 +-- .../build/jobs/perl-modulebuild-rpm-job.yml | 4 +-- guests/playbooks/build/jobs/prepare.yml | 10 +++--- .../build/jobs/python-distutils-build-job.yml | 4 +-- .../build/jobs/python-distutils-check-job.yml | 4 +-- .../build/jobs/python-distutils-rpm-job.yml | 4 +-- guests/playbooks/build/projects/libosinfo.yml | 2 +- .../playbooks/build/projects/libvirt-cim.yml | 2 +- .../playbooks/build/projects/libvirt-dbus.yml | 2 +- .../playbooks/build/projects/libvirt-glib.yml | 2 +- .../build/projects/libvirt-go-xml.yml | 2 +- .../playbooks/build/projects/libvirt-go.yml | 2 +- .../playbooks/build/projects/libvirt-perl.yml | 2 +- .../build/projects/libvirt-python.yml | 2 +- .../build/projects/libvirt-sandbox.yml | 2 +- .../playbooks/build/projects/libvirt-tck.yml | 2 +- guests/playbooks/build/projects/libvirt.yml | 2 +- .../build/projects/osinfo-db-tools.yml | 2 +- guests/playbooks/build/projects/osinfo-db.yml | 2 +- .../playbooks/build/projects/virt-manager.yml | 2 +- .../playbooks/build/projects/virt-viewer.yml | 2 +- jobs/autotools.yaml | 18 +++++----- jobs/defaults.yaml | 32 ++++++++++++++++- jobs/generic.yaml | 18 +++++----- jobs/go.yaml | 10 +++--- jobs/perl-modulebuild.yaml | 14 ++++---- jobs/python-distutils.yaml | 14 ++++---- projects/libosinfo.yaml | 14 ++++---- projects/libvirt-cim.yaml | 6 ++-- projects/libvirt-dbus.yaml | 10 +++--- projects/libvirt-glib.yaml | 14 ++++---- projects/libvirt-go-xml.yaml | 6 ++-- projects/libvirt-go.yaml | 6 ++-- projects/libvirt-perl.yaml | 8 ++--- projects/libvirt-python.yaml | 8 ++--- projects/libvirt-sandbox.yaml | 10 +++--- projects/libvirt-tck.yaml | 8 ++--- projects/libvirt.yaml | 8 ++--- projects/osinfo-db-tools.yaml | 8 ++--- projects/osinfo-db.yaml | 8 ++--- projects/virt-manager.yaml | 10 +++--- projects/virt-viewer.yaml | 14 ++++---- 56 files changed, 253 insertions(+), 171 deletions(-) -- 2.17.1

2 19

[libvirt] Release of libvirt-4.7.0
by Daniel Veillard 03 Sep '18

03 Sep '18

I didn't do this this week-end, that gave time to Andrea to update the release notes :-) it's now tagged in git and signed tarball and rpms are pushed to the usual place: ftp://libvirt.org/libvirt/ I also pushed a release 4.7.0 for the python bindings but they are virtually equivalent to 4.6.0 ones, you can find them at ftp://libvirt.org/libvirt/python/ This seems a reasonably large release, many commits, not that many people were in vacations last month ! The resulting is a balanced release with new features, improvements, and obviously the usual amount of bug fixes ! New features: - storage: add storage pool iscsi-direct Introduce a new storage pool backend that uses libiscsi instead of iscsiadm. It support basic pool operations: checkPool and refreshPool. - Add support for MBA (Memory Bandwidth Allocation technology) Domain vCPU threads can now have allocated some parts of host memory bandwidth by using the memorytune element in cputune. - qemu: Add support for RISC-V guests riscv32 and riscv64 guest architectures are now supported. Improvements: - qemu: Add ccw support for vhost-vsock Support the vhost-vsock-ccw device on S390. - qemu: Make default machine type independent of QEMU We can't control whether or not QEMU will change its default machine type in the future, or whether downstream distributions will decide to compile out some machine types, so our only option to provide a predictable behavior is taking care of the default ourselves; management applications and users are encouraged to explicitly pick a machine type when creating new guests. - apparmor: Various improvements Rules have been added to deal with a number of scenarios that didn't work correctly. Bug fixes: - esx: Truncate CPU model name Some CPU model names are too long to be stored into the corresponding property, and should be explicitly truncated to avoid unexpected behavior in users of the virNodeGetInfo() API such as virsh nodeinfo. - utils: Remove arbitrary limit on socket_id/core_id Both values were assumed to be smaller than 4096, but in fact they are entirely hardware-dependent and there have been reports of machines presenting much bigger values, preventing libvirt from working correctly; all such limits have now been removed. Thanks everybody for your help with this release be it with code, bug reports, patch reviews, documentation, ... Enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [jenkins-ci PATCH 1/2] guests: enable {media, tree}uris tests for libosinfo
by Fabiano Fidêncio 03 Sep '18

03 Sep '18

Both media and tree uris tests are only run when LIBOSINFO_NETWORK_TESTS is set. Let's have those enabled in order to early catch URL changes in osinfo-db. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/playbooks/build/projects/libosinfo.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml index c29053b..3c941d2 100644 --- a/guests/playbooks/build/projects/libosinfo.yml +++ b/guests/playbooks/build/projects/libosinfo.yml @@ -9,6 +9,11 @@ - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' + vars: + local_env: | + # export LIBOSINFO_NETWORK_TESTS in order to run both + # mediauris and treeuris tests + export LIBOSINFO_NETWORK_TESTS=1 - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' -- 2.17.1

2 3

[libvirt] [PATCH 0/6] conf: Move a bunch of stuff to device_conf
by Andrea Bolognani 03 Sep '18

03 Sep '18

These are the times where I wish we were using a language with support for proper classes and modules like, I dunno, PHP or something. Andrea Bolognani (6): conf: Move virDomainDeviceAddressType to device_conf conf: Move virDomainDeviceAddressIsValid() to device_conf conf: Change return type of *AddressIsValid() to bool conf: Move virDomainPCIAddressAsString() to device_conf conf: Rename virDomainPCIAddressAsString() conf: Move *AddressParseXML() to device_conf src/conf/device_conf.c | 348 ++++++++++++++++++++++++++++++++- src/conf/device_conf.h | 31 ++- src/conf/domain_addr.c | 20 +- src/conf/domain_addr.h | 3 - src/conf/domain_conf.c | 320 ------------------------------ src/conf/domain_conf.h | 3 - src/libvirt_private.syms | 13 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain_address.c | 6 +- 9 files changed, 386 insertions(+), 360 deletions(-) -- 2.17.1

3 14

[libvirt] [PATCH] qemu: Don't overwrite stats in qemuDomainBlocksStatsGather
by Peter Krempa 03 Sep '18

03 Sep '18

The size/capacity stats gathered in qemuDomainBlocksStatsGather when using -blockdev would be overwritten by assigning/copying the transfered data statistics at the end. Fix it by moving the assignment prior to fetching the capacity data. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f7c71675..07ea5473b6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11114,6 +11114,8 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, goto cleanup; } + **retstats = *stats; + if (blockdev) { /* capacity are reported only per node-name so we need to transfer them */ qemuBlockStatsPtr capstats; @@ -11127,8 +11129,6 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, (*retstats)->write_threshold = capstats->write_threshold; } } - - **retstats = *stats; } else { for (i = 0; i < vm->def->ndisks; i++) { disk = vm->def->disks[i]; -- 2.16.2

2 1

[libvirt] [PATCH] news: Update for 4.7.0 release
by Andrea Bolognani 03 Sep '18

03 Sep '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/news.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 2b6d08dc02..3233796f32 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -71,8 +71,51 @@ Support the vhost-vsock-ccw device on S390. </description> </change> + <change> + <summary> + qemu: Make default machine type independent of QEMU + </summary> + <description> + We can't control whether or not QEMU will change its default + machine type in the future, or whether downstream distributions + will decide to compile out some machine types, so our only option + to provide a predictable behavior is taking care of the default + ourselves; management applications and users are encouraged to + explicitly pick a machine type when creating new guests. + </description> + </change> + <change> + <summary> + apparmor: Various improvements + </summary> + <description> + Rules have been added to deal with a number of scenarios that + didn't work correctly. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + esx: Truncate CPU model name + </summary> + <description> + Some CPU model names are too long to be stored into the + corresponding property, and should be explicitly truncated to + avoid unexpected behavior. + </description> + </change> + <change> + <summary> + utils: Remove arbitrary limit on socket_id/core_id + </summary> + <description> + Both values were assumed to be smaller than 4096, but in fact + they are entirely hardware-dependent and there have been reports + of machines presenting much bigger values, preventing libvirt from + working correctly; all such limits have now been removed. + </description> + </change> </section> </release> <release version="v4.6.0" date="2018-08-06"> -- 2.17.1

2 1

[libvirt] Terminal input “udevadm trigger” command,then produce “nl_recv returned with error:No buffer space available”
by xiajidong＠cmss.chinamobile.com 03 Sep '18

03 Sep '18

Dear libvirt experts， I have add some patch as follow.this two patch add buffer size to avoid to produce “nl_recv returned with error:No buffer space available” 1. libvirt-nodedev-Increase-the-netlink-socket-buffer-size-to-t.patch 2. libvirt-util-increase-libnl-buffer-size.patch but as I set some configuration in /etc/libvirt/libvitd.conf as follows # Logging level: 4 errors, 3 warnings, 2 information, 1 debug log_level =2 # Multiple outputs can be defined, they just need to be separated by spaces. # e.g. to log all warnings and errors to syslog under the libvirtd ident: log_outputs="2:syslog:libvirtd" when I input “udevadm trigger” command [root@localhost ~]# vi /etc/libvirt/libvirtd.conf [root@localhost ~]# systemctl restart libvirtd [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# then will produce “nl_recv returned with error:No buffer space available” [root@localhost ~]# tail -f /var/log/messages | grep buffer Sep 2 22:44:00 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:33 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:45 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available So my question is: When input “udevadm trigger” in terminal, if setting log_level and log_outputs="2:syslog:libvirtd",how to avoid to produce “error virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available” log information? I am looking forward to your reply. _____ Best Regards, Jidong Xia China Mobile (Suzhou) Software Technology Company.cloud computing product department Tel: (+86) 18896726087 E-Mail：xiajidong(a)cmss.chinamobile.com <mailto:xiajidong@cmss.chinamobile.com>

1 0

[libvirt] Virsh reference is out of date, should it be updated from the man page?
by Povilas Kanapickas 02 Sep '18

02 Sep '18

Hi! The online virsh command reference at [1] seems to be very out of date according to [2]. There's much more recent documentation at tools/virsh.pod in the main libvirt repository. I believe it would be great to update the web docs as they are much more accessible and convenient to use (especially the one-command-per-page version). What would be the best way to approach that? I suppose we could look into automatically converting the current manpages into docbook and using that to update the website? What do you think? Regards, Povilas [1] - https://libvirt.org/virshcmdref.html [2] - https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary

1 0

[libvirt] [PATCHv2 0/3] network: new network forward mode 'vlan'
by Shi Lei 02 Sep '18

02 Sep '18

Hi, everyone! This patch supports VLan by '8021q' kernel module other than by OVS. The way of '8021q' is simpler and more robust. Mode 'vlan' is like mode 'route' except these major differences: - mode 'vlan' inserts a vlan-device between the specified host's interface and the internal bridge. The vlan-device is based on '8021q' kernel module. - mode 'vlan' has no routed iptables rules but has other common iptables rules It can simplify the work of management apps whose developers want to implement VLan but don't want to introduce OVS into their project. Thank John for his comments in v1. v1 here: https://www.redhat.com/archives/libvir-list/2018-July/msg00331.html since v1: - Change docs/formatnetwork.html.in - Change docs/schemas/network.rng - Add tests/networkxml2* - Other code fixes Besides, I have post two patches followed by John's suggestions. - Replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_* https://www.redhat.com/archives/libvir-list/2018-July/msg01537.html This has been accepted. - Introduce timeout mode for virKModLoad to solve the potential problem of the 'strange delay' when loading '8021q' module https://www.redhat.com/archives/libvir-list/2018-August/msg00605.html This has been rejected and I don't know wether I should continue to solve this problem. Now I just check the INIT process code of '8021q' module and I think this module should not cause delay now. The loading time of '8021q' by virKModLoad on my PC is about 30 milliseconds. Shi Lei (3): add functions: load 8021q module, create/destroy vlan-dev support new forward mode 'vlan' for virtual network tests and docs for new forward mode 'vlan' configure.ac | 6 + docs/formatnetwork.html.in | 27 ++- docs/schemas/network.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/network_conf.c | 24 ++- src/conf/network_conf.h | 1 + src/conf/virnetworkobj.c | 1 + src/esx/esx_network_driver.c | 1 + src/libvirt_private.syms | 4 + src/network/bridge_driver.c | 55 +++++- src/qemu/qemu_process.c | 1 + src/util/virnetdev.c | 203 +++++++++++++++++++++ src/util/virnetdev.h | 18 ++ tests/networkxml2confdata/vlan-network.conf | 16 ++ tests/networkxml2confdata/vlan-network.xml | 13 ++ tests/networkxml2conftest.c | 1 + .../vlan-network-multi-vlan-tag.xml | 11 ++ .../vlan-network-no-forward-dev.xml | 10 + tests/networkxml2xmlin/vlan-network-with-dhcp.xml | 15 ++ tests/networkxml2xmlin/vlan-network.xml | 10 + tests/networkxml2xmlout/vlan-network-with-dhcp.xml | 17 ++ tests/networkxml2xmlout/vlan-network.xml | 12 ++ tests/networkxml2xmltest.c | 5 + 23 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 tests/networkxml2confdata/vlan-network.conf create mode 100644 tests/networkxml2confdata/vlan-network.xml create mode 100644 tests/networkxml2xmlin/vlan-network-multi-vlan-tag.xml create mode 100644 tests/networkxml2xmlin/vlan-network-no-forward-dev.xml create mode 100644 tests/networkxml2xmlin/vlan-network-with-dhcp.xml create mode 100644 tests/networkxml2xmlin/vlan-network.xml create mode 100644 tests/networkxml2xmlout/vlan-network-with-dhcp.xml create mode 100644 tests/networkxml2xmlout/vlan-network.xml -- 2.7.4

3 5

[libvirt] [PATCH] Add virNetlinkNewLink for simplifying virNetDev*Create
by Shi Lei 02 Sep '18

02 Sep '18

This patch adds virNetlinkNewLink for simplifying virNetDevMacVLanCreate and virNetDevBridgeCreate. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 73 +++-------------------- src/util/virnetdevmacvlan.c | 137 ++++++++++++++------------------------------ src/util/virnetlink.c | 104 +++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 8 +++ 5 files changed, 164 insertions(+), 159 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 47ea35f..23931ba 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2439,6 +2439,7 @@ virNetlinkEventServiceStop; virNetlinkEventServiceStopAll; virNetlinkGetErrorCode; virNetlinkGetNeighbor; +virNetlinkNewLink; virNetlinkShutdown; virNetlinkStartup; diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index bc377b5..1f5b37e 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -417,77 +417,22 @@ virNetDevBridgeCreate(const char *brname) { /* use a netlink RTM_NEWLINK message to create the bridge */ const char *type = "bridge"; - struct nlmsgerr *err; - struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; - unsigned int recvbuflen; - struct nlattr *linkinfo; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + int error = 0; - nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, - NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); - if (!nl_msg) { - virReportOOMError(); - return -1; - } - - if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - if (nla_put(nl_msg, IFLA_IFNAME, strlen(brname)+1, brname) < 0) - goto buffer_too_small; - if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) - goto buffer_too_small; - if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) - goto buffer_too_small; - nla_nest_end(nl_msg, linkinfo); - - if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) { - return -1; - } - - if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) - goto malformed_resp; - - switch (resp->nlmsg_type) { - case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); - if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) - goto malformed_resp; - - if (err->error < 0) { + if (virNetlinkNewLink(NULL, brname, NULL, type, NULL, NULL, &error) < 0) { # if defined(HAVE_STRUCT_IFREQ) && defined(SIOCBRADDBR) - if (err->error == -EOPNOTSUPP) { - /* fallback to ioctl if netlink doesn't support creating - * bridges - */ - return virNetDevBridgeCreateWithIoctl(brname); - } -# endif - - virReportSystemError(-err->error, - _("error creating bridge interface %s"), - brname); - return -1; + if (error == -EOPNOTSUPP) { + /* fallback to ioctl if netlink doesn't support creating bridges */ + return virNetDevBridgeCreateWithIoctl(brname); } - break; +# endif + virReportSystemError(-error, _("error creating bridge interface %s"), + brname); - case NLMSG_DONE: - break; - default: - goto malformed_resp; + return -1; } return 0; - - malformed_resp: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("malformed netlink response message")); - return -1; - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - return -1; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2035b1f..1629add 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -283,6 +283,37 @@ virNetDevMacVLanReleaseName(const char *name) } +static int +virNetDevMacVLanCreateCallback(struct nl_msg *nl_msg, const void *opaque) +{ + const uint32_t *mode = (const uint32_t *) opaque; + if (!nl_msg || !opaque) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("nl_msg %p or opaque %p is NULL"), + nl_msg, opaque); + return -1; + } + + if (*mode > 0) { + struct nlattr *info_data; + if (!(info_data = nla_nest_start(nl_msg, IFLA_INFO_DATA))) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_MACVLAN_MODE, sizeof(*mode), mode) < 0) + goto buffer_too_small; + + nla_nest_end(nl_msg, info_data); + } + + return 0; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + + /** * virNetDevMacVLanCreate: * @@ -307,113 +338,29 @@ virNetDevMacVLanCreate(const char *ifname, uint32_t macvlan_mode, int *retry) { - int rc = -1; - struct nlmsgerr *err; - struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; int ifindex; - unsigned int recvbuflen; - struct nl_msg *nl_msg; - struct nlattr *linkinfo, *info_data; - char macstr[VIR_MAC_STRING_BUFLEN]; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; - - if (virNetDevGetIndex(srcdev, &ifindex) < 0) - return -1; - + int error = 0; *retry = 0; - nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, - NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); - if (!nl_msg) { - virReportOOMError(); + if (virNetDevGetIndex(srcdev, &ifindex) < 0) return -1; - } - - if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - - if (nla_put_u32(nl_msg, IFLA_LINK, ifindex) < 0) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, macaddress) < 0) - goto buffer_too_small; - - if (ifname && - nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) - goto buffer_too_small; - if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) - goto buffer_too_small; - - if (macvlan_mode > 0) { - if (!(info_data = nla_nest_start(nl_msg, IFLA_INFO_DATA))) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_MACVLAN_MODE, sizeof(macvlan_mode), - &macvlan_mode) < 0) - goto buffer_too_small; - - nla_nest_end(nl_msg, info_data); - } - - nla_nest_end(nl_msg, linkinfo); - - if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) { - goto cleanup; - } - - if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) - goto malformed_resp; - - switch (resp->nlmsg_type) { - case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); - if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) - goto malformed_resp; - - switch (err->error) { - - case 0: - break; - - case -EEXIST: + if (virNetlinkNewLink(&ifindex, ifname, macaddress, type, + virNetDevMacVLanCreateCallback, &macvlan_mode, + &error) < 0) { + char macstr[VIR_MAC_STRING_BUFLEN]; + if (error == -EEXIST) *retry = 1; - goto cleanup; - - default: - virReportSystemError(-err->error, + else + virReportSystemError(-error, _("error creating %s interface %s@%s (%s)"), type, ifname, srcdev, virMacAddrFormat(macaddress, macstr)); - goto cleanup; - } - break; - - case NLMSG_DONE: - break; - default: - goto malformed_resp; + return -1; } - rc = 0; - cleanup: - nlmsg_free(nl_msg); - return rc; - - malformed_resp: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("malformed netlink response message")); - goto cleanup; - - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - goto cleanup; + return 0; } /** diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 8f06446..817e347 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -489,6 +489,110 @@ virNetlinkDumpLink(const char *ifname, int ifindex, /** + * virNetlinkNewLink: + * + * @ifindex: The index for the 'link' device + * @ifname: The name of the link + * @mac: The MAC address of the device + * @type: The type of device, i.e., "bridge", "macvtap", "macvlan" + * @cb: The callback for filling in IFLA_INFO_DATA for this type + * @opaque: opaque for the callback + * @error: for retrieving error code + * + * Create a network "link" (aka interface aka device) with the given + * args. This works for many different types of network devices, + * including macvtap and bridges. + * + * Returns 0 on success, -1 on fatal error. + */ +int +virNetlinkNewLink(const int *ifindex, + const char *ifname, + const virMacAddr *mac, + const char *type, + virNetlinkNewLinkCallback cb, + const void *opaque, + int *error) +{ + struct nlmsgerr *err; + struct nlattr *linkinfo; + unsigned int buflen; + struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; + VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + + *error = 0; + + nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, + NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); + if (!nl_msg) { + virReportOOMError(); + return -1; + } + + if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (ifindex && nla_put_u32(nl_msg, IFLA_LINK, *ifindex) < 0) + goto buffer_too_small; + + if (mac && nla_put(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, mac) < 0) + goto buffer_too_small; + + if (ifname && nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) + goto buffer_too_small; + + if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) + goto buffer_too_small; + + if (cb && cb(nl_msg, opaque) < 0) + return -1; + + nla_nest_end(nl_msg, linkinfo); + + if (virNetlinkCommand(nl_msg, &resp, &buflen, 0, 0, NETLINK_ROUTE, 0) < 0) + return -1; + + if (buflen < NLMSG_LENGTH(0) || resp == NULL) + goto malformed_resp; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + if (err->error < 0) { + *error = err->error; + return -1; + } + break; + + case NLMSG_DONE: + break; + + default: + goto malformed_resp; + } + + return 0; + + malformed_resp: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + return -1; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + + +/** * virNetlinkDelLink: * * @ifname: Name of the link diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 1e1e616..195c7bb 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -65,6 +65,14 @@ int virNetlinkDumpCommand(struct nl_msg *nl_msg, unsigned int protocol, unsigned int groups, void *opaque); +typedef int (*virNetlinkNewLinkCallback)(struct nl_msg *nl_msg, + const void *opaque); + +int virNetlinkNewLink(const int *ifindex, const char *ifname, + const virMacAddr *macaddress, const char *type, + virNetlinkNewLinkCallback cb, const void *opaque, + int *error); + typedef int (*virNetlinkDelLinkFallback)(const char *ifname); int virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback); -- 2.7.4

2 4