Memory API conversions, batch 5

GIT PULL In review Avi Kivity 4 participants 11 messages Aug 29, 2011 – Aug 30, 2011

lore

Share & tools

lore

Avi Kivity

author

2011-08-29 15:34 UTC #0 lore raw

Please pull from

git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch

to receive a fixed version of the latest memory API conversion batch. The pflash_cfi patch has been reworked extensively, but otherwise there are no changes.

Avi Kivity (22):
mips_fulong2e: convert to memory API
stellaris_enet: convert to memory API
sysbus: add helpers to add and delete memory regions to the
system bus
pci_host: convert conf index and data ports to memory API
ReadWriteHandler: remove
an5206: convert to memory API
armv7m: convert to memory API
axis_dev88: convert to memory API (RAM only)
sysbus: add sysbus_add_memory_overlap()
integratorcp: convert to memory API (RAM/flash only)
leon3: convert to memory API
cirrus: wrap memory update in a transaction
piix_pci: wrap memory update in a transaction Makefile.hw: allow hw/ files to include glib headers pflash_cfi01/pflash_cfi02: convert to memory API
dummy_m68k: convert to memory API
lm32_boards: convert to memory API
mainstone: convert to memory API
mcf5208: convert to memory API
milkymist-minimac2: convert to memory API
milkymist-softusb: convert to memory API
milkymist: convert to memory API

 Makefile.hw                   |    1 +
 Makefile.target               |    1 -
 hw/an5206.c                   |   12 +++--
 hw/arm-misc.h                 |    5 ++-
 hw/armv7m.c                   |   22 +++++----
 hw/axis_dev88.c               |   16 +++---
 hw/cirrus_vga.c               |    2 +
 hw/collie.c                   |    7 +--
 hw/dec_pci.c                  |   13 +++---
 hw/dummy_m68k.c               |    7 ++-
 hw/flash.h                    |   13 +++++-
 hw/grackle_pci.c              |   13 +++---
 hw/gumstix.c                  |    6 +--
 hw/integratorcp.c             |   28 +++++++++---
 hw/leon3.c                    |   15 ++++---
 hw/lm32_boards.c              |   23 +++++-----
 hw/mainstone.c                |   20 +++++----
 hw/mcf5208.c                  |   72 ++++++++++++++-----------------
 hw/milkymist-minimac2.c       |   43 +++++++++---------
 hw/milkymist-softusb.c        |   48 ++++++++++----------
 hw/milkymist.c                |   13 +++---
 hw/mips_fulong2e.c            |   17 ++++---
 hw/mips_malta.c               |   54 +++++++++++++++--------
 hw/mips_r4k.c                 |   13 +++---
 hw/musicpal.c                 |    8 ++--
 hw/omap_sx1.c                 |    8 ++--
 hw/pci_host.c                 |   86 ++++++++++++++++---------------------
 hw/pci_host.h                 |   16 +++----
 hw/petalogix_ml605_mmu.c      |    5 +-
 hw/petalogix_s3adsp1800_mmu.c |    5 +-
 hw/pflash_cfi01.c             |   78 ++++++++++++++-------------------
 hw/pflash_cfi02.c             |   95 
+++++++++++++++++++++--------------------
 hw/piix_pci.c                 |   13 +++++-
 hw/ppc405_boards.c            |   49 ++++++++++++---------
 hw/ppc4xx_pci.c               |   10 +++--
 hw/ppce500_pci.c              |   21 ++++-----
 hw/prep_pci.c                 |   12 ++++-
 hw/r2d.c                      |    2 +-
 hw/stellaris.c                |    5 ++-
 hw/stellaris_enet.c           |   29 +++++-------
 hw/sysbus.c                   |   29 ++++++++++++
 hw/sysbus.h                   |    8 +++
 hw/unin_pci.c                 |   82 ++++++++++++++++++------------------
 hw/virtex_ml507.c             |    4 +-
 hw/z2.c                       |    2 +-
 rwhandler.c                   |   87 -------------------------------------
 rwhandler.h                   |   27 ------------
 47 files changed, 551 insertions(+), 594 deletions(-)
 delete mode 100644 rwhandler.c
 delete mode 100644 rwhandler.h

