From patchwork Wed Jun 1 08:54:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 837462 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p518tMJe001104 for ; Wed, 1 Jun 2011 08:55:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162294Ab1FAIzP (ORCPT ); Wed, 1 Jun 2011 04:55:15 -0400 Received: from thoth.sbs.de ([192.35.17.2]:33388 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161884Ab1FAIyu (ORCPT ); Wed, 1 Jun 2011 04:54:50 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p518skHm014710; Wed, 1 Jun 2011 10:54:46 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p518skTi022688; Wed, 1 Jun 2011 10:54:46 +0200 Message-ID: <4DE5FE55.2060603@siemens.com> Date: Wed, 01 Jun 2011 10:54:45 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] qemu-kvm: Remove some spurious diffs to upstream Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 01 Jun 2011 08:55:22 +0000 (UTC) No functional changes. Signed-off-by: Jan Kiszka --- Makefile.target | 3 --- block/raw-posix.c | 2 -- cutils.c | 5 ----- dma-helpers.c | 4 ---- fpu/softfloat-native.c | 1 - hw/i8259.c | 5 +---- sysemu.h | 1 - target-i386/kvm.c | 2 +- target-i386/machine.c | 1 - 9 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Makefile.target b/Makefile.target index 7683e3d..150a475 100644 --- a/Makefile.target +++ b/Makefile.target @@ -107,8 +107,6 @@ tcg/tcg.o: cpu.h # cpu_signal_handler() in cpu-exec.c. signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS) -qemu-kvm-helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) - ######################################################### # Linux user emulator target @@ -208,7 +206,6 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o - LIBS+=-lz QEMU_CFLAGS += $(VNC_TLS_CFLAGS) diff --git a/block/raw-posix.c b/block/raw-posix.c index a95c8d4..6b72470 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -27,8 +27,6 @@ #include "qemu-log.h" #include "block_int.h" #include "module.h" -#include "compatfd.h" -#include #include "block/raw-posix-aio.h" #ifdef CONFIG_COCOA diff --git a/cutils.c b/cutils.c index 9de57d9..f9a7e36 100644 --- a/cutils.c +++ b/cutils.c @@ -239,11 +239,6 @@ void qemu_iovec_to_buffer(QEMUIOVector *qiov, void *buf) } } -/* - * No dma flushing needed here, as the aio code will call dma_bdrv_cb() - * on completion as well, which will result in a call to - * dma_bdrv_unmap() which will do the flushing .... - */ void qemu_iovec_from_buffer(QEMUIOVector *qiov, const void *buf, size_t count) { const uint8_t *p = (const uint8_t *)buf; diff --git a/dma-helpers.c b/dma-helpers.c index d4fc077..712ed89 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -160,10 +160,6 @@ static BlockDriverAIOCB *dma_bdrv_io( dbs->is_write = is_write; dbs->bh = NULL; qemu_iovec_init(&dbs->iov, sg->nsg); - /* - * DMA flushing is handled in dma_bdrv_cb() calling dma_bdrv_unmap() - * so we don't need to do that here. - */ dma_bdrv_cb(dbs, 0); if (!dbs->acb) { qemu_aio_release(dbs); diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c index 3bb3886..8848651 100644 --- a/fpu/softfloat-native.c +++ b/fpu/softfloat-native.c @@ -5,7 +5,6 @@ #if defined(CONFIG_SOLARIS) #include #endif -#include "config-host.h" void set_float_rounding_mode(int val STATUS_PARAM) { diff --git a/hw/i8259.c b/hw/i8259.c index b892cee..1c545c7 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -23,7 +23,6 @@ */ #include "hw.h" #include "pc.h" -#include "apic.h" #include "isa.h" #include "monitor.h" #include "qemu-timer.h" @@ -192,6 +191,7 @@ int64_t irq_time[16]; static void i8259_set_irq(void *opaque, int irq, int level) { PicState2 *s = opaque; + #if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) if (level != irq_level[irq]) { DPRINTF("i8259_set_irq: irq=%d level=%d\n", irq, level); @@ -220,11 +220,9 @@ static inline void pic_intack(PicState *s, int irq) } else { s->isr |= (1 << irq); } - /* We don't clear a level sensitive interrupt here */ if (!(s->elcr & (1 << irq))) s->irr &= ~(1 << irq); - } extern int time_drift_fix; @@ -236,7 +234,6 @@ int pic_read_irq(PicState2 *s) irq = pic_get_irq(&s->pics[0]); if (irq >= 0) { - pic_intack(&s->pics[0], irq); #ifdef TARGET_I386 if (time_drift_fix && irq == 0) { diff --git a/sysemu.h b/sysemu.h index 560210d..a42d83f 100644 --- a/sysemu.h +++ b/sysemu.h @@ -40,7 +40,6 @@ void vm_stop(int reason); void qemu_system_reset_request(void); void qemu_system_shutdown_request(void); void qemu_system_powerdown_request(void); -int qemu_no_shutdown(void); void qemu_system_debug_request(void); void qemu_system_vmstop_request(int reason); int qemu_shutdown_requested_get(void); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 316057a..74a9960 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -551,7 +551,6 @@ void kvm_arch_reset_vcpu(CPUState *env) } } - static int kvm_get_supported_msrs(KVMState *s) { static int kvm_supported_msrs; @@ -982,6 +981,7 @@ static int kvm_put_msrs(CPUState *env, int level) } + static int kvm_get_fpu(CPUState *env) { struct kvm_fpu fpu; diff --git a/target-i386/machine.c b/target-i386/machine.c index bf14067..d78eceb 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -487,7 +487,6 @@ static const VMStateDescription vmstate_cpu = { /* KVM pvclock msr */ VMSTATE_UINT64_V(system_time_msr, CPUState, 11), VMSTATE_UINT64_V(wall_clock_msr, CPUState, 11), - /* XSAVE related fields */ VMSTATE_UINT64_V(xcr0, CPUState, 12), VMSTATE_UINT64_V(xstate_bv, CPUState, 12),