[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/34] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWR
From: |
Eduardo Habkost |
Subject: |
[PULL 22/34] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER |
Date: |
Tue, 8 Sep 2020 16:01:11 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Message-Id: <20200902224311.1321159-41-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
net/filter-rewriter.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 113e293207..44f6021dd8 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -25,7 +25,7 @@
#define TYPE_FILTER_REWRITER "filter-rewriter"
typedef struct RewriterState RewriterState;
-DECLARE_INSTANCE_CHECKER(RewriterState, FILTER_COLO_REWRITER,
+DECLARE_INSTANCE_CHECKER(RewriterState, FILTER_REWRITER,
TYPE_FILTER_REWRITER)
#define FAILOVER_MODE_ON true
@@ -47,7 +47,7 @@ static void filter_rewriter_failover_mode(RewriterState *s)
static void filter_rewriter_flush(NetFilterState *nf)
{
- RewriterState *s = FILTER_COLO_REWRITER(nf);
+ RewriterState *s = FILTER_REWRITER(nf);
if (!qemu_net_queue_flush(s->incoming_queue)) {
/* Unable to empty the queue, purge remaining packets */
@@ -252,7 +252,7 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
int iovcnt,
NetPacketSent *sent_cb)
{
- RewriterState *s = FILTER_COLO_REWRITER(nf);
+ RewriterState *s = FILTER_REWRITER(nf);
Connection *conn;
ConnectionKey key;
Packet *pkt;
@@ -350,7 +350,7 @@ static gboolean offset_is_nonzero(gpointer key,
static void colo_rewriter_handle_event(NetFilterState *nf, int event,
Error **errp)
{
- RewriterState *rs = FILTER_COLO_REWRITER(nf);
+ RewriterState *rs = FILTER_REWRITER(nf);
switch (event) {
case COLO_EVENT_CHECKPOINT:
@@ -370,7 +370,7 @@ static void colo_rewriter_handle_event(NetFilterState *nf,
int event,
static void colo_rewriter_cleanup(NetFilterState *nf)
{
- RewriterState *s = FILTER_COLO_REWRITER(nf);
+ RewriterState *s = FILTER_REWRITER(nf);
/* flush packets */
if (s->incoming_queue) {
@@ -381,7 +381,7 @@ static void colo_rewriter_cleanup(NetFilterState *nf)
static void colo_rewriter_setup(NetFilterState *nf, Error **errp)
{
- RewriterState *s = FILTER_COLO_REWRITER(nf);
+ RewriterState *s = FILTER_REWRITER(nf);
s->connection_track_table = g_hash_table_new_full(connection_key_hash,
connection_key_equal,
@@ -392,7 +392,7 @@ static void colo_rewriter_setup(NetFilterState *nf, Error
**errp)
static bool filter_rewriter_get_vnet_hdr(Object *obj, Error **errp)
{
- RewriterState *s = FILTER_COLO_REWRITER(obj);
+ RewriterState *s = FILTER_REWRITER(obj);
return s->vnet_hdr;
}
@@ -401,14 +401,14 @@ static void filter_rewriter_set_vnet_hdr(Object *obj,
bool value,
Error **errp)
{
- RewriterState *s = FILTER_COLO_REWRITER(obj);
+ RewriterState *s = FILTER_REWRITER(obj);
s->vnet_hdr = value;
}
static void filter_rewriter_init(Object *obj)
{
- RewriterState *s = FILTER_COLO_REWRITER(obj);
+ RewriterState *s = FILTER_REWRITER(obj);
s->vnet_hdr = false;
s->failover_mode = FAILOVER_MODE_OFF;
--
2.26.2
- [PULL 16/34] ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE, (continued)
- [PULL 16/34] ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE, Eduardo Habkost, 2020/09/08
- [PULL 17/34] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV, Eduardo Habkost, 2020/09/08
- [PULL 19/34] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID, Eduardo Habkost, 2020/09/08
- [PULL 03/34] qom: provide convenient macros for declaring and defining types, Eduardo Habkost, 2020/09/08
- [PULL 20/34] ahci: Rename ICH_AHCI to ICH9_AHCI, Eduardo Habkost, 2020/09/08
- [PULL 18/34] vfio: Rename VFIO_AP_DEVICE_TYPE to TYPE_VFIO_AP_DEVICE, Eduardo Habkost, 2020/09/08
- [PULL 24/34] sabre: Rename SABRE_DEVICE to SABRE, Eduardo Habkost, 2020/09/08
- [PULL 21/34] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/08
- [PULL 23/34] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/08
- [PULL 15/34] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV, Eduardo Habkost, 2020/09/08
- [PULL 22/34] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER,
Eduardo Habkost <=
- [PULL 25/34] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/08
- [PULL 28/34] tusb6010: Rename TUSB to TUSB6010, Eduardo Habkost, 2020/09/08
- [PULL 29/34] xilinx_axidma: Use typedef name for instance_size, Eduardo Habkost, 2020/09/08
- [PULL 26/34] vfio: Rename PCI_VFIO to VFIO_PCI, Eduardo Habkost, 2020/09/08
- [PULL 31/34] lpc_ich9: Use typedef name for instance_size, Eduardo Habkost, 2020/09/08
- [PULL 30/34] omap_intc: Use typedef name for instance_size, Eduardo Habkost, 2020/09/08
- [PULL 27/34] pc87312: Rename TYPE_PC87312_SUPERIO to TYPE_PC87312, Eduardo Habkost, 2020/09/08
- [PULL 33/34] vhost-user-vga: Use typedef name for instance_size, Eduardo Habkost, 2020/09/08
- [PULL 34/34] virtio-vga: Use typedef name for instance_size, Eduardo Habkost, 2020/09/08
- [PULL 09/34] Move QOM typedefs and add missing includes, Eduardo Habkost, 2020/09/08