- Devel - libvirt List Archives

[libvirt] [PATCH] util: Fix memory leak in virResctrlMonitorGetStats
by John Ferlan 14 Nov '18

14 Nov '18

Missed during review and surprisingly my run through Coverity also didn't see this. I only noticed it when reading the code while fixing the build breaker for commit 36780a86a. With all those continues we would leak @stats. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under trivial rule. src/util/virresctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index ef5c668921..7aeca9d287 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2684,9 +2684,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, while (virDirRead(dirp, &ent, datapath) > 0) { char *node_id = NULL; - if (VIR_ALLOC(stat) < 0) - goto cleanup; - /* Looking for directory that contains resource utilization * information file. The directory name is arranged in format * "mon_<node_name>_<node_id>". For example, "mon_L3_00" and @@ -2709,6 +2706,9 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, if (!(node_id = STRSKIP(node_id, "_"))) continue; + if (VIR_ALLOC(stat) < 0) + goto cleanup; + /* The node ID number should be here, parsing it. */ if (virStrToLong_uip(node_id, NULL, 0, &stat->id) < 0) goto cleanup; -- 2.17.2

1 0

[libvirt] [PATCH] util: Change usage of ent->d_type != DT_DIR
by John Ferlan 14 Nov '18

14 Nov '18

Fix a broken non-Linux build to use the !virFileIsDir instead Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as build breaker fix for https://travis-ci.org/libvirt/libvirt/builds/455121079 All I can say is, well that wasn't obvious... Who knew! src/util/virresctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index f7481a1036..ef5c668921 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2693,7 +2693,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, * "mon_L3_01" are two target directories for a two nodes system * with resource utilization data file for each node respectively. */ - if (ent->d_type != DT_DIR) + if (!virFileIsDir(ent->d_name)) continue; /* Looking for directory has a prefix 'mon_L' */ -- 2.17.2

1 0

[libvirt] [RFC PATCH] Add new migration flag VIR_MIGRATE_DRY_RUN
by Jim Fehlig 14 Nov '18

14 Nov '18

A dry run can be used as a best-effort check that a migration command will succeed. The destination host will be checked to see if it can accommodate the resources required by the domain. DRY_RUN will fail if the destination host is not capable of running the domain. Although a subsequent migration will likely succeed, the success of DRY_RUN does not ensure a future migration will succeed. Resources on the destination host could become unavailable between a DRY_RUN and actual migration. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- If it is agreed this is useful, my thought was to use the begin and prepare phases of migration to implement it. qemuMigrationDstPrepareAny() already does a lot of the heavy lifting wrt checking the host can accommodate the domain. Some of it, and the remaining migration phases, can be short-circuited in the case of dry run. One interesting wrinkle I've observed is the check for cpu compatibility. AFAICT qemu is actually invoked on the dst, "filtered-features" of the cpu are requested via qmp, and results are checked against cpu in domain config. If cpu on dst is insufficient, migration fails in the prepare phase with something like "guest CPU doesn't match specification: missing features: z y z". I was hoping to avoid launching qemu in the case of dry run, but that may be unavoidable if we'd like a dependable dry run result. Thanks for considering the idea! (BTW, if it is considered useful I will follow up with a V1 series that includes this patch and and impl for the qemu driver.) include/libvirt/libvirt-domain.h | 12 ++++++++++++ src/qemu/qemu_migration.h | 3 ++- tools/virsh-domain.c | 7 +++++++ tools/virsh.pod | 10 +++++++++- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index fdd2d6b8ea..6d52f6ce50 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -830,6 +830,18 @@ typedef enum { */ VIR_MIGRATE_TLS = (1 << 16), + /* Setting the VIR_MIGRATE_DRY_RUN flag will cause libvirt to make a + * best-effort attempt to check if migration will succeed. The destination + * host will be checked to see if it can accommodate the resources required + * by the domain. For example are the network, disk, memory, and CPU + * resources used by the domain on the source host also available on the + * destination host. The dry run will fail if libvirt determines the + * destination host is not capable of running the domain. Although a + * subsequent migration will likely succeed, the success of dry run does + * not ensure a future migration will succeed. Resources on the destination + * host could become unavailable between a dry run and actual migration. + */ + VIR_MIGRATE_DRY_RUN = (1 << 16), } virDomainMigrateFlags; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index e12b6972db..b0e2bc689b 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -57,7 +57,8 @@ VIR_MIGRATE_AUTO_CONVERGE | \ VIR_MIGRATE_RDMA_PIN_ALL | \ VIR_MIGRATE_POSTCOPY | \ - VIR_MIGRATE_TLS) + VIR_MIGRATE_TLS | \ + VIR_MIGRATE_DRY_RUN) /* All supported migration parameters and their types. */ # define QEMU_MIGRATION_PARAMETERS \ diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 372bdb95d3..46f0f44917 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10450,6 +10450,10 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_BOOL, .help = N_("use TLS for migration") }, + {.name = "dry-run", + .type = VSH_OT_BOOL, + .help = N_("check if migration will succeed without actually performing the migration") + }, {.name = NULL} }; @@ -10694,6 +10698,9 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "tls")) flags |= VIR_MIGRATE_TLS; + if (vshCommandOptBool(cmd, "dry-run")) + flags |= VIR_MIGRATE_DRY_RUN; + if (flags & VIR_MIGRATE_PEER2PEER || vshCommandOptBool(cmd, "direct")) { if (virDomainMigrateToURI3(dom, desturi, params, nparams, flags) == 0) ret = '0'; diff --git a/tools/virsh.pod b/tools/virsh.pod index 86c041d575..715fa3887f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1845,7 +1845,7 @@ I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<dna [I<--compressed>] [I<--comp-methods> B<method-list>] [I<--comp-mt-level>] [I<--comp-mt-threads>] [I<--comp-mt-dthreads>] [I<--comp-xbzrle-cache>] [I<--auto-converge>] [I<auto-converge-initial>] -[I<auto-converge-increment>] [I<--persistent-xml> B<file>] [I<--tls>] +[I<auto-converge-increment>] [I<--persistent-xml> B<file>] [I<--tls>] [I<--dry-run>] Migrate domain to another host. Add I<--live> for live migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> @@ -1937,6 +1937,14 @@ Providing I<--tls> causes the migration to use the host configured TLS setup the migration of the domain. Usage requires proper TLS setup for both source and target. +I<--dry-run> can be used as a best-effort check that the migration command +will succeed. The destination host will be checked to see if it can +accommodate the resources required by the domain. I<--dry-run> will fail if +the destination host is not capable of running the domain. Although a +subsequent migration will likely succeed, the success of dry run does not +ensure a future migration will succeed. Resources on the destination host +could become unavailable between a dry run and actual migration. + Running migration can be canceled by interrupting virsh (usually using C<Ctrl-C>) or by B<domjobabort> command sent from another virsh instance. -- 2.18.0

3 6

[libvirt] [libvirt-go PATCH] Add daemon shutdown reason to the list
by John Ferlan 14 Nov '18

14 Nov '18

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Something I know even less about ;-)... Although I see Daniel has noted he'll take care of it - I figured I'd give it a "go" (sorry) anyway. domain.go | 1 + 1 file changed, 1 insertion(+) diff --git a/domain.go b/domain.go index 3a3ef5b..e011980 100644 --- a/domain.go +++ b/domain.go @@ -593,6 +593,7 @@ const ( DOMAIN_SHUTOFF_SAVED = DomainShutoffReason(C.VIR_DOMAIN_SHUTOFF_SAVED) DOMAIN_SHUTOFF_FAILED = DomainShutoffReason(C.VIR_DOMAIN_SHUTOFF_FAILED) DOMAIN_SHUTOFF_FROM_SNAPSHOT = DomainShutoffReason(C.VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT) + DOMAIN_SHUTOFF_DAEMON = DomainShutoffReason(C.VIR_DOMAIN_SHUTOFF_DAEMON) ) type DomainBlockCommitFlags int -- 2.17.2

1 0

[libvirt] [PATCH v2 0/3] Fix some errors around VIR_ACCESS_DENIED
by John Ferlan 14 Nov '18

14 Nov '18

v1: https://www.redhat.com/archives/libvir-list/2018-November/msg00339.html Changes since v1: * Do the right thing, revert the bad patch and rework it. Thus patch1 is the revert and patch2 is the rework. If it's decided that patch2 is unnecessary or undesired, that's perfectly fine, but would then require a slight modification to the documentation from commit 4f1107614 to remove the reference about the access denied message. * From review - add the virObjectUnref for the data->identity for which a virIdentityGetCurrent reference was obtained. v1 cover: Patch 1 fixes my own error made in this release fortunately, but only seen because I was invesigating Patch 2 Patch 2 is perhaps a longer term issue, but perhaps coming more to light now that the nwfilter bindings have been separated and use a virConnectOpen for nwfilter:///system during reconnection processing; whereas, previously the filter bindings would have been "hidden" within various nwfilter, domain, and network driver callbacks and throughs. John Ferlan (3): Revert "access: Modify the VIR_ERR_ACCESS_DENIED to include driverName" access: Modify the VIR_ERR_ACCESS_DENIED to include driverName qemu: Set identity for the reconnect all thread src/access/viraccessmanager.c | 3 ++- src/qemu/qemu_process.c | 7 +++++++ src/rpc/gendispatch.pl | 3 ++- src/util/virerror.c | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) -- 2.17.2

2 4

[libvirt] [PATCH] libvirt: add daemon itself as shutdown reason
by Nikolay Shirokovskiy 14 Nov '18

14 Nov '18

