From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53299 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PojC7-0004CS-Um for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:09:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PojC6-0004CX-Rz for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:09:23 -0500 Received: from mail-vx0-f173.google.com ([209.85.220.173]:50197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PojC6-0004CS-Kx for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:09:22 -0500 Received: by vxb40 with SMTP id 40so2284196vxb.4 for ; Sun, 13 Feb 2011 13:09:22 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 13 Feb 2011 23:09:01 +0200 Message-ID: Content-Type: multipart/mixed; boundary=0023547c962163c0bd049c305846 Subject: [Qemu-devel] [PATCH 1/4] applesmc: make optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , "David S. Ahern" --0023547c962163c0bd049c305846 Content-Type: text/plain; charset=UTF-8 Based on patch by David Ahern. Signed-off-by: Blue Swirl --- Makefile.objs | 1 + Makefile.target | 2 +- default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + 4 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index adb5842..25ff8a5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -196,6 +196,7 @@ hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o hw-obj-$(CONFIG_DMA) += dma.o hw-obj-$(CONFIG_HPET) += hpet.o +hw-obj-$(CONFIG_APPLESMC) += applesmc.o # PPC devices hw-obj-$(CONFIG_OPENPIC) += openpic.o diff --git a/Makefile.target b/Makefile.target index a6c30dd..e4b1210 100644 --- a/Makefile.target +++ b/Makefile.target @@ -215,7 +215,7 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-i386-y += vga.o obj-i386-y += mc146818rtc.o i8259.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o -obj-i386-y += vmport.o applesmc.o +obj-i386-y += vmport.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 3e0eddf..55589fa 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -20,3 +20,4 @@ CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_HPET=y +CONFIG_APPLESMC=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 1cc1b61..59b7893 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -20,3 +20,4 @@ CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_HPET=y +CONFIG_APPLESMC=y -- 1.6.2.4 --0023547c962163c0bd049c305846 Content-Type: application/mbox; name="0001-applesmc-make-optional.patch" Content-Disposition: attachment; filename="0001-applesmc-make-optional.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gk4g6jnu0 RnJvbSBiNmE2ZGExNzc0YjY2YWEwNmEwYzhjNjFmNWUzY2M3MjlkM2YwM2UxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8YjZhNmRhMTc3NGI2NmFhMDZhMGM4YzYxZjVlM2Nj NzI5ZDNmMDNlMS4xMjk3NjMxMjg2LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KRnJvbTogQmx1 ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFN1biwgMTMgRmViIDIwMTEgMTI6 MzE6MjggKzAwMDAKU3ViamVjdDogW1BBVENIIDEvNF0gYXBwbGVzbWM6IG1ha2Ugb3B0aW9uYWwK CkJhc2VkIG9uIHBhdGNoIGJ5IERhdmlkIEFoZXJuLgoKU2lnbmVkLW9mZi1ieTogQmx1ZSBTd2ly bCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+Ci0tLQogTWFrZWZpbGUub2JqcyAgICAgICAgICAgICAg ICAgICAgICB8ICAgIDEgKwogTWFrZWZpbGUudGFyZ2V0ICAgICAgICAgICAgICAgICAgICB8ICAg IDIgKy0KIGRlZmF1bHQtY29uZmlncy9pMzg2LXNvZnRtbXUubWFrICAgfCAgICAxICsKIGRlZmF1 bHQtY29uZmlncy94ODZfNjQtc29mdG1tdS5tYWsgfCAgICAxICsKIDQgZmlsZXMgY2hhbmdlZCwg NCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL01ha2VmaWxlLm9i anMgYi9NYWtlZmlsZS5vYmpzCmluZGV4IGFkYjU4NDIuLjI1ZmY4YTUgMTAwNjQ0Ci0tLSBhL01h a2VmaWxlLm9ianMKKysrIGIvTWFrZWZpbGUub2JqcwpAQCAtMTk2LDYgKzE5Niw3IEBAIGh3LW9i ai0kKENPTkZJR19BQ1BJKSArPSBhY3BpLm8gYWNwaV9waWl4NC5vCiBody1vYmotJChDT05GSUdf QVBNKSArPSBwbV9zbWJ1cy5vIGFwbS5vCiBody1vYmotJChDT05GSUdfRE1BKSArPSBkbWEubwog aHctb2JqLSQoQ09ORklHX0hQRVQpICs9IGhwZXQubworaHctb2JqLSQoQ09ORklHX0FQUExFU01D KSArPSBhcHBsZXNtYy5vCiAKICMgUFBDIGRldmljZXMKIGh3LW9iai0kKENPTkZJR19PUEVOUElD KSArPSBvcGVucGljLm8KZGlmZiAtLWdpdCBhL01ha2VmaWxlLnRhcmdldCBiL01ha2VmaWxlLnRh cmdldAppbmRleCBhNmMzMGRkLi5lNGIxMjEwIDEwMDY0NAotLS0gYS9NYWtlZmlsZS50YXJnZXQK KysrIGIvTWFrZWZpbGUudGFyZ2V0CkBAIC0yMTUsNyArMjE1LDcgQEAgb2JqLSQoQ09ORklHX0tW TSkgKz0gaXZzaG1lbS5vCiBvYmotaTM4Ni15ICs9IHZnYS5vCiBvYmotaTM4Ni15ICs9IG1jMTQ2 ODE4cnRjLm8gaTgyNTkubyBwYy5vCiBvYmotaTM4Ni15ICs9IGNpcnJ1c192Z2EubyBhcGljLm8g aW9hcGljLm8gcGlpeF9wY2kubwotb2JqLWkzODYteSArPSB2bXBvcnQubyBhcHBsZXNtYy5vCitv YmotaTM4Ni15ICs9IHZtcG9ydC5vCiBvYmotaTM4Ni15ICs9IGRldmljZS1ob3RwbHVnLm8gcGNp LWhvdHBsdWcubyBzbWJpb3MubyB3ZHRfaWI3MDAubwogb2JqLWkzODYteSArPSBkZWJ1Z2Nvbi5v IG11bHRpYm9vdC5vCiBvYmotaTM4Ni15ICs9IHBjX3BpaXgubwpkaWZmIC0tZ2l0IGEvZGVmYXVs dC1jb25maWdzL2kzODYtc29mdG1tdS5tYWsgYi9kZWZhdWx0LWNvbmZpZ3MvaTM4Ni1zb2Z0bW11 Lm1hawppbmRleCAzZTBlZGRmLi41NTU4OWZhIDEwMDY0NAotLS0gYS9kZWZhdWx0LWNvbmZpZ3Mv aTM4Ni1zb2Z0bW11Lm1haworKysgYi9kZWZhdWx0LWNvbmZpZ3MvaTM4Ni1zb2Z0bW11Lm1hawpA QCAtMjAsMyArMjAsNCBAQCBDT05GSUdfTkUyMDAwX0lTQT15CiBDT05GSUdfUElJWF9QQ0k9eQog Q09ORklHX1NPVU5EPXkKIENPTkZJR19IUEVUPXkKK0NPTkZJR19BUFBMRVNNQz15CmRpZmYgLS1n aXQgYS9kZWZhdWx0LWNvbmZpZ3MveDg2XzY0LXNvZnRtbXUubWFrIGIvZGVmYXVsdC1jb25maWdz L3g4Nl82NC1zb2Z0bW11Lm1hawppbmRleCAxY2MxYjYxLi41OWI3ODkzIDEwMDY0NAotLS0gYS9k ZWZhdWx0LWNvbmZpZ3MveDg2XzY0LXNvZnRtbXUubWFrCisrKyBiL2RlZmF1bHQtY29uZmlncy94 ODZfNjQtc29mdG1tdS5tYWsKQEAgLTIwLDMgKzIwLDQgQEAgQ09ORklHX05FMjAwMF9JU0E9eQog Q09ORklHX1BJSVhfUENJPXkKIENPTkZJR19TT1VORD15CiBDT05GSUdfSFBFVD15CitDT05GSUdf QVBQTEVTTUM9eQotLSAKMS43LjIuMwoK --0023547c962163c0bd049c305846--