From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 16 Apr 2012 17:56:28 +0000 (-0500)
Subject: Merge remote-tracking branch 'kiszka/queues/pending' into staging
X-Git-Tag: v1.1-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc34e77bb3dd41a9932ec5830c06bcade1f5a08e;p=thirdparty%2Fqemu.git

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>
---

fc34e77bb3dd41a9932ec5830c06bcade1f5a08e
diff --cc hw/pc_piix.c
index 5c08245fede,44995bfdc14..907d723728d
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@@ -360,21 -359,6 +360,25 @@@ static QEMUMachine pc_machine_v1_1 = 
      .is_default = 1,
  };
  
 +#define PC_COMPAT_1_0 \
 +        {\
 +            .driver   = "pc-sysfw",\
 +            .property = "rom_only",\
 +            .value    = stringify(1),\
 +        }, {\
 +            .driver   = "isa-fdc",\
 +            .property = "check_media_rate",\
 +            .value    = "off",\
 +        }, {\
 +            .driver   = "virtio-balloon-pci",\
 +            .property = "class",\
 +            .value    = stringify(PCI_CLASS_MEMORY_RAM),\
++        },{\
++            .driver   = "apic",\
++            .property = "vapic",\
++            .value    = "off",\
 +        }
 +
  static QEMUMachine pc_machine_v1_0 = {
      .name = "pc-1.0",
      .desc = "Standard PC",