-localtime option
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@871 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									be3edd9590
								
							
						
					
					
						commit
						ee22c2f7db
					
				
							
								
								
									
										3
									
								
								hw/pc.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								hw/pc.c
									
									
									
									
									
								
							@ -110,7 +110,10 @@ static void cmos_init(int ram_size, int boot_device)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /* set the CMOS date */
 | 
					    /* set the CMOS date */
 | 
				
			||||||
    time(&ti);
 | 
					    time(&ti);
 | 
				
			||||||
 | 
					    if (rtc_utc)
 | 
				
			||||||
        tm = gmtime(&ti);
 | 
					        tm = gmtime(&ti);
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					        tm = localtime(&ti);
 | 
				
			||||||
    rtc_set_date(s, tm);
 | 
					    rtc_set_date(s, tm);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    val = to_bcd(s, (tm->tm_year / 100) + 19);
 | 
					    val = to_bcd(s, (tm->tm_year / 100) + 19);
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										6
									
								
								vl.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								vl.c
									
									
									
									
									
								
							@ -129,6 +129,7 @@ int vm_running;
 | 
				
			|||||||
int audio_enabled = 0;
 | 
					int audio_enabled = 0;
 | 
				
			||||||
int pci_enabled = 0;
 | 
					int pci_enabled = 0;
 | 
				
			||||||
int prep_enabled = 0;
 | 
					int prep_enabled = 0;
 | 
				
			||||||
 | 
					int rtc_utc = 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/***********************************************************/
 | 
					/***********************************************************/
 | 
				
			||||||
/* x86 ISA bus support */
 | 
					/* x86 ISA bus support */
 | 
				
			||||||
@ -2015,6 +2016,7 @@ enum {
 | 
				
			|||||||
    QEMU_OPTION_no_code_copy,
 | 
					    QEMU_OPTION_no_code_copy,
 | 
				
			||||||
    QEMU_OPTION_pci,
 | 
					    QEMU_OPTION_pci,
 | 
				
			||||||
    QEMU_OPTION_prep,
 | 
					    QEMU_OPTION_prep,
 | 
				
			||||||
 | 
					    QEMU_OPTION_localtime,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct QEMUOption {
 | 
					typedef struct QEMUOption {
 | 
				
			||||||
@ -2065,6 +2067,7 @@ const QEMUOption qemu_options[] = {
 | 
				
			|||||||
#ifdef TARGET_PPC
 | 
					#ifdef TARGET_PPC
 | 
				
			||||||
    { "prep", 0, QEMU_OPTION_prep },
 | 
					    { "prep", 0, QEMU_OPTION_prep },
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					    { "localtime", 0, QEMU_OPTION_localtime },
 | 
				
			||||||
    { NULL },
 | 
					    { NULL },
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -2341,6 +2344,9 @@ int main(int argc, char **argv)
 | 
				
			|||||||
            case QEMU_OPTION_prep:
 | 
					            case QEMU_OPTION_prep:
 | 
				
			||||||
                prep_enabled = 1;
 | 
					                prep_enabled = 1;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            case QEMU_OPTION_localtime:
 | 
				
			||||||
 | 
					                rtc_utc = 0;
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										1
									
								
								vl.h
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								vl.h
									
									
									
									
									
								
							@ -170,6 +170,7 @@ void vm_stop(int reason);
 | 
				
			|||||||
extern int audio_enabled;
 | 
					extern int audio_enabled;
 | 
				
			||||||
extern int ram_size;
 | 
					extern int ram_size;
 | 
				
			||||||
extern int bios_size;
 | 
					extern int bios_size;
 | 
				
			||||||
 | 
					extern int rtc_utc;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* XXX: make it dynamic */
 | 
					/* XXX: make it dynamic */
 | 
				
			||||||
#if defined (TARGET_PPC)
 | 
					#if defined (TARGET_PPC)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user