Merge branch pci into master (5e59b024) · Commits · Anton / libtcg · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

libtcg
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5e59b024

Commit 5e59b024 authored 12 years ago by Michael S. Tsirkin

Downloads
- Plain Diff

Merge branch pci into master

Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.

Conflicts:
	hw/esp.c

parents 7162ab21 932d4a42

No related branches found

No related tags found

No related merge requests found

Changes 33

Hide whitespace changes

Inline Side-by-side

Showing

hw/ac97.c 1 addition, 2 deletions

hw/ac97.c
hw/e1000.c 1 addition, 2 deletions

hw/e1000.c
hw/eepro100.c 1 addition, 2 deletions

hw/eepro100.c
hw/es1370.c 1 addition, 2 deletions

hw/es1370.c
hw/esp.c 1 addition, 3 deletions

hw/esp.c
hw/ide/cmd646.c 1 addition, 3 deletions

hw/ide/cmd646.c
hw/ide/ich.c 1 addition, 3 deletions

hw/ide/ich.c
hw/ide/piix.c 1 addition, 3 deletions

hw/ide/piix.c
hw/ide/via.c 1 addition, 3 deletions

hw/ide/via.c
hw/intel-hda.c 1 addition, 2 deletions

hw/intel-hda.c
hw/ioh3420.c 3 additions, 5 deletions

hw/ioh3420.c
hw/ivshmem.c 4 additions, 10 deletions

hw/ivshmem.c
hw/lsi53c895a.c 1 addition, 3 deletions

hw/lsi53c895a.c
hw/msi.c 17 additions, 0 deletions

hw/msi.c
hw/msi.h 1 addition, 0 deletions

hw/msi.h
hw/msix.c 160 additions, 130 deletions

hw/msix.c
hw/msix.h 11 additions, 8 deletions

hw/msix.h
hw/ne2000.c 1 addition, 2 deletions

hw/ne2000.c
hw/pci.c 48 additions, 6 deletions

hw/pci.c
hw/pci.h 28 additions, 7 deletions

hw/pci.h

with 284 additions and 196 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment