Patchwork [1/2] Use defines instead of numbers for pci hotplug sts bit

login
register
mail settings
Submitter Gleb Natapov
Date Oct. 17, 2010, 9:45 a.m.
Message ID <1287308725-30811-1-git-send-email-gleb@redhat.com>
Download mbox | patch
Permalink /patch/68072/
State New
Headers show

Comments

Gleb Natapov - Oct. 17, 2010, 9:45 a.m.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
 hw/acpi_piix4.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Anthony Liguori - Oct. 20, 2010, 10:24 p.m.
On 10/17/2010 04:45 AM, Gleb Natapov wrote:
> Signed-off-by: Gleb Natapov<gleb@redhat.com>
>    

Applied both.  Thanks.

Regards,

Anthony Liguori

> ---
>   hw/acpi_piix4.c |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
> index c8733e5..bec42b4 100644
> --- a/hw/acpi_piix4.c
> +++ b/hw/acpi_piix4.c
> @@ -38,6 +38,8 @@
>   #define PCI_BASE 0xae00
>   #define PCI_EJ_BASE 0xae08
>
> +#define PIIX4_PCI_HOTPLUG_STATUS 2
> +
>   struct gpe_regs {
>       uint16_t sts; /* status */
>       uint16_t en;  /* enabled */
> @@ -596,13 +598,13 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s)
>
>   static void enable_device(PIIX4PMState *s, int slot)
>   {
> -    s->gpe.sts |= 2;
> +    s->gpe.sts |= PIIX4_PCI_HOTPLUG_STATUS;
>       s->pci0_status.up |= (1<<  slot);
>   }
>
>   static void disable_device(PIIX4PMState *s, int slot)
>   {
> -    s->gpe.sts |= 2;
> +    s->gpe.sts |= PIIX4_PCI_HOTPLUG_STATUS;
>       s->pci0_status.down |= (1<<  slot);
>   }
>
>

Patch

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index c8733e5..bec42b4 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -38,6 +38,8 @@ 
 #define PCI_BASE 0xae00
 #define PCI_EJ_BASE 0xae08
 
+#define PIIX4_PCI_HOTPLUG_STATUS 2
+
 struct gpe_regs {
     uint16_t sts; /* status */
     uint16_t en;  /* enabled */
@@ -596,13 +598,13 @@  static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s)
 
 static void enable_device(PIIX4PMState *s, int slot)
 {
-    s->gpe.sts |= 2;
+    s->gpe.sts |= PIIX4_PCI_HOTPLUG_STATUS;
     s->pci0_status.up |= (1 << slot);
 }
 
 static void disable_device(PIIX4PMState *s, int slot)
 {
-    s->gpe.sts |= 2;
+    s->gpe.sts |= PIIX4_PCI_HOTPLUG_STATUS;
     s->pci0_status.down |= (1 << slot);
 }