[Qemu-devel] Re: [PATCH 09/17] pc.c: remove a global variable, RTCState *rtc_state.

[Isaku Yamahata]

On Wed, Jul 08, 2009 at 09:44:31AM +0200, Paolo Bonzini wrote:
> On 07/03/2009 09:11 AM, Isaku Yamahata wrote:
> >+#if defined(TARGET_I386)
> >  /* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE)
> >     BIOS will read it and start S3 resume at POST Entry */
> >+static RTCState *rtc_state;
> >+void cmos_set_s3_resume_init(RTCState *s)
> >+{
> >+    rtc_state = s;
> >+}
> >+
> >  void cmos_set_s3_resume(void)
> >  {
> >      if (rtc_state)
> >          rtc_set_memory(rtc_state, 0xF, 0xFE);
> >  }
> >+#endif
> 
> Comment above the wrong function.  Also, rather than defining it only 
> for TARGET_I386, I would #ifdef just the body if cmos_set_s3_resume for 
> cleanliness.

The case you pointed out is handled in pc.h. 
Or are you suggesting that they should be defined in pc.c even when
TARGET_I386 isn't defined?

thanks,

diff --git a/hw/pc.h b/hw/pc.h
index bd711ce..a18e558 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -95,7 +95,13 @@ RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift,
+qemu_irq irq,
                       int base_year);
 void rtc_set_memory(RTCState *s, int addr, int val);
 void rtc_set_date(RTCState *s, const struct tm *tm);
+#if defined(TARGET_I386)
+void cmos_set_s3_resume_init(RTCState *s);
 void cmos_set_s3_resume(void);
+#else
+static inline void cmos_set_s3_resume_init(RTCState *s) {}
+static inline void cmos_set_s3_resume(void) {}
+#endif

 /* pc.c */
 extern int fd_bootchk; 


-- 
yamahata