Signature · 2 lines

I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

Anthony Liguori

2011-08-29 15:43 UTC #1 lore raw

Quoted 7 lines · Avi Kivity

Please pull from
git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch
to receive a fixed version of the latest memory API conversion batch. The pflash_cfi patch has been reworked extensively, but otherwise there are no changes.

This has been tested against Edgar's test case?

Regards,

Anthony Liguori

Quoted 76 lines

Avi Kivity (22):
mips_fulong2e: convert to memory API
stellaris_enet: convert to memory API
sysbus: add helpers to add and delete memory regions to the system bus
pci_host: convert conf index and data ports to memory API
ReadWriteHandler: remove
an5206: convert to memory API
armv7m: convert to memory API
axis_dev88: convert to memory API (RAM only)
sysbus: add sysbus_add_memory_overlap()
integratorcp: convert to memory API (RAM/flash only)
leon3: convert to memory API
cirrus: wrap memory update in a transaction
piix_pci: wrap memory update in a transaction
Makefile.hw: allow hw/ files to include glib headers pflash_cfi01/pflash_cfi02: convert to memory API
dummy_m68k: convert to memory API
lm32_boards: convert to memory API
mainstone: convert to memory API
mcf5208: convert to memory API
milkymist-minimac2: convert to memory API
milkymist-softusb: convert to memory API
milkymist: convert to memory API
Makefile.hw | 1 +
Makefile.target | 1 -
hw/an5206.c | 12 +++--
hw/arm-misc.h | 5 ++-
hw/armv7m.c | 22 +++++----
hw/axis_dev88.c | 16 +++---
hw/cirrus_vga.c | 2 +
hw/collie.c | 7 +--
hw/dec_pci.c | 13 +++---
hw/dummy_m68k.c | 7 ++-
hw/flash.h | 13 +++++-
hw/grackle_pci.c | 13 +++---
hw/gumstix.c | 6 +--
hw/integratorcp.c | 28 +++++++++---
hw/leon3.c | 15 ++++---
hw/lm32_boards.c | 23 +++++-----
hw/mainstone.c | 20 +++++----
hw/mcf5208.c | 72 ++++++++++++++-----------------
hw/milkymist-minimac2.c | 43 +++++++++---------
hw/milkymist-softusb.c | 48 ++++++++++----------
hw/milkymist.c | 13 +++---
hw/mips_fulong2e.c | 17 ++++---
hw/mips_malta.c | 54 +++++++++++++++--------
hw/mips_r4k.c | 13 +++---
hw/musicpal.c | 8 ++--
hw/omap_sx1.c | 8 ++--
hw/pci_host.c | 86 ++++++++++++++++---------------------
hw/pci_host.h | 16 +++----
hw/petalogix_ml605_mmu.c | 5 +- hw/petalogix_s3adsp1800_mmu.c | 5 +-
hw/pflash_cfi01.c | 78 ++++++++++++++------------------- hw/pflash_cfi02.c | 95 +++++++++++++++++++++-------------------- hw/piix_pci.c | 13 +++++-
hw/ppc405_boards.c | 49 ++++++++++++--------- hw/ppc4xx_pci.c | 10 +++--
hw/ppce500_pci.c | 21 ++++-----
hw/prep_pci.c | 12 ++++-
hw/r2d.c | 2 +-
hw/stellaris.c | 5 ++-
hw/stellaris_enet.c | 29 +++++-------
hw/sysbus.c | 29 ++++++++++++
hw/sysbus.h | 8 +++
hw/unin_pci.c | 82 ++++++++++++++++++------------------ hw/virtex_ml507.c | 4 +-
hw/z2.c | 2 +-
rwhandler.c | 87 ------------------------------------- rwhandler.h | 27 ------------
47 files changed, 551 insertions(+), 594 deletions(-)
delete mode 100644 rwhandler.c
delete mode 100644 rwhandler.h