Let's introduce shutdown reason "daemon" which means we have to kill running domain ourselves as the best action we can take at that moment. Failure to pick up domain on daemon restart is one example of such case. Using reason "crashed" is a bit misleading as it is used when qemu is actually crashed or qemu destroyed on guest panic as result of user choice that is the problem was in qemu/guest itself. So I propose to use "crashed" only for qemu side issues and introduce "daemon" when we have to kill the qemu for good. There is another example where "daemon" will be useful. If we can not reboot domain we kill it and got "crashed" reason now. Looks like good candidate for "daemon" reason. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 3 ++- src/qemu/qemu_process.c | 11 ++++------- tools/virsh-domain-monitor.c | 3 ++- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index fdd2d6b..11fdab5 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -145,6 +145,7 @@ typedef enum { VIR_DOMAIN_SHUTOFF_FAILED = 6, /* domain failed to start */ VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT = 7, /* restored from a snapshot which was * taken while domain was shutoff */ + VIR_DOMAIN_SHUTOFF_DAEMON = 8, /* daemon have to kill domain */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_SHUTOFF_LAST # endif diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9911d56..e441723 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -779,7 +779,8 @@ VIR_ENUM_IMPL(virDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST, "migrated", "saved", "failed", - "from snapshot") + "from snapshot", + "daemon") VIR_ENUM_IMPL(virDomainCrashedReason, VIR_DOMAIN_CRASHED_LAST, "unknown", diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e9c7618..c4bc9ca 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7988,15 +7988,12 @@ qemuProcessReconnect(void *opaque) /* We can't get the monitor back, so must kill the VM * to remove danger of it ending up running twice if * user tries to start it again later - * If we couldn't get the monitor since QEMU supports - * no-shutdown, we can safely say that the domain - * crashed ... */ - state = VIR_DOMAIN_SHUTOFF_CRASHED; - /* If BeginJob failed, we jumped here without a job, let's hope another + * If BeginJob failed, we jumped here without a job, let's hope another * thread didn't have a chance to start playing with the domain yet * (it's all we can do anyway). */ - qemuProcessStop(driver, obj, state, QEMU_ASYNC_JOB_NONE, stopFlags); + qemuProcessStop(driver, obj, VIR_DOMAIN_SHUTOFF_DAEMON, + QEMU_ASYNC_JOB_NONE, stopFlags); } goto cleanup; } @@ -8035,7 +8032,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, * is no thread that could be doing anything else with the same domain * object. */ - qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, + qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_DAEMON, QEMU_ASYNC_JOB_NONE, 0); qemuDomainRemoveInactiveJobLocked(src->driver, obj); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 3a26363..f0ad558 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -212,7 +212,8 @@ VIR_ENUM_IMPL(virshDomainShutoffReason, N_("migrated"), N_("saved"), N_("failed"), - N_("from snapshot")) + N_("from snapshot"), + N_("daemon")) VIR_ENUM_DECL(virshDomainCrashedReason) VIR_ENUM_IMPL(virshDomainCrashedReason, -- 1.8.3.1

5 15

[libvirt] [ocaml PATCH] Cast virError* enums to int for comparisons with 0
by Pino Toscano 14 Nov '18

14 Nov '18

The actual type of an enum in C is implementation defined when there are no negative values, and thus it can be int, or uint. This is the case of the virError* enums in libvirt, as they do not have negative values. Hence, to avoid hitting tautological comparison errors when checking their rage, temporarly cast the enum values to int when checking they are not negative. The check is there to ensure the value is within the range of the OCaml type used to represent it. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- libvirt/libvirt_c_epilogue.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt/libvirt_c_epilogue.c b/libvirt/libvirt_c_epilogue.c index 29656a4..4e75d2f 100644 --- a/libvirt/libvirt_c_epilogue.c +++ b/libvirt/libvirt_c_epilogue.c @@ -153,7 +153,7 @@ Val_err_number (virErrorNumber code) CAMLparam0 (); CAMLlocal1 (rv); - if (0 <= code && code <= MAX_VIR_CODE) + if (0 <= (int) code && code <= MAX_VIR_CODE) rv = Val_int (code); else { rv = caml_alloc (1, 0); /* VIR_ERR_UNKNOWN (code) */ @@ -169,7 +169,7 @@ Val_err_domain (virErrorDomain code) CAMLparam0 (); CAMLlocal1 (rv); - if (0 <= code && code <= MAX_VIR_DOMAIN) + if (0 <= (int) code && code <= MAX_VIR_DOMAIN) rv = Val_int (code); else { rv = caml_alloc (1, 0); /* VIR_FROM_UNKNOWN (code) */ @@ -185,7 +185,7 @@ Val_err_level (virErrorLevel code) CAMLparam0 (); CAMLlocal1 (rv); - if (0 <= code && code <= MAX_VIR_LEVEL) + if (0 <= (int) code && code <= MAX_VIR_LEVEL) rv = Val_int (code); else { rv = caml_alloc (1, 0); /* VIR_ERR_UNKNOWN_LEVEL (code) */ -- 2.17.2

3 2

[libvirt] [jenkins-ci PATCH v2] Don't run libvirt-dbus-syntax-check on FreeBSD
by Andrea Bolognani 14 Nov '18

14 Nov '18

flake8 3.5.0 doesn't work with pyflakes 2.0.0, and since those are the versions available through ports there's currently no way to successfully run flake8 on FreeBSD. We will be able to revert this once flake8 3.6.0 is available through ports. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/build/projects/libvirt-dbus.yml | 7 +++---- projects/libvirt-dbus.yaml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index 1d4ecbd..41e670c 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -21,16 +21,15 @@ - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' vars: - # CentOS 7 doesn't include Python 3 and the version of pyflakes - # in FreeBSD CURRENT is too new to be used by flake8 + # CentOS 7 doesn't include Python 3, while the versions of flake8 + # and pyflakes currently available on FreeBSD (3.5.0 and 2.0.0 + # respectively) are not compatible machines: - libvirt-debian-9 - libvirt-debian-sid - libvirt-fedora-28 - libvirt-fedora-29 - libvirt-fedora-rawhide - - libvirt-freebsd-10 - - libvirt-freebsd-11 - libvirt-ubuntu-16 - libvirt-ubuntu-18 - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index 48bbdaa..3d1ed9c 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -18,15 +18,14 @@ parent_jobs: 'libvirt-glib-build' - autotools-syntax-check-job: parent_jobs: 'libvirt-dbus-build' - # CentOS 7 doesn't include Python 3 and the version of pyflakes - # in FreeBSD CURRENT is too new to be used by flake8 + # CentOS 7 doesn't include Python 3, while the versions of flake8 + # and pyflakes currently available on FreeBSD (3.5.0 and 2.0.0 + # respectively) are not compatible machines: - libvirt-debian-9 - libvirt-fedora-28 - libvirt-fedora-29 - libvirt-fedora-rawhide - - libvirt-freebsd-10 - - libvirt-freebsd-11 - autotools-check-job: parent_jobs: 'libvirt-dbus-syntax-check' # CentOS 7 doesn't include Python 3 and the version in Ubuntu -- 2.19.1

2 1

[libvirt] [jenkins-ci PATCH] Don't run libvirt-dbus-syntax-check on FreeBSD
by Andrea Bolognani 14 Nov '18

14 Nov '18

flake8 wants 'pyflakes<1.7.0,>=1.5.0', but all FreeBSD releases ship pyflakes 2.0.0 these days. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/build/projects/libvirt-dbus.yml | 4 +--- projects/libvirt-dbus.yaml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index 1d4ecbd..61ece63 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -22,15 +22,13 @@ - include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' vars: # CentOS 7 doesn't include Python 3 and the version of pyflakes - # in FreeBSD CURRENT is too new to be used by flake8 + # in FreeBSD is too new to be used by flake8 machines: - libvirt-debian-9 - libvirt-debian-sid - libvirt-fedora-28 - libvirt-fedora-29 - libvirt-fedora-rawhide - - libvirt-freebsd-10 - - libvirt-freebsd-11 - libvirt-ubuntu-16 - libvirt-ubuntu-18 - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index 48bbdaa..49f5366 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -19,14 +19,12 @@ - autotools-syntax-check-job: parent_jobs: 'libvirt-dbus-build' # CentOS 7 doesn't include Python 3 and the version of pyflakes - # in FreeBSD CURRENT is too new to be used by flake8 + # in FreeBSD is too new to be used by flake8 machines: - libvirt-debian-9 - libvirt-fedora-28 - libvirt-fedora-29 - libvirt-fedora-rawhide - - libvirt-freebsd-10 - - libvirt-freebsd-11 - autotools-check-job: parent_jobs: 'libvirt-dbus-syntax-check' # CentOS 7 doesn't include Python 3 and the version in Ubuntu -- 2.19.1

2 4

[libvirt] [PATCH 0/2] conf: qemu: support new Hyper-V enlightenments in Qemu-3.1
by Vitaly Kuznetsov 14 Nov '18

14 Nov '18

The upcoming Qemu-3.1 release will bring us two new Hyper-V enlightenments: hv_ipi and hv_evmcs. Support these in libvirt. Vitaly Kuznetsov (2): conf: qemu: add support for Hyper-V PV IPIs conf: qemu: add support for Hyper-V Enlightened VMCS docs/formatdomain.html.in | 14 ++++++++++++++ docs/schemas/domaincommon.rng | 10 ++++++++++ src/conf/domain_conf.c | 10 +++++++++- src/conf/domain_conf.h | 2 ++ src/cpu/cpu_x86.c | 6 ++++++ src/cpu/cpu_x86_data.h | 2 ++ src/qemu/qemu_command.c | 2 ++ src/qemu/qemu_parse_command.c | 2 ++ src/qemu/qemu_process.c | 2 ++ tests/qemuxml2argvdata/hyperv-off.xml | 2 ++ tests/qemuxml2argvdata/hyperv.args | 2 +- tests/qemuxml2argvdata/hyperv.xml | 2 ++ tests/qemuxml2xmloutdata/hyperv-off.xml | 2 ++ tests/qemuxml2xmloutdata/hyperv.xml | 2 ++ 14 files changed, 58 insertions(+), 2 deletions(-) -- 2.17.2

3 11

[libvirt] [PATCH v3 00/13] Implement alternative metadata locking
by Michal Privoznik 14 Nov '18

14 Nov '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-October/msg00667.html diff to v2: - Introduced two new patches (1/13 and 2/13) so that even non-Linux platforms are covered - In 4/13 I switched from indefinite wait for lock to a lock with timeout (of 10 seconds). This is basically to prevent us stalling if some app misbehaves and holds the file locked for eternity. Michal Prívozník (13): virprocess: Introduce virProcessRunInFork virprocess: Make virProcessRunInMountNamespace use virProcessRunInFork security: Always spawn process for transactions security_manager: Rework metadata locking Revert "security_manager: Load lock plugin on init" Revert "qemu_conf: Introduce metadata_lock_manager" Revert "lock_manager: Allow disabling configFile for virLockManagerPluginNew" Revert "lock_driver: Introduce VIR_LOCK_MANAGER_ACQUIRE_ROLLBACK" Revert "lock_driver: Introduce VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA" Revert "_virLockManagerLockDaemonPrivate: Move @hasRWDisks into dom union" Revert "lock_driver: Introduce new VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON" Revert "lock_driver_lockd: Introduce VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_METADATA flag" Revert "virlockspace: Allow caller to specify start and length offset in virLockSpaceAcquireResource" cfg.mk | 4 +- src/libvirt_private.syms | 1 + src/locking/lock_daemon_dispatch.c | 11 +- src/locking/lock_driver.h | 12 - src/locking/lock_driver_lockd.c | 421 ++++++++++------------------- src/locking/lock_driver_lockd.h | 1 - src/locking/lock_driver_sanlock.c | 44 +-- src/locking/lock_manager.c | 10 +- src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_conf.c | 1 - src/qemu/qemu_conf.h | 1 - src/qemu/qemu_driver.c | 3 - src/security/security_dac.c | 12 +- src/security/security_manager.c | 250 +++++++++-------- src/security/security_manager.h | 19 +- src/security/security_selinux.c | 11 +- src/util/virlockspace.c | 15 +- src/util/virlockspace.h | 4 - src/util/virprocess.c | 69 ++++- src/util/virprocess.h | 16 ++ tests/seclabeltest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- tests/testutilsqemu.c | 2 +- tests/virlockspacetest.c | 29 +- 26 files changed, 387 insertions(+), 560 deletions(-) -- 2.18.1

4 31

[libvirt] [PATCH] examples: Add missing quotes
by Andrea Bolognani 14 Nov '18

14 Nov '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. examples/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 7069d74e74..8a9c118858 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -94,7 +94,7 @@ install-apparmor-local: $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" echo "# Site-specific additions and overrides for \ 'usr.lib.libvirt.virt-aa-helper'" \ - >$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper + >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" INSTALL_DATA_LOCAL += install-apparmor-local UNINSTALL_LOCAL += uninstall-apparmor-local -- 2.19.1

1 0

[libvirt] [PATCH] build: Fix uninstall when WITH_APPARMOR_PROFILES is defined
by Jim Fehlig 14 Nov '18

14 Nov '18

When libvirt configuration includes '--with-apparmor-profiles', the make uninstall target fails make[1]: Entering directory '/home/jim/upstream/libvirt/examples' ( cd '/etc/apparmor.d//abstractions' && rm -f libvirt-qemu libvirt-lxc ) ( cd '/etc/apparmor.d/' && rm -f usr.lib.libvirt.virt-aa-helper usr.sbin.libvirtd ) make[1]: *** No rule to make target 'uninstall-apparmor-local', needed by 'uninstall-local'. Stop. Add missing 'uninstall-apparmor-local' target to the examples Makefile.am. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- examples/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/Makefile.am b/examples/Makefile.am index 7069d74e74..27f8b0ef09 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -96,6 +96,10 @@ install-apparmor-local: 'usr.lib.libvirt.virt-aa-helper'" \ >$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper +uninstall-apparmor-local: + rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" + rmdir $(APPARMOR_LOCAL_DIR) || : + INSTALL_DATA_LOCAL += install-apparmor-local UNINSTALL_LOCAL += uninstall-apparmor-local endif WITH_APPARMOR_PROFILES -- 2.18.0

2 3

[libvirt] [PATCH 0/2] Fix virCgroupGetMemoryStat memory.stat parsing
by John Ferlan 13 Nov '18

13 Nov '18

Originally reported here: https://www.redhat.com/archives/libvir-list/2018-November/msg00252.html John Ferlan (1): tests: Augment vcgrouptest to add virCgroupGetMemoryStat Peter Chubb (1): util: Fix virCgroupGetMemoryStat src/util/vircgroupv1.c | 7 ++++- src/util/vircgroupv2.c | 7 ++++- tests/vircgrouptest.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) -- 2.17.2

3 6

[libvirt] [PATCH] virSecuritySELinuxTransactionCommit: Don't mask error
by Michal Privoznik 13 Nov '18

13 Nov '18

In 4674fc6afd6 I've implemented transactions for selinux driver. Well, now that I am working in this area I've notice a subtle bug: @ret is initialized to 0 instead of -1. Facepalm. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I wonder how this could survive this long (~2y) not being noticed. src/security/security_selinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 467d1e6bfe..c09404f6f8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1091,7 +1091,7 @@ virSecuritySELinuxTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, pid_t pid) { virSecuritySELinuxContextListPtr list; - int ret = 0; + int ret = -1; list = virThreadLocalGet(&contextList); if (!list) -- 2.18.1

2 3

[libvirt] [PATCH] travis: Switch from Docker Hub to quay.io
by Andrea Bolognani 13 Nov '18

13 Nov '18

As it's currently impossible for us to create new automated builds on Docker Hub (see [1]), and quay.io doesn't suffer from the same problem while still having all the feature we need, switch to the latter. [1] https://github.com/docker/hub-feedback/issues/1676 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56d25b2ecd..55ba340a34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ script: -e VIR_TEST_DEBUG="$VIR_TEST_DEBUG" -e MINGW="$MINGW" -e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" - "libvirt/buildenv-$IMAGE" + "quay.io/libvirt/buildenv-$IMAGE:master" /bin/sh -xc "$DOCKER_CMD" git: -- 2.19.1

2 1

[libvirt] [dockerfiles PATCH 0/2] Add Fedora 29, drop Fedora 27
by Andrea Bolognani 13 Nov '18

13 Nov '18

Same as https://www.redhat.com/archives/libvir-list/2018-November/msg00073.html Pushed under the "trivial Dockerfiles update" rule. Andrea Bolognani (2): Add Fedora 29 Drop Fedora 27 ...denv-fedora-27.Dockerfile => buildenv-fedora-29.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename buildenv-fedora-27.Dockerfile => buildenv-fedora-29.Dockerfile (97%) -- 2.19.1

1 2

[libvirt] [PATCH] util: fix handling of unspecified port in URI
by Daniel P. Berrangé 13 Nov '18

13 Nov '18

When no server name is provided in the URI, modern versions of libxml2 will set the port to '-1'. This is a change from behaviour with earlier versions which set it to 0. Libvirt expects the port to be 0 in these cases and as a result we get a bug when connecting to URIs which lack a server name: $ virsh -c test+ssh:///default list error: failed to connect to the hypervisor error: Cannot recv data: Bad port '-1': Connection reset by peer This libxml2 change was attempting to fix another bug identified by libvirt where it didn't roundtrip URIs correctly in: https://github.com/GNOME/libxml2/commit/beb7281055dbf0ed4d041022a67c6c5cfd1… Essentially libxml2 was not expecting apps to look at the URI port field when the server name is not provided. This was a reasonable assumption, but none the less libvirt did look at it :-) The fix is to ensure we explicitly set port to 0 when server name is not present, avoiding undefined behaviour for the port field in libxml2. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/viruri.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/util/viruri.c b/src/util/viruri.c index d4b793f439..c8811f64c6 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -171,7 +171,16 @@ virURIParse(const char *uri) goto error; if (VIR_STRDUP(ret->server, xmluri->server) < 0) goto error; - ret->port = xmluri->port; + /* xmluri->port value is not defined if server was + * not given. Modern versions libxml2 fill port + * differently to old versions in this case, so + * don't rely on it. eg libxml2 git commit: + * beb7281055dbf0ed4d041022a67c6c5cfd126f25 + */ + if (!ret->server || STREQ(ret->server, "")) + ret->port = 0; + else + ret->port = xmluri->port; if (VIR_STRDUP(ret->path, xmluri->path) < 0) goto error; #ifdef HAVE_XMLURI_QUERY_RAW -- 2.19.1

2 1

[libvirt] [PATCH 0/2] Don't perform the vfio-ap mdev validation in post parse
by Erik Skultety 13 Nov '18

13 Nov '18

Move the respective bits to QEMU validation code instead. Erik Skultety (2): qemu: Extract MDEV VFIO PCI validation code into a separate helper conf: Move VFIO AP validation from post parse to QEMU validation code src/conf/domain_conf.c | 28 ------------------- src/qemu/qemu_domain.c | 61 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 34 deletions(-) -- 2.19.1

3 11

[libvirt] [PATCH v3] lxc: Include support to lxc version 3.0 or higher.
by Julio Faracco 12 Nov '18

12 Nov '18

This patch introduce the new settings for LXC 3.0 or higher. The older versions keep the compatibility to deprecated settings for LXC, but after release 3.0, the compatibility was removed. This commit adds the support to the refactored settings. v1-v2: Michal's suggestions to handle differences between versions. v2-v3: Adding suggestions from Pino and John too. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/lxc/lxc_native.c | 45 +++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index cbdec723dd..d3ba12bb0e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -200,8 +200,13 @@ lxcSetRootfs(virDomainDefPtr def, int type = VIR_DOMAIN_FS_TYPE_MOUNT; VIR_AUTOFREE(char *) value = NULL; - if (virConfGetValueString(properties, "lxc.rootfs", &value) <= 0) - return -1; + if (virConfGetValueString(properties, "lxc.rootfs.path", &value) <= 0) { + virResetLastError(); + + /* Check for pre LXC 3.0 legacy key */ + if (virConfGetValueString(properties, "lxc.rootfs", &value) <= 0) + return -1; + } if (STRPREFIX(value, "/dev/")) type = VIR_DOMAIN_FS_TYPE_BLOCK; @@ -684,8 +689,13 @@ lxcCreateConsoles(virDomainDefPtr def, virConfPtr properties) virDomainChrDefPtr console; size_t i; - if (virConfGetValueString(properties, "lxc.tty", &value) <= 0) - return 0; + if (virConfGetValueString(properties, "lxc.tty.max", &value) <= 0) { + virResetLastError(); + + /* Check for pre LXC 3.0 legacy key */ + if (virConfGetValueString(properties, "lxc.tty", &value) <= 0) + return 0; + } if (virStrToLong_i(value, NULL, 10, &nbttys) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse int: '%s'"), @@ -724,12 +734,13 @@ lxcIdmapWalkCallback(const char *name, virConfValuePtr value, void *data) char type; unsigned long start, target, count; - if (STRNEQ(name, "lxc.id_map") || !value->str) + /* LXC 3.0 uses "lxc.idmap", while legacy used "lxc.id_map" */ + if (STRNEQ(name, "lxc.idmap") || STRNEQ(name, "lxc.id_map") || !value->str) return 0; if (sscanf(value->str, "%c %lu %lu %lu", &type, &target, &start, &count) != 4) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid lxc.id_map: '%s'"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid: '%s'"), value->str); return -1; } @@ -1041,19 +1052,27 @@ lxcParseConfigString(const char *config, if (VIR_STRDUP(vmdef->os.init, "/sbin/init") < 0) goto error; - if (virConfGetValueString(properties, "lxc.utsname", &value) <= 0 || - VIR_STRDUP(vmdef->name, value) < 0) - goto error; + if (virConfGetValueString(properties, "lxc.uts.name", &value) <= 0) { + virResetLastError(); + + /* Check for pre LXC 3.0 legacy key */ + if (virConfGetValueString(properties, "lxc.utsname", &value) <= 0) + goto error; + } + if (!vmdef->name && (VIR_STRDUP(vmdef->name, "unnamed") < 0)) goto error; if (lxcSetRootfs(vmdef, properties) < 0) goto error; - /* Look for fstab: we shouldn't have it */ - if (virConfGetValue(properties, "lxc.mount")) { + /* LXC 3.0 uses "lxc.mount.fstab", while legacy used just "lxc.mount". + * In either case, generate the error to use "lxc.mount.entry" instead */ + if (virConfGetValue(properties, "lxc.mount.fstab") || + virConfGetValue(properties, "lxc.mount")) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("lxc.mount found, use lxc.mount.entry lines instead")); + _("lxc.mount.fstab or lxc.mount found, use " + "lxc.mount.entry lines instead")); goto error; } @@ -1069,7 +1088,7 @@ lxcParseConfigString(const char *config, if (lxcCreateConsoles(vmdef, properties) < 0) goto error; - /* lxc.id_map */ + /* lxc.idmap or legacy lxc.id_map */ if (virConfWalk(properties, lxcIdmapWalkCallback, vmdef) < 0) goto error; -- 2.19.1

4 5

[libvirt] [PULL 0/4] Fixes 31 20181112 patches
by Gerd Hoffmann 12 Nov '18

12 Nov '18

The following changes since commit 460f0236c12a86a38692c12d9bf8e2391dc10a77: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging (2018-11-12 10:12:07 +0000) are available in the git repository at: git://git.kraxel.org/qemu tags/fixes-31-20181112-pull-request for you to fetch changes up to f1aba960cc40ab65fa88c8678883bd2201708c55: ui/gtk: fix cursor in egl mode (2018-11-12 14:15:54 +0100) ---------------------------------------------------------------- fixes for 3.1: mark bt as deprecated, bugfixes for pulse, gtk and edid. ---------------------------------------------------------------- Gerd Hoffmann (2): pulseaudio: process audio data in smaller chunks ui/gtk: fix cursor in egl mode Marc-André Lureau (1): edid: silence a stringop-overflow warning Thomas Huth (1): bt: Mark the bluetooth subsystem as deprecated audio/paaudio.c | 4 ++-- hw/display/edid-generate.c | 2 +- ui/gtk-egl.c | 17 ++++++++++++----- vl.c | 4 ++++ qemu-deprecated.texi | 7 +++++++ qemu-options.hx | 4 ++++ 6 files changed, 30 insertions(+), 8 deletions(-) -- 2.9.3

2 5

[libvirt] [PATCH v2] conf: Add new module node_device_util
by Erik Skultety 12 Nov '18

12 Nov '18

There's a lot of stuff going on in src/conf/nodedev_conf which is sometimes not directly related to config and we're not really consistent with putting only parser/formatter related stuff here, e.g. like we do for domains. So, let's start simply by adding a new module node_device_util containing some of the helpers. Unfortunately, even though these helpers tend to open a secondary driver connection and would be much therefore better suited as a nodedev driver module, we can't do that without pulling headers from the driver into conf/ and that's wrong because we want conf/ to stay driver-agnostic. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/conf/Makefile.inc.am | 2 + src/conf/node_device_conf.c | 199 ----------------------- src/conf/node_device_conf.h | 11 -- src/conf/node_device_util.c | 229 +++++++++++++++++++++++++++ src/conf/node_device_util.h | 35 ++++ src/conf/virstorageobj.c | 1 + src/libvirt_private.syms | 7 +- src/node_device/node_device_driver.c | 1 + src/storage/storage_backend_scsi.c | 1 + 9 files changed, 273 insertions(+), 213 deletions(-) create mode 100644 src/conf/node_device_util.c create mode 100644 src/conf/node_device_util.h diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am index af23810640..219ff350d7 100644 --- a/src/conf/Makefile.inc.am +++ b/src/conf/Makefile.inc.am @@ -119,6 +119,8 @@ SECRET_CONF_SOURCES = \ NODE_DEVICE_CONF_SOURCES = \ conf/node_device_conf.c \ conf/node_device_conf.h \ + conf/node_device_util.c \ + conf/node_device_util.h \ conf/virnodedeviceobj.c \ conf/virnodedeviceobj.h \ $(NULL) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 03bd794dc0..74a7bc3933 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2220,205 +2220,6 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) } -/* virNodeDeviceGetParentName - * @conn: Connection pointer - * @nodedev_name: Node device to lookup - * - * Lookup the node device by name and return the parent name - * - * Returns parent name on success, caller is responsible for freeing; - * otherwise, returns NULL on failure - */ -char * -virNodeDeviceGetParentName(virConnectPtr conn, - const char *nodedev_name) -{ - virNodeDevicePtr device = NULL; - char *parent; - - if (!(device = virNodeDeviceLookupByName(conn, nodedev_name))) { - virReportError(VIR_ERR_XML_ERROR, - _("Cannot find '%s' in node device database"), - nodedev_name); - return NULL; - } - - ignore_value(VIR_STRDUP(parent, virNodeDeviceGetParent(device))); - virObjectUnref(device); - - return parent; -} - - -/** - * @fchost: Pointer to vHBA adapter - * - * Create a vHBA for Storage. This code accomplishes this via searching - * through the sysfs for scsi_host/fc_host in order to first ensure some - * vHBA doesn't already exist for the requested wwnn/wwpn (e.g. an unmanaged - * vHBA) and to search for the parent vport capable scsi_host by name, - * wwnn/wwpn, or fabric_wwn (if provided). If no parent is provided, then - * a vport capable scsi_host will be selected. - * - * Returns vHBA name on success, NULL on failure with an error message set - */ -char * -virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost) -{ - unsigned int parent_host; - char *name = NULL; - char *parent_hoststr = NULL; - bool skip_capable_check = false; - - VIR_DEBUG("parent='%s', wwnn='%s' wwpn='%s'", - NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn); - - if (fchost->parent) { - if (VIR_STRDUP(parent_hoststr, fchost->parent) < 0) - goto cleanup; - } else if (fchost->parent_wwnn && fchost->parent_wwpn) { - if (!(parent_hoststr = virVHBAGetHostByWWN(NULL, fchost->parent_wwnn, - fchost->parent_wwpn))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("cannot find parent using provided wwnn/wwpn")); - goto cleanup; - } - } else if (fchost->parent_fabric_wwn) { - if (!(parent_hoststr = - virVHBAGetHostByFabricWWN(NULL, fchost->parent_fabric_wwn))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("cannot find parent using provided fabric_wwn")); - goto cleanup; - } - } else { - if (!(parent_hoststr = virVHBAFindVportHost(NULL))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("'parent' for vHBA not specified, and " - "cannot find one on this host")); - goto cleanup; - } - skip_capable_check = true; - } - - if (virSCSIHostGetNumber(parent_hoststr, &parent_host) < 0) - goto cleanup; - - /* NOTE: - * We do not save the parent_hoststr in fchost->parent since - * we could be writing out the 'def' to the saved XML config. - * If we wrote out the name in the XML, then future starts would - * always use the same parent rather than finding the "best available" - * parent. Besides we have a way to determine the parent based on - * the 'name' field. - */ - if (!skip_capable_check && !virVHBAPathExists(NULL, parent_host)) { - virReportError(VIR_ERR_XML_ERROR, - _("parent '%s' specified for vHBA does not exist"), - parent_hoststr); - goto cleanup; - } - - if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, - VPORT_CREATE) < 0) - goto cleanup; - - /* Let's ensure the device was created */ - virWaitForDevices(); - if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { - ignore_value(virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, - VPORT_DELETE)); - goto cleanup; - } - - cleanup: - VIR_FREE(parent_hoststr); - return name; -} - - -/** - * @conn: Connection pointer - * @fchost: Pointer to vHBA adapter - * - * As long as the vHBA is being managed, search for the scsi_host via the - * provided wwnn/wwpn and then find the corresponding parent scsi_host in - * order to send the delete request. - * - * Returns 0 on success, -1 on failure - */ -int -virNodeDeviceDeleteVport(virConnectPtr conn, - virStorageAdapterFCHostPtr fchost) -{ - char *name = NULL; - char *scsi_host_name = NULL; - unsigned int parent_host; - char *vhba_parent = NULL; - int ret = -1; - - VIR_DEBUG("conn=%p parent='%s', managed='%d' wwnn='%s' wwpn='%s'", - conn, NULLSTR(fchost->parent), fchost->managed, - fchost->wwnn, fchost->wwpn); - - /* If we're not managing the deletion of the vHBA, then just return */ - if (fchost->managed != VIR_TRISTATE_BOOL_YES) - return 0; - - /* Find our vHBA by searching the fc_host sysfs tree for our wwnn/wwpn */ - if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to find fc_host for wwnn='%s' and wwpn='%s'"), - fchost->wwnn, fchost->wwpn); - goto cleanup; - } - - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; - - /* If at startup time we provided a parent, then use that to - * get the parent_host value; otherwise, we have to determine - * the parent scsi_host which we did not save at startup time - */ - if (fchost->parent) { - /* Someone provided a parent string at startup time that - * was the same as the scsi_host - meaning we have a pool - * backed to an HBA, so there won't be a vHBA to delete */ - if (STREQ(scsi_host_name, fchost->parent)) { - ret = 0; - goto cleanup; - } - - if (virSCSIHostGetNumber(fchost->parent, &parent_host) < 0) - goto cleanup; - } else { - if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) - goto cleanup; - - /* If the parent is not a scsi_host, then this is a pool backed - * directly to an HBA and there's no vHBA to remove - so we're done */ - if (!STRPREFIX(vhba_parent, "scsi_host")) { - ret = 0; - goto cleanup; - } - - if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0) - goto cleanup; - } - - if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, - VPORT_DELETE) < 0) - goto cleanup; - - ret = 0; - - cleanup: - VIR_FREE(name); - VIR_FREE(vhba_parent); - VIR_FREE(scsi_host_name); - return ret; -} - - int virNodeDeviceUpdateCaps(virNodeDeviceDefPtr def) { diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 685ae30347..fde239183d 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -367,17 +367,6 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps); VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV | \ VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV) -char * -virNodeDeviceGetParentName(virConnectPtr conn, - const char *nodedev_name); - -char * -virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost); - -int -virNodeDeviceDeleteVport(virConnectPtr conn, - virStorageAdapterFCHostPtr fchost); - int virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host); diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c new file mode 100644 index 0000000000..d1d9c3ee49 --- /dev/null +++ b/src/conf/node_device_util.c @@ -0,0 +1,229 @@ +/* + * node_device_util.c: helper functions for the node device driver + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "internal.h" + +#include "node_device_util.h" +#include "virlog.h" +#include "virscsihost.h" +#include "virstring.h" +#include "virvhba.h" + +#define VIR_FROM_THIS VIR_FROM_NODEDEV + +VIR_LOG_INIT("node_device.node_device_util"); + +/* virNodeDeviceGetParentName + * @conn: Connection pointer + * @nodedev_name: Node device to lookup + * + * Lookup the node device by name and return the parent name + * + * Returns parent name on success, caller is responsible for freeing; + * otherwise, returns NULL on failure + */ +char * +virNodeDeviceGetParentName(virConnectPtr conn, + const char *nodedev_name) +{ + virNodeDevicePtr device = NULL; + char *parent; + + if (!(device = virNodeDeviceLookupByName(conn, nodedev_name))) { + virReportError(VIR_ERR_XML_ERROR, + _("Cannot find '%s' in node device database"), + nodedev_name); + return NULL; + } + + ignore_value(VIR_STRDUP(parent, virNodeDeviceGetParent(device))); + virObjectUnref(device); + + return parent; +} + + +/** + * @fchost: Pointer to vHBA adapter + * + * Create a vHBA for Storage. This code accomplishes this via searching + * through the sysfs for scsi_host/fc_host in order to first ensure some + * vHBA doesn't already exist for the requested wwnn/wwpn (e.g. an unmanaged + * vHBA) and to search for the parent vport capable scsi_host by name, + * wwnn/wwpn, or fabric_wwn (if provided). If no parent is provided, then + * a vport capable scsi_host will be selected. + * + * Returns vHBA name on success, NULL on failure with an error message set + */ +char * +virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost) +{ + unsigned int parent_host; + char *name = NULL; + char *parent_hoststr = NULL; + bool skip_capable_check = false; + + VIR_DEBUG("parent='%s', wwnn='%s' wwpn='%s'", + NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn); + + if (fchost->parent) { + if (VIR_STRDUP(parent_hoststr, fchost->parent) < 0) + goto cleanup; + } else if (fchost->parent_wwnn && fchost->parent_wwpn) { + if (!(parent_hoststr = virVHBAGetHostByWWN(NULL, fchost->parent_wwnn, + fchost->parent_wwpn))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("cannot find parent using provided wwnn/wwpn")); + goto cleanup; + } + } else if (fchost->parent_fabric_wwn) { + if (!(parent_hoststr = + virVHBAGetHostByFabricWWN(NULL, fchost->parent_fabric_wwn))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("cannot find parent using provided fabric_wwn")); + goto cleanup; + } + } else { + if (!(parent_hoststr = virVHBAFindVportHost(NULL))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'parent' for vHBA not specified, and " + "cannot find one on this host")); + goto cleanup; + } + skip_capable_check = true; + } + + if (virSCSIHostGetNumber(parent_hoststr, &parent_host) < 0) + goto cleanup; + + /* NOTE: + * We do not save the parent_hoststr in fchost->parent since + * we could be writing out the 'def' to the saved XML config. + * If we wrote out the name in the XML, then future starts would + * always use the same parent rather than finding the "best available" + * parent. Besides we have a way to determine the parent based on + * the 'name' field. + */ + if (!skip_capable_check && !virVHBAPathExists(NULL, parent_host)) { + virReportError(VIR_ERR_XML_ERROR, + _("parent '%s' specified for vHBA does not exist"), + parent_hoststr); + goto cleanup; + } + + if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, + VPORT_CREATE) < 0) + goto cleanup; + + /* Let's ensure the device was created */ + virWaitForDevices(); + if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + ignore_value(virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, + VPORT_DELETE)); + goto cleanup; + } + + cleanup: + VIR_FREE(parent_hoststr); + return name; +} + + +/** + * @conn: Connection pointer + * @fchost: Pointer to vHBA adapter + * + * As long as the vHBA is being managed, search for the scsi_host via the + * provided wwnn/wwpn and then find the corresponding parent scsi_host in + * order to send the delete request. + * + * Returns 0 on success, -1 on failure + */ +int +virNodeDeviceDeleteVport(virConnectPtr conn, + virStorageAdapterFCHostPtr fchost) +{ + char *name = NULL; + char *scsi_host_name = NULL; + unsigned int parent_host; + char *vhba_parent = NULL; + int ret = -1; + + VIR_DEBUG("conn=%p parent='%s', managed='%d' wwnn='%s' wwpn='%s'", + conn, NULLSTR(fchost->parent), fchost->managed, + fchost->wwnn, fchost->wwpn); + + /* If we're not managing the deletion of the vHBA, then just return */ + if (fchost->managed != VIR_TRISTATE_BOOL_YES) + return 0; + + /* Find our vHBA by searching the fc_host sysfs tree for our wwnn/wwpn */ + if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to find fc_host for wwnn='%s' and wwpn='%s'"), + fchost->wwnn, fchost->wwpn); + goto cleanup; + } + + if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) + goto cleanup; + + /* If at startup time we provided a parent, then use that to + * get the parent_host value; otherwise, we have to determine + * the parent scsi_host which we did not save at startup time + */ + if (fchost->parent) { + /* Someone provided a parent string at startup time that + * was the same as the scsi_host - meaning we have a pool + * backed to an HBA, so there won't be a vHBA to delete */ + if (STREQ(scsi_host_name, fchost->parent)) { + ret = 0; + goto cleanup; + } + + if (virSCSIHostGetNumber(fchost->parent, &parent_host) < 0) + goto cleanup; + } else { + if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) + goto cleanup; + + /* If the parent is not a scsi_host, then this is a pool backed + * directly to an HBA and there's no vHBA to remove - so we're done */ + if (!STRPREFIX(vhba_parent, "scsi_host")) { + ret = 0; + goto cleanup; + } + + if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0) + goto cleanup; + } + + if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, + VPORT_DELETE) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(name); + VIR_FREE(vhba_parent); + VIR_FREE(scsi_host_name); + return ret; +} diff --git a/src/conf/node_device_util.h b/src/conf/node_device_util.h new file mode 100644 index 0000000000..5cb225d03e --- /dev/null +++ b/src/conf/node_device_util.h @@ -0,0 +1,35 @@ +/* + * node_device_util.h: utility functions for node device driver + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef __VIR_NODE_DEVICE_UTIL_H__ +# define __VIR_NODE_DEVICE_UTIL_H__ + +# include "conf/storage_adapter_conf.h" + +char * +virNodeDeviceGetParentName(virConnectPtr conn, + const char *nodedev_name); + +char * +virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost); + +int +virNodeDeviceDeleteVport(virConnectPtr conn, + virStorageAdapterFCHostPtr fchost); + +#endif /* __VIR_NODE_DEVICE_UTIL_H__ */ diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 0b3ba84af2..30aabb2b37 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -22,6 +22,7 @@ #include "datatypes.h" #include "node_device_conf.h" +#include "node_device_util.h" #include "virstorageobj.h" #include "viralloc.h" diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 335210c31d..2343a757c1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -722,14 +722,11 @@ virNodeDevCapsDefFree; virNodeDevCapTypeFromString; virNodeDevCapTypeToString; virNodeDeviceCapsListExport; -virNodeDeviceCreateVport; virNodeDeviceDefFormat; virNodeDeviceDefFree; virNodeDeviceDefParseFile; virNodeDeviceDefParseNode; virNodeDeviceDefParseString; -virNodeDeviceDeleteVport; -virNodeDeviceGetParentName; virNodeDeviceGetPCIDynamicCaps; virNodeDeviceGetSCSIHostCaps; virNodeDeviceGetSCSITargetCaps; @@ -742,6 +739,10 @@ virNodeDeviceEventLifecycleNew; virNodeDeviceEventStateRegisterID; virNodeDeviceEventUpdateNew; +# conf/node_device_util.h +virNodeDeviceCreateVport; +virNodeDeviceDeleteVport; +virNodeDeviceGetParentName; # conf/numa_conf.h virDomainMemoryAccessTypeFromString; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index c46d0fbe12..0bcb3de053 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -37,6 +37,7 @@ #include "node_device_event.h" #include "node_device_driver.h" #include "node_device_hal.h" +#include "node_device_util.h" #include "virvhba.h" #include "viraccessapicheck.h" #include "virnetdev.h" diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 7c927c4d95..fe3a1e36ac 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -35,6 +35,7 @@ #include "virstring.h" #include "storage_util.h" #include "node_device_conf.h" +#include "node_device_util.h" #include "driver.h" #define VIR_FROM_THIS VIR_FROM_STORAGE -- 2.19.1

2 2

[libvirt] [PATCH] bt: Mark the bluetooth subsystem as deprecated
by Thomas Huth 12 Nov '18

12 Nov '18

It has been unmaintained since years, and there were only trivial or tree-wide changes to the related files since many years, so the code is likely very bitrotten and broken. For example the following segfaults as soon as as you press a key: qemu-system-x86_64 -usb -device usb-bt-dongle -bt hci -bt device:keyboard Since we are not aware of anybody using bluetooth with the current version of QEMU, let's mark the subsystem as deprecated, with a special request for the users to write to the qemu-devel mailing list in case they still use it (so we could revert the deprecation status in that case). Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- qemu-deprecated.texi | 7 +++++++ qemu-options.hx | 4 ++++ vl.c | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 5d2d7a3..cb4291f 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -128,6 +128,13 @@ The @option{[hub_id name]} parameter tuple of the 'hostfwd_add' and The ``ivshmem'' device type is replaced by either the ``ivshmem-plain'' or ``ivshmem-doorbell`` device types. +@subsection bluetooth (since 3.1) + +The bluetooth subsystem is unmaintained since many years and likely bitrotten +quite a bit. It will be removed without replacement unless some users speaks +up at the @email{qemu-devel@@nongnu.org} mailing list with information about +their usecases. + @section System emulator machines @subsection pc-0.10 and pc-0.11 (since 3.0) diff --git a/qemu-options.hx b/qemu-options.hx index 38c7a97..ee379b3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2772,6 +2772,10 @@ logic. The Transport Layer is decided by the machine type. Currently the machines @code{n800} and @code{n810} have one HCI and all other machines have none. +Note: This option and the whole bluetooth subsystem is considered as deprecated. +If you still use it, please send a mail to @email{qemu-devel@@nongnu.org} where +you describe your usecase. + @anchor{bt-hcis} The following three types are recognized: diff --git a/vl.c b/vl.c index 55bab00..fa25d1a 100644 --- a/vl.c +++ b/vl.c @@ -3269,6 +3269,10 @@ int main(int argc, char **argv, char **envp) break; #endif case QEMU_OPTION_bt: + warn_report("The bluetooth subsystem is deprecated and will " + "be removed soon. If the bluetooth subsystem is " + "still useful for you, please send a mail to " + "qemu-devel(a)nongnu.org with your usecase."); add_device_config(DEV_BT, optarg); break; case QEMU_OPTION_audio_help: -- 1.8.3.1

4 3

[libvirt] [PATCHv7 00/18] Introduce x86 Cache Monitoring Technology (CMT)
by Wang Huaqiang 12 Nov '18

12 Nov '18

This series of patches and the series already been merged introduce the x86 Cache Monitoring Technology (CMT) to libvirt by interacting with kernel resource control (resctrl) interface. CMT is one of the Intel(R) x86 CPU feature which belongs to the Resource Director Technology (RDT). CMT reports the occupancy of the last level cache, which is shared by all CPU cores. In the v1 series, an original and complete feature for CMT was introduced The v2 and v3 patches address the feature for the host capability of CMT. v4 is addressing the feature for monitoring VM vcpu thread set cache occupancy and reporting it through a virsh command. We have serval discussion about the enabling of CMT, please refer to following links for the RFCs. RFCv3 https://www.redhat.com/archives/libvir-list/2018-August/msg01213.html RFCv2 https://www.redhat.com/archives/libvir-list/2018-July/msg00409.html https://www.redhat.com/archives/libvir-list/2018-July/msg01241.html RFCv1 https://www.redhat.com/archives/libvir-list/2018-June/msg00674.html And the merged commits are list as below, for host capability of CMT. 6af8417415508c31f8ce71234b573b4999f35980 8f6887998bf63594ae26e3db18d4d5896c5f2cb4 58fcee6f3a2b7e89c21c1fb4ec21429c31a0c5b8 12093f1feaf8f5023dcd9d65dff111022842183d a5d293c18831dcf69ec6195798387fbb70c9f461 1. About reason why CMT is necessary in libvirt? The perf events of 'CMT, MBML, MBMT' have been phased out since Linux kernel commit c39a0e2c8850f08249383f2425dbd8dbe4baad69, in libvirt the perf based cmt,mbm will not work with the latest linux kernel. These patches add CMT feature to libvirt through kernel resctrlfs interface. 2 Create cache monitoring group (cache monitor). The main interface for creating monitoring group is through XML file. The proposed configuration is like: <cputune> <cachetune vcpus='1'> <cache id='0' level='3' type='code' size='7680' unit='KiB'/> <cache id='1' level='3' type='data' size='3840' unit='KiB'/> + <monitor level='3' vcpus='1'/> </cachetune> <cachetune vcpus='4-7'> + <monitor level='3' vcpus='4-6'/> </cachetune> </cputune> In above XML, created 2 cache resctrl allocation groups and 2 resctrl monitoring groups. The changes of cache monitor will be effective in next booting of VM. 2 Show CMT result through command 'domstats' Adding the interface in qemu to report this information for resource monitor group through command 'virsh domstats --cpu-total'. Below is a typical output: # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.monitor.0.name=vcpus_1 cpu.cache.monitor.0.vcpus=1 cpu.cache.monitor.0.bank.count=2 cpu.cache.monitor.0.bank.0.id=0 cpu.cache.monitor.0.bank.0.bytes=4505600 cpu.cache.monitor.0.bank.1.id=1 cpu.cache.monitor.0.bank.1.bytes=5586944 cpu.cache.monitor.1.name=vcpus_4-6 cpu.cache.monitor.1.vcpus=4,5,6 cpu.cache.monitor.1.bank.count=2 cpu.cache.monitor.1.bank.0.id=0 cpu.cache.monitor.1.bank.0.bytes=17571840 cpu.cache.monitor.1.bank.1.id=1 cpu.cache.monitor.1.bank.1.bytes=29106176 Changes in v7: - Add several lines removed by mistake. Changes in v6: - Addressing John's review comments for v5. - Removed and cleaned the concepts of 'default allocation' and 'default monitor'. - qemu: virsh domstats --cpu-total output for CMT, add identifier 'monitor' for each itm. Changes in v5: - qemu: Setting up vcpu and adding pids to resctrl monitor groups during re-connection. - Add the document for domain configuration related to resctrl monitor. Changes in v4: v4 is addressing the feature for monitoring VM vcpu thread set cache occupancy and reporting it through a virsh command. - Introduced resctrl default allocation - Introduced resctrl monitor and default monitor Changes in v3: - Addressed John Ferlan's review. - Typo fixed. - Removed VIR_ENUM_DECL(virMonitor); Changes in v2: - Introduced MBM capability. - Capability layout changed * Moved <monitor> from cahe <bank> to <cache> * Renamed <Threshold> to <reuseThreshold> - Document for 'reuseThreshold' changed. - Introduced API virResctrlInfoGetMonitorPrefix - Added more tests, covering standalone CMT, fake new feature. - Creating CMT resource control group will be subsequent job. Wang Huaqiang (18): docs,util: Refactor schemas and virresctrl to support optional cache util: Introduce resctrl monitor for CMT util: Refactor code for determining allocation path util: Add interface to determine monitor path util: Refactor code for adding PID to the resource group util: Add interface for adding PID to the monitor util: Refactor code for creating resctrl group util: Add interface for creating monitor group util: Add more interfaces for resctrl monitor conf: Remove virDomainResctrlAppend and introduce virDomainResctrlNew conf: move virResctrlAllocIsEmpty to a place a litter lower conf: Introduce cache monitor element in cachetune qemu: enable resctrl monitor in qemu util: Add function for checking if monitor is running conf: Add 'id' to virDomainResctrlDef qemu: refactor qemuDomainGetStatsCpu qemu: Report cache occupancy (CMT) with domstats qemu: Setting up vcpu and adding pids to resctrl monitor groups during reconnection docs/formatdomain.html.in | 30 +- docs/schemas/domaincommon.rng | 14 +- src/conf/domain_conf.c | 310 ++++++++++-- src/conf/domain_conf.h | 12 + src/libvirt-domain.c | 9 + src/libvirt_private.syms | 11 + src/qemu/qemu_driver.c | 270 +++++++++- src/qemu/qemu_process.c | 69 ++- src/util/virresctrl.c | 560 +++++++++++++++++++-- src/util/virresctrl.h | 49 ++ tests/genericxml2xmlindata/cachetune-cdp.xml | 3 + .../cachetune-colliding-monitor.xml | 30 ++ tests/genericxml2xmlindata/cachetune-small.xml | 7 + tests/genericxml2xmltest.c | 2 + 14 files changed, 1283 insertions(+), 93 deletions(-) create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-monitor.xml -- 2.7.4

4 66

[libvirt] [PATCH] nodedev: Add new module node_device_util
by Erik Skultety 12 Nov '18

12 Nov '18

There's a lot of stuff going on in src/conf/nodedev_conf which not always has to do anything with config, so even though we're trying, we're not really consistent in putting only parser/formatter related stuff here like we do for domains. So, start the cleanup simply by adding a new module to the nodedev driver and put a few helper APIs which want to open a secondary driver connection in there (similar to storage_util module). Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- I verified the build with debian 9, centos 7, fedora 28, rawhide, and freebsd 11 src/conf/Makefile.inc.am | 1 + src/conf/node_device_conf.c | 199 ----------------------- src/conf/node_device_conf.h | 11 -- src/conf/virstorageobj.c | 1 + src/libvirt_private.syms | 8 +- src/node_device/Makefile.inc.am | 17 +- src/node_device/node_device_driver.c | 1 + src/node_device/node_device_util.c | 229 +++++++++++++++++++++++++++ src/node_device/node_device_util.h | 35 ++++ src/storage/Makefile.inc.am | 1 + src/storage/storage_backend_scsi.c | 1 + 11 files changed, 290 insertions(+), 214 deletions(-) create mode 100644 src/node_device/node_device_util.c create mode 100644 src/node_device/node_device_util.h diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am index af23810640..7cb6c29d70 100644 --- a/src/conf/Makefile.inc.am +++ b/src/conf/Makefile.inc.am @@ -163,6 +163,7 @@ libvirt_la_BUILT_LIBADD += libvirt_conf.la libvirt_conf_la_SOURCES = $(CONF_SOURCES) libvirt_conf_la_CFLAGS = \ -I$(srcdir)/conf \ + -I$(srcdir)/node_device \ $(AM_CFLAGS) \ $(NULL) libvirt_conf_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 03bd794dc0..74a7bc3933 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2220,205 +2220,6 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) } -/* virNodeDeviceGetParentName - * @conn: Connection pointer - * @nodedev_name: Node device to lookup - * - * Lookup the node device by name and return the parent name - * - * Returns parent name on success, caller is responsible for freeing; - * otherwise, returns NULL on failure - */ -char * -virNodeDeviceGetParentName(virConnectPtr conn, - const char *nodedev_name) -{ - virNodeDevicePtr device = NULL; - char *parent; - - if (!(device = virNodeDeviceLookupByName(conn, nodedev_name))) { - virReportError(VIR_ERR_XML_ERROR, - _("Cannot find '%s' in node device database"), - nodedev_name); - return NULL; - } - - ignore_value(VIR_STRDUP(parent, virNodeDeviceGetParent(device))); - virObjectUnref(device); - - return parent; -} - - -/** - * @fchost: Pointer to vHBA adapter - * - * Create a vHBA for Storage. This code accomplishes this via searching - * through the sysfs for scsi_host/fc_host in order to first ensure some - * vHBA doesn't already exist for the requested wwnn/wwpn (e.g. an unmanaged - * vHBA) and to search for the parent vport capable scsi_host by name, - * wwnn/wwpn, or fabric_wwn (if provided). If no parent is provided, then - * a vport capable scsi_host will be selected. - * - * Returns vHBA name on success, NULL on failure with an error message set - */ -char * -virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost) -{ - unsigned int parent_host; - char *name = NULL; - char *parent_hoststr = NULL; - bool skip_capable_check = false; - - VIR_DEBUG("parent='%s', wwnn='%s' wwpn='%s'", - NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn); - - if (fchost->parent) { - if (VIR_STRDUP(parent_hoststr, fchost->parent) < 0) - goto cleanup; - } else if (fchost->parent_wwnn && fchost->parent_wwpn) { - if (!(parent_hoststr = virVHBAGetHostByWWN(NULL, fchost->parent_wwnn, - fchost->parent_wwpn))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("cannot find parent using provided wwnn/wwpn")); - goto cleanup; - } - } else if (fchost->parent_fabric_wwn) { - if (!(parent_hoststr = - virVHBAGetHostByFabricWWN(NULL, fchost->parent_fabric_wwn))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("cannot find parent using provided fabric_wwn")); - goto cleanup; - } - } else { - if (!(parent_hoststr = virVHBAFindVportHost(NULL))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("'parent' for vHBA not specified, and " - "cannot find one on this host")); - goto cleanup; - } - skip_capable_check = true; - } - - if (virSCSIHostGetNumber(parent_hoststr, &parent_host) < 0) - goto cleanup; - - /* NOTE: - * We do not save the parent_hoststr in fchost->parent since - * we could be writing out the 'def' to the saved XML config. - * If we wrote out the name in the XML, then future starts would - * always use the same parent rather than finding the "best available" - * parent. Besides we have a way to determine the parent based on - * the 'name' field. - */ - if (!skip_capable_check && !virVHBAPathExists(NULL, parent_host)) { - virReportError(VIR_ERR_XML_ERROR, - _("parent '%s' specified for vHBA does not exist"), - parent_hoststr); - goto cleanup; - } - - if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, - VPORT_CREATE) < 0) - goto cleanup; - - /* Let's ensure the device was created */ - virWaitForDevices(); - if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { - ignore_value(virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, - VPORT_DELETE)); - goto cleanup; - } - - cleanup: - VIR_FREE(parent_hoststr); - return name; -} - - -/** - * @conn: Connection pointer - * @fchost: Pointer to vHBA adapter - * - * As long as the vHBA is being managed, search for the scsi_host via the - * provided wwnn/wwpn and then find the corresponding parent scsi_host in - * order to send the delete request. - * - * Returns 0 on success, -1 on failure - */ -int -virNodeDeviceDeleteVport(virConnectPtr conn, - virStorageAdapterFCHostPtr fchost) -{ - char *name = NULL; - char *scsi_host_name = NULL; - unsigned int parent_host; - char *vhba_parent = NULL; - int ret = -1; - - VIR_DEBUG("conn=%p parent='%s', managed='%d' wwnn='%s' wwpn='%s'", - conn, NULLSTR(fchost->parent), fchost->managed, - fchost->wwnn, fchost->wwpn); - - /* If we're not managing the deletion of the vHBA, then just return */ - if (fchost->managed != VIR_TRISTATE_BOOL_YES) - return 0; - - /* Find our vHBA by searching the fc_host sysfs tree for our wwnn/wwpn */ - if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to find fc_host for wwnn='%s' and wwpn='%s'"), - fchost->wwnn, fchost->wwpn); - goto cleanup; - } - - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; - - /* If at startup time we provided a parent, then use that to - * get the parent_host value; otherwise, we have to determine - * the parent scsi_host which we did not save at startup time - */ - if (fchost->parent) { - /* Someone provided a parent string at startup time that - * was the same as the scsi_host - meaning we have a pool - * backed to an HBA, so there won't be a vHBA to delete */ - if (STREQ(scsi_host_name, fchost->parent)) { - ret = 0; - goto cleanup; - } - - if (virSCSIHostGetNumber(fchost->parent, &parent_host) < 0) - goto cleanup; - } else { - if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) - goto cleanup; - - /* If the parent is not a scsi_host, then this is a pool backed - * directly to an HBA and there's no vHBA to remove - so we're done */ - if (!STRPREFIX(vhba_parent, "scsi_host")) { - ret = 0; - goto cleanup; - } - - if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0) - goto cleanup; - } - - if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, - VPORT_DELETE) < 0) - goto cleanup; - - ret = 0; - - cleanup: - VIR_FREE(name); - VIR_FREE(vhba_parent); - VIR_FREE(scsi_host_name); - return ret; -} - - int virNodeDeviceUpdateCaps(virNodeDeviceDefPtr def) { diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 685ae30347..fde239183d 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -367,17 +367,6 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps); VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV | \ VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV) -char * -virNodeDeviceGetParentName(virConnectPtr conn, - const char *nodedev_name); - -char * -virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost); - -int -virNodeDeviceDeleteVport(virConnectPtr conn, - virStorageAdapterFCHostPtr fchost); - int virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host); diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 0b3ba84af2..30aabb2b37 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -22,6 +22,7 @@ #include "datatypes.h" #include "node_device_conf.h" +#include "node_device_util.h" #include "virstorageobj.h" #include "viralloc.h" diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 335210c31d..e2f10acff4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -722,14 +722,11 @@ virNodeDevCapsDefFree; virNodeDevCapTypeFromString; virNodeDevCapTypeToString; virNodeDeviceCapsListExport; -virNodeDeviceCreateVport; virNodeDeviceDefFormat; virNodeDeviceDefFree; virNodeDeviceDefParseFile; virNodeDeviceDefParseNode; virNodeDeviceDefParseString; -virNodeDeviceDeleteVport; -virNodeDeviceGetParentName; virNodeDeviceGetPCIDynamicCaps; virNodeDeviceGetSCSIHostCaps; virNodeDeviceGetSCSITargetCaps; @@ -1317,6 +1314,11 @@ virLogManagerFree; virLogManagerNew; +# node_device/node_device_util.h +virNodeDeviceCreateVport; +virNodeDeviceDeleteVport; +virNodeDeviceGetParentName; + # secret/secret_util.h virSecretGetSecretString; diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 0c3ad51273..f7aec97ba9 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -3,6 +3,11 @@ NODE_DEVICE_DRIVER_SOURCES = \ node_device/node_device_driver.h \ $(NULL) +NODE_DEVICE_UTIL_SOURCES = \ + node_device/node_device_util.h \ + node_device/node_device_util.c \ + $(NULL) + NODE_DEVICE_DRIVER_HAL_SOURCES = \ node_device/node_device_hal.c \ node_device/node_device_hal.h \ @@ -17,6 +22,7 @@ DRIVER_SOURCE_FILES += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NODE_DEVICE_UTIL_SOURCES) \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ @@ -27,13 +33,22 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NODE_DEVICE_UTIL_SOURCES) \ $(NULL) +noinst_LTLIBRARIES += libvirt_nodedev.la +libvirt_la_BUILT_LIBADD += libvirt_nodedev.la +libvirt_nodedev_la_CFLAGS = $(AM_CFLAGS) +libvirt_nodedev_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_nodedev_la_SOURCES = $(NODE_DEVICE_UTIL_SOURCES) if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals mod_LTLIBRARIES += libvirt_driver_nodedev.la -libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) +libvirt_driver_nodedev_la_SOURCES = \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NODE_DEVICE_UTIL_SOURCES) \ + $(NULL) libvirt_driver_nodedev_la_CFLAGS = \ -I$(srcdir)/access \ diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index c46d0fbe12..0bcb3de053 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -37,6 +37,7 @@ #include "node_device_event.h" #include "node_device_driver.h" #include "node_device_hal.h" +#include "node_device_util.h" #include "virvhba.h" #include "viraccessapicheck.h" #include "virnetdev.h" diff --git a/src/node_device/node_device_util.c b/src/node_device/node_device_util.c new file mode 100644 index 0000000000..d1d9c3ee49 --- /dev/null +++ b/src/node_device/node_device_util.c @@ -0,0 +1,229 @@ +/* + * node_device_util.c: helper functions for the node device driver + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "internal.h" + +#include "node_device_util.h" +#include "virlog.h" +#include "virscsihost.h" +#include "virstring.h" +#include "virvhba.h" + +#define VIR_FROM_THIS VIR_FROM_NODEDEV + +VIR_LOG_INIT("node_device.node_device_util"); + +/* virNodeDeviceGetParentName + * @conn: Connection pointer + * @nodedev_name: Node device to lookup + * + * Lookup the node device by name and return the parent name + * + * Returns parent name on success, caller is responsible for freeing; + * otherwise, returns NULL on failure + */ +char * +virNodeDeviceGetParentName(virConnectPtr conn, + const char *nodedev_name) +{ + virNodeDevicePtr device = NULL; + char *parent; + + if (!(device = virNodeDeviceLookupByName(conn, nodedev_name))) { + virReportError(VIR_ERR_XML_ERROR, + _("Cannot find '%s' in node device database"), + nodedev_name); + return NULL; + } + + ignore_value(VIR_STRDUP(parent, virNodeDeviceGetParent(device))); + virObjectUnref(device); + + return parent; +} + + +/** + * @fchost: Pointer to vHBA adapter + * + * Create a vHBA for Storage. This code accomplishes this via searching + * through the sysfs for scsi_host/fc_host in order to first ensure some + * vHBA doesn't already exist for the requested wwnn/wwpn (e.g. an unmanaged + * vHBA) and to search for the parent vport capable scsi_host by name, + * wwnn/wwpn, or fabric_wwn (if provided). If no parent is provided, then + * a vport capable scsi_host will be selected. + * + * Returns vHBA name on success, NULL on failure with an error message set + */ +char * +virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost) +{ + unsigned int parent_host; + char *name = NULL; + char *parent_hoststr = NULL; + bool skip_capable_check = false; + + VIR_DEBUG("parent='%s', wwnn='%s' wwpn='%s'", + NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn); + + if (fchost->parent) { + if (VIR_STRDUP(parent_hoststr, fchost->parent) < 0) + goto cleanup; + } else if (fchost->parent_wwnn && fchost->parent_wwpn) { + if (!(parent_hoststr = virVHBAGetHostByWWN(NULL, fchost->parent_wwnn, + fchost->parent_wwpn))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("cannot find parent using provided wwnn/wwpn")); + goto cleanup; + } + } else if (fchost->parent_fabric_wwn) { + if (!(parent_hoststr = + virVHBAGetHostByFabricWWN(NULL, fchost->parent_fabric_wwn))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("cannot find parent using provided fabric_wwn")); + goto cleanup; + } + } else { + if (!(parent_hoststr = virVHBAFindVportHost(NULL))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'parent' for vHBA not specified, and " + "cannot find one on this host")); + goto cleanup; + } + skip_capable_check = true; + } + + if (virSCSIHostGetNumber(parent_hoststr, &parent_host) < 0) + goto cleanup; + + /* NOTE: + * We do not save the parent_hoststr in fchost->parent since + * we could be writing out the 'def' to the saved XML config. + * If we wrote out the name in the XML, then future starts would + * always use the same parent rather than finding the "best available" + * parent. Besides we have a way to determine the parent based on + * the 'name' field. + */ + if (!skip_capable_check && !virVHBAPathExists(NULL, parent_host)) { + virReportError(VIR_ERR_XML_ERROR, + _("parent '%s' specified for vHBA does not exist"), + parent_hoststr); + goto cleanup; + } + + if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, + VPORT_CREATE) < 0) + goto cleanup; + + /* Let's ensure the device was created */ + virWaitForDevices(); + if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + ignore_value(virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, + VPORT_DELETE)); + goto cleanup; + } + + cleanup: + VIR_FREE(parent_hoststr); + return name; +} + + +/** + * @conn: Connection pointer + * @fchost: Pointer to vHBA adapter + * + * As long as the vHBA is being managed, search for the scsi_host via the + * provided wwnn/wwpn and then find the corresponding parent scsi_host in + * order to send the delete request. + * + * Returns 0 on success, -1 on failure + */ +int +virNodeDeviceDeleteVport(virConnectPtr conn, + virStorageAdapterFCHostPtr fchost) +{ + char *name = NULL; + char *scsi_host_name = NULL; + unsigned int parent_host; + char *vhba_parent = NULL; + int ret = -1; + + VIR_DEBUG("conn=%p parent='%s', managed='%d' wwnn='%s' wwpn='%s'", + conn, NULLSTR(fchost->parent), fchost->managed, + fchost->wwnn, fchost->wwpn); + + /* If we're not managing the deletion of the vHBA, then just return */ + if (fchost->managed != VIR_TRISTATE_BOOL_YES) + return 0; + + /* Find our vHBA by searching the fc_host sysfs tree for our wwnn/wwpn */ + if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to find fc_host for wwnn='%s' and wwpn='%s'"), + fchost->wwnn, fchost->wwpn); + goto cleanup; + } + + if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) + goto cleanup; + + /* If at startup time we provided a parent, then use that to + * get the parent_host value; otherwise, we have to determine + * the parent scsi_host which we did not save at startup time + */ + if (fchost->parent) { + /* Someone provided a parent string at startup time that + * was the same as the scsi_host - meaning we have a pool + * backed to an HBA, so there won't be a vHBA to delete */ + if (STREQ(scsi_host_name, fchost->parent)) { + ret = 0; + goto cleanup; + } + + if (virSCSIHostGetNumber(fchost->parent, &parent_host) < 0) + goto cleanup; + } else { + if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) + goto cleanup; + + /* If the parent is not a scsi_host, then this is a pool backed + * directly to an HBA and there's no vHBA to remove - so we're done */ + if (!STRPREFIX(vhba_parent, "scsi_host")) { + ret = 0; + goto cleanup; + } + + if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0) + goto cleanup; + } + + if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, + VPORT_DELETE) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(name); + VIR_FREE(vhba_parent); + VIR_FREE(scsi_host_name); + return ret; +} diff --git a/src/node_device/node_device_util.h b/src/node_device/node_device_util.h new file mode 100644 index 0000000000..5cb225d03e --- /dev/null +++ b/src/node_device/node_device_util.h @@ -0,0 +1,35 @@ +/* + * node_device_util.h: utility functions for node device driver + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef __VIR_NODE_DEVICE_UTIL_H__ +# define __VIR_NODE_DEVICE_UTIL_H__ + +# include "conf/storage_adapter_conf.h" + +char * +virNodeDeviceGetParentName(virConnectPtr conn, + const char *nodedev_name); + +char * +virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost); + +int +virNodeDeviceDeleteVport(virConnectPtr conn, + virStorageAdapterFCHostPtr fchost); + +#endif /* __VIR_NODE_DEVICE_UTIL_H__ */ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index b4400b556f..c1fd8cc7b3 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -221,6 +221,7 @@ if WITH_STORAGE_SCSI libvirt_storage_backend_scsi_la_SOURCES = $(STORAGE_DRIVER_SCSI_SOURCES) libvirt_storage_backend_scsi_la_CFLAGS = \ -I$(srcdir)/conf \ + -I$(srcdir)/node_device \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 7c927c4d95..fe3a1e36ac 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -35,6 +35,7 @@ #include "virstring.h" #include "storage_util.h" #include "node_device_conf.h" +#include "node_device_util.h" #include "driver.h" #define VIR_FROM_THIS VIR_FROM_STORAGE -- 2.17.2

2 2