When commit bac6b266fb6a added this "functionality" this was the only naming I could think of, but after discussion with Dan we found the name 'null' fits a bit better, so change it before we make a release with the old name. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- NEWS.rst | 2 +- docs/formatdomain.rst | 4 ++-- src/ch/ch_monitor.c | 2 +- src/conf/domain_conf.c | 20 +++++++++---------- src/conf/domain_conf.h | 2 +- src/conf/netdev_bandwidth_conf.c | 2 +- src/conf/schemas/domaincommon.rng | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/xen_common.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 6 +++--- src/lxc/lxc_process.c | 4 ++-- src/qemu/qemu_command.c | 8 ++++---- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 6 +++--- src/qemu/qemu_interface.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_validate.c | 2 +- src/vmx/vmx.c | 4 ++-- .../{ethernet-dummy.vmx => ethernet-null.vmx} | 0 .../{ethernet-dummy.xml => ethernet-null.xml} | 2 +- tests/vmx2xmltest.c | 2 +- ...et-dummy.vmx => xml2vmx-ethernet-null.vmx} | 0 ...et-dummy.xml => xml2vmx-ethernet-null.xml} | 2 +- tests/xml2vmxtest.c | 2 +- tools/virsh-domain.c | 2 +- 26 files changed, 45 insertions(+), 45 deletions(-) rename tests/vmx2xmldata/{ethernet-dummy.vmx => ethernet-null.vmx} (100%) rename tests/vmx2xmldata/{ethernet-dummy.xml => ethernet-null.xml} (95%) rename tests/xml2vmxdata/{xml2vmx-ethernet-dummy.vmx => xml2vmx-ethernet-null.vmx} (100%) rename tests/xml2vmxdata/{xml2vmx-ethernet-dummy.xml => xml2vmx-ethernet-null.xml} (90%) diff --git a/NEWS.rst b/NEWS.rst index 468b41c1fd9a..2e0a4a7b945b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -26,7 +26,7 @@ v8.7.0 (unreleased) * esx: Domain XMLs can now be dumped for VMs with two new interface types - One is when the interface is not connected anywhere `type='dummy'` and one + One is when the interface is not connected anywhere `type='null'` and one when it is connected to VMWare Distributed Switch `type='vds'`. * **Bug fixes** diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 212104fe1f96..1c4700ac3736 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5240,7 +5240,7 @@ which the UDP socket packets will originate from the QEMU host. :since:`Since </devices> ... -Dummy network interface +Null network interface ^^^^^^^^^^^^^^^^^^^^^^^ An unconnected network interface sounds pretty pointless, but can show up for @@ -5251,7 +5251,7 @@ example with VMWare without any specified network to be connected to. ... <devices> - <interface type='dummy'> + <interface type='null'> <mac address='52:54:00:22:c9:42'/> </interface> </devices> diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 03f051edf67e..8d8654332f39 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -301,7 +301,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 610bbcfd5831..6950f7ec1d8f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -573,7 +573,7 @@ VIR_ENUM_IMPL(virDomainNet, "hostdev", "udp", "vdpa", - "dummy", + "null", "vds", ); @@ -2497,7 +2497,7 @@ virDomainActualNetDefFree(virDomainActualNetDef *def) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -2629,7 +2629,7 @@ virDomainNetDefFree(virDomainNetDef *def) case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9360,7 +9360,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9539,7 +9539,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_VDPA: break; @@ -23746,7 +23746,7 @@ virDomainNetDefFormat(virBuffer *buf, } case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -28362,7 +28362,7 @@ virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -28377,7 +28377,7 @@ virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: @@ -29375,7 +29375,7 @@ virDomainNetTypeSharesHostView(const virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -29638,7 +29638,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom, case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unexpected network port type %s"), diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a1f6cf7a6fd0..2b1497d78dd8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -939,7 +939,7 @@ typedef enum { VIR_DOMAIN_NET_TYPE_HOSTDEV, VIR_DOMAIN_NET_TYPE_UDP, VIR_DOMAIN_NET_TYPE_VDPA, - VIR_DOMAIN_NET_TYPE_DUMMY, + VIR_DOMAIN_NET_TYPE_NULL, VIR_DOMAIN_NET_TYPE_VDS, VIR_DOMAIN_NET_TYPE_LAST diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index b1ebfea6ddd7..f7d27fb5af6c 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -295,7 +295,7 @@ bool virNetDevSupportsBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index 7f6ea1d8887d..bb6b1058e6f5 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3435,7 +3435,7 @@ <group> <attribute name="type"> - <value>dummy</value> + <value>null</value> </attribute> <ref name="interface-options"/> </group> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6d7a6c58534c..06f338ef904c 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1395,7 +1395,7 @@ libxlMakeNic(virDomainDef *def, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 10ac8013739f..6918a4b12167 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1677,7 +1677,7 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type '%s'"), virDomainNetTypeToString(net->type)); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 9328f242df6a..9be79fa356af 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -422,7 +422,7 @@ static int virLXCControllerGetNICIndexes(virLXCController *ctrl) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type %s"), diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8a7135ff4733..f8e701021003 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3465,7 +3465,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Network device type is not supported")); @@ -3522,7 +3522,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: @@ -3966,7 +3966,7 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only bridged veth devices can be detached")); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6b12bff25cb8..fe5cab3df698 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -596,7 +596,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1609,7 +1609,7 @@ virLXCProcessReconnectNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1523ca704794..a31b8ee438e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3961,7 +3961,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: /* Should have been handled earlier via PCI/USB hotplug code. */ - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8182,7 +8182,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8281,7 +8281,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* nada */ @@ -8321,7 +8321,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* These types don't use a network device on the host, but diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d5fef76211aa..fe3ce023a440 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9784,7 +9784,7 @@ qemuDomainNetSupportsMTU(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 751fa84013b0..9b508dc8f04f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1230,7 +1230,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, @@ -3387,7 +3387,7 @@ qemuDomainChangeNetFilter(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filters not supported on interfaces of type %s"), @@ -3740,7 +3740,7 @@ qemuDomainChangeNet(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("unable to change config on '%s' network type"), diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 3ec92fdd7d36..4cc76e07a50b 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -118,7 +118,7 @@ qemuInterfaceStartDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ @@ -206,7 +206,7 @@ qemuInterfaceStopDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 68c2f45535df..32f03ff79a02 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3261,7 +3261,7 @@ qemuProcessNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8263,7 +8263,7 @@ void qemuProcessStop(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* No special cleanup procedure for these types. */ diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 703d9776a96f..640326655929 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1760,7 +1760,7 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 191f0b5e83ff..fa5cc5614683 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2880,7 +2880,7 @@ virVMXParseEthernet(virConf *conf, int controller, virDomainNetDef **def) false) < 0) goto cleanup; } else if (connectionType == NULL && networkName == NULL) { - (*def)->type = VIR_DOMAIN_NET_TYPE_DUMMY; + (*def)->type = VIR_DOMAIN_NET_TYPE_NULL; } else if (connectionType == NULL || STRCASEEQ(connectionType, "bridged")) { (*def)->type = VIR_DOMAIN_NET_TYPE_BRIDGE; (*def)->data.bridge.brname = g_steal_pointer(&networkName); @@ -3991,7 +3991,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int controller, controller); break; - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: break; case VIR_DOMAIN_NET_TYPE_VDS: { diff --git a/tests/vmx2xmldata/ethernet-dummy.vmx b/tests/vmx2xmldata/ethernet-null.vmx similarity index 100% rename from tests/vmx2xmldata/ethernet-dummy.vmx rename to tests/vmx2xmldata/ethernet-null.vmx diff --git a/tests/vmx2xmldata/ethernet-dummy.xml b/tests/vmx2xmldata/ethernet-null.xml similarity index 95% rename from tests/vmx2xmldata/ethernet-dummy.xml rename to tests/vmx2xmldata/ethernet-null.xml index a31243033785..9bc1e492e01d 100644 --- a/tests/vmx2xmldata/ethernet-dummy.xml +++ b/tests/vmx2xmldata/ethernet-null.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <interface type='dummy'> + <interface type='null'> <mac address='00:50:56:87:65:43' type='generated'/> <model type='e1000e'/> </interface> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 07d7bf24c2b3..a43cab3108b5 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -236,7 +236,7 @@ mymain(void) DO_TEST("ethernet-static"); DO_TEST("ethernet-vpx"); DO_TEST("ethernet-other"); - DO_TEST("ethernet-dummy"); + DO_TEST("ethernet-null"); DO_TEST("ethernet-vds"); DO_TEST("serial-file"); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-null.vmx similarity index 100% rename from tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx rename to tests/xml2vmxdata/xml2vmx-ethernet-null.vmx diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml b/tests/xml2vmxdata/xml2vmx-ethernet-null.xml similarity index 90% rename from tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml rename to tests/xml2vmxdata/xml2vmx-ethernet-null.xml index a071b2f21513..777c01d09110 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-null.xml @@ -6,7 +6,7 @@ <type>hvm</type> </os> <devices> - <interface type='dummy'> + <interface type='null'> <mac address='00:50:56:87:65:43'/> </interface> </devices> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index c921c8a3b0eb..1cadb9500a7e 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -225,7 +225,7 @@ mymain(void) DO_TEST("ethernet-other", "ethernet-other", 4); DO_TEST("ethernet-mac-type", "ethernet-mac-type", 4); - DO_TEST("ethernet-dummy", "ethernet-dummy", 4); + DO_TEST("ethernet-null", "ethernet-null", 4); DO_TEST("ethernet-vds", "ethernet-vds", 4); DO_TEST("serial-file", "serial-file", 4); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d2ea4d1c7b44..20aadb59f3ef 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1069,7 +1069,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: vshError(ctl, _("No support for %s in command 'attach-interface'"), -- 2.37.2