docs: Remove remaining references to OVS kmod and XenServer.

README file still mentions a kernel module and some parts of
the documentation still have XenServer references, e.g. 'xs-*'
database configuration options.  Removing them.

Fixes: 422e90437854 ("make: Remove the Linux datapath.")
Fixes: 83c9518e7c67 ("xenserver: Remove xenserver.")
Acked-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>

7 files changed, 23 insertions, 88 deletions

diff --git a/Documentation/ref/ovs-appctl.8.rst b/Documentation/ref/ovs-appctl.8.rst
index a488d9f48..3ce02e984 100644
--- a/Documentation/ref/ovs-appctl.8.rst
+++ b/Documentation/ref/ovs-appctl.8.rst
@@ -289,7 +289,7 @@ and adjusting log levels:
   The default pattern for console and file output is ``%D{%Y-%m-%dT
   %H:%M:%SZ}|%05N|%c|%p|%m``; for syslog output, ``%05N|%c|%p|%m``.
 
-  Daemons written in Python (e.g. ``ovs-xapi-sync``) do not allow
+  Daemons written in Python (e.g. ``ovs-monitor-ipsec``) do not allow
   control over the log pattern.
 
 * ``vlog/set FACILITY:<facility>``
diff --git a/README.rst b/README.rst
index 319f70515..8fe01f4cf 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,7 @@ Open vSwitch is well suited to function as a virtual switch in VM environments.
 In addition to exposing standard control and visibility interfaces to the
 virtual networking layer, it was designed to support distribution across
 multiple physical servers.  Open vSwitch supports multiple Linux-based
-virtualization technologies including Xen/XenServer, KVM, and VirtualBox.
+virtualization technologies including KVM, and VirtualBox.
 
 The bulk of the code is written in platform-independent C and is easily ported
 to other environments.  The current release of Open vSwitch supports the
@@ -43,8 +43,6 @@ following features:
 - Transactional configuration database with C and Python bindings
 - High-performance forwarding using a Linux kernel module
 
-The included Linux kernel module supports Linux 3.10 and up.
-
 Open vSwitch can also operate entirely in userspace without assistance from
 a kernel module.  This userspace implementation should be easier to port than
 the kernel-based switch. OVS in userspace can access Linux or DPDK devices.
@@ -61,10 +59,8 @@ The main components of this distribution are:
 - ovsdb-server, a lightweight database server that ovs-vswitchd queries to
   obtain its configuration.
 - ovs-dpctl, a tool for configuring the switch kernel module.
-- Scripts and specs for building RPMs for Citrix XenServer and Red Hat
-  Enterprise Linux.  The XenServer RPMs allow Open vSwitch to be installed on a
-  Citrix XenServer host as a drop-in replacement for its switch, with
-  additional functionality.
+- Scripts and specs for building RPMs for Red Hat Enterprise Linux and
+  deb packages for Ubuntu/Debian.
 - ovs-vsctl, a utility for querying and updating the configuration of
   ovs-vswitchd.
 - ovs-appctl, a utility that sends commands to running Open vSwitch daemons.
@@ -123,9 +119,6 @@ The following files are licensed under the 3-clause BSD-license
     include/windows/netinet/ip6.h
     lib/strsep.c
 
-Files under the xenserver directory are licensed on a file-by-file basis.
-Refer to each file for details.
-
 Files lib/sflow*.[ch] are licensed under the terms of either the
 Sun Industry Standards Source License 1.1, that is available at:
         http://host-sflow.sourceforge.net/sissl.html
diff --git a/debian/copyright.in b/debian/copyright.in
index ff38792d9..71e89c49c 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -109,15 +109,6 @@ Files:
 Copyright: (c) 2011 Nicira, Inc.
 License: LGPL-2.1
 
-Files: xenserver/etc_xensource_scripts_vif
- xenserver/opt_xensource_libexec_InterfaceReconfigure.py
- xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
- xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
- xenserver/opt_xensource_libexec_interface-reconfigure
- xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
-Copyright: (c) 2008,2009 Citrix Systems, Inc.
-License: LGPL-2.1-with-exception
-
 Files:
  lib/sflow.h
  lib/sflow_agent.c
diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
index fee0de853..856199875 100755
--- a/utilities/bugtool/ovs-bugtool.in
+++ b/utilities/bugtool/ovs-bugtool.in
@@ -658,8 +658,7 @@ exclude those logs from the archive.
         prefix_output(CAP_SYSTEM_LOGS, log, last_mod_time=log_last_mod_time)
 
     ovs_logs = ([OPENVSWITCH_LOG_DIR + x for x in
-        ['ovs-vswitchd.log', 'ovsdb-server.log',
-        'ovs-xapi-sync.log', 'ovs-ctl.log']])
+        ['ovs-vswitchd.log', 'ovsdb-server.log', 'ovs-ctl.log']])
     for log in ovs_logs:
         prefix_output(CAP_OPENVSWITCH_LOGS, log,
                       last_mod_time=log_last_mod_time)
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index e6e07f476..eba9512fe 100644
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -409,8 +409,8 @@ One of the following options is required for "start", "restart" and "force-reloa
   --system-id=random  use a random but persistent UUID to identify this system
 
 Other important options for "start", "restart" and "force-reload-kmod":
-  --system-type=TYPE  set system type (e.g. "XenServer")
-  --system-version=VERSION  set system version (e.g. "5.6.100-39265p")
+  --system-type=TYPE  set system type (e.g. "KVM")
+  --system-version=VERSION  set system version (e.g. "4.18.el8_6")
   --external-id="key=value"
                      add given key-value pair to Open_vSwitch external-ids
   --delete-bridges   delete all bridges just before starting ovs-vswitchd
diff --git a/utilities/ovs-testcontroller.8.in b/utilities/ovs-testcontroller.8.in
index 0f5c60344..b19ab7513 100644
--- a/utilities/ovs-testcontroller.8.in
+++ b/utilities/ovs-testcontroller.8.in
@@ -148,21 +148,6 @@ To bind locally to port 6653 (the default) and wait for incoming
 connections from OpenFlow switches:
 .IP
 \fB% ovs\-testcontroller ptcp:\fR
-.SH "BUGS"
-.PP
-Configuring a Citrix XenServer to connect to a particular controller
-only points the remote OVSDB management connection to that controller.
-It does not also configure OpenFlow connections, because the manager
-is expected to do that over the management protocol.
-\fBovs\-testcontroller\fR is not an Open vSwitch manager and does not know
-how to do that.
-.PP
-As a stopgap workaround, \fBovs\-vsctl\fR can wait for an OVSDB
-connection and set the controller, e.g.:
-.IP
-\fB% ovs\-vsctl \-t0 \-\-db=pssl: \-\-certificate=cert.pem
-\-\-ca\-cert=none \-\-private\-key=privkey.pem
-\-\-peer\-ca\-cert=cacert.pem set\-controller ssl:\fIip\fR
 .SH "SEE ALSO"
 .
 .BR ovs\-appctl (8),
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 4a9284f6b..36388e3c4 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -70,13 +70,6 @@
       <column name="external_ids" key="system-id">
         A unique identifier for the Open vSwitch's physical host.
         The form of the identifier depends on the type of the host.
-        On a Citrix XenServer, this will likely be the same as
-        <ref column="external_ids" key="xs-system-uuid"/>.
-      </column>
-
-      <column name="external_ids" key="xs-system-uuid">
-        The Citrix XenServer universally unique identifier for the physical
-        host as displayed by <code>xe host-list</code>.
       </column>
 
       <column name="external_ids" key="hostname">
@@ -999,7 +992,7 @@
       <column name="system_type">
         <p>
           An identifier for the type of system on top of which Open vSwitch
-          runs, e.g. <code>XenServer</code> or <code>KVM</code>.
+          runs, e.g. <code>KVM</code>.
         </p>
         <p>
           System integrators are responsible for choosing and setting an
@@ -1010,7 +1003,8 @@
       <column name="system_version">
         <p>
           The version of the system identified by <ref column="system_type"/>,
-          e.g. <code>5.6.100-39265p</code> on XenServer 5.6.100 build 39265.
+          e.g. <code>4.18.0-372.19.1.el8_6</code> on RHEL 8.6 with kernel
+          4.18.0-372.19.1.
         </p>
         <p>
           System integrators are responsible for choosing and setting an
