[Qemu-devel] [PULL 0/2] ide: Build fixes

[Qemu-devel] [PULL 0/2] ide: Build fixes

[Kevin Wolf]

The following changes since commit e59d688ad112719cb264f395b1f5895866ebf309:

  docs: Fix missing carets in QED specification (2010-12-17 17:05:06 +0100)

are available in the git repository at:
  git://repo.or.cz/qemu/kevin.git for-anthony

Kevin Wolf (2):
      ide: Fix build for cmd646.c
      ide: Build fix for via.c

 hw/ide/cmd646.c |    4 ++--
 hw/ide/via.c    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[Qemu-devel] [PATCH 1/2] ide: Fix build for cmd646.c

[Kevin Wolf]

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Andreas Färber <andreas.faerber@web.de>
---
 hw/ide/cmd646.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 89ba836..5d5464a 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -255,9 +255,9 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
         ide_init2(&d->bus[i], irq[i]);
 
         bmdma_init(&d->bus[i], &d->bmdma[i]);
-        bm->bus = &d->bus[i];
+        d->bmdma[i].bus = &d->bus[i];
         qemu_add_vm_change_state_handler(d->bus[i].dma->ops->restart_cb,
-                                         &d->bmdma[i]->dma);
+                                         &d->bmdma[i].dma);
     }
 
     vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d);
-- 
1.7.2.3

[Qemu-devel] [PATCH 2/2] ide: Build fix for via.c

[Kevin Wolf]

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/ide/via.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/ide/via.c b/hw/ide/via.c
index 5b70bd2..0e90679 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -150,7 +150,7 @@ static void vt82c686b_init_ports(PCIIDEState *d) {
         bmdma_init(&d->bus[i], &d->bmdma[i]);
         d->bmdma[i].bus = &d->bus[i];
         qemu_add_vm_change_state_handler(d->bus[i].dma->ops->restart_cb,
-                                         &d->bmdma[i]->dma);
+                                         &d->bmdma[i].dma);
     }
 }
 
-- 
1.7.2.3

[Qemu-devel] Re: [PULL 0/2] ide: Build fixes

[Anthony Liguori]

On 12/17/2010 01:38 PM, Kevin Wolf wrote:
> The following changes since commit e59d688ad112719cb264f395b1f5895866ebf309:
>
>    docs: Fix missing carets in QED specification (2010-12-17 17:05:06 +0100)
>
> are available in the git repository at:
>    git://repo.or.cz/qemu/kevin.git for-anthony
>    

Pushed, thanks.

Regards,

Anthony Liguori

> Kevin Wolf (2):
>        ide: Fix build for cmd646.c
>        ide: Build fix for via.c
>
>   hw/ide/cmd646.c |    4 ++--
>   hw/ide/via.c    |    2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>    

Re: [Qemu-devel] [PATCH 1/2] ide: Fix build for cmd646.c

[Stefan Hajnoczi]

On Fri, Dec 17, 2010 at 7:39 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> Acked-by: Andreas Färber <andreas.faerber@web.de>
> ---
>  hw/ide/cmd646.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Sorry, I should have rebuilt all targets before sending
f25497613134e3d1e82e216075ebe1f550e78124.

Stefan