From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M8ZIO-0007XU-Vw for qemu-devel@nongnu.org; Mon, 25 May 2009 08:28:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M8ZIJ-0007Ni-QV for qemu-devel@nongnu.org; Mon, 25 May 2009 08:28:48 -0400 Received: from [199.232.76.173] (port=57622 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M8ZIJ-0007NP-I5 for qemu-devel@nongnu.org; Mon, 25 May 2009 08:28:43 -0400 Received: from mx2.redhat.com ([66.187.237.31]:44238) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M8ZIJ-0007y2-2y for qemu-devel@nongnu.org; Mon, 25 May 2009 08:28:43 -0400 Date: Mon, 25 May 2009 15:25:11 +0300 From: "Michael S. Tsirkin" Message-ID: <20090525122511.GC5046@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 02/11] qemu: capability bits in pci save/restore List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook , Avi Kivity , qemu-devel@nongnu.org, Carsten Otte , kvm@vger.kernel.org, Rusty Russell , virtualization@lists.linux-foundation.org, Christian Borntraeger , Blue Swirl Add support for capability bits in save/restore for pci. These will be used for MSI, where the capability might be present or not as requested by user, which does not map well into a single version number. Signed-off-by: Michael S. Tsirkin --- hw/pci.c | 14 ++++++++++++-- hw/pci.h | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 1e70e46..5dcfb4e 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -127,12 +127,15 @@ int pci_bus_num(PCIBus *s) void pci_device_save(PCIDevice *s, QEMUFile *f) { + int version = s->cap_present ? 3 : 2; int i; - qemu_put_be32(f, 2); /* PCI device version */ + qemu_put_be32(f, version); /* PCI device version */ qemu_put_buffer(f, s->config, 256); for (i = 0; i < 4; i++) qemu_put_be32(f, s->irq_state[i]); + if (version >= 3) + qemu_put_be32(f, s->cap_present); } int pci_device_load(PCIDevice *s, QEMUFile *f) @@ -141,7 +144,7 @@ int pci_device_load(PCIDevice *s, QEMUFile *f) int i; version_id = qemu_get_be32(f); - if (version_id > 2) + if (version_id > 3) return -EINVAL; qemu_get_buffer(f, s->config, 256); pci_update_mappings(s); @@ -149,6 +152,13 @@ int pci_device_load(PCIDevice *s, QEMUFile *f) if (version_id >= 2) for (i = 0; i < 4; i ++) s->irq_state[i] = qemu_get_be32(f); + if (version_id >= 3) + s->cap_present = qemu_get_be32(f); + else + s->cap_present = 0; + + if (s->cap_present & ~s->cap_supported) + return -EINVAL; return 0; } diff --git a/hw/pci.h b/hw/pci.h index c0c2380..9139504 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -178,6 +178,10 @@ struct PCIDevice { /* Current IRQ levels. Used internally by the generic PCI code. */ int irq_state[4]; + + /* Capability bits for save/load */ + uint32_t cap_supported; + uint32_t cap_present; }; PCIDevice *pci_register_device(PCIBus *bus, const char *name, -- 1.6.3.1.56.g79e1.dirty