@@ -1667,16 +1661,7 @@
       </column>
 
       <column name="external_ids" key="bridge-id">
-        A unique identifier of the bridge.  On Citrix XenServer this will
-        commonly be the same as
-        <ref column="external_ids" key="xs-network-uuids"/>.
-      </column>
-
-      <column name="external_ids" key="xs-network-uuids">
-        Semicolon-delimited set of universally unique identifier(s) for the
-        network with which this bridge is associated on a Citrix XenServer
-        host.  The network identifiers are RFC 4122 UUIDs as displayed by,
-        e.g., <code>xe network-list</code>.
+        A unique identifier of the bridge.
       </column>
 
       <column name="other_config" key="hwaddr">
@@ -2494,12 +2479,12 @@
         Default is false.
       </column>
 
-      <column name="external_ids" key="fake-bridge-id-*">
+      <column name="external_ids" key="fake-bridge-*">
         External IDs for a fake bridge (see the <ref column="fake_bridge"/>
         column) are defined by prefixing a <ref table="Bridge"/> <ref
         table="Bridge" column="external_ids"/> key with
         <code>fake-bridge-</code>,
-        e.g. <code>fake-bridge-xs-network-uuids</code>.
+        e.g. <code>fake-bridge-bridge-id</code>.
       </column>
 
       <column name="other_config" key="transient"
@@ -4347,22 +4332,17 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \
         represents a virtual Ethernet interface connected to a virtual
         machine.  These key-value pairs should not be present for other types
         of interfaces.  Keys whose names end in <code>-uuid</code> have
-        values that uniquely identify the entity in question.  For a Citrix
-        XenServer hypervisor, these values are UUIDs in RFC 4122 format.
-        Other hypervisors may use other formats.
+        values that uniquely identify the entity in question.
       </p>
 
       <column name="external_ids" key="attached-mac">
         The MAC address programmed into the ``virtual hardware'' for this
         interface, in the form
         <var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>.
-        For Citrix XenServer, this is the value of the <code>MAC</code> field
-        in the VIF record for this interface.
       </column>
 
       <column name="external_ids" key="iface-id">
-        A system-unique identifier for the interface.  On XenServer, this will
-        commonly be the same as <ref column="external_ids" key="xs-vif-uuid"/>.
+        A system-unique identifier for the interface.
       </column>
 
       <column name="external_ids" key="iface-status"
@@ -4372,14 +4352,14 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \
           Hypervisors may sometimes have more than one interface associated
           with a given <ref column="external_ids" key="iface-id"/>, only one of
           which is actually in use at a given time.  For example, in some
-          circumstances XenServer has both a ``tap'' and a ``vif'' interface
-          for a single <ref column="external_ids" key="iface-id"/>, but only
-          uses one of them at a time.  A hypervisor that behaves this way must
-          mark the currently in use interface <code>active</code> and the
-          others <code>inactive</code>.  A hypervisor that never has more than
-          one interface for a given <ref column="external_ids" key="iface-id"/>
-          may mark that interface <code>active</code> or omit <ref
-          column="external_ids" key="iface-status"/> entirely.
+          circumstances hypervisor may have both a ``tap'' and a ``vif''
+          interface for a single <ref column="external_ids" key="iface-id"/>,
+          but only uses one of them at a time.  A hypervisor that behaves this
+          way must mark the currently in use interface <code>active</code> and
+          the others <code>inactive</code>.  A hypervisor that never has more
+          than one interface for a given <ref column="external_ids"
+          key="iface-id"/> may mark that interface <code>active</code> or omit
+          <ref column="external_ids" key="iface-status"/> entirely.
         </p>
 
         <p>
@@ -4396,20 +4376,7 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \
         </p>
       </column>
 
-      <column name="external_ids" key="xs-vif-uuid">
-        The virtual interface associated with this interface.
-      </column>
-
-      <column name="external_ids" key="xs-network-uuid">
-        The virtual network to which this interface is attached.
-      </column>
-
       <column name="external_ids" key="vm-id">
-        The VM to which this interface belongs. On XenServer, this will be the
-        same as <ref column="external_ids" key="xs-vm-uuid"/>.
-      </column>
-
-      <column name="external_ids" key="xs-vm-uuid">
         The VM to which this interface belongs.
       </column>
     </group>