proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-15 23:14:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

openpic: unify gcr mode mask updates

Browse Source 
The mode mask already masks out bits we don't care about, so the
actual handling code can stay intact regardless.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2013-01-07 20:15:28 +01:00
parent 7f11573b9f
commit 1ac3d71302
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/openpic.c
View File

@ -646,22 +646,23 @@ static inline void write_IRQreg_ivpr(OpenPICState *opp, int n_IRQ, uint32_t val)
static void openpic_gcr_write(OpenPICState *opp, uint64_t val) static void openpic_gcr_write(OpenPICState *opp, uint64_t val)
{ {
CPUArchState *env;
int mpic_proxy = 0;
if (val & GCR_RESET) { if (val & GCR_RESET) {
openpic_reset(&opp->busdev.qdev); openpic_reset(&opp->busdev.qdev);
} else if (opp->mpic_mode_mask) { return;
CPUArchState *env; }
int mpic_proxy = 0;
opp->gcr &= ~opp->mpic_mode_mask; opp->gcr &= ~opp->mpic_mode_mask;
opp->gcr |= val & opp->mpic_mode_mask; opp->gcr |= val & opp->mpic_mode_mask;
/* Set external proxy mode */ /* Set external proxy mode */
if ((val & opp->mpic_mode_mask) == GCR_MODE_PROXY) { if ((val & opp->mpic_mode_mask) == GCR_MODE_PROXY) {
mpic_proxy = 1; mpic_proxy = 1;
} }
for (env = first_cpu; env != NULL; env = env->next_cpu) { for (env = first_cpu; env != NULL; env = env->next_cpu) {
env->mpic_proxy = mpic_proxy; env->mpic_proxy = mpic_proxy;
}
} }
} }