mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-26 15:45:28 +00:00
55ea7be7d9
For stateless, client side drivers, it is never correct to
probe for secondary drivers. It is only ever appropriate to
use the secondary driver that is associated with the
hypervisor in question. As a result the ESX & HyperV drivers
have both been forced to do hacks where they register no-op
drivers for the ones they don't implement.
For stateful, server side drivers, we always just want to
use the same built-in shared driver. The exception is
virtualbox which is really a stateless driver and so wants
to use its own server side secondary drivers. To deal with
this virtualbox has to be built as 3 separate loadable
modules to allow registration to work in the right order.
This can all be simplified by introducing a new struct
recording the precise set of secondary drivers each
hypervisor driver wants
struct _virConnectDriver {
virHypervisorDriverPtr hypervisorDriver;
virInterfaceDriverPtr interfaceDriver;
virNetworkDriverPtr networkDriver;
virNodeDeviceDriverPtr nodeDeviceDriver;
virNWFilterDriverPtr nwfilterDriver;
virSecretDriverPtr secretDriver;
virStorageDriverPtr storageDriver;
};
Instead of registering the hypervisor driver, we now
just register a virConnectDriver instead. This allows
us to remove all probing of secondary drivers. Once we
have chosen the primary driver, we immediately know the
correct secondary drivers to use.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
80 lines
2.3 KiB
Perl
Executable File
80 lines
2.3 KiB
Perl
Executable File
#!/usr/bin/perl
|
|
#
|
|
# Copyright (C) 2013 Red Hat, Inc.
|
|
#
|
|
# 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/>.
|
|
#
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
my $intable = 0;
|
|
my $table;
|
|
my $mainprefix;
|
|
|
|
my $status = 0;
|
|
while (<>) {
|
|
if ($intable) {
|
|
if (/}/) {
|
|
$intable = 0;
|
|
$table = undef;
|
|
$mainprefix = undef;
|
|
} elsif (/\.(\w+)\s*=\s*(\w+),?/) {
|
|
my $api = $1;
|
|
my $impl = $2;
|
|
|
|
next if $api eq "no";
|
|
next if $api eq "name";
|
|
|
|
my $suffix = $impl;
|
|
my $prefix = $impl;
|
|
$prefix =~ s/^([a-z]+(?:Unified)?)(.*?)$/$1/;
|
|
|
|
if (defined $mainprefix) {
|
|
if ($mainprefix ne $prefix) {
|
|
print "$ARGV:$. Bad prefix '$prefix' for API '$api', expecting '$mainprefix'\n";
|
|
$status = 1;
|
|
}
|
|
} else {
|
|
$mainprefix = $prefix;
|
|
}
|
|
|
|
if ($api !~ /^$mainprefix/) {
|
|
$suffix =~ s/^[a-z]+(?:Unified)?//;
|
|
$suffix =~ s/^([A-Z]+)/lc $1/e;
|
|
}
|
|
|
|
if ($api ne $suffix) {
|
|
my $want = $api;
|
|
$want =~ s/^nwf/NWF/;
|
|
if ($api !~ /^$mainprefix/) {
|
|
$want =~ s/^([a-z])/uc $1/e;
|
|
$want = $mainprefix . $want;
|
|
}
|
|
print "$ARGV:$. Bad impl name '$impl' for API '$api', expecting '$want'\n";
|
|
$status = 1;
|
|
}
|
|
}
|
|
} elsif (/^(?:static\s+)?(vir(?:\w+)?Driver)\s+/) {
|
|
next if $1 eq "virNWFilterCallbackDriver" ||
|
|
$1 eq "virNWFilterTechDriver" ||
|
|
$1 eq "virConnectDriver";
|
|
$intable = 1;
|
|
$table = $1;
|
|
}
|
|
}
|
|
|
|
exit $status;
|