On Wed, Jun 26, 2019 at 04:54:40PM +0100, Daniel P. Berrangé wrote: This is a followup to commit 215d9393bb60615f957f456fec646cf187fec26e qemu: driver: Drop support for qemu-attach which also introduced an exception for domainQemuAttach in src/check-aclrules.pl: diff --git a/src/check-aclrules.pl b/src/check-aclrules.pl index be618f6c9f..23872cda98 100755 --- a/src/check-aclrules.pl +++ b/src/check-aclrules.pl @@ -61,7 +61,6 @@ my %whitelist = ( "interfaceClose" => 1, "connectURIProbe" => 1, "localOnly" => 1, - "domainQemuAttach" => 1, ); # XXX this vzDomainMigrateConfirm3Params looks Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; Jano

On Thu, 2019-06-27 at 08:02 +0200, Peter Krempa wrote: FWIW, I completely agree with Peter. -- Andrea Bolognani / Red Hat / Virtualization

This reverts commit 226094fbc483128c8888f4171c353aed738b8346. A deprecation is a warning to something that use of a feature is being discouraged. By definition it is not an error condition to continue to use a deprecated feature. A VIR_ERR_DEPRECATED constant thus makes no conceptual sense. For features which are entirely absent we already document that the VIR_ERR_NO_SUPPORT code will be used. There is no need to distinguish between a feature which never existed and a feature which previously existed and was since removed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- include/libvirt/virterror.h | 1 - src/util/virerror.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 22bc3c2d27..102a2573bf 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -329,7 +329,6 @@ typedef enum { VIR_ERR_INVALID_NETWORK_PORT = 105, /* invalid network port object */ VIR_ERR_NETWORK_PORT_EXIST = 106, /* the network port already exist */ VIR_ERR_NO_NETWORK_PORT = 107, /* network port not found */ - VIR_ERR_DEPRECATED = 108, /* configuration or operation is no longer supported */ # ifdef VIR_ENUM_SENTINELS VIR_ERR_NUMBER_LAST diff --git a/src/util/virerror.c b/src/util/virerror.c index 26f14ddd29..dfba8c5712 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1235,10 +1235,6 @@ const virErrorMsgTuple virErrorMsgStrings[VIR_ERR_NUMBER_LAST] = { [VIR_ERR_NO_NETWORK_PORT] = { N_("network port not found"), N_("network port not found: %s") }, - [VIR_ERR_DEPRECATED] = { - N_("operation or configuration no longer supported"), - "%s", - }, }; -- 2.21.0

This reverts commit 71626402f481ed47ff67dafa8521b01a42625707. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- docs/libvirt.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/libvirt.css b/docs/libvirt.css index 6639b1df64..54d015db98 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -274,12 +274,6 @@ span.since { font-weight: bold; } -span.deprecated { - color: darkred; - font-style: italic; - font-weight: bold; -} - img.diagram { background: rgb(230,230,230); border: 2px dotted rgb(178,178,178); -- 2.21.0

On Wed, Jun 26, 2019 at 04:54:42PM +0100, Daniel P. Berrangé wrote: Also, this is used by docs/drvqemu.html.in, since: commit d127bc3ce6eaf4b48dd09305368ac6a727d5aecf docs: drvqemu: Add note about deprecation of domxml-from-native where we can either: a) drop the reference to the removed class b) drop the reference to the removed command b) somehow smells of rewriting history - it would be nice to keep the deprecation notice there at leastfor some time. OTOH, we have a lot of <span class="since"> elements with pre-historic libvirt versions I'm considering removing. Jano

This reverts commit fd14dfec88957599ac5cffa28ddb7b513f404d9d. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- docs/hvsupport.pl | 44 ++++++++++++++------------------------------ docs/libvirt.css | 4 ---- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 2ea245e83a..a2b980c502 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -234,11 +234,10 @@ foreach my $src (@srcs) { } } else { - if ($line =~ m!\s*\.(\w+)\s*=\s*(\w+)\s*,?\s*(?:/\*\s*(\d+\.\d+\.\d+)\s*(?:\(deprecated:\s*(\d+\.\d+\.\d+)\))?\s*\*/\s*)?$!) { + if ($line =~ m!\s*\.(\w+)\s*=\s*(\w+)\s*,?\s*(?:/\*\s*(\d+\.\d+\.\d+)\s*\*/\s*)?$!) { my $api = $1; my $meth = $2; my $vers = $3; - my $depre = $4; next if $api eq "no" || $api eq "name"; @@ -252,16 +251,12 @@ foreach my $src (@srcs) { die "Found unexpected method $api in $ingrp\n"; } - $groups{$ingrp}->{drivers}->{$impl}->{$api} = {}; - $groups{$ingrp}->{drivers}->{$impl}->{$api}->{vers} = $vers; - $groups{$ingrp}->{drivers}->{$impl}->{$api}->{depre} = $depre; + $groups{$ingrp}->{drivers}->{$impl}->{$api} = $vers; if ($api eq "domainMigratePrepare" || $api eq "domainMigratePrepare2" || $api eq "domainMigratePrepare3") { - if (!$groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"}) { - $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"} = {}; - $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"}->{vers} = $vers; - } + $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"} = $vers + unless $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"}; } } elsif ($line =~ /}/) { @@ -285,7 +280,7 @@ $groups{virHypervisorDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate"; my $openAuthVers = (0 * 1000 * 1000) + (4 * 1000) + 0; foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) { - my $openVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"}->{vers}; + my $openVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"}; my $openVers; if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; @@ -295,16 +290,14 @@ foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) { $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"}; - $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = {}; - # virConnectOpenAuth is always 0.4.0 if the driver existed # before this time, otherwise it matches the version of # the driver's virConnectOpen entry if ($openVersStr eq "Y" || $openVers >= $openAuthVers) { - $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"}->{vers} = $openVersStr; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr; } else { - $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"}->{vers} = "0.4.0"; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0"; } } @@ -316,23 +309,21 @@ $groups{virHypervisorDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLi my $createAPIVers = (0 * 1000 * 1000) + (0 * 1000) + 3; foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) { - my $createVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateXML"}->{vers}; + my $createVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateXML"}; next unless defined $createVersStr; my $createVers; if ($createVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { $createVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; } - $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = {}; - # virCreateLinux is always 0.0.3 if the driver existed # before this time, otherwise it matches the version of # the driver's virCreateXML entry if ($createVersStr eq "Y" || $createVers >= $createAPIVers) { - $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"}->{vers} = $createVersStr; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; } else { - $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"}->{vers} = "0.0.3"; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; } } @@ -351,9 +342,7 @@ print <<EOF; <p> This page documents which <a href="html/">libvirt calls</a> work on which libvirt drivers / hypervisors, and which version the API appeared -in. If a hypervisor driver deprecated the API, the version when it -was removed is also mentioned (highlighted in -<span class="deprecatedhv">dark red</span>). +in. </p> EOF @@ -406,16 +395,11 @@ EOF EOF foreach my $drv (sort {$a cmp $b } keys %{$groups{$grp}->{drivers}}) { - print "<td>"; if (exists $groups{$grp}->{drivers}->{$drv}->{$field}) { - if ($groups{$grp}->{drivers}->{$drv}->{$field}->{vers}) { - print $groups{$grp}->{drivers}->{$drv}->{$field}->{vers}; - } - if ($groups{$grp}->{drivers}->{$drv}->{$field}->{depre}) { - print " - <span class=\"deprecatedhv\">", $groups{$grp}->{drivers}->{$drv}->{$field}->{depre}, "</span>"; - } + print "<td>", $groups{$grp}->{drivers}->{$drv}->{$field}, "</td>\n"; + } else { + print "<td></td>\n"; } - print "</td>\n"; } print <<EOF; diff --git a/docs/libvirt.css b/docs/libvirt.css index 54d015db98..3ae4ff7edc 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -582,10 +582,6 @@ td.enumvalue { display: inline; } -.deprecatedhv { - color: darkred; -} - ul.news-section-content { margin-top: 0.5em; } -- 2.21.0