* [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
@ 2011-08-29 15:34 Avi Kivity
2011-08-29 15:42 ` Anthony Liguori
2011-08-29 16:17 ` Jan Kiszka
0 siblings, 2 replies; 11+ messages in thread
From: Avi Kivity @ 2011-08-29 15:34 UTC (permalink / raw)
To: Anthony Liguori, qemu-devel
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
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
2011-08-29 15:34 [Qemu-devel] [PULL][v2] Memory API conversions, batch 5 Avi Kivity
@ 2011-08-29 15:42 ` Anthony Liguori
2011-08-29 15:44 ` Avi Kivity
2011-08-29 16:17 ` Jan Kiszka
1 sibling, 1 reply; 11+ messages in thread
From: Anthony Liguori @ 2011-08-29 15:42 UTC (permalink / raw)
To: Avi Kivity; +Cc: Edgar E. Iglesias, qemu-devel
On 08/29/2011 10:34 AM, Avi Kivity wrote:
> 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
>
> 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
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
2011-08-29 15:42 ` Anthony Liguori
@ 2011-08-29 15:44 ` Avi Kivity
0 siblings, 0 replies; 11+ messages in thread
From: Avi Kivity @ 2011-08-29 15:44 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Edgar E. Iglesias, qemu-devel
On 08/29/2011 06:42 PM, Anthony Liguori wrote:
> On 08/29/2011 10:34 AM, Avi Kivity wrote:
>> 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).
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
2011-08-29 15:34 [Qemu-devel] [PULL][v2] Memory API conversions, batch 5 Avi Kivity
2011-08-29 15:42 ` Anthony Liguori
@ 2011-08-29 16:17 ` Jan Kiszka
2011-08-29 16:22 ` Jan Kiszka
1 sibling, 1 reply; 11+ messages in thread
From: Jan Kiszka @ 2011-08-29 16:17 UTC (permalink / raw)
To: Avi Kivity; +Cc: qemu-devel
On 2011-08-29 17:34, Avi Kivity wrote:
> 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
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
2011-08-29 16:17 ` Jan Kiszka
@ 2011-08-29 16:22 ` Jan Kiszka
2011-08-29 19:14 ` Anthony Liguori
2011-08-29 19:14 ` Anthony Liguori
0 siblings, 2 replies; 11+ messages in thread
From: Jan Kiszka @ 2011-08-29 16:22 UTC (permalink / raw)
To: Avi Kivity; +Cc: qemu-devel
On 2011-08-29 18:17, Jan Kiszka wrote:
> On 2011-08-29 17:34, Avi Kivity wrote:
>> 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.
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
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
2011-08-29 16:22 ` Jan Kiszka
@ 2011-08-29 19:14 ` Anthony Liguori
2011-08-29 19:14 ` Anthony Liguori
1 sibling, 0 replies; 11+ messages in thread
From: Anthony Liguori @ 2011-08-29 19:14 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, qemu-devel
On 08/29/2011 11:22 AM, Jan Kiszka wrote:
> On 2011-08-29 18:17, Jan Kiszka wrote:
>> On 2011-08-29 17:34, Avi Kivity wrote:
>>> 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.
>
> 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
>
> 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
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
2011-08-29 16:22 ` Jan Kiszka
2011-08-29 19:14 ` Anthony Liguori
@ 2011-08-29 19:14 ` Anthony Liguori
2011-08-29 21:15 ` Avi Kivity
1 sibling, 1 reply; 11+ messages in thread
From: Anthony Liguori @ 2011-08-29 19:14 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, qemu-devel
On 08/29/2011 11:22 AM, Jan Kiszka wrote:
> On 2011-08-29 18:17, Jan Kiszka wrote:
>> On 2011-08-29 17:34, Avi Kivity wrote:
>>> 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.
>
> 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
>
> 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
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL][v2] Memory API conversions, batch 5
2011-08-29 19:14 ` Anthony Liguori
@ 2011-08-29 21:15 ` Avi Kivity
2011-08-29 22:38 ` [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices Jan Kiszka
0 siblings, 1 reply; 11+ messages in thread
From: Avi Kivity @ 2011-08-29 21:15 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Jan Kiszka, qemu-devel
On 08/29/2011 10:14 PM, Anthony Liguori wrote:
>> 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.
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices
2011-08-29 21:15 ` Avi Kivity
@ 2011-08-29 22:38 ` Jan Kiszka
2011-08-30 8:21 ` Avi Kivity
0 siblings, 1 reply; 11+ messages in thread
From: Jan Kiszka @ 2011-08-29 22:38 UTC (permalink / raw)
To: Avi Kivity; +Cc: qemu-devel
On 2011-08-29 23:15, Avi Kivity wrote:
> On 08/29/2011 10:14 PM, Anthony Liguori wrote:
>>> 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 <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
memory.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/memory.c b/memory.c
index eb31fa8..57f0fa4 100644
--- a/memory.c
+++ b/memory.c
@@ -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)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices
2011-08-29 22:38 ` [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices Jan Kiszka
@ 2011-08-30 8:21 ` Avi Kivity
2011-08-30 11:26 ` Jan Kiszka
0 siblings, 1 reply; 11+ messages in thread
From: Avi Kivity @ 2011-08-30 8:21 UTC (permalink / raw)
To: Jan Kiszka; +Cc: qemu-devel
On 08/30/2011 01:38 AM, Jan Kiszka wrote:
> On 2011-08-29 23:15, Avi Kivity wrote:
> > On 08/29/2011 10:14 PM, Anthony Liguori wrote:
> >>> 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... :)
I'm willing to hate rom_device equally. There's enough to go round.
> ---8<---
>
> From: Jan Kiszka<jan.kiszka@siemens.com>
>
> 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?
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices
2011-08-30 8:21 ` Avi Kivity
@ 2011-08-30 11:26 ` Jan Kiszka
0 siblings, 0 replies; 11+ messages in thread
From: Jan Kiszka @ 2011-08-30 11:26 UTC (permalink / raw)
To: Avi Kivity; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 852 bytes --]
On 2011-08-30 10:21, Avi Kivity wrote:
> On 08/30/2011 01:38 AM, Jan Kiszka wrote:
>> On 2011-08-29 23:15, Avi Kivity wrote:
>> > On 08/29/2011 10:14 PM, Anthony Liguori wrote:
>> >>> 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... :)
>
> I'm willing to hate rom_device equally. There's enough to go round.
>
>> ---8<---
>>
>> From: Jan Kiszka<jan.kiszka@siemens.com>
>>
>> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-08-30 11:27 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-29 15:34 [Qemu-devel] [PULL][v2] Memory API conversions, batch 5 Avi Kivity
2011-08-29 15:42 ` Anthony Liguori
2011-08-29 15:44 ` Avi Kivity
2011-08-29 16:17 ` Jan Kiszka
2011-08-29 16:22 ` Jan Kiszka
2011-08-29 19:14 ` Anthony Liguori
2011-08-29 19:14 ` Anthony Liguori
2011-08-29 21:15 ` Avi Kivity
2011-08-29 22:38 ` [Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices Jan Kiszka
2011-08-30 8:21 ` Avi Kivity
2011-08-30 11:26 ` Jan Kiszka
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.