From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MhOdF-0002m2-7k for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:10:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MhOdA-0002kl-K5 for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:10:16 -0400 Received: from [199.232.76.173] (port=54719 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MhOdA-0002ke-FV for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:10:12 -0400 Received: from mail-ew0-f223.google.com ([209.85.219.223]:38514) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MhOd9-00040i-It for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:10:12 -0400 Received: by ewy23 with SMTP id 23so3204099ewy.8 for ; Sat, 29 Aug 2009 07:10:08 -0700 (PDT) MIME-Version: 1.0 From: Blue Swirl Date: Sat, 29 Aug 2009 17:09:48 +0300 Message-ID: Content-Type: multipart/mixed; boundary=000e0cdfd7e6ae85e80472485b4a Subject: [Qemu-devel] [PATCH, RFC 4/5] x86: use device info for hpet List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --000e0cdfd7e6ae85e80472485b4a Content-Type: text/plain; charset=UTF-8 Signed-off-by: Blue Swirl --- hw/pc.c | 7 +++++++ monitor.c | 10 ---------- qemu-monitor.hx | 2 -- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 32713b4..cbb9542 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1108,6 +1108,12 @@ static CPUState *pc_new_cpu(const char *cpu_model) return env; } +static void info_hpet(Monitor *mon, void *opaque) +{ + monitor_printf(mon, "HPET is %s by QEMU\n", + (no_hpet) ? "disabled" : "enabled"); +} + /* PC hardware initialisation */ static void pc_init1(ram_addr_t ram_size, const char *boot_device, @@ -1328,6 +1334,7 @@ static void pc_init1(ram_addr_t ram_size, if (!no_hpet) { hpet_init(isa_irq); } + monitor_register_device_info("hpet", info_hpet, NULL); for(i = 0; i < MAX_SERIAL_PORTS; i++) { if (serial_hds[i]) { diff --git a/monitor.c b/monitor.c index 4f507f2..9a55e1c 100644 --- a/monitor.c +++ b/monitor.c @@ -304,14 +304,6 @@ static void do_info_name(Monitor *mon) monitor_printf(mon, "%s\n", qemu_name); } -#if defined(TARGET_I386) -static void do_info_hpet(Monitor *mon) -{ - monitor_printf(mon, "HPET is %s by QEMU\n", - (no_hpet) ? "disabled" : "enabled"); -} -#endif - static void do_info_uuid(Monitor *mon) { monitor_printf(mon, UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], @@ -1806,8 +1798,6 @@ static const mon_cmd_t info_cmds[] = { #if defined(TARGET_I386) { "mem", "", mem_info, "", "show the active virtual memory mappings", }, - { "hpet", "", do_info_hpet, - "", "show state of HPET", }, #endif { "jit", "", do_info_jit, "", "show dynamic compiler info", }, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 6ad960e..946ba34 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -49,8 +49,6 @@ show the command line history show virtual to physical memory mappings (i386 only) @item info mem show the active virtual memory mappings (i386 only) -@item info hpet -show state of HPET (i386 only) @item info kvm show KVM information @item info usb -- 1.6.2.4 --000e0cdfd7e6ae85e80472485b4a Content-Type: application/mbox; name="0004-x86-use-device-info-for-hpet.patch" Content-Disposition: attachment; filename="0004-x86-use-device-info-for-hpet.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fyyficz30 RnJvbSAxZjlkNjNkYzJmODBmYjAzY2I2ZmI3N2M3NzY3YjExMGI5NmUxMGYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdtYWlsLmNvbT4KRGF0 ZTogU2F0LCAyOSBBdWcgMjAwOSAxNDowMjowNiArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIHg4Njog dXNlIGRldmljZSBpbmZvIGZvciBocGV0CgpTaWduZWQtb2ZmLWJ5OiBCbHVlIFN3aXJsIDxibGF1 d2lyYmVsQGdtYWlsLmNvbT4KLS0tCiBody9wYy5jICAgICAgICAgfCAgICA3ICsrKysrKysKIG1v bml0b3IuYyAgICAgICB8ICAgMTAgLS0tLS0tLS0tLQogcWVtdS1tb25pdG9yLmh4IHwgICAgMiAt LQogMyBmaWxlcyBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2h3L3BjLmMgYi9ody9wYy5jCmluZGV4IDMyNzEzYjQuLmNiYjk1NDIgMTAwNjQ0 Ci0tLSBhL2h3L3BjLmMKKysrIGIvaHcvcGMuYwpAQCAtMTEwOCw2ICsxMTA4LDEyIEBAIHN0YXRp YyBDUFVTdGF0ZSAqcGNfbmV3X2NwdShjb25zdCBjaGFyICpjcHVfbW9kZWwpCiAgICAgcmV0dXJu IGVudjsKIH0KIAorc3RhdGljIHZvaWQgaW5mb19ocGV0KE1vbml0b3IgKm1vbiwgdm9pZCAqb3Bh cXVlKQoreworICAgIG1vbml0b3JfcHJpbnRmKG1vbiwgIkhQRVQgaXMgJXMgYnkgUUVNVVxuIiwK KyAgICAgICAgICAgICAgICAgICAobm9faHBldCkgPyAiZGlzYWJsZWQiIDogImVuYWJsZWQiKTsK K30KKwogLyogUEMgaGFyZHdhcmUgaW5pdGlhbGlzYXRpb24gKi8KIHN0YXRpYyB2b2lkIHBjX2lu aXQxKHJhbV9hZGRyX3QgcmFtX3NpemUsCiAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFy ICpib290X2RldmljZSwKQEAgLTEzMjgsNiArMTMzNCw3IEBAIHN0YXRpYyB2b2lkIHBjX2luaXQx KHJhbV9hZGRyX3QgcmFtX3NpemUsCiAgICAgaWYgKCFub19ocGV0KSB7CiAgICAgICAgIGhwZXRf aW5pdChpc2FfaXJxKTsKICAgICB9CisgICAgbW9uaXRvcl9yZWdpc3Rlcl9kZXZpY2VfaW5mbygi aHBldCIsIGluZm9faHBldCwgTlVMTCk7CiAKICAgICBmb3IoaSA9IDA7IGkgPCBNQVhfU0VSSUFM X1BPUlRTOyBpKyspIHsKICAgICAgICAgaWYgKHNlcmlhbF9oZHNbaV0pIHsKZGlmZiAtLWdpdCBh L21vbml0b3IuYyBiL21vbml0b3IuYwppbmRleCA0ZjUwN2YyLi45YTU1ZTFjIDEwMDY0NAotLS0g YS9tb25pdG9yLmMKKysrIGIvbW9uaXRvci5jCkBAIC0zMDQsMTQgKzMwNCw2IEBAIHN0YXRpYyB2 b2lkIGRvX2luZm9fbmFtZShNb25pdG9yICptb24pCiAgICAgICAgIG1vbml0b3JfcHJpbnRmKG1v biwgIiVzXG4iLCBxZW11X25hbWUpOwogfQogCi0jaWYgZGVmaW5lZChUQVJHRVRfSTM4NikKLXN0 YXRpYyB2b2lkIGRvX2luZm9faHBldChNb25pdG9yICptb24pCi17Ci0gICAgbW9uaXRvcl9wcmlu dGYobW9uLCAiSFBFVCBpcyAlcyBieSBRRU1VXG4iLAotICAgICAgICAgICAgICAgICAgIChub19o cGV0KSA/ICJkaXNhYmxlZCIgOiAiZW5hYmxlZCIpOwotfQotI2VuZGlmCi0KIHN0YXRpYyB2b2lk IGRvX2luZm9fdXVpZChNb25pdG9yICptb24pCiB7CiAgICAgbW9uaXRvcl9wcmludGYobW9uLCBV VUlEX0ZNVCAiXG4iLCBxZW11X3V1aWRbMF0sIHFlbXVfdXVpZFsxXSwKQEAgLTE4MDYsOCArMTc5 OCw2IEBAIHN0YXRpYyBjb25zdCBtb25fY21kX3QgaW5mb19jbWRzW10gPSB7CiAjaWYgZGVmaW5l ZChUQVJHRVRfSTM4NikKICAgICB7ICJtZW0iLCAiIiwgbWVtX2luZm8sCiAgICAgICAiIiwgInNo b3cgdGhlIGFjdGl2ZSB2aXJ0dWFsIG1lbW9yeSBtYXBwaW5ncyIsIH0sCi0gICAgeyAiaHBldCIs ICIiLCBkb19pbmZvX2hwZXQsCi0gICAgICAiIiwgInNob3cgc3RhdGUgb2YgSFBFVCIsIH0sCiAj ZW5kaWYKICAgICB7ICJqaXQiLCAiIiwgZG9faW5mb19qaXQsCiAgICAgICAiIiwgInNob3cgZHlu YW1pYyBjb21waWxlciBpbmZvIiwgfSwKZGlmZiAtLWdpdCBhL3FlbXUtbW9uaXRvci5oeCBiL3Fl bXUtbW9uaXRvci5oeAppbmRleCA2YWQ5NjBlLi45NDZiYTM0IDEwMDY0NAotLS0gYS9xZW11LW1v bml0b3IuaHgKKysrIGIvcWVtdS1tb25pdG9yLmh4CkBAIC00OSw4ICs0OSw2IEBAIHNob3cgdGhl IGNvbW1hbmQgbGluZSBoaXN0b3J5CiBzaG93IHZpcnR1YWwgdG8gcGh5c2ljYWwgbWVtb3J5IG1h cHBpbmdzIChpMzg2IG9ubHkpCiBAaXRlbSBpbmZvIG1lbQogc2hvdyB0aGUgYWN0aXZlIHZpcnR1 YWwgbWVtb3J5IG1hcHBpbmdzIChpMzg2IG9ubHkpCi1AaXRlbSBpbmZvIGhwZXQKLXNob3cgc3Rh dGUgb2YgSFBFVCAoaTM4NiBvbmx5KQogQGl0ZW0gaW5mbyBrdm0KIHNob3cgS1ZNIGluZm9ybWF0 aW9uCiBAaXRlbSBpbmZvIHVzYgotLSAKMS41LjYuNQoK --000e0cdfd7e6ae85e80472485b4a--