diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:10:49 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:10:49 -0600 |
| commit | 3cfdd0da7e513e740b759a2abec49db3c086d6e2 (patch) | |
| tree | d4083407dc731897c33d06eafd578f1c79ec88e8 /hw | |
| parent | ddf83d0173c6a64a95a6640e4bfcea4cd789cad2 (diff) | |
| parent | 50ced5b3b108aba7f9b2c8e6f7de4e924f30f83b (diff) | |
| download | qemu-3cfdd0da7e513e740b759a2abec49db3c086d6e2.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/core.c | 6 | ||||
| -rw-r--r-- | hw/piix_pci.c | 3 | ||||
| -rw-r--r-- | hw/stellaris.c | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index de9ed411a2..56b219b504 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -493,7 +493,7 @@ void ide_sector_read(IDEState *s) } } -static void dma_buf_commit(IDEState *s, int is_write) +static void dma_buf_commit(IDEState *s) { qemu_sglist_destroy(&s->sg); } @@ -532,7 +532,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op) bdrv_iostatus_set_err(s->bs, error); } else { if (op & BM_STATUS_DMA_RETRY) { - dma_buf_commit(s, 0); + dma_buf_commit(s); ide_dma_error(s); } else { ide_rw_error(s); @@ -565,7 +565,7 @@ void ide_dma_cb(void *opaque, int ret) n = s->io_buffer_size >> 9; sector_num = ide_get_sector(s); if (n > 0) { - dma_buf_commit(s, ide_cmd_is_read(s)); + dma_buf_commit(s); sector_num += n; ide_set_sector(s, sector_num); s->nsector -= n; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index d785d4ba07..ea156a9373 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -324,9 +324,8 @@ static PCIBus *i440fx_common_init(const char *device_name, pci_create_simple_multifunction(b, -1, true, "PIIX3")); pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, PIIX_NUM_PIRQS); - - qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL); } + qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL); piix3->pic = pic; (*pi440fx_state)->piix3 = piix3; diff --git a/hw/stellaris.c b/hw/stellaris.c index ce62a98158..7a73074982 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -621,6 +621,7 @@ static void ssys_reset(void *opaque) s->rcgc[0] = 1; s->scgc[0] = 1; s->dcgc[0] = 1; + ssys_calculate_system_clock(s); } static int stellaris_sys_post_load(void *opaque, int version_id) |