From 5d1c4a35ec43b8bef964071f186c29c6d717cb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Mon, 14 Oct 2019 14:07:39 +0200
Subject: [PATCH] use G_GNUC_NORETURN instead of ATTRIBUTE_NORETURN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove all usage of ATTRIBUTE_NORETURN in favor of GLib's
G_GNUC_NORETURN.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/lxc/lxc_container.c    | 2 +-
 src/network/leaseshelper.c | 2 +-
 src/util/iohelper.c        | 2 +-
 src/util/virprocess.c      | 2 +-
 src/util/virprocess.h      | 2 +-
 tests/eventtest.c          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 905645a41c..97f9055506 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -116,7 +116,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
  * in a child pid namespace if container reboot support exists.
  * Otherwise, it will either succeed or return -EPERM.
  */
-ATTRIBUTE_NORETURN static int
+G_GNUC_NORETURN static int
 lxcContainerRebootChild(void *argv)
 {
     int *cmd = argv;
diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index 46482ad3ce..dc737879ca 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -47,7 +47,7 @@ helperVersion(const char *argv0)
     printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION);
 }
 
-ATTRIBUTE_NORETURN static void
+G_GNUC_NORETURN static void
 usage(int status)
 {
     if (status) {
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index f3d45b9c03..3dc0488b26 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -175,7 +175,7 @@ runIO(const char *path, int fd, int oflags)
 
 static const char *program_name;
 
-ATTRIBUTE_NORETURN static void
+G_GNUC_NORETURN static void
 usage(int status)
 {
     if (status) {
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index b1544af730..0fa648ce74 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -1214,7 +1214,7 @@ virProcessSetupPrivateMountNS(void)
 #endif /* !defined(HAVE_SYS_MOUNT_H) || !defined(HAVE_UNSHARE) */
 
 #if defined(__linux__)
-ATTRIBUTE_NORETURN static int
+G_GNUC_NORETURN static int
 virProcessDummyChild(void *argv ATTRIBUTE_UNUSED)
 {
     _exit(0);
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 4806c592da..8e2af33c7d 100644
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -46,7 +46,7 @@ virProcessTranslateStatus(int status);
 void
 virProcessAbort(pid_t pid);
 
-void virProcessExitWithStatus(int status) ATTRIBUTE_NORETURN;
+void virProcessExitWithStatus(int status) G_GNUC_NORETURN;
 
 int
 virProcessWait(pid_t pid, int *exitstatus, bool raw)
diff --git a/tests/eventtest.c b/tests/eventtest.c
index f04b416ad2..2a6edc7461 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -158,7 +158,7 @@ static pthread_cond_t eventThreadJobCond = PTHREAD_COND_INITIALIZER;
 static int eventThreadJobDone;
 
 
-ATTRIBUTE_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) {
+G_GNUC_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) {
     while (1) {
         pthread_mutex_lock(&eventThreadMutex);
         while (!eventThreadRunOnce)