Avi Kivity

author

2011-08-29 15:44 UTC #2 lore raw

Quoted 11 lines · Anthony Liguori

Quoted 7 lines · Avi Kivity
Please pull from
git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch
to receive a fixed version of the latest memory API conversion batch. The pflash_cfi patch has been reworked extensively, but otherwise there are no changes.
This has been tested against Edgar's test case?

Yes, by both Edgar and myself. I also tested the other wiki.qemu.org images, and they all work as far as I can tell (though I don't always know what to expect).

Signature · 2 lines

I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

Jan Kiszka

2011-08-29 16:17 UTC #3 lore raw

In reply to Avi Kivity

Quoted 7 lines · Avi Kivity

Please pull from
git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch
to receive a fixed version of the latest memory API conversion batch. The pflash_cfi patch has been reworked extensively, but otherwise there are no changes.

There might be some issues remaining. I've just quickly tested my musicpal image with a firmware update cycle. The version I built from memory/batch failed to start the update while current qemu git succeeded. Need to look closer/bisect the queue later.

Jan

Signature · 2 lines

Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux

Jan Kiszka

2011-08-29 16:22 UTC #4 lore raw

Quoted 5 lines · Jan Kiszka

Quoted 4 lines · Avi Kivity
Please pull from
git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch

Quoted 8 lines

Quoted 3 lines
to receive a fixed version of the latest memory API conversion batch. The pflash_cfi patch has been reworked extensively, but otherwise there are no changes.
There might be some issues remaining. I've just quickly tested my musicpal image with a firmware update cycle. The version I built from memory/batch failed to start the update while current qemu git succeeded. Need to look closer/bisect the queue later.

OK, that was simple: It's still "pflash_cfi01/pflash_cfi02: convert to memory API".

The firmware complains "flash_binary: Can't erase mtd device LINUX_ROOT_FS. Error: -5." I guess I need to enable some debug switches, but that really has to wait.

Jan

Signature · 2 lines

Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux

Anthony Liguori

2011-08-29 19:14 UTC #5 lore raw

Quoted 10 lines · Jan Kiszka

Quoted 9 lines · Jan Kiszka
Quoted 7 lines · Avi Kivity
Please pull from
git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch
to receive a fixed version of the latest memory API conversion batch. The pflash_cfi patch has been reworked extensively, but otherwise there are no changes.

Quoted 7 lines

Quoted 4 lines
There might be some issues remaining. I've just quickly tested my musicpal image with a firmware update cycle. The version I built from memory/batch failed to start the update while current qemu git succeeded. Need to look closer/bisect the queue later.
OK, that was simple: It's still "pflash_cfi01/pflash_cfi02: convert to memory API".

Hrm, okay. Avi, maybe drop that patch and submit a v3?

Regards,

Anthony Liguori

Quoted 7 lines

The firmware complains "flash_binary: Can't erase mtd device LINUX_ROOT_FS. Error: -5." I guess I need to enable some debug switches, but that really has to wait.
Jan

Anthony Liguori

2011-08-29 19:14 UTC #6 lore raw

In reply to Jan Kiszka

Quoted 10 lines · Jan Kiszka

Quoted 9 lines · Jan Kiszka
Quoted 7 lines · Avi Kivity
Please pull from
git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch
to receive a fixed version of the latest memory API conversion batch. The pflash_cfi patch has been reworked extensively, but otherwise there are no changes.

Quoted 7 lines

Quoted 4 lines
There might be some issues remaining. I've just quickly tested my musicpal image with a firmware update cycle. The version I built from memory/batch failed to start the update while current qemu git succeeded. Need to look closer/bisect the queue later.
OK, that was simple: It's still "pflash_cfi01/pflash_cfi02: convert to memory API".

Hrm, okay. Avi, maybe drop that patch and submit a v3?

Regards,

Anthony Liguori

Quoted 7 lines

The firmware complains "flash_binary: Can't erase mtd device LINUX_ROOT_FS. Error: -5." I guess I need to enable some debug switches, but that really has to wait.
Jan

Avi Kivity

author

2011-08-29 21:15 UTC #7 lore raw

Quoted 6 lines · Anthony Liguori

Quoted 2 lines
OK, that was simple: It's still "pflash_cfi01/pflash_cfi02: convert to memory API".
Hrm, okay. Avi, maybe drop that patch and submit a v3?

Of course. I'm sta^Wcontinuing to hate that pflash thing.

Signature · 2 lines

I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

Jan Kiszka

2011-08-29 22:38 UTC #8 lore raw

PATCH 1/1 memory: Fix memory_region_get_ram_ptr for ROM devices

Quoted 9 lines · Avi Kivity

Quoted 6 lines · Anthony Liguori
Quoted 2 lines
OK, that was simple: It's still "pflash_cfi01/pflash_cfi02: convert to memory API".
Hrm, okay. Avi, maybe drop that patch and submit a v3?
Of course. I'm sta^Wcontinuing to hate that pflash thing.

It's not always the pflash... :)

---8<---

From: Jan Kiszka <[email protected]>

Mask out the sub-page bits that are used by ROM device for storing the io-index and the IO_MEM_ROMD flag.

Signed-off-by Jan Kiszka <[email protected]>

---
 memory.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

memory.c +1 -1

index eb31fa8..57f0fa4 100644
@@ -1063,7 +1063,7 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr)
 
     assert(mr->terminates);
 
