From: Avi Kivity Subject: [PATCH v2 8/8] Move msix.o build back to Makefile.objs Date: Sun, 10 Oct 2010 16:42:07 +0200 Message-ID: <1286721727-31447-9-git-send-email-avi@redhat.com> References: <1286721727-31447-1-git-send-email-avi@redhat.com> To: "Michael S. Tsirkin" , Marcelo Tosatti , kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:4251 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751641Ab0JJOmK (ORCPT ); Sun, 10 Oct 2010 10:42:10 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9AEgAup008207 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 10 Oct 2010 10:42:10 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9AEg9Rh029469 for ; Sun, 10 Oct 2010 10:42:09 -0400 In-Reply-To: <1286721727-31447-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Now that hw/msix.c does not depend on CONFIG_KVM, remove it from Makefile.target and put it back in Makefile.objs. Signed-off-by: Avi Kivity --- Makefile.objs | 4 +--- Makefile.target | 4 ---- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index a814dfe..ca5aebc 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -196,9 +196,7 @@ hw-obj-$(CONFIG_PIIX4) += piix4.o # PCI watchdog devices hw-obj-y += wdt_i6300esb.o -# MSI-X depends on kvm for interrupt injection, -# so moved it from Makefile.objs to Makefile.target for now -# hw-obj-y += msix.o +hw-obj-y += msix.o # PCI network cards hw-obj-y += ne2000.o diff --git a/Makefile.target b/Makefile.target index 2a1349a..d8a619d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -183,10 +183,6 @@ obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o -# MSI-X depends on kvm for interrupt injection, -# so moved it from Makefile.objs to Makefile.target for now -obj-y += msix.o - LIBS+=-lz QEMU_CFLAGS += $(VNC_TLS_CFLAGS) -- 1.7.3.1