[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 20/27] qapi rocker: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PATCH 20/27] qapi rocker: Elide redundant has_FOO in generated C |
Date: |
Thu, 15 Sep 2022 22:43:10 +0200 |
The has_FOO for pointer-valued FOO are redundant, except for arrays.
They are also a nuisance to work with. Recent commit "qapi: Start to
elide redundant has_FOO in generated C" provided the means to elide
them step by step. This is the step for qapi/rocker.json.
Said commit explains the transformation in more detail. The invariant
violations mentioned there do not occur here.
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/net/rocker/rocker_of_dpa.c | 13 ++-----------
monitor/hmp-cmds.c | 22 +++++++++++-----------
scripts/qapi/schema.py | 1 -
3 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c
index b3b8c5bb6d..dfe4754469 100644
--- a/hw/net/rocker/rocker_of_dpa.c
+++ b/hw/net/rocker/rocker_of_dpa.c
@@ -2348,23 +2348,19 @@ static void of_dpa_flow_fill(void *cookie, void *value,
void *user_data)
if (memcmp(key->eth.src.a, zero_mac.a, ETH_ALEN) ||
memcmp(mask->eth.src.a, zero_mac.a, ETH_ALEN)) {
- nkey->has_eth_src = true;
nkey->eth_src = qemu_mac_strdup_printf(key->eth.src.a);
}
- if (nkey->has_eth_src && memcmp(mask->eth.src.a, ff_mac.a, ETH_ALEN)) {
- nmask->has_eth_src = true;
+ if (nkey->eth_src && memcmp(mask->eth.src.a, ff_mac.a, ETH_ALEN)) {
nmask->eth_src = qemu_mac_strdup_printf(mask->eth.src.a);
}
if (memcmp(key->eth.dst.a, zero_mac.a, ETH_ALEN) ||
memcmp(mask->eth.dst.a, zero_mac.a, ETH_ALEN)) {
- nkey->has_eth_dst = true;
nkey->eth_dst = qemu_mac_strdup_printf(key->eth.dst.a);
}
- if (nkey->has_eth_dst && memcmp(mask->eth.dst.a, ff_mac.a, ETH_ALEN)) {
- nmask->has_eth_dst = true;
+ if (nkey->eth_dst && memcmp(mask->eth.dst.a, ff_mac.a, ETH_ALEN)) {
nmask->eth_dst = qemu_mac_strdup_printf(mask->eth.dst.a);
}
@@ -2400,7 +2396,6 @@ static void of_dpa_flow_fill(void *cookie, void *value,
void *user_data)
if (key->ipv4.addr.dst || mask->ipv4.addr.dst) {
char *dst = inet_ntoa(*(struct in_addr *)&key->ipv4.addr.dst);
int dst_len = of_dpa_mask2prefix(mask->ipv4.addr.dst);
- nkey->has_ip_dst = true;
nkey->ip_dst = g_strdup_printf("%s/%d", dst, dst_len);
}
break;
@@ -2501,12 +2496,10 @@ static void of_dpa_group_fill(void *key, void *value,
void *user_data)
ngroup->set_vlan_id = ntohs(group->l2_rewrite.vlan_id);
}
if (memcmp(group->l2_rewrite.src_mac.a, zero_mac.a, ETH_ALEN)) {
- ngroup->has_set_eth_src = true;
ngroup->set_eth_src =
qemu_mac_strdup_printf(group->l2_rewrite.src_mac.a);
}
if (memcmp(group->l2_rewrite.dst_mac.a, zero_mac.a, ETH_ALEN)) {
- ngroup->has_set_eth_dst = true;
ngroup->set_eth_dst =
qemu_mac_strdup_printf(group->l2_rewrite.dst_mac.a);
}
@@ -2532,12 +2525,10 @@ static void of_dpa_group_fill(void *key, void *value,
void *user_data)
ngroup->set_vlan_id = ntohs(group->l3_unicast.vlan_id);
}
if (memcmp(group->l3_unicast.src_mac.a, zero_mac.a, ETH_ALEN)) {
- ngroup->has_set_eth_src = true;
ngroup->set_eth_src =
qemu_mac_strdup_printf(group->l3_unicast.src_mac.a);
}
if (memcmp(group->l3_unicast.dst_mac.a, zero_mac.a, ETH_ALEN)) {
- ngroup->has_set_eth_dst = true;
ngroup->set_eth_dst =
qemu_mac_strdup_printf(group->l3_unicast.dst_mac.a);
}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 8f4038c6f4..7ae986ab10 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -2029,35 +2029,35 @@ void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict
*qdict)
}
}
- if (key->has_eth_src) {
+ if (key->eth_src) {
if ((strcmp(key->eth_src, "01:00:00:00:00:00") == 0) &&
- (mask->has_eth_src) &&
+ mask->eth_src &&
(strcmp(mask->eth_src, "01:00:00:00:00:00") == 0)) {
monitor_printf(mon, " src <any mcast/bcast>");
} else if ((strcmp(key->eth_src, "00:00:00:00:00:00") == 0) &&
- (mask->has_eth_src) &&
+ mask->eth_src &&
(strcmp(mask->eth_src, "01:00:00:00:00:00") == 0)) {
monitor_printf(mon, " src <any ucast>");
} else {
monitor_printf(mon, " src %s", key->eth_src);
- if (mask->has_eth_src) {
+ if (mask->eth_src) {
monitor_printf(mon, "(%s)", mask->eth_src);
}
}
}
- if (key->has_eth_dst) {
+ if (key->eth_dst) {
if ((strcmp(key->eth_dst, "01:00:00:00:00:00") == 0) &&
- (mask->has_eth_dst) &&
+ mask->eth_dst &&
(strcmp(mask->eth_dst, "01:00:00:00:00:00") == 0)) {
monitor_printf(mon, " dst <any mcast/bcast>");
} else if ((strcmp(key->eth_dst, "00:00:00:00:00:00") == 0) &&
- (mask->has_eth_dst) &&
+ mask->eth_dst &&
(strcmp(mask->eth_dst, "01:00:00:00:00:00") == 0)) {
monitor_printf(mon, " dst <any ucast>");
} else {
monitor_printf(mon, " dst %s", key->eth_dst);
- if (mask->has_eth_dst) {
+ if (mask->eth_dst) {
monitor_printf(mon, "(%s)", mask->eth_dst);
}
}
@@ -2077,7 +2077,7 @@ void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict
*qdict)
}
}
- if (key->has_ip_dst) {
+ if (key->ip_dst) {
monitor_printf(mon, " dst %s", key->ip_dst);
}
@@ -2156,7 +2156,7 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict
*qdict)
group->set_vlan_id & VLAN_VID_MASK);
}
- if (group->has_set_eth_src) {
+ if (group->set_eth_src) {
if (!set) {
set = true;
monitor_printf(mon, " set");
@@ -2164,7 +2164,7 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict
*qdict)
monitor_printf(mon, " src %s", group->set_eth_src);
}
- if (group->has_set_eth_dst) {
+ if (group->set_eth_dst) {
if (!set) {
monitor_printf(mon, " set");
}
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 3aba200abb..793387f251 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -759,7 +759,6 @@ def need_has(self):
assert self.type
# Temporary hack to support dropping the has_FOO in reviewable chunks
opt_out = [
- 'qapi/rocker.json',
'qapi/run-state.json',
'qapi/stats.json',
'qapi/tpm.json',
--
2.37.2
- [PATCH 03/27] docs/devel/qapi-code-gen: Extend example for next commit's change, (continued)
- [PATCH 03/27] docs/devel/qapi-code-gen: Extend example for next commit's change, Markus Armbruster, 2022/09/15
- [PATCH 21/27] qapi run-state: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 24/27] qapi transaction: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 12/27] qapi job: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 18/27] qapi qdev qom: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 16/27] qapi net: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 23/27] qapi tpm: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 20/27] qapi rocker: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- [PATCH 01/27] docs/devel/qapi-code-gen: Update example to match current code, Markus Armbruster, 2022/09/15
- [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- Re: [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Igor Mammedov, 2022/09/16
- Re: [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Ani Sinha, 2022/09/16
- Re: [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/16
- Re: [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Ani Sinha, 2022/09/16
- Re: [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Daniel P . Berrangé, 2022/09/16
- Re: [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Ani Sinha, 2022/09/16
- Re: [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Ani Sinha, 2022/09/16