diff options
-rw-r--r-- | block/qapi.c | 26 | ||||
-rw-r--r-- | hw/intc/apic.c | 20 | ||||
-rw-r--r-- | qapi/block-core.json | 5 | ||||
-rw-r--r-- | target-i386/cpu.c | 10 |
4 files changed, 21 insertions, 40 deletions
diff --git a/block/qapi.c b/block/qapi.c index 1301144bbc..a87a34a8b4 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -29,13 +29,6 @@ #include "qapi/qmp-output-visitor.h" #include "qapi/qmp/types.h" #include "sysemu/block-backend.h" -#ifdef __linux__ -#include <linux/fs.h> -#include <sys/ioctl.h> -#ifndef FS_NOCOW_FL -#define FS_NOCOW_FL 0x00800000 /* Do not cow file */ -#endif -#endif BlockDeviceInfo *bdrv_block_device_info(BlockDriverState *bs) { @@ -180,9 +173,6 @@ void bdrv_query_image_info(BlockDriverState *bs, int ret; Error *err = NULL; ImageInfo *info; -#ifdef __linux__ - int fd, attr; -#endif size = bdrv_getlength(bs); if (size < 0) { @@ -212,18 +202,6 @@ void bdrv_query_image_info(BlockDriverState *bs, info->format_specific = bdrv_get_specific_info(bs); info->has_format_specific = info->format_specific != NULL; -#ifdef __linux__ - /* get NOCOW info */ - fd = qemu_open(bs->filename, O_RDONLY | O_NONBLOCK); - if (fd >= 0) { - if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0 && (attr & FS_NOCOW_FL)) { - info->has_nocow = true; - info->nocow = true; - } - qemu_close(fd); - } -#endif - backing_filename = bs->backing_file; if (backing_filename[0] != '\0') { info->backing_filename = g_strdup(backing_filename); @@ -655,8 +633,4 @@ void bdrv_image_info_dump(fprintf_function func_fprintf, void *f, func_fprintf(f, "Format specific information:\n"); bdrv_image_info_specific_dump(func_fprintf, f, info->format_specific); } - - if (info->has_nocow && info->nocow) { - func_fprintf(f, "NOCOW flag: set\n"); - } } diff --git a/hw/intc/apic.c b/hw/intc/apic.c index 03ff9e94f2..0f97b47925 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -188,7 +188,7 @@ void apic_deliver_pic_intr(DeviceState *dev, int level) apic_reset_bit(s->irr, lvt & 0xff); /* fall through */ case APIC_DM_EXTINT: - cpu_reset_interrupt(CPU(s->cpu), CPU_INTERRUPT_HARD); + apic_update_irq(s); break; } } @@ -349,6 +349,11 @@ static int apic_get_arb_pri(APICCommonState *s) static int apic_irq_pending(APICCommonState *s) { int irrv, ppr; + + if (!(s->spurious_vec & APIC_SV_ENABLE)) { + return 0; + } + irrv = get_highest_priority_int(s->irr); if (irrv < 0) { return 0; @@ -366,14 +371,13 @@ static void apic_update_irq(APICCommonState *s) { CPUState *cpu; - if (!(s->spurious_vec & APIC_SV_ENABLE)) { - return; - } cpu = CPU(s->cpu); if (!qemu_cpu_is_self(cpu)) { cpu_interrupt(cpu, CPU_INTERRUPT_POLL); } else if (apic_irq_pending(s) > 0) { cpu_interrupt(cpu, CPU_INTERRUPT_HARD); + } else if (!apic_accept_pic_intr(&s->busdev.qdev) || !pic_get_output(isa_pic)) { + cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD); } } @@ -567,7 +571,10 @@ int apic_get_interrupt(DeviceState *dev) apic_sync_vapic(s, SYNC_FROM_VAPIC); intno = apic_irq_pending(s); - if (intno == 0) { + /* if there is an interrupt from the 8259, let the caller handle + * that first since ExtINT interrupts ignore the priority. + */ + if (intno == 0 || apic_check_pic(s)) { apic_sync_vapic(s, SYNC_TO_VAPIC); return -1; } else if (intno < 0) { @@ -578,9 +585,6 @@ int apic_get_interrupt(DeviceState *dev) apic_set_bit(s->isr, intno); apic_sync_vapic(s, SYNC_TO_VAPIC); - /* re-inject if there is still a pending PIC interrupt */ - apic_check_pic(s); - apic_update_irq(s); return intno; diff --git a/qapi/block-core.json b/qapi/block-core.json index 8c3e45d4c3..a14e6ab1fd 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -119,8 +119,6 @@ # @format-specific: #optional structure supplying additional format-specific # information (since 1.7) # -# @nocow: #optional info of whether NOCOW flag is set or not. (since 2.2) -# # Since: 1.3 # ## @@ -132,8 +130,7 @@ '*backing-filename': 'str', '*full-backing-filename': 'str', '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'], '*backing-image': 'ImageInfo', - '*format-specific': 'ImageInfoSpecific', - '*nocow': 'bool' } } + '*format-specific': 'ImageInfoSpecific' } } ## # @ImageCheck: diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 3f13dfe5f5..e9df33e5c3 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2912,8 +2912,14 @@ static bool x86_cpu_has_work(CPUState *cs) X86CPU *cpu = X86_CPU(cs); CPUX86State *env = &cpu->env; - return ((cs->interrupt_request & (CPU_INTERRUPT_HARD | - CPU_INTERRUPT_POLL)) && +#if !defined(CONFIG_USER_ONLY) + if (cs->interrupt_request & CPU_INTERRUPT_POLL) { + apic_poll_irq(cpu->apic_state); + cpu_reset_interrupt(cs, CPU_INTERRUPT_POLL); + } +#endif + + return ((cs->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) || (cs->interrupt_request & (CPU_INTERRUPT_NMI | CPU_INTERRUPT_INIT | |