diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-16 12:56:28 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-16 12:56:28 -0500 |
| commit | fc34e77bb3dd41a9932ec5830c06bcade1f5a08e (patch) | |
| tree | 93a7c849cc543757381e0fd230e46debf377dcbb /hw/pc_piix.c | |
| parent | 52346e8c75eba1ece4a782565d5a5ce2e23d5117 (diff) | |
| parent | 9bea6a2956e5d473b8914b2a5483fbf187b33844 (diff) | |
Merge remote-tracking branch 'kiszka/queues/pending' into staging
* 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>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 5c08245fed..907d723728 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -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 = { |