On 2011-06-15 10:25, Michael S. Tsirkin wrote: > On Wed, Jun 15, 2011 at 09:38:39AM +0200, Kevin Wolf wrote: >> Am 14.06.2011 19:36, schrieb Michael S. Tsirkin: >>> Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> >>> --- >>> hw/virtio-pci.h | 8 +++++--- >>> target-i386/kvm.c | 3 +-- >>> 2 files changed, 6 insertions(+), 5 deletions(-) >>> >>> diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h >>> index a4b5fd3..b518917 100644 >>> --- a/hw/virtio-pci.h >>> +++ b/hw/virtio-pci.h >>> @@ -37,7 +37,9 @@ typedef struct { >>> bool ioeventfd_started; >>> } VirtIOPCIProxy; >>> >>> -extern void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, >>> - uint16_t vendor, uint16_t device, >>> - uint16_t class_code, uint8_t pif); >>> +void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev); >>> + >>> +/* Virtio ABI version, if we increment this, we break the guest driver. */ >>> +#define VIRTIO_PCI_ABI_VERSION 0 >>> + >>> #endif >> >> Is this hunk there intentionally? >> >> Kevin > > Sorry, this belongs in another patch. > Thanks for pointing this out. > Otherwise ack? I've still the true fix pending, but there are concerns about the associated savevm version increase for the CPU. Not sure what will happen the next days till -rc0, so we may also go with any of these removal patches (you weren't the first by far). Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html