提交 · ae0a54664c76f1d2a2a7a268266d47b4e8c12a4c · openeuler / qemu

22 8月, 2011 40 次提交

由 Avi Kivity 提交于 8月 15, 2011

The current implementation of PAM and the PCI holes is broken in several
ways:

  - PCI BARs are not restricted to the PCI hole (a BAR may hide memory)
  - PCI devices do not respect PAM (if a PCI device maps a region while
    PAM maps the region to RAM, the request will be honored)

This patch fixes things by introducing a pci address space, and using
memory region aliases to represent PAM regions, SMRAM, and PCI holes.

The memory hierarchy looks something like

system_memory
 |
 +--- low memory alias (0-0xe0000000)
 |      |
 |      +-- ram@0
 |
 +--- high memory alias (0x100000000-EOM)
 |      |
 |      +-- ram@0xe0000000
 |
 +--- pci hole alias (end of low memory-0x100000000)
 |      |
 |      +-- pci@end-of-low-memory
 |
 |
 +--- pam[n] (0xc0000-0xc3fff etc) (when set to pci, priority 1)
 |      |
 |      +-- pci@0xc4000 etc
 |
 +--- smram (0xa0000-0xbffff) (when set to pci/vga, priority 1)
        |
        +-- pci@0xa0000 etc

ram (simple ram region)

pci
 |
 +--- BARn
 |
 +--- VGA 0xa0000-0xbffff
 |
 +--- ROMs
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

ae0a5466

vga: drop get_system_memory() from vga devices and derivatives · be20f9e9

由 Avi Kivity 提交于 8月 15, 2011

Instead, use the bus accessors, or get the address space directly
from the board constructor.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

be20f9e9

pci: add pci_address_space() · f5e6fed8

由 Avi Kivity 提交于 8月 15, 2011

Returns the PCI address space.  Useful for bridges that can obscure
part of the PCI address space.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

f5e6fed8

isa: add isa_address_space() · c839adec

由 Avi Kivity 提交于 8月 15, 2011

A helper that returns the address space used by ISA devices.  Useful
for getting rid of isa_mem_base, multiple ISA buses, or ISA buses behind
bridges.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

c839adec

sysbus: remove sysbus_init_mmio_cb() · c5b3572f

由 Avi Kivity 提交于 8月 15, 2011

This problem with this function is that it is not reversible - it is
impossible to know where things are registered and unregister them
exactly.  As there are no more users, we can remove it.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

c5b3572f

ppce500_pci: convert to sysbus_init_mmio_cb2() · cd0fa1e6

由 Avi Kivity 提交于 8月 15, 2011

Not a huge step forward, but at least we now have a 1:1 relationship
between registration and unregistration.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

cd0fa1e6

versatile_pci: convert to memory API · 45de094e

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

45de094e

arm11mpcore: use sysbus_init_mmio_cb2 · 1635bdfa

由 Avi Kivity 提交于 8月 15, 2011

This tells the sysbus code it need not use IO_MEM_UNASSIGNED.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

1635bdfa

sh_pci: convert to memory API · fb57117a

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

fb57117a

sysbus: add a variant of sysbus_init_mmio_cb with an unmap callback · d7612013

由 Avi Kivity 提交于 8月 15, 2011

sysbus_init_mmio_cb() uses the destructive IO_MEM_UNASSIGNED to remove a
region.  Provide an alternative that calls an unmap callback, so the removal
may be done non-destructively.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d7612013

ppc4xx_sdram: convert to memory API · b6dcbe08

由 Avi Kivity 提交于 8月 15, 2011

Clumsy due to the lack of clipping support, needed for
changing exposed ram size.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

b6dcbe08

ppc405_uc: convert to memory API · 9074e0e3

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

9074e0e3

pcie_host: convert to memory API · c76f990e

由 Avi Kivity 提交于 8月 15, 2011

Assuming that mmcfg size cannot change at runtime.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

c76f990e

onenand: convert to memory API · 689a1921

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

689a1921

omap_gpmc/nseries/tusb6010: convert to memory API · 64066a8f

由 Avi Kivity 提交于 8月 15, 2011

Somewhat clumsy since it needs a variable sized region.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

64066a8f

tusb6010: move declarations to new file tusb6010.h · d09871f6

由 Avi Kivity 提交于 8月 15, 2011

Avoid #include hell.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d09871f6

gt64xxx.c: convert to memory API · fc2bf449

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

fc2bf449

armv7m: convert to memory API · f69bf9d4

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

f69bf9d4

arm_timer: convert to memory API · e219dea2

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

e219dea2

arm_sysctl: convert to memory API · 460d7c53

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

460d7c53

arm_gic: convert to memory API · 755c0802

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

755c0802

apic: convert to memory API · 312b4234

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

312b4234

apb_pci: convert to memory API · 3812ed0b

由 Avi Kivity 提交于 8月 15, 2011

Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

3812ed0b

pcnet: fix wrong opaque (broken by ) · 145aebec

由 Hervé Poussineau 提交于 8月 20, 2011

Reviewed-by: NStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: NHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

145aebec

Improvements to libtool support. · 3f534581

由 Brad 提交于 8月 13, 2011

