Skip to contentSkip to conversation

ide: Build fixes

GIT PULL In review Kevin Wolf 3 participants 5 messages Dec 17, 2010 – Dec 18, 2010

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

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(-)
author
#1 lore raw

PATCH 1/2 ide: Fix build for cmd646.c

---
 hw/ide/cmd646.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
hw/ide/cmd646.c +2 -2
index 89ba836..5d5464a 100644
@@ -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);
Signature · 1 line
1.7.2.3
author
#3 lore raw

PATCH 2/2 ide: Build fix for via.c

In reply to Kevin Wolf
---
 hw/ide/via.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
hw/ide/via.c +1 -1
index 5b70bd2..0e90679 100644
@@ -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);
     }
 }
 
Signature · 1 line
1.7.2.3
#4 lore raw
In reply to Kevin Wolf
Quoted 7 lines · 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

Pushed, thanks.

Regards,

Anthony Liguori

Quoted 8 lines

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(-)