motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'kiszka/queues/pending' into staging

Browse source 
* kiszka/queues/pending:
  vapic: Disable for pre-1.1 machines
  Kick io-thread on qemu_chr_accept_input
  pcnet: Properly handle TX requests during Link Fail
  pcnet: Clear ERR in CSR0 on stop
  signrom: Rewrite as python script

Conflicts:
	hw/pc_piix.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2012-04-16 12:56:28 -05:00
commit fc34e77bb3
7 changed files with 59 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/pc_piix.c
View file

@ -373,6 +373,10 @@ static QEMUMachine pc_machine_v1_1 = {
.driver = "virtio-balloon-pci",\
.property = "class",\
.value = stringify(PCI_CLASS_MEMORY_RAM),\
},{\
.driver = "apic",\
.property = "vapic",\
.value = "off",\
}
static QEMUMachine pc_machine_v1_0 = {