[libvirt] [PATCH] libvirtd.conf: Drop max_requests

Since its introduction in f61341173bdaa2e0 it was never implemented nor there are plans to implement it. Drop it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- daemon/libvirtd-config.c | 3 --- daemon/libvirtd-config.h | 1 - daemon/libvirtd.aug | 1 - daemon/libvirtd.conf | 14 ++------------ daemon/test_libvirtd.aug.in | 1 - 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index db283a41f..19b3d168e 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -153,7 +153,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->prio_workers = 5; - data->max_requests = 20; data->max_client_requests = 5; data->audit_level = 1; @@ -348,8 +347,6 @@ daemonConfigLoadOptions(struct daemonConfig *data, if (virConfGetValueUInt(conf, "prio_workers", &data->prio_workers) < 0) goto error; - if (virConfGetValueUInt(conf, "max_requests", &data->max_requests) < 0) - goto error; if (virConfGetValueUInt(conf, "max_client_requests", &data->max_client_requests) < 0) goto error; diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index 1edf5fadb..d618c9660 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -71,7 +71,6 @@ struct daemonConfig { unsigned int prio_workers; - unsigned int max_requests; unsigned int max_client_requests; unsigned int log_level; diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index 24fdf445c..df310d876 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -60,7 +60,6 @@ module Libvirtd = | int_entry "max_clients" | int_entry "max_queued_clients" | int_entry "max_anonymous_clients" - | int_entry "max_requests" | int_entry "max_client_requests" | int_entry "prio_workers" diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index e83e9a1c1..8a1b3a92d 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -301,20 +301,10 @@ # (notably domainDestroy) can be executed in this pool. #prio_workers = 5 -# Total global limit on concurrent RPC calls. Should be -# at least as large as max_workers. Beyond this, RPC requests -# will be read into memory and queued. This directly impacts -# memory usage, currently each request requires 256 KB of -# memory. So by default up to 5 MB of memory is used -# -# XXX this isn't actually enforced yet, only the per-client -# limit is used so far -#max_requests = 20 - # Limit on concurrent requests from a single client # connection. To avoid one client monopolizing the server -# this should be a small fraction of the global max_requests -# and max_workers parameter +# this should be a small fraction of the global max_workers +# parameter. #max_client_requests = 5 # Same processing controls, but this time for the admin interface. diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in index 12009528f..b24b32e33 100644 --- a/daemon/test_libvirtd.aug.in +++ b/daemon/test_libvirtd.aug.in @@ -42,7 +42,6 @@ module Test_libvirtd = { "min_workers" = "5" } { "max_workers" = "20" } { "prio_workers" = "5" } - { "max_requests" = "20" } { "max_client_requests" = "5" } { "admin_min_workers" = "1" } { "admin_max_workers" = "5" } -- 2.13.0