From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7835C2BCA1 for ; Fri, 7 Jun 2019 14:17:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 946BB206E0 for ; Fri, 7 Jun 2019 14:17:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 946BB206E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZFgo-0002dR-Nm for qemu-devel@archiver.kernel.org; Fri, 07 Jun 2019 10:17:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51288) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZFci-0007kI-0C for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:13:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZFcg-000110-27 for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:13:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53982) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZFcd-0000Vv-UP for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:13:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F140830C31A4 for ; Fri, 7 Jun 2019 14:13:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-148.ams2.redhat.com [10.36.116.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C24247FE95 for ; Fri, 7 Jun 2019 14:13:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 533A211386A0; Fri, 7 Jun 2019 16:13:21 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 7 Jun 2019 16:13:21 +0200 Message-Id: <20190607141321.9726-1-armbru@redhat.com> In-Reply-To: <20190604181618.19980-1-armbru@redhat.com> References: <20190604181618.19980-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 07 Jun 2019 14:13:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/4] Clean up a header guard symbols (again) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Commit d52c454aad "contrib: add vhost-user-gpu" and "c68082c43a virtio-gpu: split virtio-gpu-pci & virtio-vga" created headers with unusual header guard symbols. Clean them up Signed-off-by: Markus Armbruster --- contrib/vhost-user-gpu/virgl.h | 5 +++-- contrib/vhost-user-gpu/vugbm.h | 5 +++-- contrib/vhost-user-gpu/vugpu.h | 5 +++-- hw/display/virtio-vga.h | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/contrib/vhost-user-gpu/virgl.h b/contrib/vhost-user-gpu/virg= l.h index f952bc9d4f..17078783a5 100644 --- a/contrib/vhost-user-gpu/virgl.h +++ b/contrib/vhost-user-gpu/virgl.h @@ -11,8 +11,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. */ -#ifndef VUGPU_VIRGL_H_ -#define VUGPU_VIRGL_H_ + +#ifndef VUGPU_VIRGL_H +#define VUGPU_VIRGL_H =20 #include "vugpu.h" =20 diff --git a/contrib/vhost-user-gpu/vugbm.h b/contrib/vhost-user-gpu/vugb= m.h index c0bf27af9b..07e698fcd7 100644 --- a/contrib/vhost-user-gpu/vugbm.h +++ b/contrib/vhost-user-gpu/vugbm.h @@ -6,8 +6,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. */ -#ifndef VHOST_USER_GPU_GBM_H -#define VHOST_USER_GPU_GBM_H + +#ifndef VHOST_USER_GPU_VUGBM_H +#define VHOST_USER_GPU_VUGBM_H =20 #include "qemu/osdep.h" =20 diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugp= u.h index 458e92a1b3..3153c9a6de 100644 --- a/contrib/vhost-user-gpu/vugpu.h +++ b/contrib/vhost-user-gpu/vugpu.h @@ -11,8 +11,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. */ -#ifndef VUGPU_H_ -#define VUGPU_H_ + +#ifndef VUGPU_H +#define VUGPU_H =20 #include "qemu/osdep.h" =20 diff --git a/hw/display/virtio-vga.h b/hw/display/virtio-vga.h index c10bf390aa..c41281a010 100644 --- a/hw/display/virtio-vga.h +++ b/hw/display/virtio-vga.h @@ -1,5 +1,5 @@ -#ifndef VIRTIO_VGA_H_ -#define VIRTIO_VGA_H_ +#ifndef VIRTIO_VGA_H +#define VIRTIO_VGA_H =20 #include "hw/virtio/virtio-gpu-pci.h" #include "vga_int.h" @@ -29,4 +29,4 @@ typedef struct VirtIOVGABaseClass { DeviceReset parent_reset; } VirtIOVGABaseClass; =20 -#endif /* VIRTIO_VGA_H_ */ +#endif /* VIRTIO_VGA_H */ --=20 2.21.0