From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeP9p-0001Mk-5h for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeP9o-00012A-B9 for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34961) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeP9o-000122-5u for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:00 -0400 From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:05:43 +0200 Message-Id: <1442934371-12567-21-git-send-email-pbonzini@redhat.com> In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> References: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 20/48] apic_internal.h: rename ESR_ILLEGAL_ADDRESS to APIC_ESR_ILLEGAL_ADDRESS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Denis V. Lunev" , =?UTF-8?q?Andreas=20F=C3=83=C2=A4rber?= , Pavel Butsykin From: Pavel Butsykin Added prefix APIC_ for determining the constant of a particular subsystem= , improve the overall readability and match other constant names. Signed-off-by: Pavel Butsykin Signed-off-by: Denis V. Lunev CC: Paolo Bonzini CC: Andreas F=C3=83=C2=A4rber Message-Id: <1442927901-1084-3-git-send-email-den@openvz.org> Signed-off-by: Paolo Bonzini --- hw/intc/apic.c | 4 ++-- include/hw/i386/apic_internal.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c index 52ac8b2..0a840b8 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -723,7 +723,7 @@ static uint32_t apic_mem_readl(void *opaque, hwaddr a= ddr) val =3D s->divide_conf; break; default: - s->esr |=3D ESR_ILLEGAL_ADDRESS; + s->esr |=3D APIC_ESR_ILLEGAL_ADDRESS; val =3D 0; break; } @@ -836,7 +836,7 @@ static void apic_mem_writel(void *opaque, hwaddr addr= , uint32_t val) } break; default: - s->esr |=3D ESR_ILLEGAL_ADDRESS; + s->esr |=3D APIC_ESR_ILLEGAL_ADDRESS; break; } } diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_inter= nal.h index 5a213bc..188131c 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -57,7 +57,7 @@ #define APIC_INPUT_POLARITY (1<<13) #define APIC_SEND_PENDING (1<<12) =20 -#define ESR_ILLEGAL_ADDRESS (1 << 7) +#define APIC_ESR_ILLEGAL_ADDRESS (1 << 7) =20 #define APIC_SV_DIRECTED_IO (1<<12) #define APIC_SV_ENABLE (1<<8) --=20 2.5.0