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

Conflicts:

	block-raw-posix.c

diff --cc block-raw-posix.c
Simple merge

diff --cc hw/pci.h
index 6136845b2dce95afcd9ea32846ef1e5620bfa776,2800499591ef75d593f96d6bb0ca8fec745afdb2..4f4a8c9d9e48f4cd47f151cff7148cbd8a40d89a
--- 1/hw/pci.h
--- 2/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;

diff --cc hw/piix_pci.c
Simple merge

diff --cc vl.c
Simple merge