Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
On Jan 01, 2007, Zhang, Xiantao wrote: Thank you for reporting this issue. I will fix it later. libqemu.a(kvm-tpr-opt.o): In function `enable_vapic': /house/cmarenas/kvm-58/qemu/kvm-tpr-opt.c:221: undefined reference to `kvm_enable_vapic' i still get this on i686 using kvm-59. (log at http://frugalware.org/~vmiklos/logs/kvm-59-1-i686.log) is this a known issue? ps: please cc me, i'm not on the list. thanks, - VMiklos pgpnDlVETqNA5.pgp Description: PGP signature - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
On Sun, Jan 06, 2008 at 02:06:00AM +0100, Miklos Vajna wrote: On Jan 01, 2007, Zhang, Xiantao wrote: Thank you for reporting this issue. I will fix it later. libqemu.a(kvm-tpr-opt.o): In function `enable_vapic': /house/cmarenas/kvm-58/qemu/kvm-tpr-opt.c:221: undefined reference to `kvm_enable_vapic' i still get this on i686 using kvm-59. (log at http://frugalware.org/~vmiklos/logs/kvm-59-1-i686.log) there has to be something wrong with your build system as from the log it seems you are using -I /include which most likely doesn't exist is this a known issue? only for ia64 Carlo - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Carlo Marcelo Arenas Belon wrote: On Tue, Jan 01, 2008 at 06:37:23PM +0200, Avi Kivity wrote: Carlo Marcelo Arenas Belon wrote: if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml I signed up for an account, but they don't allow ssh access (only telnet), and no outgoing connections, so it's impossible to use git or rsync with this thing. telnet in, and ftp in a snapshot tar (one that has all the files chown to root to avoid username lookups in their NIS environment) worked for me. For a compile-after-every-commit approach that's too slow. Consider sending a kernel tree using this method... Maybe rsync --write-batch / --read-batch can be made to work. -- error compiling committee.c: too many arguments to function - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
On Sat, 2007-12-22 at 22:25 +0200, Avi Kivity wrote: Amit Shah wrote: On Friday 21 December 2007 20:28:23 Zhang, Xiantao wrote: Hi, Avi Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail , this patch fixed them. Xiantao I've not checked the patch yet; but a curiosity question: Do you also test x86 compiles / builds? (Just to make sure these fixes don't just fix ia64, but also don't break x86) Well, please do test patchsets on x86. But I'd also like to check x86 patches against ia64 (and ppc, s390). Do you have easy instructions for setting up a cross-build environment? http://kernelnewbies.org/FAQ/KernelCrossCompilation has some info. It's surprisingly easy. -- Hollis Blanchard IBM Linux Technology Center - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Carlo Marcelo Arenas Belon wrote: Avi, how would you like patches to fix build issues in ia64 to be handled?, should be expected that kvm releases build for ia64? is there any system that could be used as part of a compile farm / testing for ia64? In theory every commit should compile and build on ia64. I still don't have an ia64 cross compiler so that doesn't work in practice. if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml I prefer a cross compiler, but if that turns out to difficult to set up, this can be a good substitute. -- error compiling committee.c: too many arguments to function - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Carlo Marcelo Arenas Belon wrote: Thank you for reporting this issue. I will fix it later. libqemu.a(kvm-tpr-opt.o): In function `enable_vapic': /house/cmarenas/kvm-58/qemu/kvm-tpr-opt.c:221: undefined reference to `kvm_enable_vapic' Xiantao, are there any plans to merge into qemu all changes required to get host/guest support for ia64?, if for nothing else that could help with problems due to qemu merges. Yes, we indeed have plan to push the changes to upstream for qemu/ia64 support. But you know, the current change mostly works on kvm infrastructure, so we more time to identify them out, and to see which changes can benefits qemu, and to decide the final push. Qemu/ia64 support should be support from the long run. :-) Avi, how would you like patches to fix build issues in ia64 to be handled?, should be expected that kvm releases build for ia64? is there any system that could be used as part of a compile farm / testing for ia64? if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : Good choice! But seems still be complex to maintainer. I will find the method to setup cross-compile, and hope it will help Avi to validate them. Xiantao - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Avi Kivity wrote: Carlo Marcelo Arenas Belon wrote: Avi, how would you like patches to fix build issues in ia64 to be handled?, should be expected that kvm releases build for ia64? is there any system that could be used as part of a compile farm / testing for ia64? In theory every commit should compile and build on ia64. I still don't have an ia64 cross compiler so that doesn't work in practice. Agree, for ia64 support, we indeed to assume build pass for every commit. But in fact it should be hard to operate, but at least to assure workable commit for release version, since final users mostly only use release kvm source. :) if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml I prefer a cross compiler, but if that turns out to difficult to set up, this can be a good substitute. I will try to setup the environment and send the BKM to you if it is easy to go. :) Xiantao - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Zhang, Xiantao wrote: if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml I prefer a cross compiler, but if that turns out to difficult to set up, this can be a good substitute. I will try to setup the environment and send the BKM to you if it is easy to go. :) What is a BKM? I tried setting up a crosstool environment, but I couldn't get binutils (2.18 and 2.18.50.0.3) to build (FC6 and F8, both x86_64). Maybe someone has a VM image with working cross-compiler support? -- error compiling committee.c: too many arguments to function - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Avi Kivity wrote: Zhang, Xiantao wrote: if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml I prefer a cross compiler, but if that turns out to difficult to set up, this can be a good substitute. I will try to setup the environment and send the BKM to you if it is easy to go. :) What is a BKM? Oh sorry for misunderstanding , it is the abbreviation of Best Known Method. Here I mean a tutorial to setup this environment. I tried setting up a crosstool environment, but I couldn't get binutils (2.18 and 2.18.50.0.3) to build (FC6 and F8, both x86_64). Frankly speaking, I have no experience on it. But seems this page can help us : http://www.gelato.unsw.edu.au/IA64wiki/CrossCompilation Maybe someone has a VM image with working cross-compiler support? If that, sound good to solve this problem. :) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Zhang, Xiantao wrote: I tried setting up a crosstool environment, but I couldn't get binutils (2.18 and 2.18.50.0.3) to build (FC6 and F8, both x86_64). Frankly speaking, I have no experience on it. But seems this page can help us : http://www.gelato.unsw.edu.au/IA64wiki/CrossCompilation Since I don't use debian, I tried following http://www.gelato.unsw.edu.au/IA64wiki/AlternateCrossCompilation from the same site. But as I said, I couldn't even complete the first step. -- error compiling committee.c: too many arguments to function - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Carlo Marcelo Arenas Belon wrote: if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml I signed up for an account, but they don't allow ssh access (only telnet), and no outgoing connections, so it's impossible to use git or rsync with this thing. -- error compiling committee.c: too many arguments to function - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
On Tue, Jan 01, 2008 at 06:37:23PM +0200, Avi Kivity wrote: Carlo Marcelo Arenas Belon wrote: if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml I signed up for an account, but they don't allow ssh access (only telnet), and no outgoing connections, so it's impossible to use git or rsync with this thing. telnet in, and ftp in a snapshot tar (one that has all the files chown to root to avoid username lookups in their NIS environment) worked for me. Carlo - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
On Fri, Dec 21, 2007 at 10:58:23PM +0800, Zhang, Xiantao wrote: Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail kvm-58 as released doesn't build in ia64 either because of the tpr/vapic changes that were done at release date as shown by : gcc -Wl,-G0 -Wl,-T,/house/cmarenas/kvm-58/qemu/ia64.ld -L /house/cmarenas/kvm-58/qemu/../libkvm -g -o qemu-system-ia64 vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o migration.o block-raw-posix.o lsi53c895a.o usb-ohci.o eeprom93xx.o eepro100.o ne2000.o pcnet.o rtl8139.o hypercall.o ide.o pckbd.o ps2.o vga.o sb16.o es1370.o dma.o fdc.o mc146818rtc.o serial.o i8259.o ipf.o cirrus_vga.o parallel.o acpi.o piix_pci.o usb-uhci.o /house/cmarenas/kvm-58/qemu/smbus_eeprom.o ../libqemu_common.a libqemu.a /house/cmarenas/kvm-58/qemu/../libkvm/libkvm.a -lm -lz -lkvm -lrt -lpthread -lutil libqemu.a(kvm-tpr-opt.o): In function `kvm_tpr_opt_setup': /house/cmarenas/kvm-58/qemu/kvm-tpr-opt.c:287: undefined reference to `kvm_enable_tpr_access_reporting' libqemu.a(kvm-tpr-opt.o): In function `enable_vapic': /house/cmarenas/kvm-58/qemu/kvm-tpr-opt.c:221: undefined reference to `kvm_enable_vapic' Xiantao, are there any plans to merge into qemu all changes required to get host/guest support for ia64?, if for nothing else that could help with problems due to qemu merges. Avi, how would you like patches to fix build issues in ia64 to be handled?, should be expected that kvm releases build for ia64? is there any system that could be used as part of a compile farm / testing for ia64? if nothing is available hp's testdrive have some itanium systems that could be used at least to validate the userspace part builds (as I did) : http://www.testdrive.hp.com/systems/itanium.shtml Carlo PS. there are more warnings and other issues in that build that the ones shown above. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Hi, Xiantao diff --git a/qemu/target-ia64/cpu.h b/qemu/target-ia64/cpu.h index be409c7..2d91cb9 100644 --- a/qemu/target-ia64/cpu.h +++ b/qemu/target-ia64/cpu.h @@ -30,11 +30,11 @@ #define TARGET_LONG_BITS 64 - -#define TARGET_PAGE_BITS 14 +#define TARGET_PAGE_BITS 16 Do we need to use CONFIG_IA64_PAGE_SIZE_64KB in .config of kernel? Cannot we use CONFIG_IA64_PAGE_SIZE_16KB? Best Regards, Akio Takebe - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Akio Takebe wrote: Hi, Xiantao diff --git a/qemu/target-ia64/cpu.h b/qemu/target-ia64/cpu.h index be409c7..2d91cb9 100644 --- a/qemu/target-ia64/cpu.h +++ b/qemu/target-ia64/cpu.h @@ -30,11 +30,11 @@ #define TARGET_LONG_BITS 64 - -#define TARGET_PAGE_BITS 14 +#define TARGET_PAGE_BITS 16 Do we need to use CONFIG_IA64_PAGE_SIZE_64KB in .config of kernel? Cannot we use CONFIG_IA64_PAGE_SIZE_16KB?CONFIG_IA64_PAGE_SIZE_16KB Since current kvm/ia64 doesn't support build in userspace source, userspace qemu built can't reference kernel's autoconf.h now. Once userspace built supported, we can let it use CONFIG_IA64_PAGE_SIZE_16KB or CONFIG_IA64_PAGE_SIZE_64KB in autoconf.h to define TARGET_PAGE_BITS. Now, I added a page size check in ipf_pci_init, and let user know the mismatch. :) Xiantao - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Zhang, Xiantao wrote: Hi, Avi Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail , this patch fixed them. Xiantao From: Zhang Xiantao [EMAIL PROTECTED] Date: Fri, 21 Dec 2007 22:47:52 +0800 Subject: [PATCH] kvm: qemu : Fix ia64 build on latest source. Due to last merge with qemu upstream, ia64 build is broken. This patch fix it. Applied, thanks. -- Do not meddle in the internals of kernels, for they are subtle and quick to panic. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Amit Shah wrote: On Friday 21 December 2007 20:28:23 Zhang, Xiantao wrote: Hi, Avi Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail , this patch fixed them. Xiantao I've not checked the patch yet; but a curiosity question: Do you also test x86 compiles / builds? (Just to make sure these fixes don't just fix ia64, but also don't break x86) Well, please do test patchsets on x86. But I'd also like to check x86 patches against ia64 (and ppc, s390). Do you have easy instructions for setting up a cross-build environment? -- Do not meddle in the internals of kernels, for they are subtle and quick to panic. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
[kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Hi, Avi
Due to last merge with Qemu upstream, some interfaces are changed, and
leads to build fail
, this patch fixed them.
Xiantao
From: Zhang Xiantao [EMAIL PROTECTED]
Date: Fri, 21 Dec 2007 22:47:52 +0800
Subject: [PATCH] kvm: qemu : Fix ia64 build on latest source.
Due to last merge with qemu upstream, ia64 build
is broken. This patch fix it.
Signed-off-by: Zhang Xiantao [EMAIL PROTECTED]
---
qemu/hw/boards.h |3 +
qemu/hw/ipf.c| 553
+++---
qemu/qemu-kvm-ia64.c |2 +-
qemu/sysemu.h|5 +
qemu/target-ia64/cpu.h | 10 +-
qemu/target-ia64/firmware.c |1 -
qemu/target-ia64/op_helper.c |2 +-
7 files changed, 325 insertions(+), 251 deletions(-)
diff --git a/qemu/hw/boards.h b/qemu/hw/boards.h
index 079760d..3285e6e 100644
--- a/qemu/hw/boards.h
+++ b/qemu/hw/boards.h
@@ -96,4 +96,7 @@ extern QEMUMachine dummy_m68k_machine;
/* mainstone.c */
extern QEMUMachine mainstone2_machine;
+/* ipf.c */
+extern QEMUMachine ipf_machine;
+
#endif
diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index 9bcdb85..9c74531 100644
--- a/qemu/hw/ipf.c
+++ b/qemu/hw/ipf.c
@@ -24,9 +24,20 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
* THE SOFTWARE.
*/
-#include vl.h
+
+#include hw.h
+#include pc.h
+#include fdc.h
+#include pci.h
+#include block.h
+#include sysemu.h
+#include audio/audio.h
+#include net.h
+#include smbus.h
+#include boards.h
#include firmware.h
#include ia64intrin.h
+#include dyngen.h
#include unistd.h
#ifdef USE_KVM
@@ -34,34 +45,23 @@
extern int kvm_allowed;
#endif
-/* output Bochs bios info messages */
-//#define DEBUG_BIOS
-
#define FW_FILENAME Flash.fd
/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables.
*/
#define ACPI_DATA_SIZE 0x1
+#define MAX_IDE_BUS 2
+
static fdctrl_t *floppy_controller;
static RTCState *rtc_state;
static PCIDevice *i440fx_state;
-static const int ide_iobase[2] = { 0x1f0, 0x170 };
-static const int ide_iobase2[2] = { 0x3f6, 0x376 };
-static const int ide_irq[2] = { 14, 15 };
-
-#define NE2000_NB_MAX 6
-
-static int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360,
0x280, 0x380 };
-static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
-
-static int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8
};
-static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 };
-
-static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
-static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
+static void pic_irq_request(void *opaque, int irq, int level)
+{
+ fprintf(stderr,pic_irq_request called!\n);
+}
-/* cmos mappings */
+/* PC cmos mappings */
#define REG_EQUIPMENT_BYTE 0x14
@@ -106,10 +106,30 @@ static void cmos_init_hd(int type_ofs, int
info_ofs, BlockDriverState *hd)
rtc_set_memory(s, info_ofs + 8, sectors);
}
+/* convert boot_device letter to something recognizable by the bios */
+static int boot_device2nibble(char boot_device)
+{
+switch(boot_device) {
+case 'a':
+case 'b':
+return 0x01; /* floppy boot */
+case 'c':
+return 0x02; /* hard drive boot */
+case 'd':
+return 0x03; /* CD-ROM boot */
+case 'n':
+return 0x04; /* Network boot */
+}
+return 0;
+}
+
/* hd_table must contain 4 block drivers */
-static void cmos_init(ram_addr_t ram_size, ram_addr_t
above_4g_mem_size, int boot_device, BlockDriverState **hd_table, int
smp_cpus)
+static void cmos_init(ram_addr_t ram_size, ram_addr_t
above_4g_mem_size,
+ const char *boot_device, BlockDriverState
**hd_table,
+ int smp_cpus)
{
RTCState *s = rtc_state;
+int nbds, bds[3] = { 0, };
int val;
int fd0, fd1, nb;
int i;
@@ -145,24 +165,23 @@ static void cmos_init(ram_addr_t ram_size,
ram_addr_t above_4g_mem_size, int boo
rtc_set_memory(s, 0x34, val);
rtc_set_memory(s, 0x35, val 8);
-switch(boot_device) {
-case 'a':
-case 'b':
-rtc_set_memory(s, 0x3d, 0x01); /* floppy boot */
-if (!fd_bootchk)
-rtc_set_memory(s, 0x38, 0x01); /* disable signature check
*/
-break;
-default:
-case 'c':
-rtc_set_memory(s, 0x3d, 0x02); /* hard drive boot */
-break;
-case 'd':
-rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */
-break;
-case 'n':
-rtc_set_memory(s, 0x3d, 0x04); /* Network boot */
-break;
+/* set boot devices, and disable floppy signature check if
requested */
+#define PC_MAX_BOOT_DEVICES 3
+nbds = strlen(boot_device);
+if (nbds PC_MAX_BOOT_DEVICES) {
+fprintf(stderr, Too many boot devices for PC\n);
+exit(1);
+}
+for (i = 0; i nbds; i++) {
+bds[i] = boot_device2nibble(boot_device[i]);
+if (bds[i] == 0) {
+fprintf(stderr, Invalid boot device for PC: '%c'\n,
+
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
On Friday 21 December 2007 20:28:23 Zhang, Xiantao wrote: Hi, Avi Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail , this patch fixed them. Xiantao I've not checked the patch yet; but a curiosity question: Do you also test x86 compiles / builds? (Just to make sure these fixes don't just fix ia64, but also don't break x86) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Amit Shah wrote: On Friday 21 December 2007 20:28:23 Zhang, Xiantao wrote: Hi, Avi Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail , this patch fixed them. Xiantao I've not checked the patch yet; but a curiosity question: Do you also test x86 compiles / builds? (Just to make sure these fixes don't just fix ia64, but also don't break x86) is it mean that i should place order for http://h20341.www2.hp.com/integrity/cache/342370-0-0-0-121.html ? :) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
On Friday 21 December 2007 23:38:14 Izik Eidus wrote: Amit Shah wrote: On Friday 21 December 2007 20:28:23 Zhang, Xiantao wrote: Hi, Avi Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail , this patch fixed them. Xiantao I've not checked the patch yet; but a curiosity question: Do you also test x86 compiles / builds? (Just to make sure these fixes don't just fix ia64, but also don't break x86) is it mean that i should place order for http://h20341.www2.hp.com/integrity/cache/342370-0-0-0-121.html ? :) That, or just set up a cross-build environment. I think the first option sounds simpler ;-) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
Re: [kvm-devel] [PATCH] kvm/qemu: Fix ia64 build broken.
Amit Shah wrote: On Friday 21 December 2007 20:28:23 Zhang, Xiantao wrote: Hi, Avi Due to last merge with Qemu upstream, some interfaces are changed, and leads to build fail , this patch fixed them. Xiantao I've not checked the patch yet; but a curiosity question: Do you also test x86 compiles / builds? (Just to make sure these fixes don't just fix ia64, I don't know x86 is broken. But seems somebody has sent out patchset to fix x86. :) but also don't break x86) Honestly, I didn't try it on x86 platform. But they shouldn't break x86, because these fixes only touch ia64 files. Very few changes about common code doesn't impact other platforms. Xiantao - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
