提交 c5b6a4a5 编写于 作者: D Daniel P. Berrange

Change int to size_t in size var for tap/vhost FDs

A number of methods take an int for a parameter that indicates
the size of an array. The correct type for array sizes is
size_t
上级 d654bc41
...@@ -289,7 +289,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, ...@@ -289,7 +289,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
int *tapfd, int *tapfd,
int *tapfdSize) size_t *tapfdSize)
{ {
const char *brname; const char *brname;
int ret = -1; int ret = -1;
...@@ -433,7 +433,7 @@ qemuOpenVhostNet(virDomainDefPtr def, ...@@ -433,7 +433,7 @@ qemuOpenVhostNet(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
int *vhostfd, int *vhostfd,
int *vhostfdSize) size_t *vhostfdSize)
{ {
size_t i; size_t i;
const char *vhostnet_path = net->backend.vhost; const char *vhostnet_path = net->backend.vhost;
...@@ -490,7 +490,7 @@ qemuOpenVhostNet(virDomainDefPtr def, ...@@ -490,7 +490,7 @@ qemuOpenVhostNet(virDomainDefPtr def,
"but is unavailable")); "but is unavailable"));
goto error; goto error;
} }
VIR_WARN("Unable to open vhost-net. Opened so far %zu, requested %d", VIR_WARN("Unable to open vhost-net. Opened so far %zu, requested %zu",
i, *vhostfdSize); i, *vhostfdSize);
*vhostfdSize = i; *vhostfdSize = i;
break; break;
...@@ -4353,7 +4353,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, ...@@ -4353,7 +4353,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
int vlan, int vlan,
int bootindex, int bootindex,
int vhostfdSize, size_t vhostfdSize,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
...@@ -4455,7 +4455,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, ...@@ -4455,7 +4455,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
if (usingVirtio && vhostfdSize > 1) { if (usingVirtio && vhostfdSize > 1) {
/* As advised at http://www.linux-kvm.org/page/Multiqueue /* As advised at http://www.linux-kvm.org/page/Multiqueue
* we should add vectors=2*N+2 where N is the vhostfdSize */ * we should add vectors=2*N+2 where N is the vhostfdSize */
virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 2); virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2);
} }
if (vlan == -1) if (vlan == -1)
virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias);
...@@ -4488,9 +4488,9 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, ...@@ -4488,9 +4488,9 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
char type_sep, char type_sep,
int vlan, int vlan,
char **tapfd, char **tapfd,
int tapfdSize, size_t tapfdSize,
char **vhostfd, char **vhostfd,
int vhostfdSize) size_t vhostfdSize)
{ {
bool is_tap = false; bool is_tap = false;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
...@@ -7359,9 +7359,9 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, ...@@ -7359,9 +7359,9 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd,
int ret = -1; int ret = -1;
char *nic = NULL, *host = NULL; char *nic = NULL, *host = NULL;
int *tapfd = NULL; int *tapfd = NULL;
int tapfdSize = 0; size_t tapfdSize = 0;
int *vhostfd = NULL; int *vhostfd = NULL;
int vhostfdSize = 0; size_t vhostfdSize = 0;
char **tapfdName = NULL; char **tapfdName = NULL;
char **vhostfdName = NULL; char **vhostfdName = NULL;
int actualType = virDomainNetGetActualType(net); int actualType = virDomainNetGetActualType(net);
......
...@@ -98,9 +98,9 @@ char *qemuBuildHostNetStr(virDomainNetDefPtr net, ...@@ -98,9 +98,9 @@ char *qemuBuildHostNetStr(virDomainNetDefPtr net,
char type_sep, char type_sep,
int vlan, int vlan,
char **tapfd, char **tapfd,
int tapfdSize, size_t tapfdSize,
char **vhostfd, char **vhostfd,
int vhostfdSize); size_t vhostfdSize);
/* Legacy, pre device support */ /* Legacy, pre device support */
char *qemuBuildNicStr(virDomainNetDefPtr net, char *qemuBuildNicStr(virDomainNetDefPtr net,
...@@ -112,7 +112,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def, ...@@ -112,7 +112,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
int vlan, int vlan,
int bootindex, int bootindex,
int vhostfdSize, size_t vhostfdSize,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
...@@ -195,7 +195,7 @@ int qemuNetworkIfaceConnect(virDomainDefPtr def, ...@@ -195,7 +195,7 @@ int qemuNetworkIfaceConnect(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
int *tapfd, int *tapfd,
int *tapfdSize) size_t *tapfdSize)
ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(2);
int qemuPhysIfaceConnect(virDomainDefPtr def, int qemuPhysIfaceConnect(virDomainDefPtr def,
...@@ -208,7 +208,7 @@ int qemuOpenVhostNet(virDomainDefPtr def, ...@@ -208,7 +208,7 @@ int qemuOpenVhostNet(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
int *vhostfd, int *vhostfd,
int *vhostfdSize); size_t *vhostfdSize);
int qemuNetworkPrepareDevices(virDomainDefPtr def); int qemuNetworkPrepareDevices(virDomainDefPtr def);
......
...@@ -825,10 +825,10 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, ...@@ -825,10 +825,10 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
char **tapfdName = NULL; char **tapfdName = NULL;
int *tapfd = NULL; int *tapfd = NULL;
int tapfdSize = 0; size_t tapfdSize = 0;
char **vhostfdName = NULL; char **vhostfdName = NULL;
int *vhostfd = NULL; int *vhostfd = NULL;
int vhostfdSize = 0; size_t vhostfdSize = 0;
char *nicstr = NULL; char *nicstr = NULL;
char *netstr = NULL; char *netstr = NULL;
virNetDevVPortProfilePtr vport = NULL; virNetDevVPortProfilePtr vport = NULL;
......
...@@ -235,7 +235,7 @@ virNetDevProbeVnetHdr(int tapfd) ...@@ -235,7 +235,7 @@ virNetDevProbeVnetHdr(int tapfd)
int virNetDevTapCreate(char **ifname, int virNetDevTapCreate(char **ifname,
const char *tunpath, const char *tunpath,
int *tapfd, int *tapfd,
int tapfdSize, size_t tapfdSize,
unsigned int flags) unsigned int flags)
{ {
size_t i; size_t i;
...@@ -370,7 +370,7 @@ int virNetDevTapDelete(const char *ifname, ...@@ -370,7 +370,7 @@ int virNetDevTapDelete(const char *ifname,
int virNetDevTapCreate(char **ifname, int virNetDevTapCreate(char **ifname,
const char *tunpath ATTRIBUTE_UNUSED, const char *tunpath ATTRIBUTE_UNUSED,
int *tapfd, int *tapfd,
int tapfdSize, size_t tapfdSize,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
int s; int s;
...@@ -481,7 +481,7 @@ int virNetDevTapDelete(const char *ifname, ...@@ -481,7 +481,7 @@ int virNetDevTapDelete(const char *ifname,
int virNetDevTapCreate(char **ifname ATTRIBUTE_UNUSED, int virNetDevTapCreate(char **ifname ATTRIBUTE_UNUSED,
const char *tunpath ATTRIBUTE_UNUSED, const char *tunpath ATTRIBUTE_UNUSED,
int *tapfd ATTRIBUTE_UNUSED, int *tapfd ATTRIBUTE_UNUSED,
int tapfdSize ATTRIBUTE_UNUSED, size_t tapfdSize ATTRIBUTE_UNUSED,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
virReportSystemError(ENOSYS, "%s", virReportSystemError(ENOSYS, "%s",
...@@ -534,7 +534,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, ...@@ -534,7 +534,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
const unsigned char *vmuuid, const unsigned char *vmuuid,
const char *tunpath, const char *tunpath,
int *tapfd, int *tapfd,
int tapfdSize, size_t tapfdSize,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, virNetDevVlanPtr virtVlan,
unsigned int flags) unsigned int flags)
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
int virNetDevTapCreate(char **ifname, int virNetDevTapCreate(char **ifname,
const char *tunpath, const char *tunpath,
int *tapfd, int *tapfd,
int tapfdSize, size_t tapfdSize,
unsigned int flags) unsigned int flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
...@@ -68,7 +68,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, ...@@ -68,7 +68,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
const unsigned char *vmuuid, const unsigned char *vmuuid,
const char *tunpath, const char *tunpath,
int *tapfd, int *tapfd,
int tapfdSize, size_t tapfdSize,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, virNetDevVlanPtr virtVlan,
unsigned int flags) unsigned int flags)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册