From e9e27673fa7711c163e69a556d2b040339d15c12 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Tue, 12 Dec 2017 08:43:13 -0800 Subject: [PATCH] vhost-user: updating comments for accuracy, rename device field Some comments were network specific for vhost-user devices, which is incorect. Fixed these. Renamed the HWAddress field to be Address, so that it could potentially be used more generically for non-network based vhost-user types. Signed-off-by: Eric Ernst --- qemu/qemu.go | 14 +++++++------- qemu/qemu_test.go | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qemu/qemu.go b/qemu/qemu.go index b65983cce9..de935bcc7d 100644 --- a/qemu/qemu.go +++ b/qemu/qemu.go @@ -704,7 +704,7 @@ func (blkdev BlockDevice) QemuParams(config *Config) []string { return qemuParams } -// VhostUserDeviceType is a qemu networking device type. +// VhostUserDeviceType is a qemu vhost-user device type. type VhostUserDeviceType string const ( @@ -714,21 +714,21 @@ const ( VhostUserNet = "virtio-net-pci" ) -// VhostUserDevice represents a qemu vhost-user network device meant to be passed +// VhostUserDevice represents a qemu vhost-user device meant to be passed // in to the guest type VhostUserDevice struct { SocketPath string //path to vhostuser socket on host CharDevID string - TypeDevID string //id (SCSI) or netdev (net) device parameter - MacAddress string //only valid if device type is VhostUserNet + TypeDevID string //variable QEMU parameter based on value of VhostUserType + Address string //used for MAC address in net case VhostUserType VhostUserDeviceType } -// Valid returns true if there is a valid socket path defined for VhostUserDevice +// Valid returns true if there is a valid structure defined for VhostUserDevice func (vhostuserDev VhostUserDevice) Valid() bool { if vhostuserDev.SocketPath == "" || vhostuserDev.CharDevID == "" || vhostuserDev.TypeDevID == "" || - (vhostuserDev.VhostUserType == VhostUserNet && vhostuserDev.MacAddress == "") { + (vhostuserDev.VhostUserType == VhostUserNet && vhostuserDev.Address == "") { return false } @@ -755,7 +755,7 @@ func (vhostuserDev VhostUserDevice) QemuParams(config *Config) []string { devParams = append(devParams, VhostUserNet) devParams = append(devParams, fmt.Sprintf("netdev=%s", vhostuserDev.TypeDevID)) - devParams = append(devParams, fmt.Sprintf("mac=%s", vhostuserDev.MacAddress)) + devParams = append(devParams, fmt.Sprintf("mac=%s", vhostuserDev.Address)) } else { devParams = append(devParams, VhostUserSCSI) devParams = append(devParams, fmt.Sprintf("id=%s", vhostuserDev.TypeDevID)) diff --git a/qemu/qemu_test.go b/qemu/qemu_test.go index 51269eabbf..4610734675 100644 --- a/qemu/qemu_test.go +++ b/qemu/qemu_test.go @@ -273,7 +273,7 @@ func TestAppendDeviceVhostUser(t *testing.T) { SocketPath: "/tmp/nonexistentsocket.socket", CharDevID: "char1", TypeDevID: "scsi1", - MacAddress: "", + Address: "", VhostUserType: VhostUserSCSI, } testAppend(vhostuserSCSIDevice, deviceVhostUserSCSIString, t) @@ -282,7 +282,7 @@ func TestAppendDeviceVhostUser(t *testing.T) { SocketPath: "/tmp/nonexistentsocket.socket", CharDevID: "char1", TypeDevID: "net1", - MacAddress: "00:11:22:33:44:55", + Address: "00:11:22:33:44:55", VhostUserType: VhostUserNet, } testAppend(vhostuserNetDevice, deviceVhostUserNetString, t)