Improvements to the libtool support in QEMU. Replace hard coded
libtool in the infrastructure with $(LIBTOOL) and allow
overriding the libtool binary used via the configure
script.
Reviewed-by: NAndreas F=E4rber <andreas.faerber@web.de>
Signed-off-by: NBrad Smith <brad@comstyle.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

3f534581

w32: Fix qemu_ftruncate64 · 2c993ec2

由 Stefan Weil 提交于 8月 20, 2011

SetFilePointer returns INVALID_SET_FILE_POINTER when it fails.
In addition, GetLastError must be checked.

The first call of SetFilePointer did not use INVALID_SET_FILE_POINTER,
the second call used wrong error handling.
Signed-off-by: NStefan Weil <weil@mail.berlios.de>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

2c993ec2

build: list libraries after objects, for proper linkage · 1f22a6bc

由 Diego Elio Pettenò 提交于 8月 14, 2011

Without this change, when using -Wl,--as-needed with GNU linker, the
libraries would be discarded.
Signed-off-by: NDiego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

1f22a6bc

fix code format · d62b5dea

由 Robert Wang 提交于 8月 19, 2011

Fix code format to make checkpatch.pl happy.
Signed-off-by: NRobert Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d62b5dea

e1000: use MII status register for link up/down · d4044c2a

由 Bjørn Mork 提交于 8月 17, 2011

Some guests will use the standard MII status register
to verify link state.  They will not notice link changes
unless this register is updated.

Verified with Linux 3.0 and Windows XP guests.

Without this patch, ethtool will report speed and duplex as
unknown when the link is down, but still report the link as
up.  This is because the Linux e1000 driver checks the
mac_reg[STATUS] register link state before it checks speed
and duplex, but uses the phy_reg[PHY_STATUS] register for
the actual link state check.  Fix by updating both registers
on link state changes.

Linux guest before:

 (qemu) set_link e1000.0 off

 kvm-sid:~# ethtool eth0
 Settings for eth0:
        Supported ports: [ TP ]
        Supported link modes:   10baseT/Half 10baseT/Full
                                100baseT/Half 100baseT/Full
                                1000baseT/Full
        Supports auto-negotiation: Yes
        Advertised link modes:  10baseT/Half 10baseT/Full
                                100baseT/Half 100baseT/Full
                                1000baseT/Full
        Advertised pause frame use: No
        Advertised auto-negotiation: Yes
        Speed: Unknown!
        Duplex: Unknown! (255)
        Port: Twisted Pair
        PHYAD: 0
        Transceiver: internal
        Auto-negotiation: on
        MDI-X: Unknown
        Supports Wake-on: umbg
        Wake-on: d
        Current message level: 0x00000007 (7)
                               drv probe link
        Link detected: yes

 (qemu) set_link e1000.0 on

Linux guest after:

 (qemu) set_link e1000.0 off
 [   63.384221] e1000: eth0 NIC Link is Down

 kvm-sid:~# ethtool eth0
 Settings for eth0:
        Supported ports: [ TP ]
        Supported link modes:   10baseT/Half 10baseT/Full
                                100baseT/Half 100baseT/Full
                                1000baseT/Full
        Supports auto-negotiation: Yes
        Advertised link modes:  10baseT/Half 10baseT/Full
                                100baseT/Half 100baseT/Full
                                1000baseT/Full
        Advertised pause frame use: No
        Advertised auto-negotiation: Yes
        Speed: Unknown!
        Duplex: Unknown! (255)
        Port: Twisted Pair
        PHYAD: 0
        Transceiver: internal
        Auto-negotiation: on
        MDI-X: Unknown
        Supports Wake-on: umbg
        Wake-on: d
        Current message level: 0x00000007 (7)
                               drv probe link
        Link detected: no

 (qemu) set_link e1000.0 on
 [   84.304582] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX
Signed-off-by: NBjørn Mork <bjorn@mork.no>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d4044c2a

A
char: document the functions that will be the public interface · 2011fe56
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
2011fe56
A
char: remove qemu_chr_send_event() · 903396ad
由 Anthony Liguori 提交于 8月 15, 2011
```
It's dead code.
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
903396ad
A
char: rename qemu_chr_get_msgfd() -> qemu_chr_fe_get_msgfd() · 74c0d6f0
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
74c0d6f0
A
char: rename qemu_chr_close() -> qemu_chr_delete() · 70f24fb6
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
70f24fb6
A
char: qemu_chr_open_opts() -> qemu_chr_new_from_opts() · f69554b9
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
f69554b9
A
char: rename qemu_chr_open() -> qemu_chr_new() · 27143a44
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
27143a44
A
char: rename qemu_chr_set_echo() -> qemu_chr_fe_set_echo() · 15f31519
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
15f31519
A
char: qemu_chr_ioctl() -> qemu_chr_fe_ioctl() · 41084f1b
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
41084f1b
A
char: rename qemu_chr_guest_close() -> qemu_chr_fe_close() · 2817822d
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
2817822d
A
char: rename qemu_chr_guest_open() -> qemu_chr_fe_open() · c9d830ed
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
c9d830ed
A
char: rename qemu_chr_can_read() -> qemu_chr_be_can_read() · 909cda12
由 Anthony Liguori 提交于 8月 15, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
909cda12