[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/27] compiler.h: replace QEMU_SENTINEL with G_GNUC_NULL_TERMINA
From: |
marcandre . lureau |
Subject: |
[PATCH 09/27] compiler.h: replace QEMU_SENTINEL with G_GNUC_NULL_TERMINATED |
Date: |
Wed, 16 Mar 2022 13:53:01 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
One less qemu-specific macro. It also helps to make some headers/units
only depend on glib, and thus moved in standalone projects eventually.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/compiler.h | 2 --
include/qom/object.h | 6 +++---
scripts/cocci-macro-file.h | 2 +-
scripts/checkpatch.pl | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h
index 8385e477c18e..0a5e67fb970e 100644
--- a/include/qemu/compiler.h
+++ b/include/qemu/compiler.h
@@ -19,8 +19,6 @@
#define QEMU_NORETURN __attribute__ ((__noreturn__))
-#define QEMU_SENTINEL __attribute__((sentinel))
-
#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))
# define QEMU_PACKED __attribute__((gcc_struct, packed))
#else
diff --git a/include/qom/object.h b/include/qom/object.h
index fae096f51cce..5f3d5b5bf532 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -616,7 +616,7 @@ Object *object_new_with_props(const char *typename,
Object *parent,
const char *id,
Error **errp,
- ...) QEMU_SENTINEL;
+ ...) G_GNUC_NULL_TERMINATED;
/**
* object_new_with_propv:
@@ -676,7 +676,7 @@ void object_apply_compat_props(Object *obj);
*
* Returns: %true on success, %false on error.
*/
-bool object_set_props(Object *obj, Error **errp, ...) QEMU_SENTINEL;
+bool object_set_props(Object *obj, Error **errp, ...) G_GNUC_NULL_TERMINATED;
/**
* object_set_propv:
@@ -728,7 +728,7 @@ void object_initialize(void *obj, size_t size, const char
*typename);
bool object_initialize_child_with_props(Object *parentobj,
const char *propname,
void *childobj, size_t size, const char *type,
- Error **errp, ...) QEMU_SENTINEL;
+ Error **errp, ...) G_GNUC_NULL_TERMINATED;
/**
* object_initialize_child_with_propsv:
diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h
index 9daec24d7825..3d1e9b50919a 100644
--- a/scripts/cocci-macro-file.h
+++ b/scripts/cocci-macro-file.h
@@ -21,7 +21,7 @@
/* From qemu/compiler.h */
#define QEMU_NORETURN __attribute__ ((__noreturn__))
#define G_GNUC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#define QEMU_SENTINEL __attribute__((sentinel))
+#define G_GNUC_NULL_TERMINATED __attribute__((sentinel))
#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))
# define QEMU_PACKED __attribute__((gcc_struct, packed))
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 797738a8e839..ddc6003de280 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -225,7 +225,7 @@ our $Attribute = qr{
volatile|
QEMU_NORETURN|
G_GNUC_WARN_UNUSED_RESULT|
- QEMU_SENTINEL|
+ G_GNUC_NULL_TERMINATED|
QEMU_PACKED|
G_GNUC_PRINTF
}x;
--
2.35.1.273.ge6ebfd0e8cbb
- [PATCH 09/27] compiler.h: replace QEMU_SENTINEL with G_GNUC_NULL_TERMINATED,
marcandre . lureau <=