-    return qemu_get_ram_ptr(mr->ram_addr);
+    return qemu_get_ram_ptr(mr->ram_addr & TARGET_PAGE_MASK);
 }
 
 static void memory_region_update_coalesced_range(MemoryRegion *mr)

Signature · 1 line

1.7.3.4

Avi Kivity

author

2011-08-30 08:21 UTC #9 lore raw

Re: [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices

Quoted 6 lines · Jan Kiszka

Quoted 5 lines · Avi Kivity
Quoted 4 lines · Anthony Liguori
Quoted 2 lines
OK, that was simple: It's still "pflash_cfi01/pflash_cfi02: convert to memory API".

Quoted 6 lines

Quoted 4 lines
Quoted 2 lines
Hrm, okay. Avi, maybe drop that patch and submit a v3?
Of course. I'm sta^Wcontinuing to hate that pflash thing.
It's not always the pflash... :)

I'm willing to hate rom_device equally. There's enough to go round.

Quoted 6 lines

---8<---
From: Jan Kiszka<[email protected]>
Mask out the sub-page bits that are used by ROM device for storing the io-index and the IO_MEM_ROMD flag.

Applied; thanks for the help. With this, everything works, yes?

Signature · 1 line

error compiling committee.c: too many arguments to function

Jan Kiszka

2011-08-30 11:27 UTC #10 lore raw

Re: [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices

Quoted 17 lines · Avi Kivity

Quoted 7 lines · Jan Kiszka
Quoted 2 lines · Avi Kivity
Quoted 1 line · Anthony Liguori
Quoted 1 line
OK, that was simple: It's still "pflash_cfi01/pflash_cfi02:
convert to
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
memory API".
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Hrm, okay. Avi, maybe drop that patch and submit a v3?
Of course. I'm sta^Wcontinuing to hate that pflash thing.
It's not always the pflash... :)
I'm willing to hate rom_device equally. There's enough to go round.

Quoted 8 lines

Quoted 6 lines
---8<---
From: Jan Kiszka<[email protected]>
Mask out the sub-page bits that are used by ROM device for storing the io-index and the IO_MEM_ROMD flag.
Applied; thanks for the help. With this, everything works, yes?

Yes, at least for me.

Jan