From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 13 Mar 2009 12:09:06 +0000 (+0000)
Subject: Merge branch 'master' of ../../1/qemu-iwj
X-Git-Tag: xen-3.4.0-rc2~67
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9f2b74a123c63c57b7f38cafe65eddb096f46c72;p=qemu-xen-3.4-testing.git

Merge branch 'master' of ../../1/qemu-iwj

Conflicts:

	block-raw-posix.c
---

9f2b74a123c63c57b7f38cafe65eddb096f46c72
diff --cc hw/pci.h
index 6136845b,28004995..4f4a8c9d
--- a/hw/pci.h
+++ b/hw/pci.h
@@@ -152,29 -42,9 +152,29 @@@ typedef struct PCIIORegion 
  #define PCI_MIN_GNT		0x3e	/* 8 bits */
  #define PCI_MAX_LAT		0x3f	/* 8 bits */
  
 +/* Bits in the PCI Status Register (PCI 2.3 spec) */
 +#define PCI_STATUS_RESERVED1	0x007
 +#define PCI_STATUS_INT_STATUS	0x008
 +#define PCI_STATUS_CAPABILITIES	0x010
 +#define PCI_STATUS_66MHZ	0x020
 +#define PCI_STATUS_RESERVED2	0x040
 +#define PCI_STATUS_FAST_BACK	0x080
 +#define PCI_STATUS_DEVSEL	0x600
 +
 +#define PCI_STATUS_RESERVED_MASK_LO (PCI_STATUS_RESERVED1 | \
 +                PCI_STATUS_INT_STATUS | PCI_STATUS_CAPABILITIES | \
 +                PCI_STATUS_66MHZ | PCI_STATUS_RESERVED2 | PCI_STATUS_FAST_BACK)
 +
 +#define PCI_STATUS_RESERVED_MASK_HI (PCI_STATUS_DEVSEL >> 8)
 +
 +/* Bits in the PCI Command Register (PCI 2.3 spec) */
 +#define PCI_COMMAND_RESERVED	0xf800
 +
 +#define PCI_COMMAND_RESERVED_MASK_HI (PCI_COMMAND_RESERVED >> 8)
 +
  struct PCIDevice {
      /* PCI config space */
-     uint8_t config[256];
+     uint8_t config[4096];
  
      /* the following fields are read only */
      PCIBus *bus;