All the code now just uses the virHashTablePtr type directly.
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
char *vhostuser_type = NULL;
char *trustGuestRxFilters = NULL;
char *vhost_path = NULL;
- virNWFilterHashTablePtr filterparams = NULL;
+ virHashTablePtr filterparams = NULL;
virDomainActualNetDefPtr actual = NULL;
xmlNodePtr oldnode = ctxt->node;
virDomainChrSourceReconnectDef reconnect = {0};
virNetDevIPInfo guestIP;
virDomainDeviceInfo info;
char *filter;
- virNWFilterHashTablePtr filterparams;
+ virHashTablePtr filterparams;
virNetDevBandwidthPtr bandwidth;
virNetDevVlan vlan;
int trustGuestRxFilters; /* enum virTristateBool */
typedef virNWFilterIncludeDef *virNWFilterIncludeDefPtr;
struct _virNWFilterIncludeDef {
char *filterref;
- virNWFilterHashTablePtr params;
+ virHashTablePtr params;
};
#define VIR_FROM_THIS VIR_FROM_NWFILTER
static virMutex ipAddressMapLock = VIR_MUTEX_INITIALIZER;
-static virNWFilterHashTablePtr ipAddressMap;
+static virHashTablePtr ipAddressMap;
/* Add an IP address to the list of IP addresses an interface is
static int
virNWFilterVarCombIterAddVariable(virNWFilterVarCombIterEntryPtr cie,
- virNWFilterHashTablePtr hash,
+ virHashTablePtr hash,
const virNWFilterVarAccess *varAccess)
{
virNWFilterVarValuePtr varValue;
*/
static bool
virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie,
- virNWFilterHashTablePtr hash)
+ virHashTablePtr hash)
{
size_t i, j;
virNWFilterVarValuePtr varValue, tmp;
* be created.
*/
virNWFilterVarCombIterPtr
-virNWFilterVarCombIterCreate(virNWFilterHashTablePtr hash,
+virNWFilterVarCombIterCreate(virHashTablePtr hash,
virNWFilterVarAccessPtr *varAccess,
size_t nVarAccess)
{
}
-virNWFilterHashTablePtr
+virHashTablePtr
virNWFilterHashTableCreate(int n)
{
return virHashCreate(n, hashDataFree);
}
struct addToTableStruct {
- virNWFilterHashTablePtr target;
+ virHashTablePtr target;
int errOccurred;
};
int
-virNWFilterHashTablePutAll(virNWFilterHashTablePtr src,
- virNWFilterHashTablePtr dest)
+virNWFilterHashTablePutAll(virHashTablePtr src,
+ virHashTablePtr dest)
{
struct addToTableStruct atts = {
.target = dest,
}
bool
-virNWFilterHashTableEqual(virNWFilterHashTablePtr a,
- virNWFilterHashTablePtr b)
+virNWFilterHashTableEqual(virHashTablePtr a,
+ virHashTablePtr b)
{
return virHashEqual(a, b, virNWFilterVarValueCompare);
}
return virNWFilterVarValueCreateSimpleCopyValue(val);
}
-virNWFilterHashTablePtr
+virHashTablePtr
virNWFilterParseParamAttributes(xmlNodePtr cur)
{
char *nam, *val;
virNWFilterVarValuePtr value;
- virNWFilterHashTablePtr table = virNWFilterHashTableCreate(0);
+ virHashTablePtr table = virNWFilterHashTableCreate(0);
if (!table)
return NULL;
int
virNWFilterFormatParamAttributes(virBufferPtr buf,
- virNWFilterHashTablePtr table,
+ virHashTablePtr table,
const char *filterref)
{
virHashKeyValuePairPtr items;
bool
virNWFilterVarAccessIsAvailable(const virNWFilterVarAccess *varAccess,
- const virNWFilterHashTable *hash)
+ const virHashTable *hash)
{
const char *varName = virNWFilterVarAccessGetVarName(varAccess);
const char *res;
int virNWFilterVarValueAddValueCopy(virNWFilterVarValuePtr val, const char *value);
int virNWFilterVarValueDelValue(virNWFilterVarValuePtr val, const char *value);
-typedef virHashTable virNWFilterHashTable;
-typedef virHashTable *virNWFilterHashTablePtr;
-
-virNWFilterHashTablePtr virNWFilterParseParamAttributes(xmlNodePtr cur);
+virHashTablePtr virNWFilterParseParamAttributes(xmlNodePtr cur);
int virNWFilterFormatParamAttributes(virBufferPtr buf,
- virNWFilterHashTablePtr table,
+ virHashTablePtr table,
const char *filterref);
-virNWFilterHashTablePtr virNWFilterHashTableCreate(int n);
-int virNWFilterHashTablePutAll(virNWFilterHashTablePtr src,
- virNWFilterHashTablePtr dest);
-bool virNWFilterHashTableEqual(virNWFilterHashTablePtr a,
- virNWFilterHashTablePtr b);
+virHashTablePtr virNWFilterHashTableCreate(int n);
+int virNWFilterHashTablePutAll(virHashTablePtr src,
+ virHashTablePtr dest);
+bool virNWFilterHashTableEqual(virHashTablePtr a,
+ virHashTablePtr b);
# define VALID_VARNAME \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
unsigned int virNWFilterVarAccessGetIterId(const virNWFilterVarAccess *vap);
unsigned int virNWFilterVarAccessGetIndex(const virNWFilterVarAccess *vap);
bool virNWFilterVarAccessIsAvailable(const virNWFilterVarAccess *vap,
- const virNWFilterHashTable *hash);
+ const virHashTable *hash);
typedef struct _virNWFilterVarCombIterEntry virNWFilterVarCombIterEntry;
typedef virNWFilterVarCombIterEntry *virNWFilterVarCombIterEntryPtr;
typedef struct _virNWFilterVarCombIter virNWFilterVarCombIter;
typedef virNWFilterVarCombIter *virNWFilterVarCombIterPtr;
struct _virNWFilterVarCombIter {
- virNWFilterHashTablePtr hashTable;
+ virHashTablePtr hashTable;
size_t nIter;
virNWFilterVarCombIterEntry iter[0];
};
virNWFilterVarCombIterPtr virNWFilterVarCombIterCreate(
- virNWFilterHashTablePtr hash,
+ virHashTablePtr hash,
virNWFilterVarAccessPtr *vars,
size_t nVars);
char ifkey[VIR_IFKEY_LEN];
virMacAddr macaddr;
char *filtername;
- virNWFilterHashTablePtr vars;
+ virHashTablePtr vars;
virNWFilterDriverStatePtr driver;
/* start and end of lease list, ordered by lease time */
virNWFilterSnoopIPLeasePtr start;
const unsigned char *vmuuid,
const virMacAddr *macaddr,
const char *filtername,
- virNWFilterHashTablePtr filterparams,
+ virHashTablePtr filterparams,
virNWFilterDriverStatePtr driver)
{
virNWFilterSnoopReqPtr req;
const unsigned char *vmuuid ATTRIBUTE_UNUSED,
const virMacAddr *macaddr ATTRIBUTE_UNUSED,
const char *filtername ATTRIBUTE_UNUSED,
- virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED,
+ virHashTablePtr filterparams ATTRIBUTE_UNUSED,
virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
const unsigned char *vmuuid,
const virMacAddr *macaddr,
const char *filtername,
- virNWFilterHashTablePtr filterparams,
+ virHashTablePtr filterparams,
virNWFilterDriverStatePtr driver);
void virNWFilterDHCPSnoopEnd(const char *ifname);
#endif /* __NWFILTER_DHCPSNOOP_H */
* Adds a couple of standard keys (MAC, IP) to the hash table.
*/
static int
-virNWFilterVarHashmapAddStdValues(virNWFilterHashTablePtr table,
+virNWFilterVarHashmapAddStdValues(virHashTablePtr table,
char *macaddr,
const virNWFilterVarValue *ipaddr)
{
*
* Returns pointer to hashmap, NULL if an error occurred.
*/
-virNWFilterHashTablePtr
+virHashTablePtr
virNWFilterCreateVarHashmap(char *macaddr,
const virNWFilterVarValue *ipaddr)
{
- virNWFilterHashTablePtr table = virNWFilterHashTableCreate(0);
+ virHashTablePtr table = virNWFilterHashTableCreate(0);
if (!table)
return NULL;
/**
- * Convert a virNWFilterHashTable into a string of comma-separated
+ * Convert a virHashTable into a string of comma-separated
* variable names.
*/
struct printString
* Creates a new hash table with contents of var1 and var2 added where
* contents of var2 will overwrite those of var1.
*/
-static virNWFilterHashTablePtr
-virNWFilterCreateVarsFrom(virNWFilterHashTablePtr vars1,
- virNWFilterHashTablePtr vars2)
+static virHashTablePtr
+virNWFilterCreateVarsFrom(virHashTablePtr vars1,
+ virHashTablePtr vars2)
{
- virNWFilterHashTablePtr res = virNWFilterHashTableCreate(0);
+ virHashTablePtr res = virNWFilterHashTableCreate(0);
if (!res)
return NULL;
static int
virNWFilterDefToInst(virNWFilterDriverStatePtr driver,
virNWFilterDefPtr def,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
enum instCase useNewFilter,
bool *foundNewFilter,
virNWFilterInstPtr inst);
static int
virNWFilterRuleDefToRuleInst(virNWFilterDefPtr def,
virNWFilterRuleDefPtr rule,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
virNWFilterInstPtr inst)
{
virNWFilterRuleInstPtr ruleinst;
static int
virNWFilterIncludeDefToRuleInst(virNWFilterDriverStatePtr driver,
virNWFilterIncludeDefPtr inc,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
enum instCase useNewFilter,
bool *foundNewFilter,
virNWFilterInstPtr inst)
{
virNWFilterObjPtr obj;
- virNWFilterHashTablePtr tmpvars = NULL;
+ virHashTablePtr tmpvars = NULL;
virNWFilterDefPtr childdef;
virNWFilterDefPtr newChilddef;
int ret = -1;
static int
virNWFilterDefToInst(virNWFilterDriverStatePtr driver,
virNWFilterDefPtr def,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
enum instCase useNewFilter,
bool *foundNewFilter,
virNWFilterInstPtr inst)
static int
virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter,
- virNWFilterHashTablePtr vars,
- virNWFilterHashTablePtr missing_vars,
+ virHashTablePtr vars,
+ virHashTablePtr missing_vars,
int useNewFilter,
virNWFilterDriverStatePtr driver)
{
virNWFilterDefPtr next_filter;
virNWFilterDefPtr newNext_filter;
virNWFilterVarValuePtr val;
- virNWFilterHashTablePtr tmpvars;
+ virHashTablePtr tmpvars;
for (i = 0; i < filter->nentries; i++) {
virNWFilterRuleDefPtr rule = filter->filterEntries[i]->rule;
const char *ifname,
int ifindex,
const char *linkdev,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
enum instCase useNewFilter,
bool *foundNewFilter,
bool teardownOld,
const char *learning;
bool reportIP = false;
- virNWFilterHashTablePtr missing_vars = virNWFilterHashTableCreate(0);
+ virHashTablePtr missing_vars = virNWFilterHashTableCreate(0);
memset(&inst, 0, sizeof(inst));
const char *linkdev,
const virMacAddr *macaddr,
const char *filtername,
- virNWFilterHashTablePtr filterparams,
+ virHashTablePtr filterparams,
enum instCase useNewFilter,
bool forceWithPendingReq,
bool *foundNewFilter)
const char *drvname = EBIPTABLES_DRIVER_ID;
virNWFilterTechDriverPtr techdriver;
virNWFilterObjPtr obj;
- virNWFilterHashTablePtr vars, vars1;
+ virHashTablePtr vars, vars1;
virNWFilterDefPtr filter;
virNWFilterDefPtr newFilter;
char vmmacaddr[VIR_MAC_STRING_BUFLEN] = {0};
const char *linkdev,
const virMacAddr *macaddr,
const char *filtername,
- virNWFilterHashTablePtr filterparams)
+ virHashTablePtr filterparams)
{
int rc;
bool foundNewFilter = false;
const char *linkdev,
const virMacAddr *macaddr,
const char *filtername,
- virNWFilterHashTablePtr filterparams);
+ virHashTablePtr filterparams);
int virNWFilterTeardownFilter(const virDomainNetDef *net);
-virNWFilterHashTablePtr virNWFilterCreateVarHashmap(char *macaddr,
- const virNWFilterVarValue *value);
+virHashTablePtr virNWFilterCreateVarHashmap(char *macaddr,
+ const virNWFilterVarValue *value);
int virNWFilterDomainFWUpdateCB(virDomainObjPtr vm,
void *data);
const char *linkdev,
const virMacAddr *macaddr,
const char *filtername,
- virNWFilterHashTablePtr filterparams,
+ virHashTablePtr filterparams,
virNWFilterDriverStatePtr driver,
enum howDetect howDetect)
{
int rc;
virThread thread;
virNWFilterIPAddrLearnReqPtr req = NULL;
- virNWFilterHashTablePtr ht = NULL;
+ virHashTablePtr ht = NULL;
if (howDetect == 0)
return -1;
const char *linkdev ATTRIBUTE_UNUSED,
const virMacAddr *macaddr ATTRIBUTE_UNUSED,
const char *filtername ATTRIBUTE_UNUSED,
- virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED,
+ virHashTablePtr filterparams ATTRIBUTE_UNUSED,
virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED,
enum howDetect howDetect ATTRIBUTE_UNUSED)
{
char linkdev[IF_NAMESIZE];
virMacAddr macaddr;
char *filtername;
- virNWFilterHashTablePtr filterparams;
+ virHashTablePtr filterparams;
virNWFilterDriverStatePtr driver;
enum howDetect howDetect;
const char *linkdev,
const virMacAddr *macaddr,
const char *filtername,
- virNWFilterHashTablePtr filterparams,
+ virHashTablePtr filterparams,
virNWFilterDriverStatePtr driver,
enum howDetect howDetect);
virNWFilterChainPriority chainPriority;
virNWFilterRuleDefPtr def;
virNWFilterRulePriority priority;
- virNWFilterHashTablePtr vars;
+ virHashTablePtr vars;
};
};
-static virNWFilterHashTablePtr
-virNWFilterCreateVarsFrom(virNWFilterHashTablePtr vars1,
- virNWFilterHashTablePtr vars2)
+static virHashTablePtr
+virNWFilterCreateVarsFrom(virHashTablePtr vars1,
+ virHashTablePtr vars2)
{
- virNWFilterHashTablePtr res = virNWFilterHashTableCreate(0);
+ virHashTablePtr res = virNWFilterHashTableCreate(0);
if (!res)
return NULL;
static int
virNWFilterDefToInst(const char *xml,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
virNWFilterInstPtr inst);
static int
virNWFilterRuleDefToRuleInst(virNWFilterDefPtr def,
virNWFilterRuleDefPtr rule,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
virNWFilterInstPtr inst)
{
virNWFilterRuleInstPtr ruleinst;
static int
virNWFilterIncludeDefToRuleInst(virNWFilterIncludeDefPtr inc,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
virNWFilterInstPtr inst)
{
- virNWFilterHashTablePtr tmpvars = NULL;
+ virHashTablePtr tmpvars = NULL;
int ret = -1;
char *xml;
static int
virNWFilterDefToInst(const char *xml,
- virNWFilterHashTablePtr vars,
+ virHashTablePtr vars,
virNWFilterInstPtr inst)
{
size_t i;
}
-static int testSetOneParameter(virNWFilterHashTablePtr vars,
+static int testSetOneParameter(virHashTablePtr vars,
const char *name,
const char *value)
{
return ret;
}
-static int testSetDefaultParameters(virNWFilterHashTablePtr vars)
+static int testSetDefaultParameters(virHashTablePtr vars)
{
if (testSetOneParameter(vars, "IPSETNAME", "tck_test") < 0 ||
testSetOneParameter(vars, "A", "1.1.1.1") ||
{
char *actualargv = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
- virNWFilterHashTablePtr vars = virNWFilterHashTableCreate(0);
+ virHashTablePtr vars = virNWFilterHashTableCreate(0);
virNWFilterInst inst;
int ret = -1;