From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: Re: [PATCH 1/3] kvm tools: define marcros for virtio device io space size and pci device number Date: Wed, 06 Apr 2011 21:56:58 -0600 Message-ID: <4D9D360A.8020905@gmail.com> References: <1302228309-6583-1-git-send-email-asias.hejun@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ingo Molnar , Prasad Joshi , kvm@vger.kernel.org To: Asias He , Pekka Enberg , Cyrill Gorcunov Return-path: Received: from mail-gw0-f46.google.com ([74.125.83.46]:57173 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754312Ab1DGD5H (ORCPT ); Wed, 6 Apr 2011 23:57:07 -0400 Received: by gwaa18 with SMTP id a18so658545gwa.19 for ; Wed, 06 Apr 2011 20:57:05 -0700 (PDT) In-Reply-To: <1302228309-6583-1-git-send-email-asias.hejun@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: Interesting overload of the kvm mailing list. Intended for changes to the 'native kvm' (ie., tools/kvm)? David On 04/07/11 20:05, Asias He wrote: > Signed-off-by: Asias He > --- > tools/kvm/blk-virtio.c | 6 ++++-- > tools/kvm/include/kvm/ioport.h | 7 +++++-- > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/tools/kvm/blk-virtio.c b/tools/kvm/blk-virtio.c > index 48211b5..9a723cc 100644 > --- a/tools/kvm/blk-virtio.c > +++ b/tools/kvm/blk-virtio.c > @@ -278,6 +278,8 @@ static struct pci_device_header blk_virtio_pci_device = { > .irq_line = VIRTIO_BLK_IRQ, > }; > > +#define PCI_VIRTIO_BLK_DEVNUM 1 > + > void blk_virtio__init(struct kvm *self) > { > if (!self->disk_image) > @@ -285,7 +287,7 @@ void blk_virtio__init(struct kvm *self) > > device.blk_config.capacity = self->disk_image->size / SECTOR_SIZE; > > - pci__register(&blk_virtio_pci_device, 1); > + pci__register(&blk_virtio_pci_device, PCI_VIRTIO_BLK_DEVNUM); > > - ioport__register(IOPORT_VIRTIO_BLK, &blk_virtio_io_ops, 256); > + ioport__register(IOPORT_VIRTIO_BLK, &blk_virtio_io_ops, IOPORT_VIRTIO_BLK_SIZE); > } > diff --git a/tools/kvm/include/kvm/ioport.h b/tools/kvm/include/kvm/ioport.h > index 7b6af53..b77f565 100644 > --- a/tools/kvm/include/kvm/ioport.h > +++ b/tools/kvm/include/kvm/ioport.h > @@ -5,8 +5,11 @@ > #include > > /* some ports we reserve for own use */ > -#define IOPORT_DBG 0xe0 > -#define IOPORT_VIRTIO_BLK 0xc200 /* Virtio block device */ > +#define IOPORT_DBG 0xe0 > +#define IOPORT_VIRTIO_BLK 0xc200 /* Virtio block device */ > +#define IOPORT_VIRTIO_BLK_SIZE 256 > +#define IOPORT_VIRTIO_CONSOLE 0xd200 /* Virtio console device */ > +#define IOPORT_VIRTIO_CONSOLE_SIZE 256 > > struct kvm; >