Skip to content

Commit

Permalink
Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
Browse files Browse the repository at this point in the history 
* qemu-kvm/memory/urgent:
  memory: abort if a memory region is destroyed during a transaction
  i440fx: avoid destroying memory regions within a transaction
  memory: Make eventfd adhere to device endianness
  • Loading branch information
Anthony Liguori committed Oct 22, 2012
2 parents 248bbe7 + 2be0e25 commit 50d2b4d
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 34 deletions.
69 changes: 35 additions & 34 deletions hw/piix_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ typedef struct PIIX3State {
} PIIX3State;

typedef struct PAMMemoryRegion {
MemoryRegion mem;
bool initialized;
MemoryRegion alias[4]; /* index = PAM value */
unsigned current;
} PAMMemoryRegion;

struct PCII440FXState {
Expand Down Expand Up @@ -105,37 +105,35 @@ static int pci_slot_get_pirq(PCIDevice *pci_dev, int pci_intx)
return (pci_intx + slot_addend) & 3;
}

static void update_pam(PCII440FXState *d, uint32_t start, uint32_t end, int r,
PAMMemoryRegion *mem)
static void init_pam(PCII440FXState *d, PAMMemoryRegion *mem,
uint32_t start, uint32_t size)
{
if (mem->initialized) {
memory_region_del_subregion(d->system_memory, &mem->mem);
memory_region_destroy(&mem->mem);
}
int i;

// printf("ISA mapping %08x-0x%08x: %d\n", start, end, r);
switch(r) {
case 3:
/* RAM */
memory_region_init_alias(&mem->mem, "pam-ram", d->ram_memory,
start, end - start);
break;
case 1:
/* ROM (XXX: not quite correct) */
memory_region_init_alias(&mem->mem, "pam-rom", d->ram_memory,
start, end - start);
memory_region_set_readonly(&mem->mem, true);
break;
case 2:
case 0:
/* XXX: should distinguish read/write cases */
memory_region_init_alias(&mem->mem, "pam-pci", d->pci_address_space,
start, end - start);
break;
/* RAM */
memory_region_init_alias(&mem->alias[3], "pam-ram", d->ram_memory, start, size);
/* ROM (XXX: not quite correct) */
memory_region_init_alias(&mem->alias[1], "pam-rom", d->ram_memory, start, size);
memory_region_set_readonly(&mem->alias[1], true);

/* XXX: should distinguish read/write cases */
memory_region_init_alias(&mem->alias[0], "pam-pci", d->pci_address_space,
start, size);
memory_region_init_alias(&mem->alias[2], "pam-pci", d->pci_address_space,
start, size);

for (i = 0; i < 4; ++i) {
memory_region_set_enabled(&mem->alias[i], false);
memory_region_add_subregion_overlap(d->system_memory, start, &mem->alias[i], 1);
}
memory_region_add_subregion_overlap(d->system_memory,
start, &mem->mem, 1);
mem->initialized = true;
mem->current = 0;
}

static void update_pam(PAMMemoryRegion *pam, unsigned r)
{
memory_region_set_enabled(&pam->alias[pam->current], false);
pam->current = r;
memory_region_set_enabled(&pam->alias[pam->current], true);
}

static void i440fx_update_memory_mappings(PCII440FXState *d)
Expand All @@ -145,12 +143,10 @@ static void i440fx_update_memory_mappings(PCII440FXState *d)
bool smram_enabled;

memory_region_transaction_begin();
update_pam(d, 0xf0000, 0x100000, (d->dev.config[I440FX_PAM] >> 4) & 3,
&d->pam_regions[0]);
update_pam(&d->pam_regions[0], (d->dev.config[I440FX_PAM] >> 4) & 3);
for(i = 0; i < 12; i++) {
r = (d->dev.config[(i >> 1) + (I440FX_PAM + 1)] >> ((i & 1) * 4)) & 3;
update_pam(d, 0xc0000 + 0x4000 * i, 0xc0000 + 0x4000 * (i + 1), r,
&d->pam_regions[i+1]);
update_pam(&d->pam_regions[i+1], r);
}
smram = d->dev.config[I440FX_SMRAM];
smram_enabled = (d->smm_enabled && (smram & 0x08)) || (smram & 0x40);
Expand Down Expand Up @@ -272,6 +268,7 @@ static PCIBus *i440fx_common_init(const char *device_name,
PCIHostState *s;
PIIX3State *piix3;
PCII440FXState *f;
unsigned i;

dev = qdev_create(NULL, "i440FX-pcihost");
s = PCI_HOST_BRIDGE(dev);
Expand Down Expand Up @@ -303,6 +300,10 @@ static PCIBus *i440fx_common_init(const char *device_name,
memory_region_add_subregion_overlap(f->system_memory, 0xa0000,
&f->smram_region, 1);
memory_region_set_enabled(&f->smram_region, false);
init_pam(f, &f->pam_regions[0], 0xf0000, 0x10000);
for (i = 0; i < 12; ++i) {
init_pam(f, &f->pam_regions[i+1], 0xc0000 + i * 0x4000, 0x4000);
}

/* Xen supports additional interrupt routes from the PCI devices to
* the IOAPIC: the four pins of each PCI device on the bus are also
Expand Down
3 changes: 3 additions & 0 deletions memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,7 @@ void memory_region_init_reservation(MemoryRegion *mr,
void memory_region_destroy(MemoryRegion *mr)
{
assert(QTAILQ_EMPTY(&mr->subregions));
assert(memory_region_transaction_depth == 0);
mr->destructor(mr);
memory_region_clear_coalescing(mr);
g_free((char *)mr->name);
Expand Down Expand Up @@ -1234,6 +1235,7 @@ void memory_region_add_eventfd(MemoryRegion *mr,
};
unsigned i;

adjust_endianness(mr, &mrfd.data, size);
memory_region_transaction_begin();
for (i = 0; i < mr->ioeventfd_nb; ++i) {
if (memory_region_ioeventfd_before(mrfd, mr->ioeventfds[i])) {
Expand Down Expand Up @@ -1265,6 +1267,7 @@ void memory_region_del_eventfd(MemoryRegion *mr,
};
unsigned i;

adjust_endianness(mr, &mrfd.data, size);
memory_region_transaction_begin();
for (i = 0; i < mr->ioeventfd_nb; ++i) {
if (memory_region_ioeventfd_equal(mrfd, mr->ioeventfds[i])) {
Expand Down

0 comments on commit 50d2b4d

Please sign in to comment.