Patchwork i440fx: remove piix3 field

login
register
mail settings
Submitter Paolo Bonzini
Date Dec. 20, 2011, 1:10 p.m.
Message ID <1324386636-25248-1-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/132412/
State New
Headers show

Comments

Paolo Bonzini - Dec. 20, 2011, 1:10 p.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/piix_pci.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
Anthony Liguori - Dec. 20, 2011, 10:16 p.m.
On 12/20/2011 07:10 AM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   hw/piix_pci.c |    3 ---
>   1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index 43c85aa..e188c7a 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -81,7 +81,6 @@ struct PCII440FXState {
>       PAMMemoryRegion pam_regions[13];
>       MemoryRegion smram_region;
>       uint8_t smm_enabled;
> -    PIIX3State *piix3;
>   };
>
>
> @@ -320,8 +319,6 @@ static PCIBus *i440fx_common_init(const char *device_name,
>       qdev_property_add_child(dev, "piix3",&piix3->dev.qdev, NULL);
>       piix3->pic = pic;
>
> -    (*pi440fx_state)->piix3 = piix3;
> -
>       *piix3_devfn = piix3->dev.devfn;
>
>       ram_size = ram_size / 8 / 1024 / 1024;

Patch

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 43c85aa..e188c7a 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -81,7 +81,6 @@  struct PCII440FXState {
     PAMMemoryRegion pam_regions[13];
     MemoryRegion smram_region;
     uint8_t smm_enabled;
-    PIIX3State *piix3;
 };
 
 
@@ -320,8 +319,6 @@  static PCIBus *i440fx_common_init(const char *device_name,
     qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL);
     piix3->pic = pic;
 
-    (*pi440fx_state)->piix3 = piix3;
-
     *piix3_devfn = piix3->dev.devfn;
 
     ram_size = ram_size / 8 / 1024 / 1024;