OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Use OBJECT_DECLARE_SIMPLE_TYPE when possible 

Generated using:

 $ ./scripts/codeconverter/converter.py -i \
   --pattern=ObjectDeclareType $(git grep -l '' -- '*.[ch]')

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200831210740.126168-19-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-08-31 17:07:40 -04:00
parent c821774a3b
commit 1ff5adfa5b
11 changed files with 22 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backends/dbus-vmstate.c
View File

@ -23,12 +23,9 @@
#define TYPE_DBUS_VMSTATE "dbus-vmstate" #define TYPE_DBUS_VMSTATE "dbus-vmstate"
OBJECT_DECLARE_TYPE(DBusVMState, DBusVMStateClass, OBJECT_DECLARE_SIMPLE_TYPE(DBusVMState, dbus_vmstate,
dbus_vmstate, DBUS_VMSTATE) DBUS_VMSTATE, ObjectClass)
struct DBusVMStateClass {
ObjectClass parent_class;
};
struct DBusVMState { struct DBusVMState {
Object parent; Object parent;

7
include/authz/list.h
View File

@ -27,8 +27,8 @@
#define TYPE_QAUTHZ_LIST "authz-list" #define TYPE_QAUTHZ_LIST "authz-list"
OBJECT_DECLARE_TYPE(QAuthZList, QAuthZListClass, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZList, qauthz_list,
qauthz_list, QAUTHZ_LIST) QAUTHZ_LIST, QAuthZClass)
@ -68,9 +68,6 @@ struct QAuthZList {
}; };
struct QAuthZListClass {
QAuthZClass parent_class;
};
QAuthZList *qauthz_list_new(const char *id, QAuthZList *qauthz_list_new(const char *id,

7
include/authz/listfile.h
View File

@ -27,8 +27,8 @@
#define TYPE_QAUTHZ_LIST_FILE "authz-list-file" #define TYPE_QAUTHZ_LIST_FILE "authz-list-file"
OBJECT_DECLARE_TYPE(QAuthZListFile, QAuthZListFileClass, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZListFile, qauthz_list_file,
qauthz_list_file, QAUTHZ_LIST_FILE) QAUTHZ_LIST_FILE, QAuthZClass)
@ -87,9 +87,6 @@ struct QAuthZListFile {
}; };
struct QAuthZListFileClass {
QAuthZClass parent_class;
};
QAuthZListFile *qauthz_list_file_new(const char *id, QAuthZListFile *qauthz_list_file_new(const char *id,

7
include/authz/pamacct.h
View File

@ -27,8 +27,8 @@
#define TYPE_QAUTHZ_PAM "authz-pam" #define TYPE_QAUTHZ_PAM "authz-pam"
OBJECT_DECLARE_TYPE(QAuthZPAM, QAuthZPAMClass, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZPAM, qauthz_pam,
qauthz_pam, QAUTHZ_PAM) QAUTHZ_PAM, QAuthZClass)
@ -79,9 +79,6 @@ struct QAuthZPAM {
}; };
struct QAuthZPAMClass {
QAuthZClass parent_class;
};
QAuthZPAM *qauthz_pam_new(const char *id, QAuthZPAM *qauthz_pam_new(const char *id,

7
include/authz/simple.h
View File

@ -26,8 +26,8 @@
#define TYPE_QAUTHZ_SIMPLE "authz-simple" #define TYPE_QAUTHZ_SIMPLE "authz-simple"
OBJECT_DECLARE_TYPE(QAuthZSimple, QAuthZSimpleClass, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZSimple, qauthz_simple,
qauthz_simple, QAUTHZ_SIMPLE) QAUTHZ_SIMPLE, QAuthZClass)
@ -62,9 +62,6 @@ struct QAuthZSimple {
}; };
struct QAuthZSimpleClass {
QAuthZClass parent_class;
};
QAuthZSimple *qauthz_simple_new(const char *id, QAuthZSimple *qauthz_simple_new(const char *id,

7
include/crypto/secret_keyring.h
View File

@ -26,8 +26,8 @@
#include "crypto/secret_common.h" #include "crypto/secret_common.h"
#define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring" #define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring"
OBJECT_DECLARE_TYPE(QCryptoSecretKeyring, QCryptoSecretKeyringClass, OBJECT_DECLARE_SIMPLE_TYPE(QCryptoSecretKeyring, qcrypto_secret_keyring,
qcrypto_secret_keyring, QCRYPTO_SECRET_KEYRING) QCRYPTO_SECRET_KEYRING, QCryptoSecretCommonClass)
struct QCryptoSecretKeyring { struct QCryptoSecretKeyring {
@ -36,8 +36,5 @@ struct QCryptoSecretKeyring {
}; };
struct QCryptoSecretKeyringClass {
QCryptoSecretCommonClass parent;
};
#endif /* QCRYPTO_SECRET_KEYRING_H */ #endif /* QCRYPTO_SECRET_KEYRING_H */

7
include/io/dns-resolver.h
View File

@ -26,8 +26,8 @@
#include "io/task.h" #include "io/task.h"
#define TYPE_QIO_DNS_RESOLVER "qio-dns-resolver" #define TYPE_QIO_DNS_RESOLVER "qio-dns-resolver"
OBJECT_DECLARE_TYPE(QIODNSResolver, QIODNSResolverClass, OBJECT_DECLARE_SIMPLE_TYPE(QIODNSResolver, qio_dns_resolver,
qio_dns_resolver, QIO_DNS_RESOLVER) QIO_DNS_RESOLVER, ObjectClass)
/** /**
@ -133,9 +133,6 @@ struct QIODNSResolver {
Object parent; Object parent;
}; };
struct QIODNSResolverClass {
ObjectClass parent;
};
/** /**

7
include/io/net-listener.h
View File

@ -25,8 +25,8 @@
#include "qom/object.h" #include "qom/object.h"
#define TYPE_QIO_NET_LISTENER "qio-net-listener" #define TYPE_QIO_NET_LISTENER "qio-net-listener"
OBJECT_DECLARE_TYPE(QIONetListener, QIONetListenerClass, OBJECT_DECLARE_SIMPLE_TYPE(QIONetListener, qio_net_listener,
qio_net_listener, QIO_NET_LISTENER) QIO_NET_LISTENER, ObjectClass)
typedef void (*QIONetListenerClientFunc)(QIONetListener *listener, typedef void (*QIONetListenerClientFunc)(QIONetListener *listener,
@ -58,9 +58,6 @@ struct QIONetListener {
GDestroyNotify io_notify; GDestroyNotify io_notify;
}; };
struct QIONetListenerClass {
ObjectClass parent;
};
/** /**

7
include/sysemu/vhost-user-backend.h
View File

@ -22,13 +22,10 @@
#include "io/channel.h" #include "io/channel.h"
#define TYPE_VHOST_USER_BACKEND "vhost-user-backend" #define TYPE_VHOST_USER_BACKEND "vhost-user-backend"
OBJECT_DECLARE_TYPE(VhostUserBackend, VhostUserBackendClass, OBJECT_DECLARE_SIMPLE_TYPE(VhostUserBackend, vhost_user_backend,
vhost_user_backend, VHOST_USER_BACKEND) VHOST_USER_BACKEND, ObjectClass)
struct VhostUserBackendClass {
ObjectClass parent_class;
};
struct VhostUserBackend { struct VhostUserBackend {
/* private */ /* private */

7
ui/input-barrier.c
View File

@ -20,8 +20,8 @@
#include "input-barrier.h" #include "input-barrier.h"
#define TYPE_INPUT_BARRIER "input-barrier" #define TYPE_INPUT_BARRIER "input-barrier"
OBJECT_DECLARE_TYPE(InputBarrier, InputBarrierClass, OBJECT_DECLARE_SIMPLE_TYPE(InputBarrier, input_barrier,
input_barrier, INPUT_BARRIER) INPUT_BARRIER, ObjectClass)
#define MAX_HELLO_LENGTH 1024 #define MAX_HELLO_LENGTH 1024
@ -44,9 +44,6 @@ struct InputBarrier {
char buffer[MAX_HELLO_LENGTH]; char buffer[MAX_HELLO_LENGTH];
}; };
struct InputBarrierClass {
ObjectClass parent_class;
};
static const char *cmd_names[] = { static const char *cmd_names[] = {
[barrierCmdCNoop] = "CNOP", [barrierCmdCNoop] = "CNOP",

7
ui/input-linux.c
View File

@ -31,8 +31,8 @@ static bool linux_is_button(unsigned int lnx)
} }
#define TYPE_INPUT_LINUX "input-linux" #define TYPE_INPUT_LINUX "input-linux"
OBJECT_DECLARE_TYPE(InputLinux, InputLinuxClass, OBJECT_DECLARE_SIMPLE_TYPE(InputLinux, input_linux,
input_linux, INPUT_LINUX) INPUT_LINUX, ObjectClass)
struct InputLinux { struct InputLinux {
@ -65,9 +65,6 @@ struct InputLinux {
QTAILQ_ENTRY(InputLinux) next; QTAILQ_ENTRY(InputLinux) next;
}; };
struct InputLinuxClass {
ObjectClass parent_class;
};
static QTAILQ_HEAD(, InputLinux) inputs = QTAILQ_HEAD_INITIALIZER(inputs); static QTAILQ_HEAD(, InputLinux) inputs = QTAILQ_HEAD_INITIALIZER(inputs);